From 5b9e2ab42894690afea2322384cffb45d3ece6a7 Mon Sep 17 00:00:00 2001 From: muflax Date: Thu, 16 Feb 2012 23:17:17 +0100 Subject: [PATCH] nanoc update --- Rakefile | 2 +- lib/crumb.rb | 2 +- lib/default.rb | 6 +++--- lib/episteme.rb | 2 +- lib/org_mode_filer.rb | 2 +- lib/tidy.rb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Rakefile b/Rakefile index cbec8d6..d941b59 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,3 @@ -require 'nanoc3/tasks' +require 'nanoc/tasks' Dir['tasks/**/*.rake'].sort.each { |rakefile| load rakefile} diff --git a/lib/crumb.rb b/lib/crumb.rb index 561a98d..49b482c 100644 --- a/lib/crumb.rb +++ b/lib/crumb.rb @@ -1,5 +1,5 @@ # breadcrumb navigation -include Nanoc3::Helpers::Breadcrumbs +include Nanoc::Helpers::Breadcrumbs def breadcrumbs breadcrumbs_for_identifier(@item.identifier).map do |crumb| diff --git a/lib/default.rb b/lib/default.rb index 9a1f2a0..368e5f5 100644 --- a/lib/default.rb +++ b/lib/default.rb @@ -1,8 +1,8 @@ # Helper functions for site-building. -include Nanoc3::Helpers::Rendering +include Nanoc::Helpers::Rendering -class Nanoc3::Item +class Nanoc::Item def add_content content @raw_content += "\n\n#{content}" end @@ -32,7 +32,7 @@ class Nanoc3::Item end end -class Nanoc3::Site +class Nanoc::Site # only articles that actually get printed attr_reader :printed_items diff --git a/lib/episteme.rb b/lib/episteme.rb index 8ef383a..fe62d43 100644 --- a/lib/episteme.rb +++ b/lib/episteme.rb @@ -28,7 +28,7 @@ def episteme_cat status "[#{episteme status}][Epistemic State]{:.episteme}" end -class Nanoc3::Item +class Nanoc::Item def epistemic? !!self[:episteme] end diff --git a/lib/org_mode_filer.rb b/lib/org_mode_filer.rb index bd1d7ea..672e76c 100644 --- a/lib/org_mode_filer.rb +++ b/lib/org_mode_filer.rb @@ -1,6 +1,6 @@ require 'org-ruby' -class OrgFilter < Nanoc3::Filter +class OrgFilter < Nanoc::Filter identifier :org def run(content, params={}) diff --git a/lib/tidy.rb b/lib/tidy.rb index a468430..dc51663 100644 --- a/lib/tidy.rb +++ b/lib/tidy.rb @@ -5,7 +5,7 @@ require 'tidy_ffi' -class TidyFilter < Nanoc3::Filter +class TidyFilter < Nanoc::Filter identifier :tidy def run(content, params={}) TidyFFI::Tidy.new(content,