nanoc 3.7.3 → 3.7.4

data/test/base/test_item_array.rb

@@ -46,11 +46,11 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
   end
 
   def test_brackets_and_slice_with_range
-    assert_equal [ @one, @two ], @items[0..1]
-    assert_equal [ @one, @two ], @items[0, 2]
+    assert_equal [@one, @two], @items[0..1]
+    assert_equal [@one, @two], @items[0, 2]
 
-    assert_equal [ @one, @two ], @items.slice(0..1)
-    assert_equal [ @one, @two ], @items.slice(0, 2)
+    assert_equal [@one, @two], @items.slice(0..1)
+    assert_equal [@one, @two], @items.slice(0, 2)
   end
 
   def test_brackets_and_slice_and_at_with_identifier
@@ -150,11 +150,11 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
     assert_nil @items['/one/']
     assert_nil @items['/two/']
 
-    assert_equal "New Item One", @items[0].raw_content
-    assert_equal "New Item One", @items['/new/one/'].raw_content
+    assert_equal 'New Item One', @items[0].raw_content
+    assert_equal 'New Item One', @items['/new/one/'].raw_content
 
-    assert_equal "New Item Two", @items[1].raw_content
-    assert_equal "New Item Two", @items['/new/two/'].raw_content
+    assert_equal 'New Item Two', @items[1].raw_content
+    assert_equal 'New Item Two', @items['/new/two/'].raw_content
   end
 
   def test_collect_bang_frozen
@@ -169,7 +169,7 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
 
   def test_concat
     new_item = Nanoc::Item.new('New item', {}, '/new/')
-    @items.concat([ new_item ])
+    @items.concat([new_item])
 
     assert_equal new_item, @items[2]
     assert_equal new_item, @items['/new/']
@@ -211,10 +211,10 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
     assert_nil @items['/one/']
     assert_nil @items['/two/']
 
-    assert_equal "Item 0", @items[0].raw_content
-    assert_equal "Item 0", @items['/new/0/'].raw_content
-    assert_equal "Item 1", @items[1].raw_content
-    assert_equal "Item 1", @items['/new/1/'].raw_content
+    assert_equal 'Item 0', @items[0].raw_content
+    assert_equal 'Item 0', @items['/new/0/'].raw_content
+    assert_equal 'Item 1', @items[1].raw_content
+    assert_equal 'Item 1', @items['/new/1/'].raw_content
   end
 
   def test_fill_range
@@ -225,8 +225,8 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
 
     assert_equal @one, @items[0]
     assert_equal @one, @items['/one/']
-    assert_equal "Item 1", @items[1].raw_content
-    assert_equal "Item 1", @items['/new/1/'].raw_content
+    assert_equal 'Item 1', @items[1].raw_content
+    assert_equal 'Item 1', @items['/new/1/'].raw_content
   end
 
   if Array.new.respond_to?(:keep_if)
@@ -253,7 +253,7 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
   end
 
   def test_push
-    pushy = Nanoc::Item.new("Pushy", {}, '/pushy/')
+    pushy = Nanoc::Item.new('Pushy', {}, '/pushy/')
     @items.push(pushy)
 
     assert_equal @one, @items[0]
@@ -275,10 +275,10 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
   end
 
   def test_replace
-    max  = Nanoc::Item.new("Max", {}, '/max/')
+    max  = Nanoc::Item.new('Max', {}, '/max/')
     mona = Nanoc::Item.new('Mona', {}, '/mona/')
 
-    @items.replace([ max, mona ])
+    @items.replace([max, mona])
 
     assert_nil @items['/one/']
     assert_nil @items['/two/']
@@ -320,7 +320,7 @@ class Nanoc::ItemArrayTest < Nanoc::TestCase
   end
 
   def test_unshift
-    unshifty = Nanoc::Item.new("Unshifty", {}, '/unshifty/')
+    unshifty = Nanoc::Item.new('Unshifty', {}, '/unshifty/')
     @items.unshift(unshifty)
 
     assert_equal unshifty, @items[0]

data/test/base/test_item_rep.rb

@@ -66,7 +66,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
   def test_compiled_content_with_uncompiled_content
     # Create rep
     item = Nanoc::Item.new(
-      "blah blah", {}, '/',
+      'blah blah', {}, '/',
       :binary => false
     )
     rep = Nanoc::ItemRep.new(item, nil)
@@ -87,7 +87,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
 
     # Mock item
     item = Nanoc::Item.new(
-      %[<%= '<%= "blah" %' + '>' %>], {}, '/',
+      %(<%= '<%= "blah" %' + '>' %>), {}, '/',
       :binary => false
     )
 
@@ -101,21 +101,21 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     # Filter once
     item_rep.assigns = {}
     item_rep.filter(:erb)
-    assert_equal(%[<%= "blah" %>], item_rep.instance_eval { @content[:last] })
+    assert_equal(%(<%= "blah" %>), item_rep.instance_eval { @content[:last] })
 
     # Filter twice
     item_rep.assigns = {}
     item_rep.filter(:erb)
-    assert_equal(%[blah], item_rep.instance_eval { @content[:last] })
+    assert_equal(%(blah), item_rep.instance_eval { @content[:last] })
   end
 
   def test_layout
     # Mock layout
-    layout = Nanoc::Layout.new(%[<%= "blah" %>], {}, '/somelayout/')
+    layout = Nanoc::Layout.new(%(<%= "blah" %>), {}, '/somelayout/')
 
     # Mock item
     item = Nanoc::Item.new(
-      "blah blah", {}, '/',
+      'blah blah', {}, '/',
       :binary => false
     )
 
@@ -129,7 +129,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     # Layout
     item_rep.assigns = {}
     item_rep.layout(layout, :erb, {})
-    assert_equal(%[blah], item_rep.instance_eval { @content[:last] })
+    assert_equal(%(blah), item_rep.instance_eval { @content[:last] })
   end
 
   def test_snapshot
@@ -141,7 +141,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
 
     # Mock item
     item = Nanoc::Item.new(
-      %[<%= '<%= "blah" %' + '>' %>], {}, '/foobar/',
+      %(<%= '<%= "blah" %' + '>' %>), {}, '/foobar/',
       :binary => false
     )
 
@@ -161,15 +161,15 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     item_rep.snapshot(:qux)
 
     # Check snapshots
-    assert_equal(%[<%= '<%= "blah" %' + '>' %>], item_rep.instance_eval { @content[:foo] })
-    assert_equal(%[<%= "blah" %>],               item_rep.instance_eval { @content[:bar] })
-    assert_equal(%[blah],                        item_rep.instance_eval { @content[:qux] })
+    assert_equal(%(<%= '<%= "blah" %' + '>' %>), item_rep.instance_eval { @content[:foo] })
+    assert_equal(%(<%= "blah" %>),               item_rep.instance_eval { @content[:bar] })
+    assert_equal(%(blah),                        item_rep.instance_eval { @content[:qux] })
   end
 
   def test_snapshot_should_be_written
     # Mock item
     item = Nanoc::Item.new(
-      "blah blah", {}, '/',
+      'blah blah', {}, '/',
       :binary => false
     )
 
@@ -198,13 +198,13 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
   def test_write_should_not_touch_identical_textual_files
     # Mock item
     item = Nanoc::Item.new(
-      "blah blah", {}, '/',
+      'blah blah', {}, '/',
       :binary => false
     )
 
     # Create rep
     item_rep = Nanoc::ItemRep.new(item, :foo)
-    def item_rep.generate_diff ; end
+    def item_rep.generate_diff; end
     item_rep.instance_eval { @content[:last] = 'Lorem ipsum, etc.' }
     item_rep.raw_path = 'foo/bar/baz/quux.txt'
 
@@ -222,7 +222,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
   def test_write
     # Mock item
     item = Nanoc::Item.new(
-      "blah blah", {}, '/',
+      'blah blah', {}, '/',
       :binary => false
     )
 
@@ -242,19 +242,19 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
   def test_filter_text_to_binary
     # Mock item
     item = Nanoc::Item.new(
-      "blah blah", {}, '/',
+      'blah blah', {}, '/',
       :binary => false
     )
 
     # Create rep
     rep = Nanoc::ItemRep.new(item, :foo)
-    def rep.assigns ; {} ; end
+    def rep.assigns; {}; end
 
     # Create fake filter
     def rep.filter_named(name)
       @filter ||= Class.new(::Nanoc::Filter) do
         type :text => :binary
-        def run(content, params={})
+        def run(content, params = {})
           File.open(output_filename, 'w') { |io| io.write(content) }
         end
       end
@@ -270,19 +270,19 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
   def test_filter_with_textual_rep_and_binary_filter
     # Mock item
     item = Nanoc::Item.new(
-      "blah blah", {}, '/',
+      'blah blah', {}, '/',
       :binary => false
     )
 
     # Create rep
     rep = Nanoc::ItemRep.new(item, :foo)
-    def rep.assigns ; {} ; end
+    def rep.assigns; {}; end
 
     # Create fake filter
     def rep.filter_named(name)
       @filter ||= Class.new(::Nanoc::Filter) do
         type :binary
-        def run(content, params={})
+        def run(content, params = {})
           File.open(output_filename, 'w') { |io| io.write(content) }
         end
       end
@@ -329,7 +329,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
 
   def test_converted_binary_rep_can_be_layed_out
     # Mock layout
-    layout = Nanoc::Layout.new(%[<%= "blah" %> <%= yield %>], {}, '/somelayout/')
+    layout = Nanoc::Layout.new(%(<%= "blah" %> <%= yield %>), {}, '/somelayout/')
 
     # Create item and item rep
     item = create_binary_item
@@ -338,9 +338,9 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
 
     # Create filter
     Class.new(::Nanoc::Filter) do
-      type       :binary => :text
+      type :binary => :text
       identifier :binary_to_text
-      def run(content, params={})
+      def run(content, params = {})
         content + ' textified'
       end
     end
@@ -367,8 +367,8 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     def rep.filter_named(name)
       Class.new(::Nanoc::Filter) do
         type :binary => :text
-        def run(content, params={})
-          "Some textual content"
+        def run(content, params = {})
+          'Some textual content'
         end
       end
     end
@@ -378,8 +378,8 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     def rep.filter_named(name)
       Class.new(::Nanoc::Filter) do
         type :text
-        def run(content, params={})
-          "Some textual content"
+        def run(content, params = {})
+          'Some textual content'
         end
       end
     end
@@ -403,8 +403,8 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     def rep.filter_named(name)
       @filter ||= Class.new(::Nanoc::Filter) do
         type :binary => :text
-        def run(content, params={})
-          "Some textual content"
+        def run(content, params = {})
+          'Some textual content'
         end
       end
     end
@@ -415,16 +415,16 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
 
   def test_new_content_should_be_frozen
     filter_class = Class.new(::Nanoc::Filter) do
-      def run(content, params={})
+      def run(content, params = {})
         content.gsub!('foo', 'moo')
         content
       end
     end
 
-    item = Nanoc::Item.new("foo bar", {}, '/foo/')
+    item = Nanoc::Item.new('foo bar', {}, '/foo/')
     rep = Nanoc::ItemRep.new(item, :default)
     rep.instance_eval { @filter_class = filter_class }
-    def rep.filter_named(name) ; @filter_class ; end
+    def rep.filter_named(name); @filter_class; end
 
     assert_raises_frozen_error do
       rep.filter(:whatever)
@@ -433,16 +433,16 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
 
   def test_filter_should_freeze_content
     filter_class = Class.new(::Nanoc::Filter) do
-      def run(content, params={})
+      def run(content, params = {})
         content.gsub!('foo', 'moo')
         content
       end
     end
 
-    item = Nanoc::Item.new("foo bar", {}, '/foo/')
+    item = Nanoc::Item.new('foo bar', {}, '/foo/')
     rep = Nanoc::ItemRep.new(item, :default)
     rep.instance_eval { @filter_class = filter_class }
-    def rep.filter_named(name) ; @filter_class ; end
+    def rep.filter_named(name); @filter_class; end
 
     assert_raises_frozen_error do
       rep.filter(:erb)
@@ -452,8 +452,8 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
 
   def test_raw_path_should_generate_dependency
     items = [
-      Nanoc3::Item.new("foo", {}, '/foo/'),
-      Nanoc3::Item.new("bar", {}, '/bar/')
+      Nanoc3::Item.new('foo', {}, '/foo/'),
+      Nanoc3::Item.new('bar', {}, '/bar/')
     ]
     item_reps = [
       Nanoc3::ItemRep.new(items[0], :default),
@@ -467,13 +467,13 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     Nanoc3::NotificationCenter.post(:visit_ended,   items[0])
     dt.stop
 
-    assert_equal [ items[1] ], dt.objects_causing_outdatedness_of(items[0])
+    assert_equal [items[1]], dt.objects_causing_outdatedness_of(items[0])
   end
 
   def test_path_should_generate_dependency
     items = [
-      Nanoc3::Item.new("foo", {}, '/foo/'),
-      Nanoc3::Item.new("bar", {}, '/bar/')
+      Nanoc3::Item.new('foo', {}, '/foo/'),
+      Nanoc3::Item.new('bar', {}, '/bar/')
     ]
     item_reps = [
       Nanoc3::ItemRep.new(items[0], :default),
@@ -487,11 +487,11 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     Nanoc3::NotificationCenter.post(:visit_ended,   items[0])
     dt.stop
 
-    assert_equal [ items[1] ], dt.objects_causing_outdatedness_of(items[0])
+    assert_equal [items[1]], dt.objects_causing_outdatedness_of(items[0])
   end
 
   def test_access_compiled_content_of_binary_item
-    item = Nanoc::Item.new("content/somefile.dat", {}, '/somefile/', :binary => true)
+    item = Nanoc::Item.new('content/somefile.dat', {}, '/somefile/', :binary => true)
     item_rep = Nanoc::ItemRep.new(item, :foo)
     assert_raises(Nanoc::Errors::CannotGetCompiledContentOfBinaryItem) do
       item_rep.compiled_content
@@ -503,7 +503,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     FileUtils.mkdir_p('content')
     File.open('content/meow.dat', 'w') { |io| io.write('asdf') }
     item = Nanoc::Item.new(
-      "content/meow.dat", {}, '/',
+      'content/meow.dat', {}, '/',
       :binary => true
     )
 
@@ -531,7 +531,7 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     FileUtils.mkdir_p('content')
     File.open('content/meow.dat', 'w') { |io| io.write('asdf') }
     item = Nanoc::Item.new(
-      "content/meow.dat", {}, '/',
+      'content/meow.dat', {}, '/',
       :binary => true
     )
 
@@ -556,11 +556,11 @@ class Nanoc::ItemRepTest < Nanoc::TestCase
     Nanoc::NotificationCenter.remove(:rep_written, self)
   end
 
-private
+  private
 
   def create_binary_item
     Nanoc::Item.new(
-      "/a/file/name.dat", {}, '/',
+      '/a/file/name.dat', {}, '/',
       :binary => true
     )
   end
@@ -580,8 +580,8 @@ private
   def create_textual_filter
     f = create_filter(:text)
     f.class_eval do
-      def run(content, params={})
-        ""
+      def run(content, params = {})
+        ''
       end
     end
     f
@@ -590,7 +590,7 @@ private
   def create_binary_filter
     f = create_filter(:binary)
     f.class_eval do
-      def run(content, params={})
+      def run(content, params = {})
         File.open(output_filename, 'w') { |io| io.write(content) }
       end
     end

data/test/base/test_layout.rb

@@ -4,16 +4,16 @@ class Nanoc::LayoutTest < Nanoc::TestCase
 
   def test_initialize
     # Make sure attributes are cleaned
-    layout = Nanoc::Layout.new("content", { 'foo' => 'bar' }, '/foo/')
+    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
     assert_equal({ :foo => 'bar' }, layout.attributes)
 
     # Make sure identifier is cleaned
-    layout = Nanoc::Layout.new("content", { 'foo' => 'bar' }, 'foo')
+    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, 'foo')
     assert_equal('/foo/', layout.identifier)
   end
 
   def test_frozen_identifier
-    layout = Nanoc::Layout.new("foo", {}, '/foo')
+    layout = Nanoc::Layout.new('foo', {}, '/foo')
 
     assert_raises_frozen_error do
       layout.identifier.chop!
@@ -22,7 +22,7 @@ class Nanoc::LayoutTest < Nanoc::TestCase
 
   def test_lookup_with_known_attribute
     # Create layout
-    layout = Nanoc::Layout.new("content", { 'foo' => 'bar' }, '/foo/')
+    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
 
     # Check attributes
     assert_equal('bar', layout[:foo])
@@ -30,7 +30,7 @@ class Nanoc::LayoutTest < Nanoc::TestCase
 
   def test_lookup_with_unknown_attribute
     # Create layout
-    layout = Nanoc::Layout.new("content", { 'foo' => 'bar' }, '/foo/')
+    layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
 
     # Check attributes
     assert_equal(nil, layout[:filter])
@@ -38,7 +38,7 @@ class Nanoc::LayoutTest < Nanoc::TestCase
 
   def test_dump_and_load
     layout = Nanoc::Layout.new(
-      "foobar",
+      'foobar',
       { :a => { :b => 123 }},
       '/foo/')