nanoc 4.4.5 → 4.4.6

data/test/deploying/test_fog.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Deploying::Deployers::FogTest < Nanoc::TestCase
   def test_read_etags_with_local_provider
     if_have 'fog' do

data/test/deploying/test_rsync.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Deploying::Deployers::RsyncTest < Nanoc::TestCase
   def test_run_without_dst
     # Create deployer
@@ -24,7 +26,7 @@ class Nanoc::Deploying::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Deploying::Deployers::Rsync.new(
       'output/',
-      { dst: 'asdf/' },
+      dst: 'asdf/',
     )
 
     # Mock run_shell_cmd
@@ -45,7 +47,7 @@ class Nanoc::Deploying::Deployers::RsyncTest < Nanoc::TestCase
     # Create deployer
     rsync = Nanoc::Deploying::Deployers::Rsync.new(
       'output',
-      { dst: 'asdf' },
+      dst: 'asdf',
     )
 
     # Mock run_shell_cmd

data/test/extra/core_ext/test_pathname.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Extra::CoreExtPathnameTest < Nanoc::TestCase
   def test_components
     assert_equal %w(/ a bb ccc dd e), Pathname.new('/a/bb/ccc/dd/e').__nanoc_components

data/test/extra/core_ext/test_time.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::ExtraCoreExtTimeTest < Nanoc::TestCase
   def test___nanoc_to_iso8601_date_utc
     assert_equal('2008-05-19', Time.utc(2008, 5, 19, 14, 20, 0, 0).__nanoc_to_iso8601_date)

data/test/extra/test_link_collector.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
   def test_all
     # Create dummy data

data/test/extra/test_piper.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Extra::PiperTest < Nanoc::TestCase
   def test_basic
     stdout = StringIO.new

data/test/filters/colorize_syntax/test_coderay.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::ColorizeSyntax::CoderayTest < Nanoc::TestCase
   CODERAY_PRE  = '<div class="CodeRay"><div class="code">'.freeze
   CODERAY_POST = '</div></div>'.freeze

data/test/filters/colorize_syntax/test_common.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::ColorizeSyntax::CommonTest < Nanoc::TestCase
   def test_dummy
     if_have 'nokogiri' do

data/test/filters/colorize_syntax/test_pygmentize.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::ColorizeSyntax::PygmentizeTest < Nanoc::TestCase
   def test_pygmentize
     if_have 'nokogiri' do

data/test/filters/colorize_syntax/test_pygments.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::ColorizeSyntax::PygmentsTest < Nanoc::TestCase
   def test_pygmentsrb
     skip 'pygments.rb does not support Windows' if on_windows?

data/test/filters/colorize_syntax/test_simon.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::ColorizeSyntax::SimonTest < Nanoc::TestCase
   def test_simon_highlight
     if_have 'nokogiri' do

data/test/filters/test_asciidoc.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
   def test_filter
     skip_unless_have_command 'asciidoc'

data/test/filters/test_bluecloth.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::BlueClothTest < Nanoc::TestCase
   def test_filter
     if_have 'bluecloth' do

data/test/filters/test_coffeescript.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
   def test_filter
     skip_v8_on_ruby24

data/test/filters/test_erb.rb

@@ -1,7 +1,9 @@
+require 'helper'
+
 class Nanoc::Filters::ERBTest < Nanoc::TestCase
   def test_filter_with_instance_variable
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new(location: 'a cheap motel')
 
     # Run filter
     result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
@@ -10,7 +12,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
   def test_filter_with_instance_method
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new(location: 'a cheap motel')
 
     # Run filter
     result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
@@ -45,7 +47,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
   def test_filter_with_yield
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ content: 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new(content: 'a cheap motel')
 
     # Run filter
     result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
@@ -54,7 +56,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
   def test_filter_with_yield_without_content
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new(location: 'a cheap motel')
 
     # Run filter
     assert_raises LocalJumpError do
@@ -83,7 +85,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
   def test_trim_mode
     # Set up
-    filter = ::Nanoc::Filters::ERB.new({ location: 'a cheap motel' })
+    filter = ::Nanoc::Filters::ERB.new(location: 'a cheap motel')
     $trim_mode_works = false
 
     # Without

data/test/filters/test_erubis.rb

@@ -1,8 +1,10 @@
+require 'helper'
+
 class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_instance_variable
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ location: 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new(location: 'a cheap motel')
 
       # Run filter
       result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
@@ -13,7 +15,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_instance_method
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ location: 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new(location: 'a cheap motel')
 
       # Run filter
       result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
@@ -42,7 +44,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_yield
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ content: 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new(content: 'a cheap motel')
 
       # Run filter
       result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
@@ -53,7 +55,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_yield_without_content
     if_have 'erubis' do
       # Create filter
-      filter = ::Nanoc::Filters::Erubis.new({ location: 'a cheap motel' })
+      filter = ::Nanoc::Filters::Erubis.new(location: 'a cheap motel')
 
       # Run filter
       assert_raises LocalJumpError do

data/test/filters/test_haml.rb

@@ -1,8 +1,10 @@
+require 'helper'
+
 class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ question: 'Is this the Payne residence?' })
+      filter = ::Nanoc::Filters::Haml.new(question: 'Is this the Payne residence?')
 
       # Run filter (no assigns)
       result = filter.setup_and_run('%html')
@@ -21,7 +23,7 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_with_params
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ foo: 'bar' })
+      filter = ::Nanoc::Filters::Haml.new(foo: 'bar')
 
       # Check with HTML5
       result = filter.setup_and_run('%img', format: :html5)
@@ -36,7 +38,7 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_error
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ foo: 'bar' })
+      filter = ::Nanoc::Filters::Haml.new(foo: 'bar')
 
       # Run filter
       raised = false
@@ -54,7 +56,7 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_with_yield
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ content: 'Is this the Payne residence?' })
+      filter = ::Nanoc::Filters::Haml.new(content: 'Is this the Payne residence?')
 
       # Run filter
       result = filter.setup_and_run('%p= yield')
@@ -65,7 +67,7 @@ class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter_with_yield_without_content
     if_have 'haml' do
       # Create filter
-      filter = ::Nanoc::Filters::Haml.new({ location: 'Is this the Payne residence?' })
+      filter = ::Nanoc::Filters::Haml.new(location: 'Is this the Payne residence?')
 
       # Run filter
       assert_raises LocalJumpError do

data/test/filters/test_handlebars.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
   def test_filter
     skip_v8_on_ruby24

data/test/filters/test_kramdown.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::KramdownTest < Nanoc::TestCase
   def test_filter
     if_have 'kramdown' do

data/test/filters/test_markaby.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::MarkabyTest < Nanoc::TestCase
   def test_filter
     if_have 'markaby' do

data/test/filters/test_maruku.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::MarukuTest < Nanoc::TestCase
   def test_filter
     if_have 'maruku' do

data/test/filters/test_mustache.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::MustacheTest < Nanoc::TestCase
   def test_filter
     if_have 'mustache' do
@@ -9,7 +11,7 @@ class Nanoc::Filters::MustacheTest < Nanoc::TestCase
       )
 
       # Create filter
-      filter = ::Nanoc::Filters::Mustache.new({ item: item })
+      filter = ::Nanoc::Filters::Mustache.new(item: item)
 
       # Run filter
       result = filter.setup_and_run('The protagonist of {{title}} is {{protagonist}}.')
@@ -28,7 +30,7 @@ class Nanoc::Filters::MustacheTest < Nanoc::TestCase
 
       # Create filter
       filter = ::Nanoc::Filters::Mustache.new(
-        { content: 'No Payne No Gayne', item: item },
+        content: 'No Payne No Gayne', item: item,
       )
 
       # Run filter

data/test/filters/test_pandoc.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::PandocTest < Nanoc::TestCase
   def test_filter
     if_have 'pandoc-ruby' do

data/test/filters/test_rainpress.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::RainpressTest < Nanoc::TestCase
   def test_filter
     if_have 'rainpress' do

data/test/filters/test_rdiscount.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::RDiscountTest < Nanoc::TestCase
   def test_filter
     if_have 'rdiscount' do

data/test/filters/test_rdoc.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::RDocTest < Nanoc::TestCase
   def test_filter
     # Get filter

data/test/filters/test_redcarpet.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
   def test_find
     if_have 'redcarpet' do

data/test/filters/test_redcloth.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::RedClothTest < Nanoc::TestCase
   def test_filter
     if_have 'redcloth' do

data/test/filters/test_relativize_paths.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
   def test_filter_html_with_double_quotes
     # Create filter with mock item

data/test/filters/test_rubypants.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::RubyPantsTest < Nanoc::TestCase
   def test_filter
     if_have 'rubypants' do

data/test/filters/test_sass.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::SassTest < Nanoc::TestCase
   def setup
     super
@@ -12,7 +14,7 @@ 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")
@@ -23,7 +25,7 @@ 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')

data/test/filters/test_slim.rb

@@ -1,8 +1,10 @@
+require 'helper'
+
 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')
@@ -20,7 +22,7 @@ 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)

data/test/filters/test_typogruby.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::TypogrubyTest < Nanoc::TestCase
   def test_filter
     if_have 'typogruby' do

data/test/filters/test_uglify_js.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
   def test_filter
     skip_v8_on_ruby24

data/test/filters/test_xsl.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 require 'tempfile'
 
 class Nanoc::Filters::XSLTest < Nanoc::TestCase

data/test/filters/test_yui_compressor.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Filters::YUICompressorTest < Nanoc::TestCase
   def test_filter_javascript
     if_have 'yuicompressor' do
@@ -13,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
@@ -31,7 +33,7 @@ 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

data/test/helpers/test_blogging.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   include Nanoc::Helpers::Blogging
   include Nanoc::Helpers::Text

data/test/helpers/test_capturing.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
   include Nanoc::Helpers::Capturing
 

data/test/helpers/test_link_to.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
   include Nanoc::Helpers::LinkTo
 

data/test/helpers/test_xml_sitemap.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   include Nanoc::Helpers::XMLSitemap
 

data/test/rule_dsl/test_action_provider.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::RuleDSL::ActionProviderTest < Nanoc::TestCase
   def new_action_provider(site)
     rules_collection = Nanoc::RuleDSL::RulesCollection.new

data/test/rule_dsl/test_compiler_dsl.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::RuleDSL::CompilerDSLTest < Nanoc::TestCase
   def test_compile
     # TODO: implement
@@ -290,7 +292,7 @@ EOS
   end
 
   def test_create_pattern_with_string_with_glob_string_pattern_type
-    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, string_pattern_type: 'glob')
 
     pattern = compiler_dsl.create_pattern('/foo/*')
     assert pattern.match?('/foo/aaaa')
@@ -299,14 +301,14 @@ EOS
   end
 
   def test_create_pattern_with_regex
-    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, string_pattern_type: 'glob')
 
     pattern = compiler_dsl.create_pattern(%r{\A/foo/a*/})
     assert pattern.match?('/foo/aaaa/')
   end
 
   def test_create_pattern_with_string_with_unknown_string_pattern_type
-    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { string_pattern_type: 'donkey' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, string_pattern_type: 'donkey')
 
     err = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
       compiler_dsl.create_pattern('/foo/*')
@@ -437,7 +439,7 @@ EOS
 
   def test_config
     $venetian = 'unsnares'
-    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, { venetian: 'snares' })
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, venetian: 'snares')
     compiler_dsl.instance_eval { $venetian = @config[:venetian] }
     assert_equal 'snares', $venetian
   end

data/test/rule_dsl/test_rule.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::Int::RuleTest < Nanoc::TestCase
   def test_initialize
     # TODO: implement

data/test/rule_dsl/test_rules_collection.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::RuleDSL::RulesCollectionTest < Nanoc::TestCase
   def test_compilation_rule_for
     # Mock rules

data/test/test_gem.rb

@@ -1,3 +1,5 @@
+require 'helper'
+
 class Nanoc::GemTest < Nanoc::TestCase
   def setup
     super