nanoc 3.3.2 → 3.3.3

data/Gemfile.lock

@@ -12,36 +12,35 @@ GEM
       posix-spawn (>= 0.3.6)
     bluecloth (2.2.0)
     builder (3.0.0)
-    coderay (1.0.5)
+    coderay (1.0.6)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    commonjs (0.2.0)
-      therubyracer (~> 0.9.9)
-    cri (2.2.0)
+    commonjs (0.2.5)
+    cri (2.2.1)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
     haml (3.1.4)
-    json (1.6.5)
+    json (1.6.6)
     kramdown (0.13.5)
-    less (2.0.9)
+    less (2.1.0)
       commonjs (~> 0.2.0)
-      therubyracer (~> 0.9.9)
+      therubyracer (~> 0.10.0)
     libv8 (3.3.10.4)
     markaby (0.7.2)
       builder (>= 2.0.0)
     maruku (0.6.0)
       syntax (>= 1.0.0)
     metaclass (0.0.1)
-    mime-types (1.17.2)
-    minitest (2.11.3)
+    mime-types (1.18)
+    minitest (2.12.0)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.1.0)
+    multi_json (1.2.0)
     mustache (0.99.4)
-    nokogiri (1.5.0)
+    nokogiri (1.5.2)
     posix-spawn (0.3.6)
     rack (1.4.1)
     rainpress (1.0)
@@ -49,21 +48,21 @@ GEM
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.1.0)
+    redcarpet (2.1.1)
     rubypants (0.2.0)
     sass (3.1.15)
-    slim (1.1.1)
+    slim (1.2.0)
       temple (~> 0.4.0)
-      tilt (~> 1.3.2)
+      tilt (~> 1.3.3)
     syntax (1.0.0)
-    systemu (2.4.2)
+    systemu (2.5.0)
     temple (0.4.0)
-    therubyracer (0.9.9)
+    therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     tilt (1.3.3)
-    typogruby (1.0.14)
+    typogruby (1.0.15)
       rubypants
-    uglifier (1.2.3)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     w3c_validators (1.2)

data/NEWS.md

@@ -1,5 +1,13 @@
 # nanoc news
 
+## 3.3.3 (2012-04-11)
+
+* Fixed directed graph implementation on Rubinius
+* Made capturing helper not remember content between runs
+* Fixed Date#freeze issue on Ruby 1.8.x
+* Made it possible to have any kind of object as parameters in the Rules file
+* Fixed bug which caused changes routes not to cause a recompile
+
 ## 3.3.2 (2012-03-16)
 
 * Removed bin/nanoc3 (use nanoc3 gem if you want it)

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 
   # @return [String] A string containing information about this nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).

data/lib/nanoc/base/compilation/rules_collection.rb

@@ -195,10 +195,28 @@ module Nanoc
     def new_rule_memory_for_rep(rep)
       recording_proxy = rep.to_recording_proxy
       compilation_rule_for(rep).apply_to(recording_proxy, :compiler => @compiler)
-      recording_proxy.rule_memory
+      recording_proxy.rule_memory << [ :write, rep.path ]
+      make_rule_memory_serializable(recording_proxy.rule_memory)
     end
     memoize :new_rule_memory_for_rep
 
+    # Makes the given rule memory serializable by calling `#inspect` on the
+    # filter arguments, so that objects such as classes and filenames can be
+    # serialized.
+    #
+    # @param [Array] rs The rule memory for a certain item rep
+    #
+    # @return [Array] The serializable rule memory
+    def make_rule_memory_serializable(rs)
+      rs.map do |r|
+        if r[0] == :filter
+          [ r[0], r[1], r[2].to_a.sort.map { |a| a.inspect }  ]
+        else
+          r
+        end
+      end
+    end
+
     # @param [Nanoc::Layout] layout The layout to get the rule memory for
     #
     # @return [Array] The rule memory for the given layout

data/lib/nanoc/base/core_ext.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'nanoc/base/core_ext/array'
+require 'nanoc/base/core_ext/date'
 require 'nanoc/base/core_ext/hash'
 require 'nanoc/base/core_ext/pathname'
 require 'nanoc/base/core_ext/string'

data/lib/nanoc/base/core_ext/date.rb

@@ -0,0 +1,27 @@
+require 'date'
+
+begin
+  d = ::Date.today
+  d.freeze
+  d.year
+  needs_patch = false
+rescue => e
+  needs_patch = true
+end
+
+if needs_patch
+ 
+  class ::Date
+
+    [ :amjd, :jd, :day_fraction, :mjd, :ld, :civil, :ordinal, :commercial, :weeknum0, :weeknum1, :time, :wday, :julian?, :gregorian?, :leap? ].each do |m|
+      module_eval <<EOS
+        alias_method :__orig_#{m}, :#{m}
+        def #{m}
+          self.frozen? ? self.dup.#{m} : self.send(:__orig_#{m})
+        end
+EOS
+    end
+
+  end
+
+end

data/lib/nanoc/base/directed_graph.rb

@@ -31,26 +31,19 @@ module Nanoc
   #     # => %w( b c )
   class DirectedGraph
 
-    # The set of vertices in this graph.
-    #
-    # @return [Set]
-    attr_reader :vertices
-
     # @group Creating a graph
 
     # Creates a new directed graph with the given vertices.
     def initialize(vertices)
-      @vertices = Set.new(vertices)
+      @vertices = {}
+      vertices.each_with_index do |v,i|
+        @vertices[v] = i
+      end
 
       @from_graph = {}
       @to_graph   = {}
 
-      @vertice_indexes = {}
-      @vertices.each_with_index do |v, i|
-        @vertice_indexes[v] = i
-      end
-
-      @roots = Set.new(@vertices)
+      @roots = Set.new(@vertices.keys)
 
       invalidate_caches
     end
@@ -72,7 +65,7 @@ module Nanoc
       @from_graph[from] << to
 
       @to_graph[to] ||= Set.new
-      @to_graph[to]  << from
+      @to_graph[to] << from
 
       @roots.delete(to)
 
@@ -109,12 +102,11 @@ module Nanoc
     #
     # @since 3.2.0
     def add_vertex(v)
-      return if @vertices.include?(v)
+      return if @vertices.has_key?(v)
 
-      @vertices << v
-      @vertice_indexes[v] = @vertices.size-1
+      @vertices[v] = @vertices.size
 
-      @roots    << v
+      @roots << v
     end
 
     # Deletes all edges coming from the given vertex.
@@ -206,15 +198,20 @@ module Nanoc
       @successors[from] ||= recursively_find_vertices(from, :direct_successors_of)
     end
 
+    # @return [Array] The list of all vertices in this graph.
+    def vertices
+      @vertices.keys.sort_by { |v| @vertices[v] }
+    end
+
     # Returns an array of tuples representing the edges. The result of this
     # method may take a while to compute and should be cached if possible.
     #
     # @return [Array] The list of all edges in this graph.
     def edges
       result = []
-      @vertices.each_with_index do |v, i|
-        direct_successors_of(v).map { |v2| @vertice_indexes[v2] }.each do |i2|
-          result << [ i, i2 ]
+      @vertices.each_pair do |v1, i1|
+        direct_successors_of(v1).map { |v2| @vertices[v2] }.each do |i2|
+          result << [ i1, i2 ]
         end
       end
       result

data/lib/nanoc/base/source_data/item.rb

@@ -36,6 +36,9 @@ module Nanoc
     #   item’s content (only available for binary items)
     attr_reader   :raw_filename
 
+    # @return [Nanoc::Site] The site this item belongs to
+    attr_accessor :site
+
     # @return [Nanoc::Item, nil] The parent item of this item. This can be
     #   nil even for non-root items.
     attr_accessor :parent

data/lib/nanoc/base/source_data/site.rb

@@ -311,7 +311,10 @@ module Nanoc
       @items = []
       data_sources.each do |ds|
         items_in_ds = ds.items
-        items_in_ds.each { |i| i.identifier = File.join(ds.items_root, i.identifier) }
+        items_in_ds.each do |i|
+          i.identifier = File.join(ds.items_root, i.identifier)
+          i.site = self
+        end
         @items.concat(items_in_ds)
       end
     end

data/lib/nanoc/cli/error_handler.rb

@@ -159,7 +159,7 @@ module Nanoc::CLI
       'rainpress'      => 'rainpress',
       'rdiscount'      => 'rdiscount',
       'redcarpet'      => 'redcarpet',
-      'redcloth'       => 'redcloth',
+      'redcloth'       => 'RedCloth',
       'rubypants'      => 'rubypants',
       'sass'           => 'sass',
       'systemu'        => 'systemu',

data/lib/nanoc/extra/deployers/rsync.rb

@@ -34,7 +34,7 @@ module Nanoc::Extra::Deployers
       require 'systemu'
 
       # Get params
-      src = File.expand_path(self.source_path) + '/'
+      src = self.source_path + '/'
       dst = self.config[:dst]
       options = self.config[:options] || DEFAULT_OPTIONS
 

data/lib/nanoc/filters/colorize_syntax.rb

@@ -143,24 +143,6 @@ module Nanoc::Filters
       doc.send(method, :encoding => 'UTF-8')
     end
 
-  private
-
-    KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight ]
-
-    # Removes the first blank lines and any whitespace at the end.
-    def strip(s)
-      s.lines.drop_while { |line| line.strip.empty? }.join.rstrip
-    end
-
-    def highlight(code, language, params={})
-      colorizer = @colorizers[language.to_sym]
-      if KNOWN_COLORIZERS.include?(colorizer)
-        send(colorizer, code, language, params[colorizer] || {})
-      else
-        raise RuntimeError, "I don’t know how to highlight code using the “#{colorizer}” colorizer"
-      end
-    end
-
     # Runs the code through [CodeRay](http://coderay.rubychan.de/).
     #
     # @api private
@@ -254,13 +236,15 @@ module Nanoc::Filters
     #
     # @api private
     #
+    # @since 3.2.0
+    #
     # @param [String] code The code to colorize
     #
     # @param [String] language The language the code is written in
     #
     # @option params [String] :style The style to use
     #
-    # @since 3.2.0
+    # @return [String] The colorized output
     def simon_highlight(code, language, params={})
       require 'systemu'
 
@@ -289,6 +273,24 @@ module Nanoc::Filters
       stdout.read
     end
 
+  private
+
+    KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight ]
+
+    # Removes the first blank lines and any whitespace at the end.
+    def strip(s)
+      s.lines.drop_while { |line| line.strip.empty? }.join.rstrip
+    end
+
+    def highlight(code, language, params={})
+      colorizer = @colorizers[language.to_sym]
+      if KNOWN_COLORIZERS.include?(colorizer)
+        send(colorizer, code, language, params[colorizer] || {})
+      else
+        raise RuntimeError, "I don’t know how to highlight code using the “#{colorizer}” colorizer"
+      end
+    end
+
     def check_availability(*cmd)
       systemu cmd
       raise "Could not spawn #{cmd.join(' ')}" if $?.exitstatus != 0

data/lib/nanoc/helpers/capturing.rb

@@ -39,9 +39,6 @@ module Nanoc::Helpers
     # @api private
     class CapturesStore
 
-      require 'singleton'
-      include Singleton
-
       def initialize
         @store = {}
       end
@@ -58,6 +55,15 @@ module Nanoc::Helpers
 
     end
 
+    class ::Nanoc::Site
+
+      # @api private
+      def captures_store
+        @captures_store ||= CapturesStore.new
+      end
+
+    end
+
     # @overload content_for(name, &block)
     #
     #   Captures the content inside the block and stores it so that it can be
@@ -96,7 +102,7 @@ module Nanoc::Helpers
 
         # Capture and store
         content = capture(&block)
-        CapturesStore.instance[@item, name.to_sym] = content
+        @site.captures_store[@item, name.to_sym] = content
       else # Get content
         # Get args
         if args.size != 2
@@ -107,7 +113,7 @@ module Nanoc::Helpers
         name = args[1]
 
         # Get content
-        CapturesStore.instance[item, name.to_sym]
+        @site.captures_store[item, name.to_sym]
       end
     end
 

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -31,7 +31,7 @@ module Nanoc::Helpers
     #
     # @example Excluding binary items from the sitemap
     #
-    #   <%= xml_sitemap :items => @items.reject{ |i| i[:is_hidden] || i[:binary] } %>
+    #   <%= xml_sitemap :items => @items.reject{ |i| i[:is_hidden] || i.binary? } %>
     #
     # @option params [Array] :items A list of items to include in the sitemap
     #

data/test/base/core_ext/array_spec.rb

@@ -31,7 +31,7 @@ describe 'Array#freeze_recursively' do
       array[0] = 123
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
   end
@@ -45,7 +45,7 @@ describe 'Array#freeze_recursively' do
       array[1][0] = 123
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
   end

data/test/base/core_ext/date_spec.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+describe 'Date' do
+
+  it 'should not crash when requesting frozen attributes' do
+    # This test will pass without patch on MRI 1.9.x, but on MRI 1.8.x it
+    # crashes. (Untested on other Ruby implementations such as Rubinius and
+    # JRuby).
+    d = Date.today
+    d.freeze
+    d.year
+  end
+
+end
+

data/test/base/core_ext/hash_spec.rb

@@ -49,7 +49,7 @@ describe 'Hash#freeze_recursively' do
       hash[:a] = 123
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
   end
@@ -63,7 +63,7 @@ describe 'Hash#freeze_recursively' do
       hash[:a][:b] = 123
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
   end

data/test/base/test_compiler.rb

@@ -434,4 +434,58 @@ class Nanoc::CompilerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_change_routing_rule_and_recompile
+    with_site do |site|
+      # Create items
+      File.open('content/a.html', 'w') do |io|
+        io.write('<h1>A</h1>')
+      end
+      File.open('content/b.html', 'w') do |io|
+        io.write('<h1>B</h1>')
+      end
+
+      # Create routes
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '/a/' do\n"
+        io.write "  '/index.html'\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '*' do\n"
+        io.write "  nil\n"
+        io.write "end\n"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check
+      assert_equal '<h1>A</h1>', File.read('output/index.html')
+
+      # Create routes
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '/b/' do\n"
+        io.write "  '/index.html'\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '*' do\n"
+        io.write "  nil\n"
+        io.write "end\n"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check
+      assert_equal '<h1>B</h1>', File.read('output/index.html')
+    end
+  end
+
 end

data/test/base/test_directed_graph.rb

@@ -54,8 +54,11 @@ class Nanoc::DirectedGraphTest < MiniTest::Unit::TestCase
 
   def test_edges_with_new_vertices
     graph = Nanoc::DirectedGraph.new([ 1 ])
+    assert_equal [ 1 ], graph.vertices
     graph.add_edge(1, 2)
+    assert_equal [ 1, 2 ], graph.vertices
     graph.add_edge(3, 2)
+    assert_equal [ 1, 2, 3 ], graph.vertices
 
     assert_equal [ [ 0, 1 ], [ 2, 1 ] ], graph.edges.sort
   end

data/test/base/test_item.rb

@@ -25,7 +25,7 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
       item.identifier.chop!
     rescue => error
       raised = true
-      assert_match /^can't modify frozen [Ss]tring$/, error.message
+      assert_match /(^can't modify frozen [Ss]tring|^unable to modify frozen object$)/, error.message
     end
     assert raised, 'Should have raised when trying to modify a frozen string'
   end
@@ -149,7 +149,7 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
       item[:abc] = '123'
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
 
@@ -158,7 +158,7 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
       item[:a][:b] = '456'
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
   end

data/test/base/test_item_rep.rb

@@ -459,7 +459,7 @@ class Nanoc::ItemRepTest < MiniTest::Unit::TestCase
       rep.filter(:whatever)
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
   end
@@ -483,7 +483,7 @@ class Nanoc::ItemRepTest < MiniTest::Unit::TestCase
       rep.filter(:whatever)
     rescue => e
       raised = true
-      assert_match /^can't modify frozen /, e.message
+      assert_match /(^can't modify frozen |^unable to modify frozen object$)/, e.message
     end
     assert raised
   end

data/test/base/test_layout.rb

@@ -22,7 +22,7 @@ class Nanoc::LayoutTest < MiniTest::Unit::TestCase
       layout.identifier.chop!
     rescue => error
       raised = true
-      assert_match /^can't modify frozen [Ss]tring$/, error.message
+      assert_match /(^can't modify frozen [Ss]tring|^unable to modify frozen object$)/, error.message
     end
     assert raised, 'Should have raised when trying to modify a frozen string'
   end

data/test/base/test_outdatedness_checker.rb

@@ -391,4 +391,37 @@ class Nanoc::OutdatednessCheckerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_non_serializable_parameters_in_rules_should_be_allowed
+    # Create site
+    with_site(:name => 'foo') do |site|
+      File.open('content/index.html', 'w') { |io| io.write('o hello') }
+      File.open('Rules', 'w') do |io|
+        io.write("compile '/' do\n")
+        io.write("  c = Class.new {}\n")
+        io.write("  def c.inspect ; 'I am so classy' ; end\n")
+        io.write("  filter :erb, :stuff => c\n")
+        io.write("end\n")
+        io.write("\n")
+        io.write("route '/' do\n")
+        io.write("  '/index.html'\n")
+        io.write("end\n")
+      end
+    end
+
+    # Compile
+    FileUtils.cd('foo') do
+      site = Nanoc::Site.new('.')
+      site.compile
+    end
+
+    # Assert not outdated
+    FileUtils.cd('foo') do
+      site = Nanoc::Site.new('.')
+      outdatedness_checker = site.compiler.outdatedness_checker
+      site.items.each do |item|
+        refute outdatedness_checker.outdated?(item), "item should not be outdated"
+      end
+    end
+  end
+
 end

data/test/extra/deployers/test_rsync.rb

@@ -52,7 +52,7 @@ class Nanoc::Extra::Deployers::RsyncTest < MiniTest::Unit::TestCase
     if_have 'systemu' do
       # Create deployer
       rsync = Nanoc::Extra::Deployers::Rsync.new(
-        'output/',
+        'output',
         { :dst => 'asdf' })
 
       # Mock run_shell_cmd
@@ -66,7 +66,7 @@ class Nanoc::Extra::Deployers::RsyncTest < MiniTest::Unit::TestCase
       # Check args
       opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
       assert_equal(
-        [ 'rsync', opts, File.expand_path('output') + '/', 'asdf' ].flatten,
+        [ 'rsync', opts, 'output/', 'asdf' ].flatten,
         rsync.instance_eval { @shell_cms_args }
       )
     end
@@ -76,7 +76,7 @@ class Nanoc::Extra::Deployers::RsyncTest < MiniTest::Unit::TestCase
     if_have 'systemu' do
       # Create deployer
       rsync = Nanoc::Extra::Deployers::Rsync.new(
-        'output/',
+        'output',
         { :dst => 'asdf' },
         :dry_run => true)
 
@@ -91,7 +91,7 @@ class Nanoc::Extra::Deployers::RsyncTest < MiniTest::Unit::TestCase
       # Check args
       opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
       assert_equal(
-        [ 'echo', 'rsync', opts, File.expand_path('output') + '/', 'asdf' ].flatten,
+        [ 'echo', 'rsync', opts, 'output/', 'asdf' ].flatten,
         rsync.instance_eval { @shell_cms_args }
       )
     end

data/test/extra/validators/test_links.rb

@@ -53,10 +53,9 @@ class Nanoc::Extra::Validators::LinksTest < MiniTest::Unit::TestCase
     validator = Nanoc::Extra::Validators::Links.new('output', [ 'index.html' ])
 
     # Test
-    assert validator.send(:fetch_http_status_for, URI.parse('http://heise.de/'), 200)
-    assert validator.send(:fetch_http_status_for, URI.parse('https://www.google.com/'), 200)
-    assert validator.send(:fetch_http_status_for, URI.parse('https://google.com/'), 200)
-    assert validator.send(:fetch_http_status_for, URI.parse('http://google.com/foo/bar'), 404)
+    assert_equal 200, validator.send(:fetch_http_status_for, URI.parse('http://www.apple.com/'))
+    assert_equal 200, validator.send(:fetch_http_status_for, URI.parse('https://www.apple.com/'))
+    assert_equal 404, validator.send(:fetch_http_status_for, URI.parse('http://www.apple.com/sdfghgfdsdfgh'))
   end
 
 end

data/test/helpers/test_capturing.rb

@@ -14,8 +14,12 @@ class Nanoc::Helpers::CapturingTest < MiniTest::Unit::TestCase
               "  <%= 1+2 %>\n" +
               "<% end %> foot"
 
-    # Evaluate content
+    # Build site
+    @site = Nanoc3::Site.new({})
     @item = Nanoc::Item.new('moo', {}, '/blah/')
+    @item.site = @site
+
+    # Evaluate content
     result = ::ERB.new(content).result(binding)
 
     # Check
@@ -27,6 +31,10 @@ class Nanoc::Helpers::CapturingTest < MiniTest::Unit::TestCase
   def test_capture
     require 'erb'
 
+    # Build site
+    @site = Nanoc3::Site.new({})
+    @item = Nanoc::Item.new('moo', {}, '/blah/')
+
     # Capture
     _erbout = 'foo'
     captured_content = capture do
@@ -38,4 +46,49 @@ class Nanoc::Helpers::CapturingTest < MiniTest::Unit::TestCase
     assert_equal 'bar', captured_content
   end
 
+  def test_content_for_recursively
+    require 'erb'
+
+    content = <<EOS
+head
+<% content_for :box do %>
+  basic
+<% end %>
+<% content_for :box do %>
+  before <%= content_for @item, :box %> after
+<% end %>
+<%= content_for @item, :box %>
+foot
+EOS
+
+    @site = Nanoc3::Site.new({})
+    @item = Nanoc::Item.new('content', {}, '/')
+
+    result = ::ERB.new(content).result(binding)
+
+    expected = %w( head before basic after foot )
+    actual   = result.scan(/[a-z]+/)
+    assert_equal expected, actual
+  end
+
+  def test_different_sites
+    require 'erb'
+
+    @site = Nanoc3::Site.new({})
+    @item = Nanoc::Item.new('content', {}, '/')
+    content = "<% content_for :a do %>Content One<% end %>"
+    ::ERB.new(content).result(binding)
+
+    assert_equal 'Content One', content_for(@item, :a)
+    assert_equal nil,           content_for(@item, :b)
+
+    @site = Nanoc3::Site.new({})
+    @item = Nanoc::Item.new('content', {}, '/')
+    content = "<% content_for :b do %>Content Two<% end %>"
+    ::ERB.new(content).result(binding)
+
+    assert_equal nil,           content_for(@item, :a)
+    assert_equal 'Content Two', content_for(@item, :b)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &70355075174180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70355075174180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70355075173560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355075173560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70355075172820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355075172820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70355075309900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355075309900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70355075308600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355075308600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70355075306460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355075306460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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,
@@ -117,6 +147,7 @@ files:
 - lib/nanoc/base/compilation/rules_collection.rb
 - lib/nanoc/base/context.rb
 - lib/nanoc/base/core_ext/array.rb
+- lib/nanoc/base/core_ext/date.rb
 - lib/nanoc/base/core_ext/hash.rb
 - lib/nanoc/base/core_ext/pathname.rb
 - lib/nanoc/base/core_ext/string.rb
@@ -233,6 +264,7 @@ files:
 - tasks/doc.rake
 - tasks/test.rake
 - test/base/core_ext/array_spec.rb
+- test/base/core_ext/date_spec.rb
 - test/base/core_ext/hash_spec.rb
 - test/base/core_ext/pathname_spec.rb
 - test/base/core_ext/string_spec.rb
@@ -368,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized