nanoc-core 4.12.2 → 4.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a5b22f92ecd2425faeae4cbb597dee48846a8507e5c00673478c4146d99b60
-  data.tar.gz: b384739256cd987cbbdead7820fcfa3b48a0dff9aacbc632b48bdf9daf77305c
+  metadata.gz: 3dc7e6692696f6b2b0bbf15a7c5f0aa607af851182de259323b3f18869117ef0
+  data.tar.gz: a6964648a0eb41ffbffbda9fd9b18da1f80dd83a1a86d8564aee05f6bd5be16d
 SHA512:
-  metadata.gz: 4c06b89e2b6e699c07cf8a3da87755d15b03e05f368a1823eaa31165822dc258221c08048505a23e64cf412cbafda1425eaf2b6a93fee833351bf1f7ed4caa2c
-  data.tar.gz: a0108e0a31c98c277a5306d55ec0f666b2e87717a9f0355813c5d66a5410392bbc145a4a8a6b13f8fb1be849a1c1275804c9ac53ae60f0e350d33d6dd8a23516
+  metadata.gz: 4ee96bf469d44eb81ee815f6adf1439dadcd7efa34fdb9f71c057888ac4b690d799506d24b3fce04d54530deca15deb3564894cd340f519fde93fdeb80295487
+  data.tar.gz: cfa697a3471cb5efb04c8d9e7f919c39b399f958b2f20a8232bd6c3d2d5214fd2a3acf4fb4308a4b094cbf02c4bb87ae050379c6a3b0421092101c2576e69432

data/lib/nanoc/core/code_snippet.rb

@@ -36,7 +36,13 @@ module Nanoc
       # @return [void]
       def load
         # rubocop:disable Security/Eval
-        eval('def self.use_helper(mod); Nanoc::Core::Context.instance_eval { include mod }; end', TOPLEVEL_BINDING)
+        eval(<<~CODE, TOPLEVEL_BINDING)
+          unless respond_to?(:use_helper)
+            def self.use_helper(mod)
+              Nanoc::Core::Context.instance_eval { include mod }
+            end
+          end
+        CODE
         eval(@data, TOPLEVEL_BINDING, @filename)
         # rubocop:enable Security/Eval
         nil

data/lib/nanoc/core/compilation_phases/cache.rb

@@ -18,15 +18,20 @@ module Nanoc
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
         def run(rep, is_outdated:)
           if can_reuse_content_for_rep?(rep, is_outdated: is_outdated)
+            # If cached content can be used for this item rep, do so, and skip
+            # recalculation of the item rep compiled content.
             Nanoc::Core::NotificationCenter.post(:cached_content_used, rep)
-
             @compiled_content_store.set_all(rep, @compiled_content_cache[rep])
           else
+            # Cached content couldn’t be used for this rep. Continue as usual with
+            # recalculation of the item rep compiled content.
             yield
+
+            # Update compiled content cache, now that the item rep is compiled.
+            @compiled_content_cache[rep] = @compiled_content_store.get_all(rep)
           end
 
           rep.compiled = true
-          @compiled_content_cache[rep] = @compiled_content_store.get_all(rep)
         end
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Bool

data/lib/nanoc/core/dependency_store.rb

@@ -19,20 +19,25 @@ module Nanoc
       def initialize(items, layouts, config)
         super(Nanoc::Core::Store.tmp_path_for(config: config, store_name: 'dependencies'), 5)
 
+        @config = config
         @items = items
         @layouts = layouts
 
-        @refs2objs = {}
-        items.each   { |o| add_vertex_for(o) }
-        layouts.each { |o| add_vertex_for(o) }
-        add_vertex_for(config)
-        add_vertex_for(items)
-        add_vertex_for(layouts)
+        rebuild_refs2objs
 
         @new_objects = []
         @graph = Nanoc::Core::DirectedGraph.new([nil] + objs2refs(@items) + objs2refs(@layouts))
       end
 
+      def rebuild_refs2objs
+        @refs2objs = {}
+        @items.each   { |o| add_vertex_for(o) }
+        @layouts.each { |o| add_vertex_for(o) }
+        add_vertex_for(@config)
+        add_vertex_for(@items)
+        add_vertex_for(@layouts)
+      end
+
       contract C_OBJ_SRC => C::ArrayOf[Nanoc::Core::Dependency]
       def dependencies_causing_outdatedness_of(object)
         objects_causing_outdatedness_of(object).map do |other_object|
@@ -53,14 +58,12 @@ module Nanoc
 
       def items=(items)
         @items = items
-        items.each { |o| @refs2objs[obj2ref(o)] = o }
-        add_vertex_for(items)
+        rebuild_refs2objs
       end
 
       def layouts=(layouts)
         @layouts = layouts
-        layouts.each { |o| @refs2objs[obj2ref(o)] = o }
-        add_vertex_for(layouts)
+        rebuild_refs2objs
       end
 
       def new_items

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.2'
+    VERSION = '4.12.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.2
+  version: 4.12.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Core of Nanoc