nanoc 4.0.0b3 → 4.0.0b4

data/test/base/test_layout.rb

@@ -5,32 +5,8 @@ class Nanoc::Int::LayoutTest < Nanoc::TestCase
     assert_equal({ foo: 'bar' }, layout.attributes)
   end
 
-  def test_lookup_with_known_attribute
-    # Create layout
+  def test_attributes
     layout = Nanoc::Int::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
-
-    # Check attributes
-    assert_equal('bar', layout[:foo])
-  end
-
-  def test_lookup_with_unknown_attribute
-    # Create layout
-    layout = Nanoc::Int::Layout.new('content', { 'foo' => 'bar' }, '/foo/')
-
-    # Check attributes
-    assert_equal(nil, layout[:filter])
-  end
-
-  def test_dump_and_load
-    layout = Nanoc::Int::Layout.new(
-      'foobar',
-      { a: { b: 123 } },
-      '/foo/')
-
-    layout = Marshal.load(Marshal.dump(layout))
-
-    assert_equal Nanoc::Identifier.new('/foo/'), layout.identifier
-    assert_equal 'foobar', layout.raw_content
-    assert_equal({ a: { b: 123 } }, layout.attributes)
+    assert_equal({ foo: 'bar' }, layout.attributes)
   end
 end

data/test/base/test_rule.rb

@@ -12,11 +12,11 @@ class Nanoc::Int::RuleTest < Nanoc::TestCase
   end
 
   def test_matches
-    pattern    = Nanoc::Int::Pattern.from(%r</(.*)/(.*)/>)
+    pattern    = Nanoc::Int::Pattern.from(%r{/(.*)/(.*)/})
     identifier = '/anything/else/'
-    expected   = ['anything', 'else']
+    expected   = %w(anything else)
 
-    rule = Nanoc::Int::Rule.new(pattern, :string, Proc.new {})
+    rule = Nanoc::Int::Rule.new(pattern, :string, proc {})
 
     assert_equal expected, rule.send(:matches, identifier)
   end

data/test/base/test_rule_context.rb

@@ -15,15 +15,24 @@ class Nanoc::Int::RuleContextTest < Nanoc::TestCase
     compiler = Nanoc::Int::Compiler.new(site)
 
     # Create context
-    @rule_context = Nanoc::Int::RuleContext.new(rep: rep, compiler: compiler)
+    executor = nil
+    rule_context = Nanoc::Int::RuleContext.new(rep: rep, executor: executor, compiler: compiler)
 
-    # Check
-    assert_equal rep,     @rule_context.rep
-    assert_equal item,    @rule_context.item
-    assert_equal site,    @rule_context.site
-    assert_equal config,  @rule_context.config
-    assert_equal layouts, @rule_context.layouts
-    assert_equal items,   @rule_context.items
+    # Check classes
+    assert_equal Nanoc::ItemRepView,          rule_context.rep.class
+    assert_equal Nanoc::ItemView,             rule_context.item.class
+    assert_equal Nanoc::SiteView,             rule_context.site.class
+    assert_equal Nanoc::ConfigView,           rule_context.config.class
+    assert_equal Nanoc::LayoutCollectionView, rule_context.layouts.class
+    assert_equal Nanoc::ItemCollectionView,   rule_context.items.class
+
+    # Check content
+    assert_equal rep,     rule_context.rep.unwrap
+    assert_equal item,    rule_context.item.unwrap
+    assert_equal site,    rule_context.site.unwrap
+    assert_equal config,  rule_context.config.unwrap
+    assert_equal layouts, rule_context.layouts.unwrap
+    assert_equal items,   rule_context.items.unwrap
   end
 
   def test_actions
@@ -41,19 +50,29 @@ class Nanoc::Int::RuleContextTest < Nanoc::TestCase
     # Mock rep
     rep = mock
     rep.stubs(:item).returns(item)
-    rep.expects(:filter).with(:foo, { bar: 'baz' })
-    rep.expects(:layout).with('foo')
-    rep.expects(:snapshot).with('awesome')
 
     # Mock compiler
     compiler = Nanoc::Int::Compiler.new(site)
 
     # Create context
-    @rule_context = Nanoc::Int::RuleContext.new(rep: rep, compiler: compiler)
+    executor = nil
+    rule_context = Nanoc::Int::RuleContext.new(rep: rep, executor: executor, compiler: compiler)
 
     # Check
-    rep.filter :foo, bar: 'baz'
-    rep.layout 'foo'
-    rep.snapshot 'awesome'
+    assert_raises(NoMethodError) do
+      rule_context.instance_eval do
+        item_rep.filter :foo, bar: 'baz'
+      end
+    end
+    assert_raises(NoMethodError) do
+      rule_context.instance_eval do
+        item_rep.layout 'foo'
+      end
+    end
+    assert_raises(NoMethodError) do
+      rule_context.instance_eval do
+        item_rep.snapshot 'awesome'
+      end
+    end
   end
 end

data/test/data_sources/test_filesystem.rb

@@ -105,13 +105,13 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
       File.open(filename, 'w') { |io| io.write('test') }
     end
 
-  # Check - { './stuff/foo' => ['yaml', ['html', 'md']] }
+    # Check - { './stuff/foo' => ['yaml', ['html', 'md']] }
     res = data_source.send(:all_split_files_in, '.')
     assert_equal ['./stuff/foo'], res.keys
     assert_equal 2, res.values[0].size
     assert_equal 'yaml', res.values[0][0]
     assert_equal Array, res.values[0][1].class
-    assert_equal ['html', 'md'], res.values[0][1].sort
+    assert_equal %w(html md), res.values[0][1].sort
   end
 
   def test_all_split_files_in_with_multiple_content_files

data/test/data_sources/test_filesystem_unified.rb

@@ -41,31 +41,27 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     expected_out = [
       klass.new(
         'test 1',
-        { 'num' => 1, :filename => 'foo/bar.html',   :extension => 'html' },
+        { 'num' => 1, :filename => 'foo/bar.html',   :extension => 'html', mtime: File.mtime('foo/bar.html') },
         '/bar/',
-        binary: false, mtime: File.mtime('foo/bar.html')
       ),
       klass.new(
         'test 2',
-        { 'num' => 2, :filename => 'foo/b.c.html',   :extension => 'c.html' },
+        { 'num' => 2, :filename => 'foo/b.c.html',   :extension => 'c.html', mtime: File.mtime('foo/b.c.html') },
         '/b/',
-        binary: false, mtime: File.mtime('foo/b.c.html')
       ),
       klass.new(
         'test 3',
-        { 'num' => 3, :filename => 'foo/a/b/c.html', :extension => 'html' },
+        { 'num' => 3, :filename => 'foo/a/b/c.html', :extension => 'html', mtime: File.mtime('foo/a/b/c.html') },
         '/a/b/c/',
-        binary: false, mtime: File.mtime('foo/a/b/c.html')
       )
     ]
-    actual_out = data_source.send(:load_objects, 'foo', 'The Foo', klass).sort_by { |i| i.stuff[0] }
+    actual_out = data_source.send(:load_objects, 'foo', 'The Foo', klass).sort_by { |i| i.stuff[0].string }
 
     # Check
     (0..expected_out.size - 1).each do |i|
-      assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0], 'content must match'
+      assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0].string, 'content must match'
       assert_equal expected_out[i].stuff[2], actual_out[i].stuff[2], 'identifier must match'
-      assert_equal expected_out[i].stuff[3][:mtime], actual_out[i].stuff[3][:mtime], 'mtime must match'
-      ['num', :filename, :extension].each do |key|
+      ['num', :filename, :extension, :mtime].each do |key|
         assert_equal expected_out[i].stuff[1][key], actual_out[i].stuff[1][key], "attribute key #{key} must match"
       end
     end
@@ -110,9 +106,9 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
     # Check
     assert_equal 1, items.size
-    assert items[0].binary?
-    assert_equal 'foo/stuff.dat', items[0].raw_filename
-    assert_nil items[0].raw_content
+    assert items[0].content.binary?
+    assert_equal "#{Dir.getwd}/foo/stuff.dat", items[0].content.filename
+    assert_equal Nanoc::Int::BinaryContent, items[0].content.class
   end
 
   def test_load_layouts_with_nil_dir_name
@@ -340,10 +336,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :content_filename => nil,
           :meta_filename    => 'foo/a/b/c.yaml',
           :extension        => nil,
-          :file             => nil
+          :file             => nil,
+          mtime: File.mtime('foo/a/b/c.yaml')
         },
         '/a/b/c/',
-        binary: false, mtime: File.mtime('foo/a/b/c.yaml')
       ),
       klass.new(
         'test 2',
@@ -352,10 +348,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :content_filename => 'foo/b.c.html',
           :meta_filename    => 'foo/b.c.yaml',
           :extension        => 'html',
-          :file             => File.open('foo/b.c.html')
+          :file             => File.open('foo/b.c.html'),
+          mtime: File.mtime('foo/b.c.html') > File.mtime('foo/b.c.yaml') ? File.mtime('foo/b.c.html') : File.mtime('foo/b.c.yaml')
         },
         '/b.c/',
-        binary: false, mtime: File.mtime('foo/b.c.html') > File.mtime('foo/b.c.yaml') ? File.mtime('foo/b.c.html') : File.mtime('foo/b.c.yaml')
       ),
       klass.new(
         'test 3',
@@ -363,10 +359,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           content_filename: 'foo/car.html',
           meta_filename: nil,
           extension: 'html',
-          file: File.open('foo/car.html')
+          file: File.open('foo/car.html'),
+          mtime: File.mtime('foo/car.html')
         },
         '/car/',
-        binary: false, mtime: File.mtime('foo/car.html')
       )
     ]
 
@@ -375,11 +371,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
     # Check
     (0..expected_out.size - 1).each do |i|
-      assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0], 'content must match'
+      assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0].string, 'content must match'
       assert_equal expected_out[i].stuff[2], actual_out[i].stuff[2], 'identifier must match'
-      assert_equal expected_out[i].stuff[3][:mtime], actual_out[i].stuff[3][:mtime], 'mtime must match'
 
-      ['num', :content_filename, :meta_filename, :extension].each do |key|
+      ['num', :content_filename, :meta_filename, :extension, :mtime].each do |key|
         assert_equal expected_out[i].stuff[1][key], actual_out[i].stuff[1][key], "attribute key #{key} must match"
       end
     end
@@ -423,10 +418,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :content_filename => nil,
           :meta_filename    => 'foo/a/b/c.yaml',
           :extension        => nil,
-          :file             => nil
+          :file             => nil,
+          mtime: File.mtime('foo/a/b/c.yaml')
         },
         '/a/b/c/',
-        binary: false, mtime: File.mtime('foo/a/b/c.yaml')
       ),
       klass.new(
         'test 2',
@@ -435,10 +430,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           :content_filename => 'foo/b.html.erb',
           :meta_filename    => 'foo/b.yaml',
           :extension        => 'html.erb',
-          :file             => File.open('foo/b.html.erb')
+          :file             => File.open('foo/b.html.erb'),
+          mtime: File.mtime('foo/b.html.erb') > File.mtime('foo/b.yaml') ? File.mtime('foo/b.html.erb') : File.mtime('foo/b.yaml')
         },
         '/b/',
-        binary: false, mtime: File.mtime('foo/b.html.erb') > File.mtime('foo/b.yaml') ? File.mtime('foo/b.html.erb') : File.mtime('foo/b.yaml')
       ),
       klass.new(
         'test 3',
@@ -446,10 +441,10 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
           content_filename: 'foo/car.html',
           meta_filename: nil,
           extension: 'html',
-          file: File.open('foo/car.html')
+          file: File.open('foo/car.html'),
+          mtime: File.mtime('foo/car.html')
         },
         '/car/',
-        binary: false, mtime: File.mtime('foo/car.html')
       )
     ]
 
@@ -458,16 +453,27 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
 
     # Check
     (0..expected_out.size - 1).each do |i|
-      assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0], 'content must match'
+      assert_equal expected_out[i].stuff[0], actual_out[i].stuff[0].string, 'content must match'
       assert_equal expected_out[i].stuff[2], actual_out[i].stuff[2], 'identifier must match'
-      assert_equal expected_out[i].stuff[3][:mtime], actual_out[i].stuff[3][:mtime], 'mtime must match'
 
-      ['num', :content_filename, :meta_filename, :extension].each do |key|
+      ['num', :content_filename, :meta_filename, :extension, :mtime].each do |key|
         assert_equal expected_out[i].stuff[1][key], actual_out[i].stuff[1][key], "attribute key #{key} must match"
       end
     end
   end
 
+  def test_load_objects_correct_identifier_with_separate_yaml_file
+    data_source = new_data_source({ identifier_type: 'full' })
+
+    FileUtils.mkdir_p('foo')
+    File.write('foo/donkey.jpeg', 'data')
+    File.write('foo/donkey.yaml', "---\nalt: Donkey\n")
+
+    objects = data_source.send(:load_objects, 'foo', 'The Foo', Nanoc::Int::Item)
+    assert_equal 1, objects.size
+    assert_equal '/donkey.jpeg', objects.first.identifier.to_s
+  end
+
   def test_filename_for
     data_source = new_data_source
 
@@ -517,7 +523,7 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
       items = data_source.items
 
       assert_equal 1, items.size
-      assert_equal Encoding.find('UTF-8'), items[0].raw_content.encoding
+      assert_equal Encoding.find('UTF-8'), items[0].content.string.encoding
     ensure
       Encoding.default_external = original_default_external_encoding
     end
@@ -548,6 +554,6 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     # Parse
     items = data_source.items
     assert_equal 1, items.size
-    assert_equal Encoding.find('UTF-8'), items[0].raw_content.encoding
+    assert_equal Encoding.find('UTF-8'), items[0].content.string.encoding
   end
 end

data/test/extra/checking/checks/test_html.rb

@@ -34,7 +34,6 @@ class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
         assert_equal 2, check.issues.size
         assert_equal 'line 1: no document type declaration; will parse without validation: <h2>Hi!</h1>', check.issues.to_a[0].description
         assert_equal 'line 1: end tag for element "H1" which is not open: <h2>Hi!</h1>', check.issues.to_a[1].description
-          check.issues.to_a[0].description
       end
     end
   end

data/test/extra/checking/checks/test_mixed_content.rb

@@ -1,9 +1,9 @@
 class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
   def create_output_file(name, lines)
     FileUtils.mkdir_p('output')
-    File.open('output/' + name, 'w') { |io|
+    File.open('output/' + name, 'w') do |io|
       io.write(lines.join('\n'))
-    }
+    end
   end
 
   def assert_include(haystack, needle)
@@ -137,7 +137,7 @@ class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
       issues = check.issues.to_a
       assert_equal 8, issues.count
 
-      descriptions = issues.map { |issue| issue.description }
+      descriptions = issues.map(&:description)
       issues.each do |issue|
         assert_equal 'output/foo.html', issue.subject
       end

data/test/extra/deployers/test_fog.rb

@@ -62,31 +62,31 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_run_cdn_with_dry_run
     if_have 'fog' do
       begin
-	# Create deployer
-	fog = Nanoc::Extra::Deployers::Fog.new(
-	  'output/',
-	  {
-	    :provider              => 'aws',
-            :cdn_id                => 'id-cdn',
-	    # FIXME bucket is necessary for deployer but fog doesn't like it
-	    :bucket_name           => 'doesntmatter',
-	    :aws_access_key_id     => 'meh',
-	    :aws_secret_access_key => 'dontcare'},
-	  :dry_run => true)
-
-	# Create site
-	FileUtils.mkdir_p('output')
-	File.open('output/meow', 'w') { |io| io.write "I am a cat!" }
-	File.open('output/bark', 'w') { |io| io.write "I am a dog!" }
-
-	# Create local cloud (but not bucket)
-	FileUtils.mkdir_p('mylocalcloud')
-
-	# Run
-	fog.run
+        # Create deployer
+        fog = Nanoc::Extra::Deployers::Fog.new(
+          'output/',
+          {
+            provider: 'aws',
+                  cdn_id: 'id-cdn',
+            # FIXME: bucket is necessary for deployer but fog doesn't like it
+            bucket_name: 'doesntmatter',
+            aws_access_key_id: 'meh',
+            aws_secret_access_key: 'dontcare' },
+          dry_run: true)
+
+        # Create site
+        FileUtils.mkdir_p('output')
+        File.open('output/meow', 'w') { |io| io.write 'I am a cat!' }
+        File.open('output/bark', 'w') { |io| io.write 'I am a dog!' }
+
+        # Create local cloud (but not bucket)
+        FileUtils.mkdir_p('mylocalcloud')
+
+        # Run
+        fog.run
       ensure
-	# Hack :(
-	::Fog.instance_eval { @mocking = false }
+        # HACK :(
+        ::Fog.instance_eval { @mocking = false }
       end
     end
   end

data/test/filters/test_less.rb

@@ -2,7 +2,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_filter
     if_have 'less' do
       # Create item
-      @item = Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'))
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -20,7 +20,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
       File.open('content/foo/bar/imported_file.less', 'w') { |io| io.write('p { color: red; }') }
 
       # Create item
-      @item = Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'))
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -39,7 +39,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
 
       # Create item
       File.open('content/foo/bar.txt', 'w') { |io| io.write('meh') }
-      @item = Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'))
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -108,7 +108,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_compression
     if_have 'less' do
       # Create item
-      @item = Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/')
+      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'))
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])

data/test/filters/test_sass.rb

@@ -274,7 +274,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
         io.write("p\n  color: blue")
       end
 
-      options = { :filename => File.join(Dir.getwd, 'test.sass') }
+      options = { filename: File.join(Dir.getwd, 'test.sass') }
       ::Sass::Engine.new('@import "morestuff"', options).render
     end
   end
@@ -285,10 +285,15 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
     FileUtils.mkdir_p('content')
     File.open('content/xyzzy.sass', 'w') { |io| io.write('p\n  color: green') }
 
-    items = [Nanoc::Int::Item.new(
-      'blah',
-      { content_filename: 'content/xyzzy.sass' },
-      '/blah/')]
+    items = [
+      Nanoc::ItemView.new(
+        Nanoc::Int::Item.new(
+          'blah',
+          { content_filename: 'content/xyzzy.sass' },
+          '/blah/',
+        ),
+      ),
+    ]
     params = { item: items[0], items: items }.merge(params)
     ::Nanoc::Filters::Sass.new(params)
   end