nanoc-core 4.12.9 → 4.12.11

data/lib/nanoc/core/outdatedness_status.rb

@@ -13,7 +13,12 @@ module Nanoc
       end
 
       def useful_to_apply?(rule)
-        (rule.affected_props - @props.active).any?
+        return true if rule.affects_raw_content? && !@props.raw_content?
+        return true if rule.affects_attributes? && !@props.attributes?
+        return true if rule.affects_compiled_content? && !@props.compiled_content?
+        return true if rule.affects_path? && !@props.path?
+
+        false
       end
 
       def update(reason)

data/lib/nanoc/core/store.rb

@@ -7,11 +7,7 @@ module Nanoc
     # graphs.
     #
     # Each store has a version number. When attempting to load data from a store
-    # that has an incompatible version number, no data will be loaded, but
-    # {#version_mismatch_detected} will be called.
-    #
-    # @abstract Subclasses must implement {#data} and {#data=}, and may
-    #   implement {#no_data_found} and {#version_mismatch_detected}.
+    # that has an incompatible version number, no data will be loaded.
     #
     # @api private
     class Store
@@ -78,17 +74,8 @@ module Nanoc
       #
       # @return [void]
       def load
-        return unless File.file?(filename)
-
-        begin
-          pstore.transaction(true) do
-            return if pstore[:version] != version
-
-            self.data = pstore[:data]
-          end
-        rescue
-          FileUtils.rm_f(filename)
-          load
+        Nanoc::Core::Instrumentor.call(:store_loaded, self.class) do
+          load_uninstrumented
         end
       end
 
@@ -97,18 +84,64 @@ module Nanoc
       #
       # @return [void]
       def store
-        FileUtils.mkdir_p(File.dirname(filename))
-
-        pstore.transaction do
-          pstore[:data]    = data
-          pstore[:version] = version
+        # NOTE: Yes, the “store stored” name is a little silly. Maybe stores
+        # need to be renamed to databases or so.
+        Nanoc::Core::Instrumentor.call(:store_stored, self.class) do
+          store_uninstrumented
         end
       end
 
       private
 
-      def pstore
-        @pstore ||= PStore.new(filename)
+      def load_uninstrumented
+        unsafe_load_uninstrumented
+      rescue
+        # An error occurred! Remove the database and try again
+        FileUtils.rm_f(version_filename)
+        FileUtils.rm_f(data_filename)
+
+        # Try again
+        unsafe_load_uninstrumented
+      end
+
+      def store_uninstrumented
+        FileUtils.mkdir_p(File.dirname(filename))
+
+        write_obj_to_file(version_filename, version)
+        write_obj_to_file(data_filename, data)
+
+        # Remove old file (back from the PStore days), if there are any.
+        FileUtils.rm_f(filename)
+      end
+
+      # Unsafe, because it can throw exceptions.
+      def unsafe_load_uninstrumented
+        # If there is no database, no point in loading anything
+        return unless File.file?(version_filename)
+
+        # Check if store version is the expected version. If it is not, don’t
+        # load.
+        read_version = read_obj_from_file(version_filename)
+        return if read_version != version
+
+        # Load data
+        self.data = read_obj_from_file(data_filename)
+      end
+
+      def write_obj_to_file(fn, obj)
+        File.binwrite(fn, Marshal.dump(obj))
+      end
+
+      def read_obj_from_file(fn)
+        Marshal.load(File.binread(fn))
+      end
+
+      def version_filename
+        "#{filename}.version.db"
+      end
+
+      def data_filename
+        "#{filename}.data.db"
       end
     end
   end

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.9'
+    VERSION = '4.12.11'
   end
 end

data/lib/nanoc/core.rb

@@ -33,6 +33,14 @@ module Nanoc
     # thus cannot be used to mean the presence of nothing.
     UNDEFINED = Object.new
 
+    def UNDEFINED.inspect
+      '<UNDEFINED>'
+    end
+
+    def UNDEFINED.to_s
+      inspect
+    end
+
     # @return [String] A string containing information about this Nanoc version
     #   and its environment (Ruby engine and version, Rubygems version if any).
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.9
+  version: 4.12.11
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -169,6 +169,7 @@ files:
 - lib/nanoc/core/basic_item_rep_collection_view.rb
 - lib/nanoc/core/basic_item_rep_view.rb
 - lib/nanoc/core/basic_item_view.rb
+- lib/nanoc/core/basic_outdatedness_checker.rb
 - lib/nanoc/core/binary_compiled_content_cache.rb
 - lib/nanoc/core/binary_content.rb
 - lib/nanoc/core/changes_stream.rb
@@ -315,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Core of Nanoc