nanoc 4.0.2 → 4.1.0a1

data/test/helper.rb

@@ -33,14 +33,12 @@ module Nanoc::TestHelpers
     libs.each do |lib|
       if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && lib == 'nokogiri' && disable_nokogiri?
         skip 'Pure Java Nokogiri has issues that cause problems with nanoc (see https://github.com/nanoc/nanoc/pull/422) -- run without DISABLE_NOKOGIRI to enable Nokogiri tests'
-        return
       end
 
       begin
         require lib
       rescue LoadError
         skip "requiring #{lib} failed"
-        return
       end
     end
 

data/test/helpers/test_blogging.rb

@@ -47,7 +47,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].expects(:compiled_content).with(snapshot: :pre).returns('item 2 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -78,7 +78,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].expects(:compiled_content).returns('item 2 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -99,7 +99,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_item]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -124,7 +124,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: nil })
+      @config = Nanoc::ConfigView.new({ base_url: nil }, nil)
 
       # Create feed item
       @item = mock
@@ -149,7 +149,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -174,7 +174,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -204,7 +204,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[0].expects(:compiled_content).returns('item 1 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com/' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com/' }, nil)
 
       # Create feed item
       @item = mock
@@ -246,7 +246,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -273,7 +273,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].stubs(:[]).with(:created_at).returns(nil)
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -299,7 +299,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -325,10 +325,13 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @config = Nanoc::ConfigView.new(
-        author_name: 'Bob',
-        author_uri: 'http://example.com/~bob/',
-        title: 'My Blog Or Something',
-        base_url: 'http://example.com',
+        {
+          author_name: 'Bob',
+          author_uri: 'http://example.com/~bob/',
+          title: 'My Blog Or Something',
+          base_url: 'http://example.com',
+        },
+        nil,
       )
 
       # Create feed item
@@ -353,7 +356,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -377,7 +380,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -410,7 +413,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].stubs(:[]).with(:created_at).returns('22-03-2009')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -439,7 +442,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].stubs(:[]).with(:created_at).returns('01-01-2014')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -463,7 +466,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -484,7 +487,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -505,7 +508,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -526,7 +529,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock
@@ -548,7 +551,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[0].stubs(:path).returns(nil)
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
 
       # Create feed item
       @item = mock

data/test/helpers/test_capturing.rb

@@ -17,8 +17,8 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
     # Build site
     site = Nanoc::Int::SiteLoader.new.new_empty
     item = Nanoc::Int::Item.new('moo', {}, '/blah/')
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
-    @item = Nanoc::ItemView.new(item)
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
+    @item = Nanoc::ItemView.new(item, nil)
 
     # Evaluate content
     result = ::ERB.new(content).result(binding)
@@ -32,8 +32,8 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
     require 'erb'
 
     # Build site
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'), nil)
 
     # Capture
     _erbout = 'foo'
@@ -59,15 +59,15 @@ head
 <% content_for :box do %>
   basic
 <% end %>
-<% content_for :box do %>
+<% content_for :outerbox do %>
   before <%= content_for @item, :box %> after
 <% end %>
-<%= content_for @item, :box %>
+<%= content_for @item, :outerbox %>
 foot
 EOS
 
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
 
     result = ::ERB.new(content).result(binding)
 
@@ -84,16 +84,16 @@ EOS
       io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
     end
 
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
     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 = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
+    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
     content = '<% content_for :b do %>Content Two<% end %>'
     ::ERB.new(content).result(binding)
 
@@ -101,6 +101,125 @@ EOS
     assert_equal 'Content Two', content_for(@item, :b)
   end
 
+  def test_content_for_with_existing_symbol
+    with_site do |_site|
+      # Prepare
+      File.open('lib/helpers.rb', 'w') do |io|
+        io.write 'include Nanoc::Helpers::Capturing'
+      end
+      File.open('content/includer.erb', 'w') do |io|
+        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
+      end
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do ; filter :erb ; end\n"
+        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
+      end
+
+      File.open('content/includee.erb', 'w') do |io|
+        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah do %>Second content<% end %>}'
+      end
+
+      # Using the same symbols twice now raises an error, to be changed to concatenating in a future version
+      assert_raises do
+        Nanoc::CLI.run(%w(compile))
+      end
+    end
+  end
+
+  def test_content_for_with_existing_symbol_with_error_option
+    with_site do |_site|
+      # Prepare
+      File.open('lib/helpers.rb', 'w') do |io|
+        io.write 'include Nanoc::Helpers::Capturing'
+      end
+      File.open('content/includer.erb', 'w') do |io|
+        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
+      end
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do ; filter :erb ; end\n"
+        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
+      end
+
+      File.open('content/includee.erb', 'w') do |io|
+        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah, existing: :error do %>Second content<% end %>}'
+      end
+
+      assert_raises do
+        Nanoc::CLI.run(%w(compile))
+      end
+    end
+  end
+
+  def test_content_for_with_existing_symbol_with_overwrite_option
+    with_site do |_site|
+      # Prepare
+      File.open('lib/helpers.rb', 'w') do |io|
+        io.write 'include Nanoc::Helpers::Capturing'
+      end
+      File.open('content/includer.erb', 'w') do |io|
+        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
+      end
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do ; filter :erb ; end\n"
+        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
+      end
+
+      File.open('content/includee.erb', 'w') do |io|
+        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah, existing: :overwrite do %>Second content<% end %>}'
+      end
+
+      Nanoc::CLI.run(%w(compile))
+      assert_equal '[Second content]', File.read('output/includer/index.html')
+    end
+  end
+
+  def test_content_for_with_existing_symbol_with_append_option
+    with_site do |_site|
+      # Prepare
+      File.open('lib/helpers.rb', 'w') do |io|
+        io.write 'include Nanoc::Helpers::Capturing'
+      end
+      File.open('content/includer.erb', 'w') do |io|
+        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
+      end
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do ; filter :erb ; end\n"
+        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
+      end
+
+      File.open('content/includee.erb', 'w') do |io|
+        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah, existing: :append do %>Second content<% end %>}'
+      end
+
+      Nanoc::CLI.run(%w(compile))
+      assert_equal '[First contentSecond content]', File.read('output/includer/index.html')
+    end
+  end
+
+  def test_content_for_with_existing_symbol_with_unrecognised_option
+    with_site do |_site|
+      # Prepare
+      File.open('lib/helpers.rb', 'w') do |io|
+        io.write 'include Nanoc::Helpers::Capturing'
+      end
+      File.open('content/includer.erb', 'w') do |io|
+        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
+      end
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do ; filter :erb ; end\n"
+        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
+      end
+
+      File.open('content/includee.erb', 'w') do |io|
+        io.write '{<% content_for :blah, existing: :donkey do %>First content<% end %>}'
+      end
+
+      assert_raises(ArgumentError) do
+        Nanoc::CLI.run(%w(compile))
+      end
+    end
+  end
+
   def test_dependencies
     with_site do |_site|
       # Prepare

data/test/helpers/test_filtering.rb

@@ -11,7 +11,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
 
       # Mock item and rep
       @item_rep = mock
-      @item_rep = Nanoc::ItemRepView.new(@item_rep)
+      @item_rep = Nanoc::ItemRepView.new(@item_rep, nil)
 
       # Evaluate content
       result = ::ERB.new(content).result(binding)
@@ -32,8 +32,8 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new('stuff', { title: 'Bar...' }, '/foo.md')
       item_rep = Nanoc::Int::ItemRep.new(item, :default)
 
-      @item = Nanoc::ItemView.new(item)
-      @item_rep = Nanoc::ItemRepView.new(item_rep)
+      @item = Nanoc::ItemView.new(item, nil)
+      @item_rep = Nanoc::ItemRepView.new(item_rep, nil)
 
       result = ::ERB.new(content).result(binding)
 
@@ -64,7 +64,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
 
       # Mock item and rep
       @item_rep = mock
-      @item_rep = Nanoc::ItemRepView.new(@item_rep)
+      @item_rep = Nanoc::ItemRepView.new(@item_rep, nil)
 
       # Evaluate content
       result = ::ERB.new(content).result(binding)
@@ -82,7 +82,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
 
       # Mock item and rep
       @item_rep = mock
-      @item_rep = Nanoc::ItemRepView.new(@item_rep)
+      @item_rep = Nanoc::ItemRepView.new(@item_rep, nil)
 
       # Evaluate content
       result = ::Haml::Engine.new(content).render(binding)
@@ -102,7 +102,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
 
     # Mock item and rep
     @item_rep = mock
-    @item_rep = Nanoc::ItemRepView.new(@item_rep)
+    @item_rep = Nanoc::ItemRepView.new(@item_rep, nil)
 
     ::ERB.new(content).result(binding)
 

data/test/helpers/test_link_to.rb

@@ -67,7 +67,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
 
     # Check
     assert_equal(
-      '<span class="active" title="You\'re here.">Bar</span>',
+      '<span class="active">Bar</span>',
       link_to_unless_current('Bar', @item_rep),
     )
   ensure

data/test/helpers/test_rendering.rb

@@ -12,9 +12,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       end
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       assert_equal('This is the /foo/ layout.', render('/foo/'))
     end
@@ -31,9 +30,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       end
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       assert_equal('This is the /foo/ layout.', render('/foo'))
     end
@@ -50,9 +48,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       end
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       assert_equal('I am the Nanoc::LayoutView class.', render('/foo/'))
     end
@@ -69,9 +66,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       end
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       assert_equal('I am the Nanoc::Int::Layout class.', render('/foo/'))
     end
@@ -80,9 +76,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
   def test_render_with_unknown_layout
     with_site do |site|
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       assert_raises(Nanoc::Int::Errors::UnknownLayout) do
         render '/dsfghjkl/'
@@ -99,9 +94,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       File.open('layouts/foo.erb', 'w').close
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       assert_raises(Nanoc::Int::Errors::CannotDetermineFilter) do
         render '/foo/'
@@ -118,9 +112,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       File.open('layouts/foo.erb', 'w').close
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       assert_raises(Nanoc::Int::Errors::UnknownFilter) do
         render '/foo/'
@@ -139,9 +132,8 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       end
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.load
-      @site = Nanoc::SiteView.new(site)
-      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+      @site = Nanoc::SiteView.new(site, nil)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts, nil)
 
       _erbout = '[erbout-before]'
       result = render '/foo/' do