nanoc 3.5.0 → 3.6.0

data/lib/nanoc/filters/erb.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8                                                                                                           
 
-require 'erb'
-
 module Nanoc::Filters
   class ERB < Nanoc::Filter
 
+    requires 'erb'
+
     # Runs the content through [ERB](http://ruby-doc.org/stdlib/libdoc/erb/rdoc/classes/ERB.html).
     #
     # @param [String] content The content to filter

data/lib/nanoc/filters/erubis.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'erubis'
-
 module Nanoc::Filters
   class Erubis < Nanoc::Filter
 
+    requires 'erubis'
+
     # The same as `::Erubis::Eruby` but adds `_erbout` as an alias for the
     # `_buf` variable, making it compatible with nanoc’s helpers that rely
     # on `_erbout`, such as {Nanoc::Helpers::Capturing}.

data/lib/nanoc/filters/haml.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'haml'
-
 module Nanoc::Filters
   class Haml < Nanoc::Filter
 
+    requires 'haml'
+
     # Runs the content through [Haml](http://haml-lang.com/).
     # Parameters passed to this filter will be passed on to Haml.
     #

data/lib/nanoc/filters/handlebars.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-require 'handlebars'
-
 module Nanoc::Filters
 
   # @since 3.4.0
   class Handlebars < Nanoc::Filter
 
+    requires 'handlebars'
+
     # Runs the content through
     # [Handlebars](http://handlebarsjs.com/) using
     # [Handlebars.rb](https://github.com/cowboyd/handlebars.rb).

data/lib/nanoc/filters/kramdown.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'kramdown'
-
 module Nanoc::Filters
   class Kramdown < Nanoc::Filter
 
+    requires 'kramdown'
+
     # Runs the content through [Kramdown](http://kramdown.rubyforge.org/).
     # Parameters passed to this filter will be passed on to Kramdown.
     #

data/lib/nanoc/filters/less.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'less'
-
 module Nanoc::Filters
   class Less < Nanoc::Filter
 
+    requires 'less'
+
     # Runs the content through [LESS](http://lesscss.org/).
     # This method takes no options.
     #

data/lib/nanoc/filters/markaby.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'markaby'
-
 module Nanoc::Filters
   class Markaby < Nanoc::Filter
 
+    requires 'markaby'
+
     # Runs the content through [Markaby](http://markaby.rubyforge.org/).
     # This method takes no options.
     #

data/lib/nanoc/filters/maruku.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'maruku'
-
 module Nanoc::Filters
   class Maruku < Nanoc::Filter
 
+    requires 'maruku'
+
     # Runs the content through [Maruku](http://maruku.rubyforge.org/).
     # Parameters passed to this filter will be passed on to Maruku.
     #

data/lib/nanoc/filters/mustache.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-require 'mustache'
-
 module Nanoc::Filters
 
   # @since 3.2.0
   class Mustache < Nanoc::Filter
 
+    requires 'mustache'
+
     # Runs the content through
     # [Mustache](http://github.com/defunkt/mustache). This method takes no
     # options.

data/lib/nanoc/filters/pandoc.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'pandoc-ruby'
-
 module Nanoc::Filters
   class Pandoc < Nanoc::Filter
 
+    requires 'pandoc-ruby'
+
     # Runs the content through [Pandoc](http://johnmacfarlane.net/pandoc/)
     # using [PandocRuby](https://github.com/alphabetum/pandoc-ruby). Options
     # are passed on to PandocRuby.

data/lib/nanoc/filters/rainpress.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'rainpress'
-
 module Nanoc::Filters
   class Rainpress < Nanoc::Filter
 
+    requires 'rainpress'
+
     # Runs the content through [Rainpress](http://code.google.com/p/rainpress/).
     # Parameters passed to this filter will be passed on to Rainpress.
     #

data/lib/nanoc/filters/rdiscount.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'rdiscount'
-
 module Nanoc::Filters
   class RDiscount < Nanoc::Filter
 
+    requires 'rdiscount'
+
     # Runs the content through [RDiscount](http://github.com/rtomayko/rdiscount).
     #
     # @option params [Array] symbol ([]) A list of RDiscount extensions

data/lib/nanoc/filters/rdoc.rb

@@ -1,18 +1,10 @@
 # encoding: utf-8
 
-begin
-  # new RDoc
-  require 'rdoc/markup'
-  require 'rdoc/markup/to_html'
-rescue LoadError
-  # old RDoc
-  require 'rdoc/markup/simple_markup'
-  require 'rdoc/markup/simple_markup/to_html'
-end
-
 module Nanoc::Filters
   class RDoc < Nanoc::Filter
 
+    requires 'rdoc/markup', 'rdoc/markup/to_html'
+
     # Runs the content through [RDoc::Markup](http://rdoc.rubyforge.org/RDoc/Markup.html).
     # This method takes no options.
     #
@@ -20,13 +12,7 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      begin
-        # new RDoc
-        ::RDoc::Markup.new.convert(content, ::RDoc::Markup::ToHtml.new)
-      rescue LoadError
-        # old RDoc
-        ::SM::SimpleMarkup.new.convert(content, ::SM::ToHtml.new)
-      end
+      ::RDoc::Markup.new.convert(content, ::RDoc::Markup::ToHtml.new)
     end
 
   end

data/lib/nanoc/filters/redcarpet.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-require 'redcarpet'
-
 module Nanoc::Filters
 
   # @since 3.2.0
   class Redcarpet < Nanoc::Filter
 
+    requires 'redcarpet'
+
     # Runs the content through [Redcarpet](https://github.com/vmg/redcarpet).
     # This method optionally takes processing options to pass on to Redcarpet.
     #
@@ -49,7 +49,11 @@ module Nanoc::Filters
           warn 'WARNING: You are passing an array of options to the :redcarpet filter, but Redcarpet 2.x expects a hash instead. This will likely fail.'
         end
 
-        renderer = renderer_class.new(renderer_options)
+        if renderer_class == ::Redcarpet::Render::HTML_TOC
+          renderer = renderer_class.new
+        else
+          renderer = renderer_class.new(renderer_options)
+        end
         ::Redcarpet::Markdown.new(renderer, options).render(content)
       else
         options = params[:options] || []

data/lib/nanoc/filters/redcloth.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'redcloth'
-
 module Nanoc::Filters
   class RedCloth < Nanoc::Filter
 
+    requires 'redcloth'
+
     # Runs the content through [RedCloth](http://redcloth.org/). This method
     # takes the following options:
     #

data/lib/nanoc/filters/rubypants.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'rubypants'
-
 module Nanoc::Filters
   class RubyPants < Nanoc::Filter
 
+    requires 'rubypants'
+
     # Runs the content through [RubyPants](http://rubydoc.info/gems/rubypants/).
     # This method takes no options.
     #

data/lib/nanoc/filters/sass.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
-require 'sass'
-require 'set'
-
 module Nanoc::Filters
   class Sass < Nanoc::Filter
 
+    requires 'sass'
+
     class << self
       # The current filter. This is definitely going to bite me if I ever get
       # to multithreading nanoc.

data/lib/nanoc/filters/slim.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-require 'slim'
-
 module Nanoc::Filters
 
   # @since 3.2.0
   class Slim < Nanoc::Filter
 
+    requires 'slim'
+
     # Runs the content through [Slim](http://slim-lang.com/).
     # This method takes no options.
     #

data/lib/nanoc/filters/typogruby.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-require 'typogruby'
-
 module Nanoc::Filters
 
   # @since 3.2.0
   class Typogruby < Nanoc::Filter
 
+    requires 'typogruby'
+
     # Runs the content through [Typogruby](http://avdgaag.github.com/typogruby/).
     # This method takes no options.
     #

data/lib/nanoc/filters/uglify_js.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'uglifier'
-
 module Nanoc::Filters
   class UglifyJS < Nanoc::Filter
 
+    requires 'uglifier'
+
     # Runs the content through [UglifyJS](https://github.com/mishoo/UglifyJS/).
     # This method optionally takes options to pass directly to Uglifier:
     #

data/lib/nanoc/filters/xsl.rb

@@ -1,11 +1,12 @@
 # encoding: utf-8
-require 'nokogiri'
 
 module Nanoc::Filters
 
   # @since 3.3.0
   class XSL < Nanoc::Filter
 
+    requires 'nokogiri'
+
     # Runs the item content through an [XSLT](http://www.w3.org/TR/xslt) 
     # stylesheet using  [Nokogiri](http://nokogiri.org/).
     #

data/lib/nanoc/filters/yui_compressor.rb

@@ -1,10 +1,10 @@
-require 'yuicompressor'
-
 module Nanoc::Filters
 
   # @since 3.3.0
   class YUICompressor < Nanoc::Filter
 
+    requires 'yuicompressor'
+
     # Compress Javascript or CSS using [YUICompressor](http://rubydoc.info/gems/yuicompressor).
     # This method optionally takes options to pass directly to the
     # YUICompressor gem.

data/lib/nanoc/helpers/blogging.rb

@@ -350,7 +350,7 @@ module Nanoc::Helpers
     # used in the Atom feed to uniquely identify articles. These IDs are
     # created using a procedure suggested by Mark Pilgrim and described in his
     # ["How to make a good ID in Atom" blog post]
-    # (http://diveintomark.org/archives/2004/05/28/howto-atom-id).
+    # (http://web.archive.org/web/20110915110202/http://diveintomark.org/archives/2004/05/28/howto-atom-id).
     #
     # @param [Nanoc::Item] item The item for which to create an atom tag
     #

data/lib/nanoc/helpers/filtering.rb

@@ -39,7 +39,7 @@ module Nanoc::Helpers
 
       # Filter captured data
       Nanoc::NotificationCenter.post(:filtering_started, @item_rep, filter_name)
-      filtered_data = filter.run(data, arguments)
+      filtered_data = filter.setup_and_run(data, arguments)
       Nanoc::NotificationCenter.post(:filtering_ended, @item_rep, filter_name)
 
       # Append filtered data to buffer

data/lib/nanoc/helpers/rendering.rb

@@ -117,7 +117,7 @@ module Nanoc::Helpers
         Nanoc::NotificationCenter.post(:processing_started, layout)
 
         # Layout
-        result = filter.run(layout.raw_content, filter_args)
+        result = filter.setup_and_run(layout.raw_content, filter_args)
 
         # Append to erbout if we have a block
         if block_given?

data/nanoc.gemspec

@@ -6,7 +6,7 @@ require 'nanoc'
 Gem::Specification.new do |s|
   s.name        = 'nanoc'
   s.version     = Nanoc::VERSION
-  s.homepage    = 'http://nanoc.stoneship.org/'
+  s.homepage    = 'http://nanoc.ws/'
   s.summary     = 'a web publishing system written in Ruby for building small to medium-sized websites.'
   s.description = 'nanoc is a simple but very flexible static site generator written in Ruby. It operates on local files, and therefore does not run on the server. nanoc “compiles” the local source files into HTML (usually), by evaluating eRuby, Markdown, etc.'
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = [ '--main', 'README.md' ]
   s.extra_rdoc_files = [ 'ChangeLog', 'LICENSE', 'README.md', 'NEWS.md' ]
 
-  s.add_runtime_dependency('cri', '~> 2.2')
+  s.add_runtime_dependency('cri', '~> 2.3')
 
   s.add_development_dependency('minitest')
   s.add_development_dependency('mocha')

data/test/base/core_ext/array_spec.rb

@@ -22,32 +22,24 @@ end
 
 describe 'Array#freeze_recursively' do
 
+  include Nanoc::TestHelpers
+
   it 'should prevent first-level elements from being modified' do
     array = [ :a, [ :b, :c ], :d ]
     array.freeze_recursively
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       array[0] = 123
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
   end
 
   it 'should prevent second-level elements from being modified' do
     array = [ :a, [ :b, :c ], :d ]
     array.freeze_recursively
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       array[1][0] = 123
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
   end
 
   it 'should not freeze infinitely' do

data/test/base/core_ext/hash_spec.rb

@@ -40,32 +40,24 @@ end
 
 describe 'Hash#freeze_recursively' do
 
+  include Nanoc::TestHelpers
+
   it 'should prevent first-level elements from being modified' do
     hash = { :a => { :b => :c } }
     hash.freeze_recursively
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       hash[:a] = 123
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
   end
 
   it 'should prevent second-level elements from being modified' do
     hash = { :a => { :b => :c } }
     hash.freeze_recursively
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       hash[:a][:b] = 123
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
   end
 
   it 'should not freeze infinitely' do