nanoc 4.6.1 → 4.6.2

data/lib/nanoc/base/views/mutable_layout_collection_view.rb

@@ -15,7 +15,7 @@ module Nanoc
     #
     # @return [self]
     def create(content, attributes, identifier)
-      @objects << Nanoc::Int::Layout.new(content, attributes, identifier)
+      @objects = @objects.add(Nanoc::Int::Layout.new(content, attributes, identifier))
       self
     end
   end

data/lib/nanoc/checking/checks/html.rb

@@ -8,7 +8,7 @@ module ::Nanoc::Checking::Checks
     end
 
     def validator_class
-      ::W3CValidators::MarkupValidator
+      ::W3CValidators::NuValidator
     end
   end
 end

data/lib/nanoc/checking/checks/stale.rb

@@ -26,7 +26,8 @@ module Nanoc::Checking::Checks
             .flat_map(&:reps)
             .map(&:unwrap)
             .flat_map(&:raw_paths)
-            .flat_map(&:values),
+            .flat_map(&:values)
+            .flatten,
         )
     end
 

data/lib/nanoc/checking/checks/w3c_validator.rb

@@ -3,6 +3,7 @@ module ::Nanoc::Checking::Checks
   class W3CValidator < ::Nanoc::Checking::Check
     def run
       require 'w3c_validators'
+      require 'resolv-replace'
 
       Dir[@config[:output_dir] + '/**/*.' + extension].each do |filename|
         results = validator_class.new.validate_file(filename)

data/lib/nanoc/cli/commands/compile.rb

@@ -355,8 +355,9 @@ module Nanoc::CLI::Commands
         Nanoc::Int::NotificationCenter.remove(:compilation_suspended, self)
         Nanoc::Int::NotificationCenter.remove(:rep_written, self)
 
-        @reps.select { |r| !r.compiled? }.each do |rep|
-          rep.raw_paths.each do |_snapshot_name, raw_path|
+        @reps.reject(&:compiled?).each do |rep|
+          raw_paths = rep.raw_paths.values.flatten.uniq
+          raw_paths.each do |raw_path|
             log(:low, :skip, raw_path, nil)
           end
         end

data/lib/nanoc/cli/commands/show-data.rb

@@ -115,8 +115,10 @@ module Nanoc::CLI::Commands
           puts '  (not written)'
         end
         length = rep.raw_paths.keys.map { |s| s.to_s.length }.max
-        rep.raw_paths.each do |snapshot_name, raw_path|
-          puts format("  [ %-#{length}s ] %s", snapshot_name, raw_path)
+        rep.raw_paths.each do |snapshot_name, raw_paths|
+          raw_paths.each do |raw_path|
+            puts format("  [ %-#{length}s ] %s", snapshot_name, raw_path)
+          end
         end
       end
     end

data/lib/nanoc/data_sources/filesystem.rb

@@ -254,7 +254,7 @@ module Nanoc::DataSources
       by_basename.each_pair do |basename, filenames|
         # Divide
         meta_filenames    = filenames.select { |fn| ext_of(fn) == '.yaml' }
-        content_filenames = filenames.select { |fn| ext_of(fn) != '.yaml' }
+        content_filenames = filenames.reject { |fn| ext_of(fn) == '.yaml' }
 
         # Check number of files per type
         unless [0, 1].include?(meta_filenames.size)

data/lib/nanoc/helpers/filtering.rb

@@ -13,8 +13,7 @@ module Nanoc::Helpers
       data = capture(&block)
 
       # Find filter
-      klass = Nanoc::Filter.named(filter_name)
-      raise Nanoc::Int::Errors::UnknownFilter.new(filter_name) if klass.nil?
+      klass = Nanoc::Filter.named!(filter_name)
 
       # Create filter
       assigns = {

data/lib/nanoc/helpers/rendering.rb

@@ -41,8 +41,7 @@ module Nanoc::Helpers
       raise Nanoc::Int::Errors::CannotDetermineFilter.new(layout.identifier) if filter_name.nil?
 
       # Get filter class
-      filter_class = Nanoc::Filter.named(filter_name)
-      raise Nanoc::Int::Errors::UnknownFilter.new(filter_name) if filter_class.nil?
+      filter_class = Nanoc::Filter.named!(filter_name)
 
       # Create filter
       filter = filter_class.new(assigns)

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -26,8 +26,8 @@ module Nanoc::Helpers
       xml.urlset(xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9') do
         # Add item
         items.sort_by(&:identifier).each do |item|
-          reps = item.reps.reject { |r| r.raw_path.nil? }
-          reps.reject! { |r| !select_proc[r] } if select_proc
+          reps = item.reps.select(&:path)
+          reps.select! { |r| select_proc[r] } if select_proc
           reps.sort_by { |r| r.name.to_s }.each do |rep|
             xml.url do
               xml.loc URI.escape(@config[:base_url] + rep.path)

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -40,12 +40,19 @@ module Nanoc::RuleDSL
       @rule_memory_calculator.snapshots_defs_for(rep)
     end
 
+    def need_preprocessing?
+      @rules_collection.preprocessors.any?
+    end
+
     def preprocess(site)
       ctx = new_preprocessor_context(site)
 
       @rules_collection.preprocessors.each_value do |preprocessor|
         ctx.instance_eval(&preprocessor)
       end
+
+      site.data_source =
+        Nanoc::Int::InMemDataSource.new(ctx.items.unwrap, ctx.layouts.unwrap)
     end
 
     def postprocess(site, reps)

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -74,7 +74,10 @@ module Nanoc::RuleDSL
     #
     # @return [void]
     def write(path)
-      snapshot(:last, path: path)
+      @_write_snapshot_counter ||= 0
+      snapshot_name = "_#{@_write_snapshot_counter}".to_sym
+      @_write_snapshot_counter += 1
+      snapshot(snapshot_name, path: path)
     end
   end
 end

data/lib/nanoc/rule_dsl/rule_memory_calculator.rb

@@ -55,9 +55,21 @@ module Nanoc::RuleDSL
     end
 
     def snapshots_defs_for(rep)
-      self[rep].snapshot_actions.map do |a|
-        Nanoc::Int::SnapshotDef.new(a.snapshot_name)
+      is_binary = rep.item.content.binary?
+      snapshot_defs = []
+
+      self[rep].each do |action|
+        case action
+        when Nanoc::Int::ProcessingActions::Snapshot
+          action.snapshot_names.each do |snapshot_name|
+            snapshot_defs << Nanoc::Int::SnapshotDef.new(snapshot_name, binary: is_binary)
+          end
+        when Nanoc::Int::ProcessingActions::Filter
+          is_binary = Nanoc::Filter.named!(action.filter_name).to_binary?
+        end
       end
+
+      snapshot_defs
     end
 
     # @param [Nanoc::Int::ItemRep] rep The item representation to get the rule
@@ -81,14 +93,14 @@ module Nanoc::RuleDSL
       if rule_memory.any_layouts?
         executor.snapshot(:post)
       end
-      unless rule_memory.snapshot_actions.any? { |sa| sa.snapshot_name == :last }
+      unless rule_memory.snapshot_actions.any? { |sa| sa.snapshot_names.include?(:last) }
         executor.snapshot(:last)
       end
-      unless rule_memory.snapshot_actions.any? { |sa| sa.snapshot_name == :pre }
+      unless rule_memory.snapshot_actions.any? { |sa| sa.snapshot_names.include?(:pre) }
         executor.snapshot(:pre)
       end
 
-      assign_paths_to_mem(rule_memory, rep: rep)
+      copy_paths_from_routing_rules(rule_memory.compact_snapshots, rep: rep)
     end
 
     # @param [Nanoc::Int::Layout] layout
@@ -106,21 +118,29 @@ module Nanoc::RuleDSL
       end
     end
 
-    def assign_paths_to_mem(mem, rep:)
+    def copy_paths_from_routing_rules(mem, rep:)
       mem.map do |action|
-        if action.is_a?(Nanoc::Int::ProcessingActions::Snapshot) && action.path.nil?
-          path_from_rules = basic_path_from_rules_for(rep, action.snapshot_name)
-          if path_from_rules
-            action.copy(path: path_from_rules.to_s)
-          else
-            action
-          end
+        if action.is_a?(Nanoc::Int::ProcessingActions::Snapshot) && action.paths.empty?
+          copy_path_from_routing_rule(action, rep: rep)
         else
           action
         end
       end
     end
 
+    def copy_path_from_routing_rule(action, rep:)
+      paths_from_rules =
+        action.snapshot_names.map do |snapshot_name|
+          basic_path_from_rules_for(rep, snapshot_name)
+        end.compact
+
+      if paths_from_rules.any?
+        action.update(paths: paths_from_rules.map(&:to_s))
+      else
+        action
+      end
+    end
+
     # FIXME: ugly
     def basic_path_from_rules_for(rep, snapshot_name)
       routing_rules = @rules_collection.routing_rules_for(rep)

data/lib/nanoc/spec.rb

@@ -31,7 +31,7 @@ module Nanoc
       # @return [Nanoc::ItemWithRepsView] A view for the newly created item
       def create_item(content, attributes, identifier)
         item = Nanoc::Int::Item.new(content, attributes, identifier)
-        @items << item
+        @items = @items.add(item)
         Nanoc::ItemWithRepsView.new(item, view_context)
       end
 
@@ -46,7 +46,7 @@ module Nanoc
       # @return [Nanoc::ItemWithRepsView] A view for the newly created layout
       def create_layout(content, attributes, identifier)
         layout = Nanoc::Int::Layout.new(content, attributes, identifier)
-        @layouts << layout
+        @layouts = @layouts.add(layout)
         Nanoc::LayoutView.new(layout, view_context)
       end
 
@@ -58,7 +58,7 @@ module Nanoc
       # @param [Symbol] rep The rep name to create
       def create_rep(item, path, rep = :default)
         rep = Nanoc::Int::ItemRep.new(item.unwrap, rep)
-        rep.paths[:last] = path
+        rep.paths[:last] = [path]
         @reps << rep
         Nanoc::ItemRepView.new(rep, view_context)
       end
@@ -146,7 +146,7 @@ module Nanoc
           end
 
           def snapshots_defs_for(_rep)
-            [Nanoc::Int::SnapshotDef.new(:last)]
+            [Nanoc::Int::SnapshotDef.new(:last, binary: false)]
           end
         end.new(self)
       end
@@ -160,8 +160,7 @@ module Nanoc
           site = Nanoc::Int::Site.new(
             config: @config,
             code_snippets: [],
-            items: @items,
-            layouts: @layouts,
+            data_source: Nanoc::Int::InMemDataSource.new(@items, @layouts),
           )
           site.compiler = new_compiler_for(site)
           site

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.6.1'.freeze
+  VERSION = '4.6.2'.freeze
 end

data/spec/nanoc/base/checksummer_spec.rb

@@ -279,10 +279,13 @@ describe Nanoc::Int::Checksummer do
     let(:config) { Nanoc::Int::Configuration.new(hash: { 'foo' => 'bar' }) }
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << Nanoc::Int::Item.new('foo', {}, '/foo.md')
-        arr << Nanoc::Int::Item.new('bar', {}, '/foo.md')
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          Nanoc::Int::Item.new('foo', {}, '/foo.md'),
+          Nanoc::Int::Item.new('bar', {}, '/foo.md'),
+        ],
+      )
     end
 
     it { is_expected.to eql('Nanoc::ItemCollectionWithRepsView<Nanoc::Int::IdentifiableCollection<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<foo>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<bar>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,>>') }
@@ -294,10 +297,13 @@ describe Nanoc::Int::Checksummer do
     let(:config) { Nanoc::Int::Configuration.new(hash: { 'foo' => 'bar' }) }
 
     let(:wrapped) do
-      Nanoc::Int::IdentifiableCollection.new(config).tap do |arr|
-        arr << Nanoc::Int::Item.new('foo', {}, '/foo.md')
-        arr << Nanoc::Int::Item.new('bar', {}, '/foo.md')
-      end
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          Nanoc::Int::Item.new('foo', {}, '/foo.md'),
+          Nanoc::Int::Item.new('bar', {}, '/foo.md'),
+        ],
+      )
     end
 
     it { is_expected.to eql('Nanoc::ItemCollectionWithoutRepsView<Nanoc::Int::IdentifiableCollection<Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<foo>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,Nanoc::Int::Item<content=Nanoc::Int::TextualContent<String<bar>>,attributes=Hash<>,identifier=Nanoc::Identifier<String</foo.md>>>,>>') }
@@ -310,7 +316,11 @@ describe Nanoc::Int::Checksummer do
     let(:item) { Nanoc::Int::Item.new('stuff', {}, '/stuff.md') }
 
     let(:site) do
-      Nanoc::Int::Site.new(config: config, code_snippets: code_snippets, items: items, layouts: layouts)
+      Nanoc::Int::Site.new(
+        config: config,
+        code_snippets: code_snippets,
+        data_source: Nanoc::Int::InMemDataSource.new(items, layouts),
+      )
     end
 
     let(:config) { Nanoc::Int::Configuration.new(hash: { 'foo' => 'bar' }) }

data/spec/nanoc/base/compiler_spec.rb

@@ -35,8 +35,7 @@ describe Nanoc::Int::Compiler do
     Nanoc::Int::Site.new(
       config: config,
       code_snippets: code_snippets,
-      items: items,
-      layouts: layouts,
+      data_source: Nanoc::Int::InMemDataSource.new(items, layouts),
     )
   end
 
@@ -45,17 +44,14 @@ describe Nanoc::Int::Compiler do
   let(:code_snippets) { [] }
 
   let(:items) do
-    Nanoc::Int::IdentifiableCollection.new(config).tap do |col|
-      col << item
-      col << other_item
-    end
+    Nanoc::Int::IdentifiableCollection.new(config, [item, other_item])
   end
 
   let(:memory) do
     actions =
       [
         Nanoc::Int::ProcessingActions::Filter.new(:erb, {}),
-        Nanoc::Int::ProcessingActions::Snapshot.new(:last, nil),
+        Nanoc::Int::ProcessingActions::Snapshot.new([:last], []),
       ]
 
     Nanoc::Int::RuleMemory.new(nil, actions: actions)
@@ -66,7 +62,7 @@ describe Nanoc::Int::Compiler do
     reps << other_rep
 
     reps.each do |rep|
-      rep.snapshot_defs << Nanoc::Int::SnapshotDef.new(:last)
+      rep.snapshot_defs << Nanoc::Int::SnapshotDef.new(:last, binary: false)
     end
 
     allow(outdatedness_checker).to receive(:outdated?).with(rep).and_return(true)

data/spec/nanoc/base/entities/document_spec.rb

@@ -203,4 +203,24 @@ shared_examples 'a document' do
       end
     end
   end
+
+  describe '#with_identifier_prefix' do
+    let(:document) { described_class.new('kontent', { at: 'ribut' }, '/donkey.md') }
+
+    subject { document.with_identifier_prefix('/animals') }
+
+    it 'does not mutate the original' do
+      document.freeze
+      subject
+    end
+
+    it 'returns a new document with a prefixed identifier' do
+      expect(subject.identifier).to eq('/animals/donkey.md')
+    end
+
+    it 'does not change other data' do
+      expect(subject.content).to be_some_textual_content('kontent')
+      expect(subject.attributes).to eq(at: 'ribut')
+    end
+  end
 end

data/spec/nanoc/base/entities/identifiable_collection_spec.rb

@@ -0,0 +1,12 @@
+describe Nanoc::Int::IdentifiableCollection do
+  subject(:identifiable_collection) { described_class.new(config, objects) }
+
+  let(:config) { Nanoc::Int::Configuration.new }
+  let(:objects) { [] }
+
+  describe '#reject' do
+    subject { identifiable_collection.reject { |_| false } }
+
+    it { is_expected.to be_a(described_class) }
+  end
+end

data/spec/nanoc/base/entities/item_rep_spec.rb

@@ -8,7 +8,7 @@ describe Nanoc::Int::ItemRep do
     let(:snapshot_name) { raise 'override me' }
 
     before do
-      rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(:donkey)]
+      rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(:donkey, binary: false)]
     end
 
     context 'snapshot does not exist' do

data/spec/nanoc/base/entities/processing_actions/snapshot_spec.rb

@@ -1,32 +1,38 @@
 describe Nanoc::Int::ProcessingActions::Snapshot do
-  let(:action) { described_class.new(:before_layout, '/foo.md') }
+  let(:action) { described_class.new([:before_layout], ['/foo.md']) }
 
   describe '#serialize' do
     subject { action.serialize }
-    it { is_expected.to eql([:snapshot, :before_layout, true, '/foo.md']) }
+    it { is_expected.to eql([:snapshot, [:before_layout], true, ['/foo.md']]) }
   end
 
   describe '#to_s' do
     subject { action.to_s }
-    it { is_expected.to eql('snapshot :before_layout, path: "/foo.md"') }
+    it { is_expected.to eql('snapshot [:before_layout], paths: ["/foo.md"]') }
   end
 
   describe '#inspect' do
     subject { action.inspect }
-    it { is_expected.to eql('<Nanoc::Int::ProcessingActions::Snapshot :before_layout, true, "/foo.md">') }
+    it { is_expected.to eql('<Nanoc::Int::ProcessingActions::Snapshot [:before_layout], true, ["/foo.md"]>') }
   end
 
-  describe '#copy' do
-    context 'without path' do
-      subject { action.copy }
-      its(:snapshot_name) { is_expected.to eql(:before_layout) }
-      its(:path) { is_expected.to eql('/foo.md') }
+  describe '#update' do
+    context 'with nothing' do
+      subject { action.update }
+      its(:snapshot_names) { is_expected.to eql([:before_layout]) }
+      its(:paths) { is_expected.to eql(['/foo.md']) }
     end
 
-    context 'with path' do
-      subject { action.copy(path: '/donkey.md') }
-      its(:snapshot_name) { is_expected.to eql(:before_layout) }
-      its(:path) { is_expected.to eql('/donkey.md') }
+    context 'with snapshot name' do
+      subject { action.update(snapshot_names: [:zebra]) }
+      its(:snapshot_names) { is_expected.to eql([:before_layout, :zebra]) }
+      its(:paths) { is_expected.to eql(['/foo.md']) }
+    end
+
+    context 'with paths' do
+      subject { action.update(paths: ['/donkey.md', '/giraffe.md']) }
+      its(:snapshot_names) { is_expected.to eql([:before_layout]) }
+      its(:paths) { is_expected.to eql(['/foo.md', '/donkey.md', '/giraffe.md']) }
     end
   end
 end