nanoc 4.8.9 → 4.8.10

data/spec/nanoc/cli/commands/show_rules_spec.rb

@@ -58,7 +58,7 @@ describe Nanoc::CLI::Commands::ShowRules, stdio: true, site: true do
     let(:config) { Nanoc::Int::Configuration.new }
 
     let(:action_provider) { double(:action_provider, rules_collection: rules_collection) }
-    let(:compiler) { double(:compiler, action_provider: action_provider, reps: reps) }
+    let(:compiler) { double(:compiler) }
 
     let(:rules_collection) do
       Nanoc::RuleDSL::RulesCollection.new.tap do |rc|
@@ -105,7 +105,9 @@ describe Nanoc::CLI::Commands::ShowRules, stdio: true, site: true do
 
     it 'writes item and layout rules to stdout' do
       expect(runner).to receive(:load_site).and_return(site)
-      expect(compiler).to receive(:build_reps).once
+      expect(Nanoc::Int::Compiler).to receive(:new_for).with(site).and_return(compiler)
+      expect(compiler).to receive(:run_until_reps_built).and_return(reps: reps)
+      expect(Nanoc::RuleDSL::ActionProvider).to receive(:for).with(site).and_return(action_provider)
       expect { subject }.to output(expected_out).to_stdout
     end
 

data/spec/nanoc/regressions/gh_767_spec.rb

@@ -16,6 +16,6 @@ EOS
 
   it 'does not expose #path on @item' do
     site = Nanoc::Int::SiteLoader.new.new_from_cwd
-    expect { site.compile }.to raise_error(NoMethodError, /undefined method .*path.* for .*Nanoc::ItemWithoutRepsView/)
+    expect { site.compile }.to raise_error(NoMethodError, /undefined method .*path.* for .*Nanoc::BasicItemView/)
   end
 end

data/spec/nanoc/regressions/gh_776_spec.rb

@@ -30,7 +30,8 @@ EOS
 
   context 'with pruning' do
     before do
-      Nanoc::Pruner.new(site.config, site.compiler.reps).run
+      res = Nanoc::Int::Compiler.new_for(site).run_until_reps_built
+      Nanoc::Pruner.new(site.config, res.fetch(:reps)).run
     end
 
     it 'does not prune written snapshots' do

data/spec/nanoc/rule_dsl/action_sequence_calculator_spec.rb

@@ -6,7 +6,31 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
   end
 
   let(:rules_collection) { Nanoc::RuleDSL::RulesCollection.new }
-  let(:site) { double(:site) }
+
+  let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+  let(:items) { Nanoc::Int::ItemCollection.new(config) }
+  let(:layouts) { Nanoc::Int::LayoutCollection.new(config) }
+
+  let(:data_source_class) do
+    Class.new(Nanoc::DataSource) do
+      def items
+        @config.fetch(:items)
+      end
+
+      def layouts
+        @config.fetch(:layouts)
+      end
+    end
+  end
+
+  let(:data_source) do
+    data_source_config = { items: items, layouts: layouts }
+    data_source_class.new(config, '/', '/', data_source_config)
+  end
+
+  let(:site) do
+    Nanoc::Int::Site.new(config: config, code_snippets: [], data_source: data_source)
+  end
 
   describe '#[]' do
     subject { action_sequence_calculator[obj] }
@@ -15,17 +39,6 @@ describe(Nanoc::RuleDSL::ActionSequenceCalculator) do
       let(:obj) { Nanoc::Int::ItemRep.new(item, :csv) }
 
       let(:item) { Nanoc::Int::Item.new('content', {}, Nanoc::Identifier.from('/list.md')) }
-      let(:config) { Nanoc::Int::Configuration.new.with_defaults }
-      let(:items) { Nanoc::Int::ItemCollection.new(config) }
-      let(:layouts) { Nanoc::Int::LayoutCollection.new(config) }
-      let(:site) { double(:site, items: items, layouts: layouts, config: config, compiler: compiler) }
-      let(:compiler) { double(:compiler, compilation_context: compilation_context) }
-      let(:compilation_context) { double(:compilation_context) }
-      let(:view_context) { double(:view_context) }
-
-      before do
-        expect(compilation_context).to receive(:create_view_context).and_return(view_context)
-      end
 
       context 'no rules exist' do
         it 'raises error' do

data/spec/nanoc/rule_dsl/rule_context_spec.rb

@@ -16,14 +16,24 @@ describe(Nanoc::RuleDSL::RuleContext) do
   let(:executor) { double(:executor) }
   let(:reps) { double(:reps) }
   let(:compilation_context) { double(:compilation_context) }
-  let(:view_context) { Nanoc::ViewContext.new(reps: reps, items: items, dependency_tracker: dependency_tracker, compilation_context: compilation_context, snapshot_repo: snapshot_repo) }
+
+  let(:view_context) do
+    Nanoc::ViewContextForCompilation.new(
+      reps:                Nanoc::Int::ItemRepRepo.new,
+      items:               items,
+      dependency_tracker:  dependency_tracker,
+      compilation_context: compilation_context,
+      snapshot_repo:       snapshot_repo,
+    )
+  end
+
   let(:dependency_tracker) { double(:dependency_tracker) }
   let(:snapshot_repo) { double(:snapshot_repo) }
 
   describe '#initialize' do
     it 'wraps objects in view classes' do
-      expect(subject.rep.class).to eql(Nanoc::ItemRepView)
-      expect(subject.item.class).to eql(Nanoc::ItemWithoutRepsView)
+      expect(subject.rep.class).to eql(Nanoc::BasicItemRepView)
+      expect(subject.item.class).to eql(Nanoc::BasicItemView)
       expect(subject.config.class).to eql(Nanoc::ConfigView)
       expect(subject.layouts.class).to eql(Nanoc::LayoutCollectionView)
       expect(subject.items.class).to eql(Nanoc::ItemCollectionWithoutRepsView)
@@ -42,7 +52,7 @@ describe(Nanoc::RuleDSL::RuleContext) do
     subject { rule_context.item }
 
     it 'is a view without reps access' do
-      expect(subject.class).to eql(Nanoc::ItemWithoutRepsView)
+      expect(subject.class).to eql(Nanoc::BasicItemView)
     end
 
     it 'contains the right item' do
@@ -67,7 +77,7 @@ describe(Nanoc::RuleDSL::RuleContext) do
       end
 
       it 'wraps the parent in a view without reps access' do
-        expect(subject.parent.class).to eql(Nanoc::ItemWithoutRepsView)
+        expect(subject.parent.class).to eql(Nanoc::BasicItemView)
         expect(subject.parent).not_to respond_to(:compiled_content)
         expect(subject.parent).not_to respond_to(:path)
         expect(subject.parent).not_to respond_to(:reps)
@@ -78,7 +88,7 @@ describe(Nanoc::RuleDSL::RuleContext) do
       end
 
       it 'wraps the children in a view without reps access' do
-        expect(subject.children.map(&:class)).to eql([Nanoc::ItemWithoutRepsView])
+        expect(subject.children.map(&:class)).to eql([Nanoc::BasicItemView])
         expect(subject.children[0]).not_to respond_to(:compiled_content)
         expect(subject.children[0]).not_to respond_to(:path)
         expect(subject.children[0]).not_to respond_to(:reps)

data/test/base/test_data_source.rb

@@ -3,24 +3,6 @@
 require 'helper'
 
 class Nanoc::DataSourceTest < Nanoc::TestCase
-  def test_loading
-    # Create data source
-    data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
-    data_source.expects(:up).times(1)
-    data_source.expects(:down).times(1)
-
-    # Test nested loading
-    assert_equal(0, data_source.instance_eval { @references })
-    data_source.loading do
-      assert_equal(1, data_source.instance_eval { @references })
-      data_source.loading do
-        assert_equal(2, data_source.instance_eval { @references })
-      end
-      assert_equal(1, data_source.instance_eval { @references })
-    end
-    assert_equal(0, data_source.instance_eval { @references })
-  end
-
   def test_not_implemented
     # Create data source
     data_source = Nanoc::DataSource.new(nil, nil, nil, nil)

data/test/checking/checks/test_external_links.rb

@@ -65,11 +65,10 @@ class Nanoc::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
 
   def test_excluded
     with_site do |site|
-      # Create check
-      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
       site.config.update(checks: { external_links: { exclude: ['^http://excluded.com$'] } })
 
-      # Test
+      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
+
       assert check.send(:excluded?, 'http://excluded.com')
       refute check.send(:excluded?, 'http://excluded.com/notexcluded')
       refute check.send(:excluded?, 'http://notexcluded.com')
@@ -78,11 +77,10 @@ class Nanoc::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
 
   def test_excluded_file
     with_site do |site|
-      # Create check
-      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
       site.config.update(checks: { external_links: { exclude_files: ['blog/page'] } })
 
-      # Test
+      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
+
       assert check.send(:excluded_file?, 'output/blog/page1/index.html')
       refute check.send(:excluded_file?, 'output/blog/pag1/index.html')
     end

data/test/checking/checks/test_internal_links.rb

@@ -71,11 +71,10 @@ class Nanoc::Checking::Checks::InternalLinksTest < Nanoc::TestCase
 
   def test_exclude
     with_site do |site|
-      # Create check
-      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       site.config.update(checks: { internal_links: { exclude: ['^/excluded\d+'] } })
 
-      # Test
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
+
       assert check.send(:valid?, '/excluded1', 'output/origin')
       assert check.send(:valid?, '/excluded2', 'output/origin')
       assert !check.send(:valid?, '/excluded_not', 'output/origin')
@@ -84,11 +83,10 @@ class Nanoc::Checking::Checks::InternalLinksTest < Nanoc::TestCase
 
   def test_exclude_targets
     with_site do |site|
-      # Create check
-      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       site.config.update(checks: { internal_links: { exclude_targets: ['^/excluded\d+'] } })
 
-      # Test
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
+
       assert check.send(:valid?, '/excluded1', 'output/origin')
       assert check.send(:valid?, '/excluded2', 'output/origin')
       assert !check.send(:valid?, '/excluded_not', 'output/origin')
@@ -97,11 +95,10 @@ class Nanoc::Checking::Checks::InternalLinksTest < Nanoc::TestCase
 
   def test_exclude_origins
     with_site do |site|
-      # Create check
-      check = Nanoc::Checking::Checks::InternalLinks.create(site)
       site.config.update(checks: { internal_links: { exclude_origins: ['^/excluded'] } })
 
-      # Test
+      check = Nanoc::Checking::Checks::InternalLinks.create(site)
+
       assert check.send(:valid?, '/foo', 'output/excluded')
       assert !check.send(:valid?, '/foo', 'output/not_excluded')
     end

data/test/cli/commands/test_compile.rb

@@ -129,41 +129,6 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
     end
   end
 
-  def test_setup_and_teardown_listeners
-    with_site do
-      test_listener_class = Class.new(::Nanoc::CLI::Commands::CompileListeners::Abstract) do
-        def start
-          @started = true
-        end
-
-        def stop
-          @stopped = true
-        end
-
-        def started?
-          @started
-        end
-
-        def stopped?
-          @stopped
-        end
-      end
-
-      options = {}
-      arguments = []
-      cmd = nil
-      cmd_runner = Nanoc::CLI::Commands::Compile.new(options, arguments, cmd)
-      cmd_runner.listener_classes = [test_listener_class]
-
-      cmd_runner.run
-
-      listeners = cmd_runner.send(:listeners)
-      assert listeners.size == 1
-      assert listeners.first.started?
-      assert listeners.first.stopped?
-    end
-  end
-
   def test_file_action_printer_normal
     # Create data
     item = Nanoc::Int::Item.new('content', {}, '/a')

data/test/cli/test_cleaning_stream.rb

@@ -88,7 +88,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
   end
 
   def test_invalid_string
-    s = "\x80"
+    s = [128].pack('C').force_encoding('UTF-8')
     stream = StringIO.new
     cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
     cleaning_stream << s

data/test/data_sources/test_filesystem.rb

@@ -1004,6 +1004,22 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     end
   end
 
+  def test_parse_internal_four_dashes
+    content = \
+      "----\n" \
+      "fav_animal: donkey\n" \
+      "----\n" \
+      "blah blah\n"
+
+    File.open('test.html', 'w') { |io| io.write(content) }
+
+    data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
+
+    result = data_source.instance_eval { parse('test.html', nil) }
+    assert_equal({}, result.attributes)
+    assert_equal(content, result.content)
+  end
+
   def test_parse_external_bad_metadata
     File.open('test.html', 'w') { |io| io.write('blah blah') }
     File.open('test.yaml', 'w') { |io| io.write('Hello world!') }

data/test/filters/test_kramdown.rb

@@ -18,9 +18,9 @@ class Nanoc::Filters::KramdownTest < Nanoc::TestCase
     if_have 'kramdown' do
       # Create item
       item = Nanoc::Int::Item.new('foo', {}, '/foo.md')
-      item_view = Nanoc::ItemWithRepsView.new(item, nil)
+      item_view = Nanoc::CompilationItemView.new(item, nil)
       item_rep = Nanoc::Int::ItemRep.new(item, :default)
-      item_rep_view = Nanoc::ItemRepView.new(item_rep, nil)
+      item_rep_view = Nanoc::CompilationItemRepView.new(item_rep, nil)
 
       # Create filter
       filter = ::Nanoc::Filters::Kramdown.new(item: item_view, item_rep: item_rep_view)
@@ -38,9 +38,9 @@ class Nanoc::Filters::KramdownTest < Nanoc::TestCase
     if_have 'kramdown' do
       # Create item
       item = Nanoc::Int::Item.new('foo', {}, '/foo.md')
-      item_view = Nanoc::ItemWithRepsView.new(item, nil)
+      item_view = Nanoc::CompilationItemView.new(item, nil)
       item_rep = Nanoc::Int::ItemRep.new(item, :default)
-      item_rep_view = Nanoc::ItemRepView.new(item_rep, nil)
+      item_rep_view = Nanoc::CompilationItemRepView.new(item_rep, nil)
 
       # Create filter
       filter = ::Nanoc::Filters::Kramdown.new(item: item_view, item_rep: item_rep_view)

data/test/filters/test_sass.rb

@@ -300,7 +300,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
     File.open('content/xyzzy.sass', 'w') { |io| io.write('p\n  color: green') }
 
     items = [
-      Nanoc::ItemWithRepsView.new(
+      Nanoc::CompilationItemView.new(
         Nanoc::Int::Item.new(
           'blah',
           { content_filename: 'content/xyzzy.sass' },

data/test/filters/test_slim.rb

@@ -32,12 +32,14 @@ class Nanoc::Filters::SlimTest < Nanoc::TestCase
   end
 
   def new_view_context
-    Nanoc::ViewContext.new(
-      reps: :__irrelevat_reps,
-      items: :__irrelevat_items,
-      dependency_tracker: :__irrelevant_dependency_tracker,
+    config = Nanoc::Int::Configuration.new
+
+    Nanoc::ViewContextForCompilation.new(
+      reps:                Nanoc::Int::ItemRepRepo.new,
+      items:               Nanoc::Int::ItemCollection.new(config),
+      dependency_tracker:  :__irrelevant_dependency_tracker,
       compilation_context: :__irrelevat_compiler,
-      snapshot_repo: :__irrelevant_snapshot_repo,
+      snapshot_repo:       :__irrelevant_snapshot_repo,
     )
   end
 

data/test/filters/test_xsl.rb

@@ -101,12 +101,14 @@ EOS
   end
 
   def new_view_context
-    Nanoc::ViewContext.new(
-      reps: :__irrelevat_reps,
-      items: :__irrelevat_items,
-      dependency_tracker: @dependency_tracker,
+    config = Nanoc::Int::Configuration.new
+
+    Nanoc::ViewContextForCompilation.new(
+      reps:                Nanoc::Int::ItemRepRepo.new,
+      items:               Nanoc::Int::ItemCollection.new(config),
+      dependency_tracker:  @dependency_tracker,
       compilation_context: :__irrelevat_compiler,
-      snapshot_repo: :__irrelevant_snapshot_repo,
+      snapshot_repo:       :__irrelevant_snapshot_repo,
     )
   end
 
@@ -114,7 +116,7 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN, {}, '/content')
-      item = Nanoc::ItemWithRepsView.new(item, new_view_context)
+      item = Nanoc::CompilationItemView.new(item, new_view_context)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL, {}, '/layout')
       layout = Nanoc::LayoutView.new(layout, new_view_context)
 
@@ -140,7 +142,7 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_PARAMS, {}, '/content')
-      item = Nanoc::ItemWithRepsView.new(item, new_view_context)
+      item = Nanoc::CompilationItemView.new(item, new_view_context)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_PARAMS, {}, '/layout')
       layout = Nanoc::LayoutView.new(layout, new_view_context)
 
@@ -166,7 +168,7 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_OMIT_XML_DECL, {}, '/content')
-      item = Nanoc::ItemWithRepsView.new(item, new_view_context)
+      item = Nanoc::CompilationItemView.new(item, new_view_context)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_OMIT_XML_DECL, {}, '/layout')
       layout = Nanoc::LayoutView.new(layout, new_view_context)
 

data/test/helpers/test_blogging.rb

@@ -37,12 +37,12 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     dep_store = Nanoc::Int::DependencyStore.new(items, layouts, config)
     dependency_tracker = Nanoc::Int::DependencyTracker.new(dep_store)
 
-    @view_context = Nanoc::ViewContext.new(
-      reps: :__irrelevant__,
-      items: nil,
-      dependency_tracker: dependency_tracker,
+    @view_context = Nanoc::ViewContextForCompilation.new(
+      reps:                Nanoc::Int::ItemRepRepo.new,
+      items:               Nanoc::Int::ItemCollection.new(config),
+      dependency_tracker:  dependency_tracker,
       compilation_context: :__irrelevant__,
-      snapshot_repo: :__irrelevant_snapshot_repo,
+      snapshot_repo:       :__irrelevant_snapshot_repo,
     )
   end
 

data/test/helpers/test_capturing.rb

@@ -12,12 +12,14 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
   end
 
   def view_context_for(item)
-    Nanoc::ViewContext.new(
-      reps: item_rep_repo_for(item),
-      items: :__irrelevant__,
-      dependency_tracker: :__irrelevant__,
+    config = Nanoc::Int::Configuration.new
+
+    Nanoc::ViewContextForCompilation.new(
+      reps:                item_rep_repo_for(item),
+      items:               Nanoc::Int::ItemCollection.new(config),
+      dependency_tracker:  :__irrelevant__,
       compilation_context: :__irrelevant__,
-      snapshot_repo: snapshot_repo,
+      snapshot_repo:       snapshot_repo,
     )
   end
 
@@ -82,7 +84,7 @@ EOS
 
     item = Nanoc::Int::Item.new('content', {}, '/asdf')
     view_context = view_context_for(item)
-    @item = Nanoc::ItemWithRepsView.new(item, view_context_for(item))
+    @item = Nanoc::CompilationItemView.new(item, view_context_for(item))
     @config = Nanoc::ConfigView.new(Nanoc::Int::Configuration.new, view_context)
 
     result = ::ERB.new(content).result(binding)