nanoc 3.7.4 → 3.7.5

data/test/helpers/test_breadcrumbs.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
-
   include Nanoc::Helpers::Breadcrumbs
 
   def test_breadcrumbs_trail_at_root
@@ -39,5 +38,4 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
 
     assert_equal [@items[0], nil, @items[1]], breadcrumbs_trail
   end
-
 end

data/test/helpers/test_capturing.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
-
   include Nanoc::Helpers::Capturing
 
   def test_content_for
@@ -105,7 +104,7 @@ EOS
   end
 
   def test_dependencies
-    with_site do |site|
+    with_site do |_site|
       # Prepare
       File.open('lib/helpers.rb', 'w') do |io|
         io.write 'include Nanoc::Helpers::Capturing'
@@ -135,7 +134,7 @@ EOS
   end
 
   def test_dependency_without_item_variable
-    with_site do |site|
+    with_site do |_site|
       # Prepare
       File.open('lib/helpers.rb', 'w') do |io|
         io.write "include Nanoc::Helpers::Capturing\n"
@@ -170,7 +169,7 @@ EOS
   end
 
   def test_self
-    with_site do |site|
+    with_site do |_site|
       File.open('lib/helpers.rb', 'w') do |io|
         io.write 'include Nanoc::Helpers::Capturing'
       end
@@ -191,7 +190,7 @@ EOS
   end
 
   def test_recompile_dependency
-    with_site do |site|
+    with_site do |_site|
       # Prepare
       File.open('lib/helpers.rb', 'w') do |io|
         io.write 'include Nanoc::Helpers::Capturing'
@@ -221,5 +220,4 @@ EOS
       assert_equal 'New-Content', File.read('output/includer/index.html')
     end
   end
-
 end

data/test/helpers/test_filtering.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
-
   include Nanoc::Helpers::Filtering
 
   def test_filter_simple
@@ -40,8 +39,8 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
       @item_rep = mock
       @item_rep.expects(:name).returns('default')
       @item_rep.expects(:assigns).returns({
-        :item     => @item,
-        :item_rep => @item_rep
+        item: @item,
+        item_rep: @item_rep
       })
 
       # Evaluate content
@@ -120,5 +119,4 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
     assert notifications.include?(:filtering_started)
     assert notifications.include?(:filtering_ended)
   end
-
 end

data/test/helpers/test_html_escape.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::HTMLEscapeTest < Nanoc::TestCase
-
   include Nanoc::Helpers::HTMLEscape
 
   def test_html_escape_with_string
@@ -26,5 +25,4 @@ class Nanoc::Helpers::HTMLEscapeTest < Nanoc::TestCase
       h
     end
   end
-
 end

data/test/helpers/test_link_to.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
-
   include Nanoc::Helpers::LinkTo
 
   def test_link_to_with_path
@@ -40,7 +39,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a title="Dis mai foo!" href="/foo/">Foo</a>',
-      link_to('Foo', '/foo/', :title => 'Dis mai foo!')
+      link_to('Foo', '/foo/', title: 'Dis mai foo!')
     )
   end
 
@@ -48,13 +47,15 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Check
     assert_equal(
       '<a title="Foo &amp; Bar" href="/foo&amp;bar/">Foo &amp; Bar</a>',
-      link_to('Foo &amp; Bar', '/foo&bar/', :title => 'Foo & Bar')
+      link_to('Foo &amp; Bar', '/foo&bar/', title: 'Foo & Bar')
     )
   end
 
   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)
@@ -151,7 +152,6 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     )
   end
 
-
   def test_relative_path_to_item
     # Mock self
     @item_rep = mock
@@ -250,5 +250,4 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     # Run
     assert_examples_correct 'Nanoc::Helpers::LinkTo#relative_path_to'
   end
-
 end

data/test/helpers/test_rendering.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
-
   include Nanoc::Helpers::Rendering
 
   def test_render
@@ -38,7 +37,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', nil\n")
       end
 
-      File.open('layouts/foo.erb', 'w').close()
+      File.open('layouts/foo.erb', 'w').close
 
       assert_raises(Nanoc::Errors::CannotDetermineFilter) do
         render '/foo/'
@@ -54,7 +53,7 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write("layout '/foo/', :asdf\n")
       end
 
-      File.open('layouts/foo.erb', 'w').close()
+      File.open('layouts/foo.erb', 'w').close
 
       assert_raises(Nanoc::Errors::UnknownFilter) do
         render '/foo/'
@@ -83,5 +82,4 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
       assert_equal '', result
     end
   end
-
 end

data/test/helpers/test_tagging.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
-
   include Nanoc::Helpers::Tagging
 
   def test_tags_for_without_tags
@@ -17,45 +16,45 @@ 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: %w(foo bar) }, '/path/')
 
     # Check
     assert_equal(
       "#{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/')
+      tags_for(item, base_url: 'http://stoneship.org/tag/')
     )
   end
 
   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(
       'no tags for you, fool',
-      tags_for(item, :none_text => 'no tags for you, fool')
+      tags_for(item, none_text: 'no tags for you, fool')
     )
   end
 
   def test_tags_for_with_custom_separator
     # Create item
-    item = Nanoc::Item.new('content', { :tags => ['foo', 'bar']}, '/path/')
+    item = Nanoc::Item.new('content', { tags: %w(foo bar) }, '/path/')
 
     # Check
     assert_equal(
       "#{link_for_tag('foo', 'http://technorati.com/tag/')} ++ " \
       "#{link_for_tag('bar', 'http://technorati.com/tag/')}",
-      tags_for(item, :separator => ' ++ ')
+      tags_for(item, separator: ' ++ ')
     )
   end
 
   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
@@ -81,5 +80,4 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
       link_for_tag('foo&bar', 'http://stoneship.org/tags&stuff/')
     )
   end
-
 end

data/test/helpers/test_text.rb

@@ -1,22 +1,20 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::TextTest < Nanoc::TestCase
-
   include Nanoc::Helpers::Text
 
   def test_excerpt_length
-    assert_equal('...',                         excerptize('Foo bar baz quux meow woof', :length => 3))
-    assert_equal('Foo ...',                     excerptize('Foo bar baz quux meow woof', :length => 7))
-    assert_equal('Foo bar baz quux meow woof',  excerptize('Foo bar baz quux meow woof', :length => 26))
-    assert_equal('Foo bar baz quux meow woof',  excerptize('Foo bar baz quux meow woof', :length => 8623785))
+    assert_equal('...',                         excerptize('Foo bar baz quux meow woof', length: 3))
+    assert_equal('Foo ...',                     excerptize('Foo bar baz quux meow woof', length: 7))
+    assert_equal('Foo bar baz quux meow woof',  excerptize('Foo bar baz quux meow woof', length: 26))
+    assert_equal('Foo bar baz quux meow woof',  excerptize('Foo bar baz quux meow woof', length: 8_623_785))
   end
 
   def test_excerpt_omission
-    assert_equal('Foo [continued]',             excerptize('Foo bar baz quux meow woof', :length => 15, :omission => '[continued]'))
+    assert_equal('Foo [continued]',             excerptize('Foo bar baz quux meow woof', length: 15, omission: '[continued]'))
   end
 
   def test_strip_html
-    # TODO implement
+    # TODO: implement
   end
-
 end

data/test/helpers/test_xml_sitemap.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
-
   include Nanoc::Helpers::XMLSitemap
 
   def teardown
@@ -23,10 +22,10 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       create_item_rep(@items.last, :one_b, '/item-one/b/')
 
       # Create item 2
-      @items << Nanoc::Item.new('some content 2', { :is_hidden => true }, '/item-two/')
+      @items << Nanoc::Item.new('some content 2', { is_hidden: true }, '/item-two/')
 
       # Create item 3
-      attrs = { :mtime => Time.parse('2004-07-12'), :changefreq => 'daily', :priority => 0.5 }
+      attrs = { mtime: Time.parse('2004-07-12'), changefreq: 'daily', priority: 0.5 }
       @items << Nanoc::Item.new('some content 3', attrs, '/item-three/')
       create_item_rep(@items.last, :three_a, '/item-three/a/')
       create_item_rep(@items.last, :three_b, '/item-three/b/')
@@ -39,7 +38,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
 
       # Create site
-      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+      @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
       # Build sitemap
       res = xml_sitemap
@@ -83,10 +82,10 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
 
       # Create site
-      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+      @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
       # Build sitemap
-      res = xml_sitemap(:items => [@items[1]])
+      res = xml_sitemap(items: [@items[1]])
 
       # Check
       doc = Nokogiri::XML(res)
@@ -116,10 +115,10 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
 
       # Create site
-      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+      @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
       # Build sitemap
-      res = xml_sitemap(:rep_select => lambda { |rep| rep.name == :one_a } )
+      res = xml_sitemap(rep_select: ->(rep) { rep.name == :one_a })
 
       # Check
       doc = Nokogiri::XML(res)
@@ -152,10 +151,10 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @item = Nanoc::Item.new('sitemap content', {}, '/sitemap/')
 
       # Create site
-      @site = Nanoc::Site.new({ :base_url => 'http://example.com' })
+      @site = Nanoc::Site.new({ base_url: 'http://example.com' })
 
       # Build sitemap
-      res = xml_sitemap(:items => @items)
+      res = xml_sitemap(items: @items)
 
       # Check
       doc = Nokogiri::XML(res)
@@ -176,10 +175,9 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
 
   def create_item_rep(item, name, path)
     rep = Nanoc::ItemRep.new(item, name)
-    rep.paths     = { :last => path }
-    rep.raw_paths = { :last => path }
+    rep.paths     = { last: path }
+    rep.raw_paths = { last: path }
     item.reps << rep
     rep
   end
-
 end

data/test/tasks/test_clean.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::Tasks::CleanTest < Nanoc::TestCase
-
   def test_simple
     if_have 'w3c_validators' do
       # Stub items
@@ -61,5 +60,4 @@ class Nanoc::Tasks::CleanTest < Nanoc::TestCase
       clean.run
     end
   end
-
 end

data/test/test_gem.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Nanoc::GemTest < Nanoc::TestCase
-
   def setup
     super
     FileUtils.cd(@orig_wd)
@@ -15,7 +14,7 @@ class Nanoc::GemTest < Nanoc::TestCase
     files_before = Set.new Dir['**/*']
     stdout = StringIO.new
     stderr = StringIO.new
-    piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+    piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     piper.run(%w( gem build nanoc.gemspec ), nil)
     files_after = Set.new Dir['**/*']
 
@@ -30,5 +29,4 @@ class Nanoc::GemTest < Nanoc::TestCase
   ensure
     Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.7.5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -28,16 +28,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.10
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: nanoc is a simple but very flexible static site generator written in
   Ruby. It operates on local files, and therefore does not run on the server. nanoc
   “compiles” the local source files into HTML (usually), by evaluating eRuby, Markdown,
@@ -55,7 +61,6 @@ files:
 - CONTRIBUTING.md
 - ChangeLog
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS.md
 - README.md
@@ -84,7 +89,6 @@ files:
 - lib/nanoc/base/context.rb
 - lib/nanoc/base/core_ext.rb
 - lib/nanoc/base/core_ext/array.rb
-- lib/nanoc/base/core_ext/date.rb
 - lib/nanoc/base/core_ext/hash.rb
 - lib/nanoc/base/core_ext/pathname.rb
 - lib/nanoc/base/core_ext/string.rb
@@ -92,7 +96,6 @@ files:
 - lib/nanoc/base/errors.rb
 - lib/nanoc/base/memoization.rb
 - lib/nanoc/base/notification_center.rb
-- lib/nanoc/base/ordered_hash.rb
 - lib/nanoc/base/plugin_registry.rb
 - lib/nanoc/base/result_data/item_rep.rb
 - lib/nanoc/base/source_data/code_snippet.rb
@@ -157,7 +160,6 @@ files:
 - lib/nanoc/extra/checking/runner.rb
 - lib/nanoc/extra/chick.rb
 - lib/nanoc/extra/core_ext.rb
-- lib/nanoc/extra/core_ext/enumerable.rb
 - lib/nanoc/extra/core_ext/pathname.rb
 - lib/nanoc/extra/core_ext/time.rb
 - lib/nanoc/extra/deployer.rb
@@ -236,7 +238,6 @@ files:
 - tasks/test.rake
 - test/base/checksummer_spec.rb
 - test/base/core_ext/array_spec.rb
-- test/base/core_ext/date_spec.rb
 - test/base/core_ext/hash_spec.rb
 - test/base/core_ext/pathname_spec.rb
 - test/base/core_ext/string_spec.rb
@@ -290,7 +291,6 @@ files:
 - test/extra/checking/test_check.rb
 - test/extra/checking/test_dsl.rb
 - test/extra/checking/test_runner.rb
-- test/extra/core_ext/test_enumerable.rb
 - test/extra/core_ext/test_pathname.rb
 - test/extra/core_ext/test_time.rb
 - test/extra/deployers/test_fog.rb
@@ -333,6 +333,7 @@ files:
 - test/filters/test_yui_compressor.rb
 - test/fixtures/vcr_cassettes/css_run_error.yml
 - test/fixtures/vcr_cassettes/css_run_ok.yml
+- test/fixtures/vcr_cassettes/css_run_parse_error.yml
 - test/fixtures/vcr_cassettes/html_run_error.yml
 - test/fixtures/vcr_cassettes/html_run_ok.yml
 - test/gem_loader.rb
@@ -363,7 +364,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -371,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: a web publishing system written in Ruby for building small to medium-sized