nanoc 4.7.3 → 4.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06af73e98c0935c6d7d8fd00b40d9e09329d745c
-  data.tar.gz: f5e03e20454c8d526ef62d3be16638e9a4e8bfe6
+  metadata.gz: a7edb702d8929a927c1451d25bfa2371a4464914
+  data.tar.gz: 1120a8323748658b9d26bb5ca10b500dfc162a31
 SHA512:
-  metadata.gz: e898a8a5f2270666742feff827ab473843fed2f9dd6801016fbf5c201b6649d4f3a9825ce17fada634be2254252cfabda285e35ca004388d88ce2900994c208d
-  data.tar.gz: 4246e6c9ad39036c4f271f3e99ac28b2b44f0f3de670459d72761046416369948a4695c9c4953ff4f7d7591f42f7dde698f4665f9ec1aaea5d940982fef53938
+  metadata.gz: a62949639c9c7ebb38ecaf5c1c4c60c1b03e73cdcc4791c300a811517e8fbf826b71079eee6dc5966ae4c25c7aea4e1eefe0ff589c3ec477e0a41f3b70717d16
+  data.tar.gz: 962038a9d13bb4d58395999e77f73a48fc6b3be78fc862e83135aa8fa82f894f01ffb8b696d2354dcaabc7b1b4983245a339bdc96d3cb98ac9bede5153cc0536

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/bbatsov/rubocop.git
-  revision: d1b9d66c3518389b0c408a6a4a42061b36748df4
+  revision: d602d0a763da9f4f16b441f6205c6913eb99fbe4
   specs:
     rubocop (0.48.0)
       parser (>= 2.3.3.1, < 3.0)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.7.3)
+    nanoc (4.7.4)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -273,7 +273,7 @@ GEM
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
-    mustache (1.0.4)
+    mustache (1.0.5)
     nenv (0.3.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
@@ -338,7 +338,7 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     temple (0.7.7)
-    term-ansicolor (1.4.1)
+    term-ansicolor (1.5.0)
       tins (~> 1.0)
     thor (0.19.4)
     tilt (2.0.7)
@@ -347,7 +347,7 @@ GEM
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.1.10)
+    uglifier (3.1.11)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.3)
     url (0.3.2)

data/NEWS.md

@@ -1,5 +1,12 @@
 # Nanoc news
 
+## 4.7.4 (2017-03-29)
+
+Enhancements:
+
+* Made attribute dependencies cause outdatedness less often (#1136, #1137, #1138)
+* Improved speed of Rules file handling (#1140)
+
 ## 4.7.3 (2017-03-26)
 
 Fixes:

data/lib/nanoc/base/entities.rb

@@ -16,7 +16,7 @@ require_relative 'entities/item_rep'
 require_relative 'entities/layout'
 require_relative 'entities/pattern'
 require_relative 'entities/props'
-require_relative 'entities/rule_memory'
+require_relative 'entities/action_sequence'
 require_relative 'entities/site'
 require_relative 'entities/snapshot_def'
 

data/lib/nanoc/base/entities/{rule_memory.rb → action_sequence.rb}

@@ -1,5 +1,5 @@
 module Nanoc::Int
-  class RuleMemory
+  class ActionSequence
     include Nanoc::Int::ContractsSupport
     include Enumerable
 
@@ -83,6 +83,24 @@ module Nanoc::Int
       self.class.new(@item_rep, actions: actions)
     end
 
+    def snapshots_defs
+      is_binary = @item_rep.item.content.binary?
+      snapshot_defs = []
+
+      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
+
     private
 
     def will_add_snapshot(name)

data/lib/nanoc/base/entities/outdatedness_reasons.rb

@@ -49,10 +49,18 @@ module Nanoc::Int
       Props.new(raw_content: true, compiled_content: true),
     )
 
-    AttributesModified = Generic.new(
-      'The attributes of this item have been modified since the last time the site was compiled.',
-      Props.new(attributes: true, compiled_content: true),
-    )
+    class AttributesModified < Generic
+      attr_reader :attributes
+
+      def initialize(attributes)
+        super(
+          'The attributes of this item have been modified since the last time the site was compiled.',
+          Props.new(attributes: true, compiled_content: true),
+        )
+
+        @attributes = attributes
+      end
+    end
 
     PathsModified = Generic.new(
       'One or more output paths of this item have been modified since the last time the site was compiled.',

data/lib/nanoc/base/entities/outdatedness_status.rb

@@ -10,7 +10,7 @@ module Nanoc::Int
     end
 
     def useful_to_apply?(rule)
-      (rule.instance.reason.props.active - @props.active).any?
+      (rule.affected_props - @props.active).any?
     end
 
     def update(reason)

data/lib/nanoc/base/repos.rb

@@ -7,7 +7,7 @@ require_relative 'repos/data_source'
 require_relative 'repos/dependency_store'
 require_relative 'repos/item_rep_repo'
 require_relative 'repos/outdatedness_store'
-require_relative 'repos/rule_memory_store'
+require_relative 'repos/action_sequence_store'
 require_relative 'repos/site_loader'
 require_relative 'repos/snapshot_repo'
 require_relative 'repos/in_mem_data_source'

data/lib/nanoc/base/repos/{rule_memory_store.rb → action_sequence_store.rb}

@@ -1,43 +1,43 @@
 module Nanoc::Int
-  # Stores rule memories for objects that can be run through a rule (item
+  # Stores action sequences for objects that can be run through a rule (item
   # representations and layouts).
   #
   # @api private
-  class RuleMemoryStore < ::Nanoc::Int::Store
+  class ActionSequenceStore < ::Nanoc::Int::Store
     def initialize(site: nil)
       super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'rule_memory'), 1)
 
-      @rule_memories = {}
+      @action_sequences = {}
     end
 
     # @param [Nanoc::Int::ItemRep, Nanoc::Int::Layout] obj The item representation or
-    #   the layout to get the rule memory for
+    #   the layout to get the action sequence for
     #
-    # @return [Array] The rule memory for the given object
+    # @return [Array] The action sequence for the given object
     def [](obj)
-      @rule_memories[obj.reference]
+      @action_sequences[obj.reference]
     end
 
     # @param [Nanoc::Int::ItemRep, Nanoc::Int::Layout] obj The item representation or
-    #   the layout to set the rule memory for
+    #   the layout to set the action sequence for
     #
-    # @param [Array] rule_memory The new rule memory to be stored
+    # @param [Array] action_sequence The new action sequence to be stored
     #
     # @return [void]
-    def []=(obj, rule_memory)
-      @rule_memories[obj.reference] = rule_memory
+    def []=(obj, action_sequence)
+      @action_sequences[obj.reference] = action_sequence
     end
 
     protected
 
     # @see Nanoc::Int::Store#data
     def data
-      @rule_memories
+      @action_sequences
     end
 
     # @see Nanoc::Int::Store#data=
     def data=(new_data)
-      @rule_memories = new_data
+      @action_sequences = new_data
     end
   end
 end

data/lib/nanoc/base/repos/checksum_store.rb

@@ -28,7 +28,7 @@ module Nanoc::Int
     def add(obj)
       if obj.is_a?(Nanoc::Int::Document)
         @checksums[[obj.reference, :content]] = Nanoc::Int::Checksummer.calc_for_content_of(obj)
-        @checksums[[obj.reference, :attributes]] = Nanoc::Int::Checksummer.calc_for_attributes_of(obj)
+        @checksums[[obj.reference, :each_attribute]] = Nanoc::Int::Checksummer.calc_for_each_attribute_of(obj)
       end
 
       @checksums[obj.reference] = Nanoc::Int::Checksummer.calc(obj)
@@ -41,9 +41,9 @@ module Nanoc::Int
       @checksums[[obj.reference, :content]]
     end
 
-    contract c_obj => C::Maybe[String]
+    contract c_obj => C::Maybe[C::HashOf[Symbol, String]]
     def attributes_checksum_for(obj)
-      @checksums[[obj.reference, :attributes]]
+      @checksums[[obj.reference, :each_attribute]]
     end
 
     protected

data/lib/nanoc/base/services/action_provider.rb

@@ -11,18 +11,10 @@ module Nanoc::Int
       raise NotImplementedError
     end
 
-    def memory_for(_rep)
+    def action_sequence_for(_rep)
       raise NotImplementedError
     end
 
-    def snapshots_defs_for(_rep)
-      raise NotImplementedError
-    end
-
-    def paths_for(rep)
-      memory_for(rep).paths
-    end
-
     def need_preprocessing?
       raise NotImplementedError
     end

data/lib/nanoc/base/services/checksummer.rb

@@ -48,8 +48,10 @@ module Nanoc::Int
         obj.content_checksum_data || obj.checksum_data || Nanoc::Int::Checksummer.calc(obj.content)
       end
 
-      def calc_for_attributes_of(obj)
-        obj.attributes_checksum_data || obj.checksum_data || Nanoc::Int::Checksummer.calc(obj.attributes)
+      def calc_for_each_attribute_of(obj, digest_class = CompactDigest)
+        obj.attributes.each_with_object({}) do |(key, value), memo|
+          memo[key] = Nanoc::Int::Checksummer.calc(value, digest_class)
+        end
       end
 
       private

data/lib/nanoc/base/services/compiler.rb

@@ -33,7 +33,7 @@ module Nanoc::Int
       end
 
       def filter_name_and_args_for_layout(layout)
-        mem = @action_provider.memory_for(layout)
+        mem = @action_provider.action_sequence_for(layout)
         if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::ProcessingActions::Filter)
           raise Nanoc::Int::Errors::UndefinedFilterForLayout.new(layout)
         end
@@ -84,7 +84,7 @@ module Nanoc::Int
     attr_reader :checksum_store
 
     # @api private
-    attr_reader :rule_memory_store
+    attr_reader :action_sequence_store
 
     # @api private
     attr_reader :action_provider
@@ -104,12 +104,12 @@ module Nanoc::Int
     # @api private
     attr_reader :snapshot_repo
 
-    def initialize(site, compiled_content_cache:, checksum_store:, rule_memory_store:, action_provider:, dependency_store:, outdatedness_checker:, reps:, outdatedness_store:)
+    def initialize(site, compiled_content_cache:, checksum_store:, action_sequence_store:, action_provider:, dependency_store:, outdatedness_checker:, reps:, outdatedness_store:)
       @site = site
 
       @compiled_content_cache = compiled_content_cache
       @checksum_store         = checksum_store
-      @rule_memory_store      = rule_memory_store
+      @action_sequence_store  = action_sequence_store
       @dependency_store       = dependency_store
       @outdatedness_checker   = outdatedness_checker
       @reps                   = reps
@@ -141,9 +141,9 @@ module Nanoc::Int
 
     # TODO: rename to store_preprocessed_state
     def store
-      # Calculate rule memory
+      # Calculate action sequence
       (@reps.to_a + @site.layouts.to_a).each do |obj|
-        rule_memory_store[obj] = action_provider.memory_for(obj).serialize
+        action_sequence_store[obj] = action_provider.action_sequence_for(obj).serialize
       end
 
       # Calculate checksums
@@ -153,7 +153,7 @@ module Nanoc::Int
 
       # Store
       checksum_store.store
-      rule_memory_store.store
+      action_sequence_store.store
     end
 
     def store_output_state
@@ -164,7 +164,7 @@ module Nanoc::Int
       builder = Nanoc::Int::ItemRepBuilder.new(
         site, action_provider, @reps
       )
-      builder.run
+      @action_sequences = builder.run
     end
 
     def compilation_context
@@ -214,7 +214,7 @@ module Nanoc::Int
       @_compile_reps_stage ||= Stages::CompileReps.new(
         outdatedness_store: @outdatedness_store,
         dependency_store: @dependency_store,
-        action_provider: action_provider,
+        action_sequences: @action_sequences,
         compilation_context: compilation_context,
         compiled_content_cache: compiled_content_cache,
       )
@@ -225,7 +225,7 @@ module Nanoc::Int
     end
 
     def determine_outdatedness
-      determine_outdatedness_stage.run do |outdated_items|
+      determine_outdatedness_stage.run(@action_sequences) do |outdated_items|
         @outdated_items = outdated_items
       end
     end
@@ -241,7 +241,7 @@ module Nanoc::Int
         checksum_store,
         compiled_content_cache,
         @dependency_store,
-        rule_memory_store,
+        action_sequence_store,
         @outdatedness_store,
       ]
     end

data/lib/nanoc/base/services/compiler/phases/recalculate.rb

@@ -4,10 +4,10 @@ module Nanoc::Int::Compiler::Phases
   class Recalculate < Abstract
     include Nanoc::Int::ContractsSupport
 
-    def initialize(action_provider:, dependency_store:, compilation_context:)
+    def initialize(action_sequences:, dependency_store:, compilation_context:)
       super(wrapped: nil)
 
-      @action_provider = action_provider
+      @action_sequences = action_sequences
       @dependency_store = dependency_store
       @compilation_context = compilation_context
     end
@@ -21,7 +21,7 @@ module Nanoc::Int::Compiler::Phases
 
       @compilation_context.snapshot_repo.set(rep, :last, rep.item.content)
 
-      actions = @action_provider.memory_for(rep)
+      actions = @action_sequences[rep]
       actions.each do |action|
         case action
         when Nanoc::Int::ProcessingActions::Filter

data/lib/nanoc/base/services/compiler/stages/cleanup.rb

@@ -26,7 +26,7 @@ module Nanoc::Int::Compiler::Stages
     end
 
     def cleanup_old_stores
-      %w(checksums compiled_content dependencies outdatedness rule_memory).each do |fn|
+      %w(checksums compiled_content dependencies outdatedness action_sequence).each do |fn|
         full_fn = File.join('tmp', fn)
         if File.file?(full_fn)
           FileUtils.rm_f(full_fn)

data/lib/nanoc/base/services/compiler/stages/compile_reps.rb

@@ -1,9 +1,9 @@
 module Nanoc::Int::Compiler::Stages
   class CompileReps
-    def initialize(outdatedness_store:, dependency_store:, action_provider:, compilation_context:, compiled_content_cache:)
+    def initialize(outdatedness_store:, dependency_store:, action_sequences:, compilation_context:, compiled_content_cache:)
       @outdatedness_store = outdatedness_store
       @dependency_store = dependency_store
-      @action_provider = action_provider
+      @action_sequences = action_sequences
       @compilation_context = compilation_context
       @compiled_content_cache = compiled_content_cache
     end
@@ -33,7 +33,7 @@ module Nanoc::Int::Compiler::Stages
     def item_rep_compiler
       @_item_rep_compiler ||= begin
         recalculate_phase = Nanoc::Int::Compiler::Phases::Recalculate.new(
-          action_provider: @action_provider,
+          action_sequences: @action_sequences,
           dependency_store: @dependency_store,
           compilation_context: @compilation_context,
         )

data/lib/nanoc/base/services/compiler/stages/determine_outdatedness.rb

@@ -1,14 +1,19 @@
 module Nanoc::Int::Compiler::Stages
   class DetermineOutdatedness
+    include Nanoc::Int::ContractsSupport
+
     def initialize(reps:, outdatedness_checker:, outdatedness_store:)
       @reps = reps
       @outdatedness_checker = outdatedness_checker
       @outdatedness_store = outdatedness_store
     end
 
-    def run
+    C_OBJ = C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout]
+
+    contract C::HashOf[C_OBJ => Nanoc::Int::ActionSequence], C::Func[C::IterOf[Nanoc::Int::Item] => C::Any] => C::Any
+    def run(action_sequences)
       outdated_reps_tmp = @reps.select do |r|
-        @outdatedness_store.include?(r) || @outdatedness_checker.outdated?(r)
+        @outdatedness_store.include?(r) || @outdatedness_checker.outdated?(r, action_sequences)
       end
 
       outdated_items = outdated_reps_tmp.map(&:item).uniq

data/lib/nanoc/base/services/compiler_loader.rb

@@ -2,7 +2,7 @@ module Nanoc::Int
   # @api private
   class CompilerLoader
     def load(site, action_provider: nil)
-      rule_memory_store = Nanoc::Int::RuleMemoryStore.new(site: site)
+      action_sequence_store = Nanoc::Int::ActionSequenceStore.new(site: site)
 
       dependency_store =
         Nanoc::Int::DependencyStore.new(site.items.to_a + site.layouts.to_a, site: site)
@@ -24,7 +24,7 @@ module Nanoc::Int
           site: site,
           checksum_store: checksum_store,
           dependency_store: dependency_store,
-          rule_memory_store: rule_memory_store,
+          action_sequence_store: action_sequence_store,
           action_provider: action_provider,
           reps: item_rep_repo,
         )
@@ -38,7 +38,7 @@ module Nanoc::Int
       params = {
         compiled_content_cache: compiled_content_cache,
         checksum_store: checksum_store,
-        rule_memory_store: rule_memory_store,
+        action_sequence_store: action_sequence_store,
         dependency_store: dependency_store,
         outdatedness_checker: outdatedness_checker,
         reps: item_rep_repo,