nanoc 3.7.3 → 3.7.4

data/test/helpers/test_blogging.rb

@@ -14,7 +14,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     item.stubs(:[]).with(:custom_path_in_feed).returns(nil)
     item.stubs(:[]).with(:custom_url_in_feed).returns(nil)
     item.stubs(:[]).with(:excerpt).returns(nil)
-    item.stubs(:path).returns("/item/")
+    item.stubs(:path).returns('/item/')
     item.stubs(:[]).with(:author_name).returns(nil)
     item.stubs(:[]).with(:author_uri).returns(nil)
     item.stubs(:compiled_content).returns('item content')
@@ -88,7 +88,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed
     if_have 'builder' do
       # Create items
-      @items = [ mock, mock_article, mock_article ]
+      @items = [mock, mock_article, mock_article]
 
       # Create item 0
       @items[0].stubs(:[]).with(:kind).returns('item')
@@ -101,7 +101,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].stubs(:[]).with(:custom_path_in_feed).returns(nil)
       @items[1].stubs(:[]).with(:custom_url_in_feed).returns(nil)
       @items[1].stubs(:[]).with(:excerpt).returns(nil)
-      @items[1].stubs(:path).returns("/item1/")
+      @items[1].stubs(:path).returns('/item1/')
       @items[1].expects(:compiled_content).with(:snapshot => :pre).returns('item 1 content')
 
       # Create item 2
@@ -117,7 +117,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:author_name).returns('Denis Defreyne')
       @item.stubs(:[]).with(:author_uri).returns('http://stoneship.org/')
       @item.stubs(:[]).with(:feed_url).returns(nil)
-      @item.stubs(:path).returns("/journal/feed/")
+      @item.stubs(:path).returns('/journal/feed/')
 
       # Check
       atom_feed
@@ -127,7 +127,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_times
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article, mock_article ]
+      @items = [mock_item, mock_article, mock_article]
 
       # Create item 1
       @items[1].stubs(:[]).with(:updated_at).returns(Time.now - 500)
@@ -149,7 +149,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:author_name).returns('Denis Defreyne')
       @item.stubs(:[]).with(:author_uri).returns('http://stoneship.org/')
       @item.stubs(:[]).with(:feed_url).returns(nil)
-      @item.stubs(:path).returns("/journal/feed/")
+      @item.stubs(:path).returns('/journal/feed/')
 
       # Check
       atom_feed
@@ -159,7 +159,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_without_articles
     if_have 'builder' do
       # Mock items
-      @items = [ mock_item, mock_item ]
+      @items = [mock_item, mock_item]
 
       # Mock site
       @site = mock
@@ -185,7 +185,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_without_base_url
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article ]
+      @items = [mock_item, mock_article]
 
       # Mock site
       @site = mock
@@ -211,7 +211,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_without_title
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article ]
+      @items = [mock_item, mock_article]
 
       # Mock site
       @site = mock
@@ -237,7 +237,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_without_author_name
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article ]
+      @items = [mock_item, mock_article]
 
       # Mock site
       @site = mock
@@ -263,11 +263,11 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_author_name_and_uri_from_content_item
     if_have 'builder' do
       # Create items
-      @items = [ mock_article ]
+      @items = [mock_article]
 
       # Create item 1
-      @items[0].stubs(:[]).with(:author_name).returns("Don Alias")
-      @items[0].stubs(:[]).with(:author_uri).returns("http://don.example.com/")
+      @items[0].stubs(:[]).with(:author_name).returns('Don Alias')
+      @items[0].stubs(:[]).with(:author_uri).returns('http://don.example.com/')
       @items[0].expects(:compiled_content).returns('item 1 content')
 
       # Mock site
@@ -281,7 +281,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:author_name).returns('Denis Defreyne')
       @item.stubs(:[]).with(:author_uri).returns('http://stoneship.org/')
       @item.stubs(:[]).with(:feed_url).returns(nil)
-      @item.stubs(:path).returns("/journal/feed/")
+      @item.stubs(:path).returns('/journal/feed/')
 
       # Check
       # TODO: Use xpath matchers for more specific test
@@ -311,7 +311,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_without_author_uri
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article ]
+      @items = [mock_item, mock_article]
 
       # Mock site
       @site = mock
@@ -337,7 +337,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_without_articles_created_at
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article, mock_article ]
+      @items = [mock_item, mock_article, mock_article]
       @items[1].stubs(:[]).with(:created_at).returns(Time.now.to_s)
       @items[2].stubs(:[]).with(:created_at).returns(nil)
 
@@ -365,7 +365,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_title_author_name_and_uri_as_params
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article ]
+      @items = [mock_item, mock_article]
       @items[1].expects(:compiled_content).with(:snapshot => :pre).returns('asdf')
 
       # Mock site
@@ -391,7 +391,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_title_author_name_and_uri_from_config
     if_have 'builder' do
       # Create items
-      @items = [ mock_item, mock_article ]
+      @items = [mock_item, mock_article]
       @items[1].expects(:compiled_content).with(:snapshot => :pre).returns('asdf')
 
       # Mock site
@@ -419,7 +419,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_articles_param
     if_have 'builder' do
       # Mock items
-      @items = [ mock_article, mock_article ]
+      @items = [mock_article, mock_article]
 
       @items[0].expects(:compiled_content).never
       @items[1].stubs(:[]).with(:title).returns('Item One')
@@ -437,14 +437,14 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:[]).with(:feed_url).returns('http://example.com/feed')
 
       # Check
-      atom_feed :articles => [ @items[1] ]
+      atom_feed :articles => [@items[1]]
     end
   end
 
   def test_atom_feed_with_limit_param
     if_have 'builder' do
       # Mock articles
-      @items = [ mock_article, mock_article ]
+      @items = [mock_article, mock_article]
       @items.each_with_index do |article, i|
         article.stubs(:[]).with(:title).returns("Article #{i}")
         article.stubs(:[]).with(:created_at).returns(Time.now - i)
@@ -477,7 +477,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_sorting
     if_have 'builder' do
       # Mock articles
-      @items = [ mock_article, mock_article ]
+      @items = [mock_article, mock_article]
       @items.each_with_index do |article, i|
         article.stubs(:[]).with(:title).returns("Article #{i}")
       end
@@ -507,7 +507,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_content_proc_param
     if_have 'builder' do
       # Mock article
-      @items = [ mock_article ]
+      @items = [mock_article]
 
       # Mock site
       @site = mock
@@ -529,7 +529,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_excerpt_proc_param
     if_have 'builder' do
       # Mock article
-      @items = [ mock_article ]
+      @items = [mock_article]
 
       # Mock site
       @site = mock
@@ -551,7 +551,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_icon_param
     if_have 'builder' do
       # Mock article
-      @items = [ mock_article ]
+      @items = [mock_article]
 
       # Mock site
       @site = mock
@@ -573,7 +573,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_logo_param
     if_have 'builder' do
       # Mock article
-      @items = [ mock_article ]
+      @items = [mock_article]
 
       # Mock site
       @site = mock
@@ -595,7 +595,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   def test_atom_feed_with_item_without_path
     if_have 'builder' do
       # Create items
-      @items = [ mock_article ]
+      @items = [mock_article]
       @items[0].stubs(:path).returns(nil)
 
       # Mock site
@@ -609,7 +609,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:author_name).returns('Denis Defreyne')
       @item.stubs(:[]).with(:author_uri).returns('http://stoneship.org/')
       @item.stubs(:[]).with(:feed_url).returns(nil)
-      @item.stubs(:path).returns("/journal/feed/")
+      @item.stubs(:path).returns('/journal/feed/')
 
       # Check
       atom_feed

data/test/helpers/test_breadcrumbs.rb

@@ -6,38 +6,38 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
 
   def test_breadcrumbs_trail_at_root
     @items = Nanoc::ItemArray.new
-    @items << Nanoc::Item.new("root", {}, '/')
+    @items << Nanoc::Item.new('root', {}, '/')
     @item = @items.last
 
-    assert_equal [ @items[0] ], breadcrumbs_trail
+    assert_equal [@items[0]], breadcrumbs_trail
   end
 
   def test_breadcrumbs_trail_with_1_parent
     @items = Nanoc::ItemArray.new
-    @items << Nanoc::Item.new("parent", {}, '/')
-    @items << Nanoc::Item.new("child",  {}, '/foo/')
+    @items << Nanoc::Item.new('parent', {}, '/')
+    @items << Nanoc::Item.new('child',  {}, '/foo/')
     @item = @items.last
 
-    assert_equal [ @items[0], @items[1] ], breadcrumbs_trail
+    assert_equal [@items[0], @items[1]], breadcrumbs_trail
   end
 
   def test_breadcrumbs_trail_with_many_parents
     @items = Nanoc::ItemArray.new
-    @items << Nanoc::Item.new("grandparent", {}, '/')
-    @items << Nanoc::Item.new("parent",      {}, '/foo/')
-    @items << Nanoc::Item.new("child",       {}, '/foo/bar/')
+    @items << Nanoc::Item.new('grandparent', {}, '/')
+    @items << Nanoc::Item.new('parent',      {}, '/foo/')
+    @items << Nanoc::Item.new('child',       {}, '/foo/bar/')
     @item = @items.last
 
-    assert_equal [ @items[0], @items[1], @items[2] ], breadcrumbs_trail
+    assert_equal [@items[0], @items[1], @items[2]], breadcrumbs_trail
   end
 
   def test_breadcrumbs_trail_with_nils
     @items = Nanoc::ItemArray.new
-    @items << Nanoc::Item.new("grandparent", {}, '/')
-    @items << Nanoc::Item.new("child",       {}, '/foo/bar/')
+    @items << Nanoc::Item.new('grandparent', {}, '/')
+    @items << Nanoc::Item.new('child',       {}, '/foo/bar/')
     @item = @items.last
 
-    assert_equal [ @items[0], nil, @items[1] ], breadcrumbs_trail
+    assert_equal [@items[0], nil, @items[1]], breadcrumbs_trail
   end
 
 end

data/test/helpers/test_capturing.rb

@@ -13,9 +13,9 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
     end
 
     # Build content to be evaluated
-    content = "head <% content_for :sidebar do %>\n" +
-              "  <%= 1+2 %>\n" +
-              "<% end %> foot"
+    content = "head <% content_for :sidebar do %>\n" \
+              "  <%= 1+2 %>\n" \
+              '<% end %> foot'
 
     # Build site
     @site = Nanoc3::Site.new({})
@@ -89,7 +89,7 @@ EOS
 
     @site = Nanoc3::Site.new({})
     @item = Nanoc::Item.new('content', {}, '/')
-    content = "<% content_for :a do %>Content One<% end %>"
+    content = '<% content_for :a do %>Content One<% end %>'
     ::ERB.new(content).result(binding)
 
     assert_equal 'Content One', content_for(@item, :a)
@@ -97,7 +97,7 @@ EOS
 
     @site = Nanoc3::Site.new({})
     @item = Nanoc::Item.new('content', {}, '/')
-    content = "<% content_for :b do %>Content Two<% end %>"
+    content = '<% content_for :b do %>Content Two<% end %>'
     ::ERB.new(content).result(binding)
 
     assert_equal nil,           content_for(@item, :a)
@@ -176,8 +176,8 @@ EOS
       end
 
       File.open('content/self.erb', 'w') do |io|
-        io.write "<% content_for :foo do %>Foo!<% end %>"
-        io.write "<%= content_for(@item, :foo) %>"
+        io.write '<% content_for :foo do %>Foo!<% end %>'
+        io.write '<%= content_for(@item, :foo) %>'
       end
 
       File.open('Rules', 'w') do |io|

data/test/helpers/test_filtering.rb

@@ -7,9 +7,9 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
   def test_filter_simple
     if_have 'rubypants' do
       # Build content to be evaluated
-      content = "<p>Foo...</p>\n" +
-                "<% filter :rubypants do %>\n" +
-                " <p>Bar...</p>\n" +
+      content = "<p>Foo...</p>\n" \
+                "<% filter :rubypants do %>\n" \
+                " <p>Bar...</p>\n" \
                 "<% end %>\n"
 
       # Mock item and rep
@@ -28,9 +28,9 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
   def test_filter_with_assigns
     if_have 'rubypants' do
       # Build content to be evaluated
-      content = "<p>Foo...</p>\n" +
-                "<% filter :erb do %>\n" +
-                " <p><%%= @item[:title] %></p>\n" +
+      content = "<p>Foo...</p>\n" \
+                "<% filter :erb do %>\n" \
+                " <p><%%= @item[:title] %></p>\n" \
                 "<% end %>\n"
 
       # Mock item and rep
@@ -55,9 +55,9 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
 
   def test_filter_with_unknown_filter_name
     # Build content to be evaluated
-    content = "<p>Foo...</p>\n" +
-              "<% filter :askjdflkawgjlkwaheflnvz do %>\n" +
-              " <p>Blah blah blah.</p>\n" +
+    content = "<p>Foo...</p>\n" \
+              "<% filter :askjdflkawgjlkwaheflnvz do %>\n" \
+              " <p>Blah blah blah.</p>\n" \
               "<% end %>\n"
 
     # Evaluate content
@@ -69,8 +69,8 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
   def test_filter_with_arguments
     if_have 'coderay' do
       # Build content to be evaluated
-      content = "<% filter :coderay, :language => 'ruby' do %>\n" +
-                "   def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end\n" +
+      content = "<% filter :coderay, :language => 'ruby' do %>\n" \
+                "   def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end\n" \
                 "<% end %>\n"
 
       # Mock item and rep
@@ -86,9 +86,9 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
   def test_with_haml
     if_have 'haml' do
       # Build content to be evaluated
-      content = "%p Foo.\n" +
-                "- filter(:erb) do\n" +
-                "  <%= 'abc' + 'xyz' %>\n" +
+      content = "%p Foo.\n" \
+                "- filter(:erb) do\n" \
+                "  <%= 'abc' + 'xyz' %>\n" \
                 "%p Bar.\n"
 
       # Mock item and rep
@@ -107,8 +107,8 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
     Nanoc::NotificationCenter.on(:filtering_ended)   { notifications << :filtering_ended   }
 
     # Build content to be evaluated
-    content = "<% filter :erb do %>\n" +
-              "   ... stuff ...\n" +
+    content = "<% filter :erb do %>\n" \
+              "   ... stuff ...\n" \
               "<% end %>\n"
 
     # Mock item and rep

data/test/helpers/test_link_to.rb

@@ -54,10 +54,10 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
 
   def test_link_to_to_nil_item_or_item_rep
     obj = Object.new
-    def obj.path ; nil ; end
+    def obj.path; nil; end
 
     assert_raises RuntimeError do
-      link_to("Some Text", obj)
+      link_to('Some Text', obj)
     end
   end
 
@@ -210,7 +210,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     YARD.parse(LIB_DIR + '/nanoc/helpers/link_to.rb')
 
     # Mock
-    @items = [ mock, mock, mock ]
+    @items = [mock, mock, mock]
     @items[0].stubs(:identifier).returns('/about/')
     @items[0].stubs(:path).returns('/about.html')
     @items[1].stubs(:identifier).returns('/software/')

data/test/helpers/test_rendering.rb

@@ -76,7 +76,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
 
       _erbout = '[erbout-before]'
       result = render '/foo/' do
-        _erbout << "This is some extra content"
+        _erbout << 'This is some extra content'
       end
 
       assert_equal('[erbout-before][partial-before]This is some extra content[partial-after]', _erbout)

data/test/helpers/test_tagging.rb

@@ -17,11 +17,11 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_base_url
     # Create item
-    item = Nanoc::Item.new('content', { :tags => [ 'foo', 'bar' ]}, '/path/')
+    item = Nanoc::Item.new('content', { :tags => ['foo', 'bar']}, '/path/')
 
     # Check
     assert_equal(
-      "#{link_for_tag('foo', 'http://stoneship.org/tag/')}, " +
+      "#{link_for_tag('foo', 'http://stoneship.org/tag/')}, " \
       "#{link_for_tag('bar', 'http://stoneship.org/tag/')}",
       tags_for(item, :base_url => 'http://stoneship.org/tag/')
     )
@@ -29,7 +29,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_none_text
     # Create item
-    item = Nanoc::Item.new('content', { :tags => [ ]}, '/path/')
+    item = Nanoc::Item.new('content', { :tags => []}, '/path/')
 
     # Check
     assert_equal(
@@ -40,11 +40,11 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_separator
     # Create item
-    item = Nanoc::Item.new('content', { :tags => [ 'foo', 'bar' ]}, '/path/')
+    item = Nanoc::Item.new('content', { :tags => ['foo', 'bar']}, '/path/')
 
     # Check
     assert_equal(
-      "#{link_for_tag('foo', 'http://technorati.com/tag/')} ++ " +
+      "#{link_for_tag('foo', 'http://technorati.com/tag/')} ++ " \
       "#{link_for_tag('bar', 'http://technorati.com/tag/')}",
       tags_for(item, :separator => ' ++ ')
     )
@@ -53,9 +53,9 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
   def test_items_with_tag
     # Create items
     @items = [
-      Nanoc::Item.new('item 1', { :tags => [ :foo ]       }, '/item1/'),
-      Nanoc::Item.new('item 2', { :tags => [ :bar ]       }, '/item2/'),
-      Nanoc::Item.new('item 3', { :tags => [ :foo, :bar ] }, '/item3/')
+      Nanoc::Item.new('item 1', { :tags => [:foo]       }, '/item1/'),
+      Nanoc::Item.new('item 2', { :tags => [:bar]       }, '/item2/'),
+      Nanoc::Item.new('item 3', { :tags => [:foo, :bar] }, '/item3/')
     ]
 
     # Find items
@@ -63,21 +63,21 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
     # Check
     assert_equal(
-      [ @items[0], @items[2] ],
+      [@items[0], @items[2]],
       items_with_foo_tag
     )
   end
 
   def test_link_for_tag
     assert_equal(
-      %[<a href="http://stoneship.org/tags/foobar" rel="tag">foobar</a>],
+      %(<a href="http://stoneship.org/tags/foobar" rel="tag">foobar</a>),
       link_for_tag('foobar', 'http://stoneship.org/tags/')
     )
   end
 
   def test_link_for_tag_escape
     assert_equal(
-      %[<a href="http://stoneship.org/tags&amp;stuff/foo&amp;bar" rel="tag">foo&amp;bar</a>],
+      %(<a href="http://stoneship.org/tags&amp;stuff/foo&amp;bar" rel="tag">foo&amp;bar</a>),
       link_for_tag('foo&bar', 'http://stoneship.org/tags&stuff/')
     )
   end