nanoc 3.7.4 → 3.7.5

data/test/filters/test_rubypants.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::RubyPantsTest < Nanoc::TestCase
-
   def test_filter
     if_have 'rubypants' do
       # Get filter
@@ -12,5 +11,4 @@ class Nanoc::Filters::RubyPantsTest < Nanoc::TestCase
       assert_equal('Wait&#8212;what?', result)
     end
   end
-
 end

data/test/filters/test_sass.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::Filters::SassTest < Nanoc::TestCase
-
   def test_filter
     if_have 'sass' do
       # Get filter
-      filter = create_filter({ :foo => 'bar' })
+      filter = create_filter({ foo: 'bar' })
 
       # Run filter
       result = filter.setup_and_run(".foo #bar\n  color: #f00")
@@ -16,14 +15,14 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
   def test_filter_with_params
     if_have 'sass' do
       # Create filter
-      filter = create_filter({ :foo => 'bar' })
+      filter = create_filter({ foo: 'bar' })
 
       # Check with compact
-      result = filter.setup_and_run(".foo #bar\n  color: #f00", :style => 'compact')
+      result = filter.setup_and_run(".foo #bar\n  color: #f00", style: 'compact')
       assert_match(/^\.foo #bar[\s]*\{[\s]*color:\s*(red|#f00);?[\s]*\}/m, result)
 
       # Check with compressed
-      result = filter.setup_and_run(".foo #bar\n  color: #f00", :style => 'compressed')
+      result = filter.setup_and_run(".foo #bar\n  color: #f00", style: 'compressed')
       assert_match(/^\.foo #bar[\s]*\{[\s]*color:\s*(red|#f00);?[\s]*\}/m, result)
     end
   end
@@ -64,7 +63,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
       filter = create_filter
 
       # Create sample file
-      File.open('moo.sass', 'w') { |io| io.write %Q(@import subdir/relative) }
+      File.open('moo.sass', 'w') { |io| io.write %(@import subdir/relative) }
       FileUtils.mkdir_p('subdir')
       File.open('subdir/relative.sass', 'w') { |io| io.write "body\n  color: red" }
 
@@ -275,14 +274,13 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
 
   def create_filter(params = {})
     FileUtils.mkdir_p('content')
-    File.open('content/xyzzy.sass', 'w') { |io| io.write('p\n  color: green')}
+    File.open('content/xyzzy.sass', 'w') { |io| io.write('p\n  color: green') }
 
     items = [Nanoc::Item.new(
       'blah',
-      { :content_filename => 'content/xyzzy.sass' },
+      { content_filename: 'content/xyzzy.sass' },
       '/blah/')]
-    params = { :item => items[0], :items => items }.merge(params)
+    params = { item: items[0], items: items }.merge(params)
     ::Nanoc::Filters::Sass.new(params)
   end
-
 end

data/test/filters/test_slim.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 class Nanoc::Filters::SlimTest < Nanoc::TestCase
-
   def test_filter
     if_have 'slim' do
       # Create filter
-      filter = ::Nanoc::Filters::Slim.new({ :rabbit => 'The rabbit is on the branch.' })
+      filter = ::Nanoc::Filters::Slim.new({ rabbit: 'The rabbit is on the branch.' })
 
       # Run filter (no assigns)
       result = filter.setup_and_run('html')
@@ -23,11 +22,10 @@ class Nanoc::Filters::SlimTest < Nanoc::TestCase
 
   def test_filter_with_yield
     if_have 'slim' do
-      filter = ::Nanoc::Filters::Slim.new({ :content => 'The rabbit is on the branch.' })
+      filter = ::Nanoc::Filters::Slim.new({ content: 'The rabbit is on the branch.' })
 
       result = filter.setup_and_run('p = yield')
       assert_equal('<p>The rabbit is on the branch.</p>', result)
     end
   end
-
 end

data/test/filters/test_typogruby.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::TypogrubyTest < Nanoc::TestCase
-
   def test_filter
     if_have 'typogruby' do
       # Get filter
@@ -14,6 +13,4 @@ class Nanoc::Filters::TypogrubyTest < Nanoc::TestCase
       assert_equal(b, result)
     end
   end
-
 end
-

data/test/filters/test_uglify_js.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
-
   def test_filter
     if_have 'uglifier' do
       # Create filter
@@ -19,12 +18,11 @@ class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::UglifyJS.new
       input = "if(donkey) alert('It is a donkey!');"
 
-      result = filter.setup_and_run(input, :output => { :beautify => false })
+      result = filter.setup_and_run(input, output: { beautify: false })
       assert_equal 'donkey&&alert("It is a donkey!");', result
 
-      result = filter.setup_and_run(input, :output => { :beautify => true })
+      result = filter.setup_and_run(input, output: { beautify: true })
       assert_equal 'donkey && alert("It is a donkey!");', result
     end
   end
-
 end

data/test/filters/test_xsl.rb

@@ -3,7 +3,6 @@
 require 'tempfile'
 
 class Nanoc::Filters::XSLTest < Nanoc::TestCase
-
   SAMPLE_XSL = <<-EOS
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -88,17 +87,17 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Item.new(SAMPLE_XML_IN,
-                             { },
+                             {},
                              '/content/')
       layout = Nanoc::Layout.new(SAMPLE_XSL,
-                                 { },
+                                 {},
                                  '/layout/')
 
       # Create an instance of the filter
       assigns = {
-        :item => item,
-        :layout => layout,
-        :content => item.raw_content
+        item: item,
+        layout: layout,
+        content: item.raw_content
       }
       filter = ::Nanoc::Filters::XSL.new(assigns)
 
@@ -112,23 +111,23 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Item.new(SAMPLE_XML_IN_WITH_PARAMS,
-                             { },
+                             {},
                              '/content/')
       layout = Nanoc::Layout.new(SAMPLE_XSL_WITH_PARAMS,
-                                 { },
+                                 {},
                                  '/layout/')
 
       # Create an instance of the filter
       assigns = {
-        :item => item,
-        :layout => layout,
-        :content => item.raw_content
+        item: item,
+        layout: layout,
+        content: item.raw_content
       }
       filter = ::Nanoc::Filters::XSL.new(assigns)
 
       # Run the filter and validate the results
       result = filter.setup_and_run(layout.raw_content,
-                                    :foo => 'bar')
+                                    foo: 'bar')
       assert_match SAMPLE_XML_OUT_WITH_PARAMS, result
     end
   end
@@ -137,17 +136,17 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Item.new(SAMPLE_XML_IN_WITH_OMIT_XML_DECL,
-                             { },
+                             {},
                              '/content/')
       layout = Nanoc::Layout.new(SAMPLE_XSL_WITH_OMIT_XML_DECL,
-                                 { },
+                                 {},
                                  '/layout/')
 
       # Create an instance of the filter
       assigns = {
-        :item => item,
-        :layout => layout,
-        :content => item.raw_content
+        item: item,
+        layout: layout,
+        content: item.raw_content
       }
       filter = ::Nanoc::Filters::XSL.new(assigns)
 
@@ -156,5 +155,4 @@ EOS
       assert_match SAMPLE_XML_OUT_WITH_OMIT_XML_DECL, result
     end
   end
-
 end

data/test/filters/test_yui_compressor.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Filters::YUICompressorTest < Nanoc::TestCase
-
   def test_filter_javascript
     if_have 'yuicompressor' do
       filter = ::Nanoc::Filters::YUICompressor.new
@@ -16,10 +15,10 @@ class Nanoc::Filters::YUICompressorTest < Nanoc::TestCase
         }
       JAVASCRIPT
 
-      result = filter.setup_and_run(sample_js, { :type => 'js', :munge => true })
+      result = filter.setup_and_run(sample_js, { type: 'js', munge: true })
       assert_match 'function factorial(c){var a=1;for(var b=2;b<=c;b++){a*=b}return a};', result
 
-      result = filter.setup_and_run(sample_js, { :type => 'js', :munge => false })
+      result = filter.setup_and_run(sample_js, { type: 'js', munge: false })
       assert_match 'function factorial(n){var result=1;for(var i=2;i<=n;i++){result*=i}return result};', result
     end
   end
@@ -34,9 +33,8 @@ class Nanoc::Filters::YUICompressorTest < Nanoc::TestCase
         }
       CSS
 
-      result = filter.setup_and_run(sample_css, { :type => 'css' })
+      result = filter.setup_and_run(sample_css, { type: 'css' })
       assert_match '*{margin:0}', result
     end
   end
-
 end

data/test/fixtures/vcr_cassettes/css_run_parse_error.yml

@@ -0,0 +1,65 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://jigsaw.w3.org/css-validator/validator?output=soap12&profile=css3&text=h1%20%7B%20%3B%20%7B
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Date:
+      - Sat, 06 Dec 2014 11:12:00 GMT
+      Pragma:
+      - no-cache
+      Transfer-Encoding:
+      - chunked
+      Content-Language:
+      - en
+      Content-Type:
+      - application/soap+xml;charset=utf-8
+      Server:
+      - Jigsaw/2.3.0-beta2
+      Vary:
+      - Accept-Language
+      X-W3c-Validator-Errors:
+      - '1'
+      X-W3c-Validator-Status:
+      - Invalid
+    body:
+      encoding: UTF-8
+      string: "<?xml version='1.0' encoding=\"utf-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n
+        \   <env:Body>\n        <m:cssvalidationresponse\n            env:encodingStyle=\"http://www.w3.org/2003/05/soap-encoding\"\n
+        \           xmlns:m=\"http://www.w3.org/2005/07/css-validator\">\n            <m:uri>file://localhost/TextArea</m:uri>\n
+        \           <m:checkedby>http://jigsaw.w3.org/css-validator/</m:checkedby>\n
+        \           <m:csslevel>css3</m:csslevel>\n            <m:date>2014-12-06T11:12:00Z</m:date>\n
+        \           <m:validity>false</m:validity>\n            <m:result>\n                <m:errors
+        xml:lang=\"en\">\n                    <m:errorcount>1</m:errorcount>\n                                                                    \n
+        \               <m:errorlist>\n                    <m:uri>file://localhost/TextArea</m:uri>\n
+        \                           \n                        <m:error>\n                            <m:line>1</m:line>\n
+        \                           <m:errortype>parse-error</m:errortype>\n                            <m:context>h1</m:context>
+        \       \n                            <m:errorsubtype>\n                                unrecognized\n
+        \                           </m:errorsubtype>\n                            <m:skippedstring>\n
+        \                               ; {\n                            </m:skippedstring>\n
+        \                           <m:type>generator.unrecognize</m:type>\n        \n
+        \                           <m:message>\n        \n                                Parse
+        Error\n                            </m:message>\n                        </m:error>\n
+        \           \n                    </m:errorlist>\n        \n                </m:errors>\n
+        \               <m:warnings xml:lang=\"en\">\n                    <m:warningcount>0</m:warningcount>\n
+        \               </m:warnings>\n            </m:result>\n        </m:cssvalidationresponse>\n
+        \   </env:Body>\n</env:Envelope>\n\n"
+    http_version: 
+  recorded_at: Sat, 06 Dec 2014 11:12:00 GMT
+recorded_with: VCR 2.9.3

data/test/gem_loader.rb

@@ -7,5 +7,5 @@ begin
   Gem::Specification.load(gemspec).dependencies.each do |dep|
     gem dep.name, *dep.requirement.as_list
   end
-rescue LoadError => e
+rescue LoadError
 end

data/test/helper.rb

@@ -30,7 +30,6 @@ VCR.configure do |c|
 end
 
 module Nanoc::TestHelpers
-
   LIB_DIR = File.expand_path(File.dirname(__FILE__) + '/../lib')
 
   def disable_nokogiri?
@@ -58,7 +57,7 @@ module Nanoc::TestHelpers
   def if_implemented
     yield
   rescue NotImplementedError, NameError
-    skip $!
+    skip $ERROR_INFO
     return
   end
 
@@ -159,7 +158,7 @@ EOS
     end
   end
 
-  def capturing_stdio(&block)
+  def capturing_stdio(&_block)
     # Store
     orig_stdout = $stdout
     orig_stderr = $stderr
@@ -168,7 +167,7 @@ EOS
     $stdout = StringIO.new
     $stderr = StringIO.new
     yield
-    { :stdout => $stdout.string, :stderr => $stderr.string }
+    { stdout: $stdout.string, stderr: $stderr.string }
   ensure
     # Restore
     $stdout = orig_stdout
@@ -192,7 +191,7 @@ EOS
           pieces << line
         end
       end
-      lines = pieces.map { |p| p.last }
+      lines = pieces.map(&:last)
 
       # Test
       b = binding
@@ -208,14 +207,14 @@ EOS
 
   def assert_contains_exactly(expected, actual)
     assert_equal expected.size, actual.size,
-      'Expected %s to be of same size as %s' % [actual.inspect, expected.inspect]
+      format('Expected %s to be of same size as %s', actual.inspect, expected.inspect)
     remaining = actual.dup.to_a
     expected.each do |e|
       index = remaining.index(e)
       remaining.delete_at(index) if index
     end
     assert remaining.empty?,
-      'Expected %s to contain all the elements of %s' % [actual.inspect, expected.inspect]
+      format('Expected %s to contain all the elements of %s', actual.inspect, expected.inspect)
   end
 
   def assert_raises_frozen_error
@@ -223,12 +222,12 @@ EOS
     assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, error.message)
   end
 
-  def with_env_vars(hash, &block)
+  def with_env_vars(hash, &_block)
     orig_env_hash = ENV.to_hash
-    hash.each_pair { |k,v| ENV[k] = v }
+    hash.each_pair { |k, v| ENV[k] = v }
     yield
   ensure
-    orig_env_hash.each_pair { |k,v| ENV[k] = v }
+    orig_env_hash.each_pair { |k, v| ENV[k] = v }
   end
 
   def on_windows?
@@ -236,7 +235,7 @@ EOS
   end
 
   def command?(cmd)
-    which, null = on_windows? ? ['where', 'NUL'] : ['which', '/dev/null']
+    which, null = on_windows? ? %w(where NUL) : ['which', '/dev/null']
     system("#{which} #{cmd} > #{null} 2>&1")
   end
 
@@ -255,13 +254,10 @@ EOS
   def skip_unless_symlinks_supported
     skip 'Symlinks are not supported by Ruby on Windows' unless symlinks_supported?
   end
-
 end
 
 class Nanoc::TestCase < MiniTest::Unit::TestCase
-
   include Nanoc::TestHelpers
-
 end
 
 # Unexpected system exit is unexpected
@@ -271,6 +267,6 @@ end
 #
 class Time
   def inspect
-    strftime("%a %b %d %H:%M:%S.#{'%06d' % usec} %Z %Y")
+    strftime("%a %b %d %H:%M:%S.#{format('%06d', usec)} %Z %Y")
   end
 end

data/test/helpers/test_blogging.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
-
   include Nanoc::Helpers::Blogging
   include Nanoc::Helpers::Text
 
@@ -32,17 +31,17 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     @items = [
       Nanoc::Item.new(
         'blah',
-        { :kind => 'item' },
+        { kind: 'item' },
         '/0/'
       ),
       Nanoc::Item.new(
         'blah blah',
-        { :kind => 'article' },
+        { kind: 'article' },
         '/1/'
       ),
       Nanoc::Item.new(
         'blah blah blah',
-        { :kind => 'article' },
+        { kind: 'article' },
         '/2/'
       )
     ]
@@ -61,17 +60,17 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     @items = [
       Nanoc::Item.new(
         'blah',
-        { :kind => 'item' },
+        { kind: 'item' },
         '/0/'
       ),
       Nanoc::Item.new(
         'blah',
-        { :kind => 'article', :created_at => (Date.today - 1).to_s }, 
+        { kind: 'article', created_at: (Date.today - 1).to_s },
         '/1/'
       ),
       Nanoc::Item.new(
         'blah',
-        { :kind => 'article', :created_at => (Time.now - 500).to_s },
+        { kind: 'article', created_at: (Time.now - 500).to_s },
         '/2/'
       )
     ]
@@ -102,14 +101,14 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @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].expects(:compiled_content).with(:snapshot => :pre).returns('item 1 content')
+      @items[1].expects(:compiled_content).with(snapshot: :pre).returns('item 1 content')
 
       # Create item 2
-      @items[2].expects(:compiled_content).with(:snapshot => :pre).returns('item 2 content')
+      @items[2].expects(:compiled_content).with(snapshot: :pre).returns('item 2 content')
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -141,7 +140,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -163,7 +162,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -189,7 +188,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({:base_url => nil})
+      @site.stubs(:config).returns({ base_url: nil })
 
       # Create feed item
       @item = mock
@@ -215,7 +214,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -241,7 +240,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -272,7 +271,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com/' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com/' })
 
       # Create feed item
       @item = mock
@@ -315,7 +314,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -343,7 +342,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -366,11 +365,11 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     if_have 'builder' do
       # Create items
       @items = [mock_item, mock_article]
-      @items[1].expects(:compiled_content).with(:snapshot => :pre).returns('asdf')
+      @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -381,9 +380,9 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Check
       atom_feed(
-        :author_name => 'Bob',
-        :author_uri  => 'http://example.com/~bob/',
-        :title       => 'My Blog Or Something'
+        author_name: 'Bob',
+        author_uri: 'http://example.com/~bob/',
+        title: 'My Blog Or Something'
       )
     end
   end
@@ -392,14 +391,14 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     if_have 'builder' do
       # Create items
       @items = [mock_item, mock_article]
-      @items[1].expects(:compiled_content).with(:snapshot => :pre).returns('asdf')
+      @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
       @config = {
-        :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'
       }
       @site = mock
       @site.stubs(:config).returns(@config)
@@ -423,11 +422,11 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       @items[0].expects(:compiled_content).never
       @items[1].stubs(:[]).with(:title).returns('Item One')
-      @items[1].expects(:compiled_content).with(:snapshot => :pre).returns('asdf')
+      @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -437,7 +436,7 @@ 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
 
@@ -452,7 +451,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -462,7 +461,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
 
       # Check
-      result = atom_feed :limit => 1, :articles => @items
+      result = atom_feed limit: 1, articles: @items
       assert_match(
         Regexp.new('Article 0', Regexp::MULTILINE),
         result
@@ -486,7 +485,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -511,7 +510,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -521,7 +520,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
 
       # Check
-      result = atom_feed :content_proc => lambda { |a| 'foobar!' }
+      result = atom_feed content_proc: ->(_a) { 'foobar!' }
       assert_match 'foobar!</content>', result
     end
   end
@@ -533,7 +532,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -543,7 +542,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:[]).with(:feed_url).returns('http://example.com/feed')
 
       # Check
-      result = atom_feed :excerpt_proc => lambda { |a| 'foobar!' }
+      result = atom_feed excerpt_proc: ->(_a) { 'foobar!' }
       assert_match 'foobar!</summary>', result
     end
   end
@@ -555,7 +554,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -565,7 +564,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
 
       # Check
-      result = atom_feed :icon => 'http://example.com/icon.png'
+      result = atom_feed icon: 'http://example.com/icon.png'
       assert_match '<icon>http://example.com/icon.png</icon>', result
     end
   end
@@ -577,7 +576,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -587,7 +586,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
 
       # Check
-      result = atom_feed :logo => 'http://example.com/logo.png'
+      result = atom_feed logo: 'http://example.com/logo.png'
       assert_match '<logo>http://example.com/logo.png</logo>', result
     end
   end
@@ -600,7 +599,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
       # Mock site
       @site = mock
-      @site.stubs(:config).returns({ :base_url => 'http://example.com' })
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
 
       # Create feed item
       @item = mock
@@ -618,7 +617,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_url_for_without_custom_path_in_feed
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
     item = Nanoc::Item.new('content', {}, '/foo/')
@@ -634,11 +633,11 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_url_for_with_custom_path_in_feed
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
     item = Nanoc::Item.new(
-      'content', { :custom_path_in_feed => '/meow/woof/' }, '/foo/')
+      'content', { custom_path_in_feed: '/meow/woof/' }, '/foo/')
     item.reps << Nanoc::ItemRep.new(item, :default)
 
     # Check
@@ -650,11 +649,11 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_url_for_with_custom_url_in_feed
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
     item = Nanoc::Item.new(
-      'content', { :custom_url_in_feed => 'http://example.org/x' }, '/foo/')
+      'content', { custom_url_in_feed: 'http://example.org/x' }, '/foo/')
     item.reps << Nanoc::ItemRep.new(item, :default)
 
     # Check
@@ -676,7 +675,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_url_for_without_path
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
     item = Nanoc::Item.new('content', {}, '/foo/')
@@ -689,7 +688,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_feed_url_without_custom_feed_url
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
     @item = Nanoc::Item.new('content', {}, '/foo/')
@@ -705,10 +704,10 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_feed_url_with_custom_feed_url
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create feed item
-    @item = Nanoc::Item.new('content', { :feed_url => 'http://example.com/feed/' }, '/foo/')
+    @item = Nanoc::Item.new('content', { feed_url: 'http://example.com/feed/' }, '/foo/')
     @item.reps << Nanoc::ItemRep.new(@item, :default)
     @item.reps[0].path = '/foo/bar/'
 
@@ -731,10 +730,10 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_atom_tag_for_with_path
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
-    item = Nanoc::Item.new('content', { :created_at => '2008-05-19' }, '/foo/')
+    item = Nanoc::Item.new('content', { created_at: '2008-05-19' }, '/foo/')
     item.reps << Nanoc::ItemRep.new(item, :default)
     item.reps[0].path = '/foo/bar/'
 
@@ -744,10 +743,10 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_atom_tag_for_without_path
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
-    item = Nanoc::Item.new('content', { :created_at => '2008-05-19' }, '/baz/qux/')
+    item = Nanoc::Item.new('content', { created_at: '2008-05-19' }, '/baz/qux/')
     item.reps << Nanoc::ItemRep.new(item, :default)
 
     # Check
@@ -756,10 +755,10 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_atom_tag_for_with_base_url_in_dir
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com/somedir' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com/somedir' })
 
     # Create article
-    item = Nanoc::Item.new('content', { :created_at => '2008-05-19' }, '/foo/')
+    item = Nanoc::Item.new('content', { created_at: '2008-05-19' }, '/foo/')
     item.reps << Nanoc::ItemRep.new(item, :default)
     item.reps[0].path = '/foo/bar/'
 
@@ -769,10 +768,10 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_atom_tag_for_with_time
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
-    item = Nanoc::Item.new('content', { :created_at => Time.parse('2008-05-19') }, '/foo/')
+    item = Nanoc::Item.new('content', { created_at: Time.parse('2008-05-19') }, '/foo/')
     item.reps << Nanoc::ItemRep.new(item, :default)
     item.reps[0].path = '/foo/bar/'
 
@@ -782,15 +781,14 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
 
   def test_atom_tag_for_with_date
     # Create site
-    @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+    @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
     # Create article
-    item = Nanoc::Item.new('content', { :created_at => Date.parse('2008-05-19') }, '/foo/')
+    item = Nanoc::Item.new('content', { created_at: Date.parse('2008-05-19') }, '/foo/')
     item.reps << Nanoc::ItemRep.new(item, :default)
     item.reps[0].path = '/foo/bar/'
 
     # Check
     assert_equal('tag:example.com,2008-05-19:/foo/bar/', atom_tag_for(item))
   end
-
 end