nanoc 3.7.4 → 3.7.5

data/test/base/test_layout.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::LayoutTest < Nanoc::TestCase
-
   def test_initialize
     # Make sure attributes are cleaned
     layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
-    assert_equal({ :foo => 'bar' }, layout.attributes)
+    assert_equal({ foo: 'bar' }, layout.attributes)
 
     # Make sure identifier is cleaned
     layout = Nanoc::Layout.new('content', { 'foo' => 'bar' }, 'foo')
@@ -39,14 +38,13 @@ class Nanoc::LayoutTest < Nanoc::TestCase
   def test_dump_and_load
     layout = Nanoc::Layout.new(
       'foobar',
-      { :a => { :b => 123 }},
+      { a: { b: 123 } },
       '/foo/')
 
     layout = Marshal.load(Marshal.dump(layout))
 
     assert_equal '/foo/', layout.identifier
     assert_equal 'foobar', layout.raw_content
-    assert_equal({ :a => { :b => 123 }}, layout.attributes)
+    assert_equal({ a: { b: 123 } }, layout.attributes)
   end
-
 end

data/test/base/test_memoization.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
 class Nanoc::MemoizationTest < Nanoc::TestCase
-
   class Sample1
-
     extend Nanoc::Memoization
 
     def initialize(value)
@@ -11,14 +9,12 @@ class Nanoc::MemoizationTest < Nanoc::TestCase
     end
 
     def run(n)
-      @value*10 + n
+      @value * 10 + n
     end
     memoize :run
-
   end
 
   class Sample2
-
     extend Nanoc::Memoization
 
     def initialize(value)
@@ -26,14 +22,12 @@ class Nanoc::MemoizationTest < Nanoc::TestCase
     end
 
     def run(n)
-      @value*100 + n
+      @value * 100 + n
     end
     memoize :run
-
   end
 
   class EqualSample
-
     extend Nanoc::Memoization
 
     def initialize(value)
@@ -44,19 +38,18 @@ class Nanoc::MemoizationTest < Nanoc::TestCase
       4
     end
 
-    def eql?(other)
+    def eql?(_other)
       true
     end
 
-    def ==(other)
+    def ==(_other)
       true
     end
 
     def run(n)
-      @value*10 + n
+      @value * 10 + n
     end
     memoize :run
-
   end
 
   def test
@@ -66,10 +59,10 @@ class Nanoc::MemoizationTest < Nanoc::TestCase
     sample2b = Sample2.new(25)
 
     3.times do
-      assert_equal 10*10+5,  sample1a.run(5)
-      assert_equal 10*15+7,  sample1b.run(7)
-      assert_equal 100*20+5, sample2a.run(5)
-      assert_equal 100*25+7, sample2b.run(7)
+      assert_equal 10 * 10 + 5,  sample1a.run(5)
+      assert_equal 10 * 15 + 7,  sample1b.run(7)
+      assert_equal 100 * 20 + 5, sample2a.run(5)
+      assert_equal 100 * 25 + 7, sample2b.run(7)
     end
   end
 
@@ -78,11 +71,10 @@ class Nanoc::MemoizationTest < Nanoc::TestCase
     sample2 = EqualSample.new(3)
 
     3.times do
-      assert_equal 2*10+5, sample1.run(5)
-      assert_equal 2*10+3, sample1.run(3)
-      assert_equal 3*10+5, sample2.run(5)
-      assert_equal 3*10+3, sample2.run(3)
+      assert_equal 2 * 10 + 5, sample1.run(5)
+      assert_equal 2 * 10 + 3, sample1.run(3)
+      assert_equal 3 * 10 + 5, sample2.run(5)
+      assert_equal 3 * 10 + 3, sample2.run(3)
     end
   end
-
 end

data/test/base/test_notification_center.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::NotificationCenterTest < Nanoc::TestCase
-
   def test_post
     # Set up notification
     Nanoc::NotificationCenter.on :ping_received, :test do
@@ -28,5 +27,4 @@ class Nanoc::NotificationCenterTest < Nanoc::TestCase
     Nanoc::NotificationCenter.post :ping_received
     assert(!@ping_received)
   end
-
 end

data/test/base/test_outdatedness_checker.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 
 class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
-
   def test_not_outdated
     # Compile once
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
 
@@ -12,7 +11,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items[0].reps[0]
       assert_nil outdatedness_checker.outdatedness_reason_for(rep)
@@ -21,7 +20,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_item_checksum_nil
     # Compile once
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
 
@@ -29,12 +28,12 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Delete checksums
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |_site|
       FileUtils.rm('tmp/checksums')
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::OutdatednessReasons::NotEnoughData,
@@ -44,7 +43,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_compiled_file_doesnt_exist
     # Compile once
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
 
@@ -57,7 +56,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::OutdatednessReasons::NotWritten,
@@ -67,7 +66,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_item_checksum_is_different
     # Compile once
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('content/new.html', 'w') { |io| io.write('o hello too') }
       File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
@@ -81,7 +80,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/new/' }.reps[0]
       assert_equal ::Nanoc::OutdatednessReasons::SourceModified,
@@ -91,7 +90,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_dependent_layout_outdated
     # Compile once
-    with_site(:name => 'foo', :compilation_rule_content => 'layout "/default/"', :has_layout => true) do |site|
+    with_site(name: 'foo', compilation_rule_content: 'layout "/default/"', has_layout: true) do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
       File.open('layouts/default.html', 'w') { |io| io.write('!!! <%= yield %> !!!') }
 
@@ -104,8 +103,8 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
-      # FIXME ugly fugly hack
+    with_site(name: 'foo') do |site|
+      # FIXME: ugly fugly hack
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -117,7 +116,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_dependent_item_outdated
     # Compile once
-    with_site(:name => 'foo', :compilation_rule_content => 'filter :erb') do |site|
+    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
       File.open('content/a.html', 'w') do |io|
         io.write('<%= @items.find { |i| i.identifier == "/b/" }.compiled_content %>')
       end
@@ -136,8 +135,8 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
-      # FIXME ugly fugly hack
+    with_site(name: 'foo') do |site|
+      # FIXME: ugly fugly hack
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -149,7 +148,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_dependent_item_outdated_chained
     # Compile once
-    with_site(:name => 'foo', :compilation_rule_content => 'filter :erb') do |site|
+    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
       File.open('content/a.html', 'w') do |io|
         io.write('<%= @items.find { |i| i.identifier == "/b/" }.compiled_content %> aaa')
       end
@@ -171,8 +170,8 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
-      # FIXME ugly fugly hack
+    with_site(name: 'foo') do |site|
+      # FIXME: ugly fugly hack
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -184,7 +183,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_dependent_item_removed
     # Compile once
-    with_site(:name => 'foo', :compilation_rule_content => 'filter :erb') do |site|
+    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
       File.open('content/a.html', 'w') do |io|
         io.write('<% @items.select { |i| i.identifier != @item.identifier }.each do |i| %>')
         io.write('  <%= i.compiled_content %>')
@@ -203,8 +202,8 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
-      # FIXME ugly fugly hack
+    with_site(name: 'foo') do |site|
+      # FIXME: ugly fugly hack
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -216,7 +215,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_dependent_item_added
     # Compile once
-    with_site(:name => 'foo', :compilation_rule_content => 'filter :erb') do |site|
+    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
       File.open('content/a.html', 'w') do |io|
         io.write('<% @items.select { |i| i.identifier != @item.identifier }.each do |i| %>')
         io.write('  <%= i.compiled_content %>')
@@ -237,8 +236,8 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
-      # FIXME ugly fugly hack
+    with_site(name: 'foo') do |site|
+      # FIXME: ugly fugly hack
       site.compiler.load
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
@@ -248,11 +247,11 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
   end
 
-  # TODO make sure outdatedness of non-outdated items is correct
+  # TODO: make sure outdatedness of non-outdated items is correct
 
   def test_outdated_if_code_snippets_outdated
     # Compile once
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
       site.compile
@@ -264,7 +263,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::OutdatednessReasons::CodeSnippetsModified,
@@ -274,7 +273,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_config_outdated
     # Compile once
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
       site.compile
@@ -286,7 +285,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_equal ::Nanoc::OutdatednessReasons::ConfigurationModified,
@@ -296,7 +295,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_not_outdated_if_irrelevant_rule_modified
     # Compile once
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
       site.compile
@@ -308,7 +307,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
     end
 
     # Check
-    with_site(:name => 'foo') do |site|
+    with_site(name: 'foo') do |site|
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
       assert_nil outdatedness_checker.outdatedness_reason_for(rep)
@@ -317,7 +316,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_outdated_if_relevant_rule_modified
     # Create site
-    with_site(:name => 'foo') do |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")
@@ -360,7 +359,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_items_in_rules_should_not_cause_outdatedness
     # Create site
-    with_site(:name => 'foo') do |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")
@@ -391,7 +390,7 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
 
   def test_non_serializable_parameters_in_rules_should_be_allowed
     # Create site
-    with_site(:name => 'foo') do |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")
@@ -421,5 +420,4 @@ class Nanoc::OutdatednessCheckerTest < Nanoc::TestCase
       end
     end
   end
-
 end

data/test/base/test_plugin.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::PluginTest < Nanoc::TestCase
-
   class SampleFilter < Nanoc::Filter
     identifier :_plugin_test_sample_filter
   end
@@ -24,5 +23,4 @@ class Nanoc::PluginTest < Nanoc::TestCase
 
     refute_nil filter
   end
-
 end

data/test/base/test_rule.rb

@@ -1,17 +1,15 @@
 # encoding: utf-8
 
 class Nanoc::RuleTest < Nanoc::TestCase
-
   def test_initialize
-    # TODO implement
+    # TODO: implement
   end
 
   def test_applicable_to
-    # TODO implement
+    # TODO: implement
   end
 
   def test_apply_to
-    # TODO implement
+    # TODO: implement
   end
-
 end

data/test/base/test_rule_context.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::RuleContextTest < Nanoc::TestCase
-
   def test_objects
     # Mock everything
     config = mock
@@ -18,7 +17,7 @@ class Nanoc::RuleContextTest < Nanoc::TestCase
     compiler = Nanoc::Compiler.new(site)
 
     # Create context
-    @rule_context = Nanoc::RuleContext.new(:rep => rep, :compiler => compiler)
+    @rule_context = Nanoc::RuleContext.new(rep: rep, compiler: compiler)
 
     # Check
     assert_equal rep,     @rule_context.rep
@@ -44,7 +43,7 @@ class Nanoc::RuleContextTest < Nanoc::TestCase
     # Mock rep
     rep = mock
     rep.stubs(:item).returns(item)
-    rep.expects(:filter).with(:foo, { :bar => 'baz' })
+    rep.expects(:filter).with(:foo, { bar: 'baz' })
     rep.expects(:layout).with('foo')
     rep.expects(:snapshot).with('awesome')
 
@@ -52,12 +51,11 @@ class Nanoc::RuleContextTest < Nanoc::TestCase
     compiler = Nanoc::Compiler.new(site)
 
     # Create context
-    @rule_context = Nanoc::RuleContext.new(:rep => rep, :compiler => compiler)
+    @rule_context = Nanoc::RuleContext.new(rep: rep, compiler: compiler)
 
     # Check
-    rep.filter :foo, :bar => 'baz'
+    rep.filter :foo, bar: 'baz'
     rep.layout 'foo'
     rep.snapshot 'awesome'
   end
-
 end