nanoc 4.8.2 → 4.8.3

data/spec/nanoc/helpers/link_to_spec.rb

@@ -36,21 +36,21 @@ describe Nanoc::Helpers::LinkTo, helper: true do
 
     context 'with rep' do
       before do
-        ctx.create_item('content', {}, '/target/')
-        ctx.create_rep(ctx.items['/target/'], '/target.html')
+        ctx.create_item('content', {}, '/target')
+        ctx.create_rep(ctx.items['/target'], '/target.html')
       end
 
-      let(:target) { ctx.items['/target/'].reps[:default] }
+      let(:target) { ctx.items['/target'].reps[:default] }
 
       it { is_expected.to eql('<a href="/target.html">Text</a>') }
     end
 
     context 'with item' do
       before do
-        ctx.create_item('content', {}, '/target/')
+        ctx.create_item('content', {}, '/target')
       end
 
-      let(:target) { ctx.items['/target/'] }
+      let(:target) { ctx.items['/target'] }
 
       before do
         ctx.create_rep(target, '/target.html')
@@ -77,11 +77,11 @@ describe Nanoc::Helpers::LinkTo, helper: true do
 
     context 'with nil path' do
       before do
-        ctx.create_item('content', {}, '/target/')
-        ctx.create_rep(ctx.items['/target/'], nil)
+        ctx.create_item('content', {}, '/target')
+        ctx.create_rep(ctx.items['/target'], nil)
       end
 
-      let(:target) { ctx.items['/target/'].reps[:default] }
+      let(:target) { ctx.items['/target'].reps[:default] }
 
       it 'raises' do
         expect { subject }.to raise_error(RuntimeError)

data/spec/spec_helper.rb

@@ -17,6 +17,10 @@ require 'fuubar'
 Nanoc::CLI.setup
 
 RSpec.configure do |c|
+  c.include(Nanoc::Spec::Helper)
+
+  c.include(Nanoc::Spec::HelperHelper, helper: true)
+
   c.fuubar_progress_bar_options = {
     format: '%c/%C |<%b>%i| %p%%',
   }
@@ -29,16 +33,13 @@ RSpec.configure do |c|
 
   c.around(:each) do |example|
     Dir.mktmpdir('nanoc-test') do |dir|
-      FileUtils.cd(dir) do
-        example.run
-      end
+      chdir(dir) { example.run }
     end
   end
 
   c.around(:each, chdir: false) do |example|
-    FileUtils.cd(__dir__ + '/..') do
-      example.run
-    end
+    Dir.chdir(__dir__ + '/..')
+    example.run
   end
 
   c.before(:each) do
@@ -71,8 +72,6 @@ RSpec.configure do |c|
     File.write('Rules', 'passthrough "/**/*"')
   end
 
-  c.include(Nanoc::Spec::HelperHelper, helper: true)
-
   # Set focus if any
   if ENV.fetch('FOCUS', false)
     $stdout.puts "Focusing spec on '#{ENV['FOCUS']}'"

data/test/base/test_data_source.rb

@@ -37,20 +37,20 @@ class Nanoc::DataSourceTest < Nanoc::TestCase
   def test_new_item
     data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
 
-    item = data_source.new_item('stuff', { title: 'Stuff!' }, '/asdf/', checksum_data: 'abcdef')
+    item = data_source.new_item('stuff', { title: 'Stuff!' }, '/asdf', checksum_data: 'abcdef')
     assert_equal 'stuff', item.content.string
     assert_equal 'Stuff!', item.attributes[:title]
-    assert_equal Nanoc::Identifier.new('/asdf/'), item.identifier
+    assert_equal Nanoc::Identifier.new('/asdf'), item.identifier
     assert_equal 'abcdef', item.checksum_data
   end
 
   def test_new_item_with_checksums
     data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
 
-    item = data_source.new_item('stuff', { title: 'Stuff!' }, '/asdf/', content_checksum_data: 'con-cs', attributes_checksum_data: 'attr-cs')
+    item = data_source.new_item('stuff', { title: 'Stuff!' }, '/asdf', content_checksum_data: 'con-cs', attributes_checksum_data: 'attr-cs')
     assert_equal 'stuff', item.content.string
     assert_equal 'Stuff!', item.attributes[:title]
-    assert_equal Nanoc::Identifier.new('/asdf/'), item.identifier
+    assert_equal Nanoc::Identifier.new('/asdf'), item.identifier
     assert_equal 'con-cs', item.content_checksum_data
     assert_equal 'attr-cs', item.attributes_checksum_data
   end
@@ -58,20 +58,20 @@ class Nanoc::DataSourceTest < Nanoc::TestCase
   def test_new_layout
     data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
 
-    layout = data_source.new_layout('stuff', { title: 'Stuff!' }, '/asdf/', checksum_data: 'abcdef')
+    layout = data_source.new_layout('stuff', { title: 'Stuff!' }, '/asdf', checksum_data: 'abcdef')
     assert_equal 'stuff', layout.content.string
     assert_equal 'Stuff!', layout.attributes[:title]
-    assert_equal Nanoc::Identifier.new('/asdf/'), layout.identifier
+    assert_equal Nanoc::Identifier.new('/asdf'), layout.identifier
     assert_equal 'abcdef', layout.checksum_data
   end
 
   def test_new_layout_with_checksums
     data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
 
-    layout = data_source.new_layout('stuff', { title: 'Stuff!' }, '/asdf/', content_checksum_data: 'con-cs', attributes_checksum_data: 'attr-cs')
+    layout = data_source.new_layout('stuff', { title: 'Stuff!' }, '/asdf', content_checksum_data: 'con-cs', attributes_checksum_data: 'attr-cs')
     assert_equal 'stuff', layout.content.string
     assert_equal 'Stuff!', layout.attributes[:title]
-    assert_equal Nanoc::Identifier.new('/asdf/'), layout.identifier
+    assert_equal Nanoc::Identifier.new('/asdf'), layout.identifier
     assert_equal 'con-cs', layout.content_checksum_data
     assert_equal 'attr-cs', layout.attributes_checksum_data
   end

data/test/base/test_item_array.rb

@@ -6,32 +6,32 @@ class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
   def setup
     super
 
-    @one = Nanoc::Int::Item.new('Item One', {}, '/one/')
-    @two = Nanoc::Int::Item.new('Item Two', {}, '/two/')
+    @one = Nanoc::Int::Item.new('Item One', {}, '/one')
+    @two = Nanoc::Int::Item.new('Item Two', {}, '/two')
 
     @items = Nanoc::Int::ItemCollection.new({}, [@one, @two])
   end
 
   def test_change_item_identifier
-    assert_equal @one, @items['/one/']
-    assert_nil @items['/foo/']
+    assert_equal @one, @items['/one']
+    assert_nil @items['/foo']
 
-    @one.identifier = '/foo/'
+    @one.identifier = '/foo'
 
-    assert_nil @items['/one/']
-    assert_equal @one, @items['/foo/']
+    assert_nil @items['/one']
+    assert_equal @one, @items['/foo']
   end
 
   def test_enumerable
-    assert_equal @one, @items.find { |i| i.identifier == '/one/' }
+    assert_equal @one, @items.find { |i| i.identifier == '/one' }
   end
 
   def test_less_than_less_than
-    assert_nil @items['/foo/']
+    assert_nil @items['/foo']
 
-    foo = Nanoc::Int::Item.new('Item Foo', {}, '/foo/')
+    foo = Nanoc::Int::Item.new('Item Foo', {}, '/foo')
     @items = Nanoc::Int::ItemCollection.new({}, [@one, @two, foo])
 
-    assert_equal foo, @items['/foo/']
+    assert_equal foo, @items['/foo']
   end
 end

data/test/cli/commands/test_compile.rb

@@ -166,7 +166,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
 
   def test_file_action_printer_normal
     # Create data
-    item = Nanoc::Int::Item.new('content', {}, '/')
+    item = Nanoc::Int::Item.new('content', {}, '/a')
     rep = Nanoc::Int::ItemRep.new(item, :default)
     rep.raw_paths[:last] = ['output/foo.txt']
     rep.compiled = true
@@ -188,7 +188,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
 
   def test_file_action_printer_skip
     # Create data
-    item = Nanoc::Int::Item.new('content', {}, '/')
+    item = Nanoc::Int::Item.new('content', {}, '/a')
     rep = Nanoc::Int::ItemRep.new(item, :default)
     rep.raw_paths[:last] = ['output/foo.txt']
 

data/test/filters/test_handlebars.rb

@@ -9,12 +9,12 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne', location: 'here' },
-        '/games/max-payne/',
+        '/games/max-payne',
       )
       layout = Nanoc::Int::Layout.new(
         'layout content',
         { name: 'Max Payne' },
-        '/default/',
+        '/default',
       )
       config = { animals: 'cats and dogs' }
 
@@ -43,7 +43,7 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne', location: 'here' },
-        '/games/max-payne/',
+        '/games/max-payne',
       )
 
       # Create filter

data/test/filters/test_mustache.rb

@@ -9,7 +9,7 @@ class Nanoc::Filters::MustacheTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne' },
-        '/games/max-payne/',
+        '/games/max-payne',
       )
 
       # Create filter
@@ -27,7 +27,7 @@ class Nanoc::Filters::MustacheTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new(
         'content',
         { title: 'Max Payne', protagonist: 'Max Payne' },
-        '/games/max-payne/',
+        '/games/max-payne',
       )
 
       # Create filter

data/test/filters/test_relativize_paths.rb

@@ -13,7 +13,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -39,7 +39,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -65,7 +65,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -91,7 +91,7 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -129,7 +129,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -167,7 +167,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -193,7 +193,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -219,7 +219,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -245,7 +245,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -271,7 +271,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -297,7 +297,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -323,7 +323,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -349,7 +349,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -375,7 +375,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -399,7 +399,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -435,7 +435,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -461,7 +461,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -487,7 +487,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -513,7 +513,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -542,7 +542,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -568,7 +568,7 @@ EOS
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )
@@ -595,7 +595,7 @@ EOS
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/',
+            '/foo/bar/baz',
           ),
           :blah,
         )
@@ -628,7 +628,7 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/',
+            '/foo/bar/baz',
           ),
           :blah,
         )
@@ -660,7 +660,7 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/',
+            '/foo/bar/baz',
           ),
           :blah,
         )
@@ -697,7 +697,7 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/',
+            '/foo/bar/baz',
           ),
           :blah,
         )
@@ -739,7 +739,7 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/bar/baz/',
+            '/foo/bar/baz',
           ),
           :blah,
         )
@@ -774,7 +774,7 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/baz/',
+            '/foo/baz',
           ),
           :blah,
         )
@@ -808,7 +808,7 @@ XML
           Nanoc::Int::Item.new(
             'content',
             {},
-            '/foo/baz/',
+            '/foo/baz',
           ),
           :blah,
         )
@@ -839,7 +839,7 @@ XML
         Nanoc::Int::Item.new(
           'content',
           {},
-          '/foo/bar/baz/',
+          '/foo/bar/baz',
         ),
         :blah,
       )