nanoc 4.10.2 → 4.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb2cbc0d64311d9e3b14715a1f05d0c45d0dc49020b929fb9d528429393a4b6
-  data.tar.gz: 88014c7a2d2f9f48e1c616f55a10401679e1bb7f069f324ccdd13d1560f67975
+  metadata.gz: 29fff0fd45abb2f33fe2ecd8b80531a166163bfea453b2f4633bd7796847624d
+  data.tar.gz: 8795f5b0c4d192c4d02cc3febc198a5af78410d073ba6df41c8ffbe32ad94f54
 SHA512:
-  metadata.gz: 70430b8f328bbcc2b537bd02bce5b094d9060545e5e1bb70dbc34e575a01812b6845f9624ea0dbce6af0e2c7739dbe4174572c8283df0e595c7d792bdd26ee54
-  data.tar.gz: 92d75e7db1a2bbacc5364c449a7ef1499a88ac35f9c28fc07d58be43a5fc932e999447a4897ff0d96f6b577a3ec6c1260979e7eb83f6fd97c36b04e25c590694
+  metadata.gz: d208e075e74aa527b9384aa902a98b52d35ee0fc7432fc2ed93c142ebf66dd02ade7ecf169fce4a1ded36c680428afcf36b675d5de158553beb5d3e256850fcc
+  data.tar.gz: 5a8b4e5c7f3c367620fcf568491665d509dc6ccfab035994bb896962bf83403309b6b116d221836babf82afba750b8b944f38c9ef462d7c45a964fa82afd1877

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.10.3 (2018-10-28)
+
+Fixes:
+
+* Fixed an issue which could cause `write nil` to still invoke the routing rule (#1374, #1375)
+
 ## 4.10.2 (2018-10-21)
 
 Fixes:

data/lib/nanoc/base/entities/processing_actions/snapshot.rb

@@ -23,7 +23,7 @@ module Nanoc::Int::ProcessingActions
 
     contract C::KeywordArgs[snapshot_names: C::Optional[C::IterOf[Symbol]], paths: C::Optional[C::IterOf[String]]] => self
     def update(snapshot_names: [], paths: [])
-      self.class.new(@snapshot_names + snapshot_names, @paths + paths)
+      self.class.new(@snapshot_names + snapshot_names.to_a, @paths + paths.to_a)
     end
 
     contract C::None => String

data/lib/nanoc/rule_dsl/action_recorder.rb

@@ -12,7 +12,7 @@ module Nanoc
         @any_layouts = false
         @last_snapshot = false
         @pre_snapshot = false
-        @skip_routing_rule = false
+        @snapshots_for_which_to_skip_routing_rule = Set.new
       end
 
       def inspect
@@ -40,7 +40,9 @@ module Nanoc
       MaybePathlike = C::Or[nil, Nanoc::UNDEFINED, String, Nanoc::Identifier]
       contract Symbol, C::KeywordArgs[path: C::Optional[MaybePathlike]] => nil
       def snapshot(snapshot_name, path: Nanoc::UNDEFINED)
-        @skip_routing_rule = path.nil?
+        unless Nanoc::UNDEFINED.equal?(path)
+          @snapshots_for_which_to_skip_routing_rule << snapshot_name
+        end
 
         path =
           if Nanoc::UNDEFINED.equal?(path) || path.nil?
@@ -69,9 +71,9 @@ module Nanoc
         @any_layouts
       end
 
-      contract C::None => C::Bool
-      def skip_routing_rule?
-        @skip_routing_rule
+      contract C::None => Set
+      def snapshots_for_which_to_skip_routing_rule
+        @snapshots_for_which_to_skip_routing_rule
       end
 
       contract C::None => C::Bool

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -69,7 +69,11 @@ module Nanoc::RuleDSL
       recorder.snapshot(:last) unless recorder.last_snapshot?
       recorder.snapshot(:pre) unless recorder.pre_snapshot?
 
-      copy_paths_from_routing_rules(compact_snapshots(recorder.action_sequence), rep: rep)
+      copy_paths_from_routing_rules(
+        compact_snapshots(recorder.action_sequence),
+        recorder.snapshots_for_which_to_skip_routing_rule,
+        rep: rep,
+      )
     end
 
     # @param [Nanoc::Int::Layout] layout
@@ -99,26 +103,25 @@ module Nanoc::RuleDSL
       Nanoc::Int::ActionSequence.new(seq.item_rep, actions: actions)
     end
 
-    def copy_paths_from_routing_rules(seq, rep:)
+    def copy_paths_from_routing_rules(seq, snapshots_for_which_to_skip_routing_rule, rep:)
+      # NOTE: This assumes that `seq` is compacted, i.e. there are no two consecutive snapshot actions.
+
       seq.map do |action|
-        if action.is_a?(Nanoc::Int::ProcessingActions::Snapshot) && action.paths.empty?
-          copy_path_from_routing_rule(action, rep: rep)
-        else
-          action
-        end
-      end
-    end
+        # Only potentially modify snapshot actions
+        next action unless action.is_a?(Nanoc::Int::ProcessingActions::Snapshot)
 
-    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 any of the action’s snapshot are explicitly marked as excluded from
+        # getting a path from a routing rule, then ignore routing rules.
+        next action if snapshots_for_which_to_skip_routing_rule.intersect?(Set.new(action.snapshot_names))
 
-      if paths_from_rules.any?
-        action.update(paths: paths_from_rules.map(&:to_s))
-      else
-        action
+        # If this action already has paths that don’t come from routing rules,
+        # then don’t add more to them.
+        next action unless action.paths.empty?
+
+        # For each snapshot name, find a path from a routing rule. The routing
+        # rule might return nil, so we need #compact.
+        paths = action.snapshot_names.map { |sn| basic_path_from_rules_for(rep, sn) }.compact
+        action.update(snapshot_names: [], paths: paths)
       end
     end
 

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.10.2'
+  VERSION = '4.10.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.10.2
+  version: 4.10.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable