nanoc-core 4.12.14 → 4.12.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6002d238861027abd84a4b7499c56f95be1e8bf3dec412eb21051c91c11fcce
-  data.tar.gz: 3788262a93f33920e549372a34d5fcacc4a2c6d120d3acf1562499eaaaca0cfb
+  metadata.gz: 504696dcd7c11b5e8b4c960c59888723781485ed7059bb9a39cd8538f17ed6b0
+  data.tar.gz: aa3660ab2fd38cb60575d224f47525aab6dca804dbfbeb0d056b0c8e0fee5df7
 SHA512:
-  metadata.gz: 869cddca22933872511ec0b10d7a09c9d37ff3dd89de4340f88b2d6fcceee725779d0c0dd9e891f2c28e2a25adb6f7a909f378537d8d88bd5a4f128fc76b86de
-  data.tar.gz: 208bd267925b4d51df67bd0293fe6f903671089f4899c529fc63cc8d5ecd0130c434662211b2e232e115bb532a2234301c6c44e5b74fff4acfc74e93288d703d
+  metadata.gz: 6fc2dd2a837e71c286ec441ecd67199782d5498026b8670f61f0ba3e216be08ce65857a2d09921770e193621fa6da72aa4c755d357efaffc6837f4f23ccc8fdc
+  data.tar.gz: b0db461960d33ff772a1831688c140595edd58a531fc2f3b506924cc46c1b4a7792bfad74f41930eae9d2aedf08be0ea24066747e5e891bfa37207813b8e7d91

data/lib/nanoc/core/checksummer.rb

@@ -61,7 +61,7 @@ module Nanoc
 
         private
 
-        def update(obj, digest, visited = Hamster::Set.new)
+        def update(obj, digest, visited = Immutable::Set.new)
           digest.update(obj.class.to_s)
 
           if visited.include?(obj)
@@ -276,11 +276,15 @@ module Nanoc
 
       class RescueUpdateBehavior < UpdateBehavior
         def self.update(obj, digest)
+          # rubocop:disable Style/ClassEqualityComparison
+          # This Rubocop rule is disabled because the class
+          # itself might not be loaded (yet).
           if obj.class.to_s == 'Sass::Importers::Filesystem'
             digest.update('root=')
             digest.update(obj.root)
             return
           end
+          # rubocop:enable Style/ClassEqualityComparison
 
           data =
             begin

data/lib/nanoc/core/compiler.rb

@@ -5,6 +5,16 @@ module Nanoc
     class Compiler
       include Nanoc::Core::ContractsSupport
 
+      contract Nanoc::Core::Site => C::Any
+      def self.compile(site)
+        new_for(site).run_until_end
+      end
+
+      contract Nanoc::Core::Site => Nanoc::Core::Compiler
+      def self.new_for(site)
+        Nanoc::Core::CompilerLoader.new.load(site)
+      end
+
       def initialize(site, compiled_content_cache:, checksum_store:, action_sequence_store:, action_provider:, dependency_store:, outdatedness_store:)
         @site = site
 
@@ -21,16 +31,6 @@ module Nanoc
         @compiled_content_store = Nanoc::Core::CompiledContentStore.new
       end
 
-      contract Nanoc::Core::Site => C::Any
-      def self.compile(site)
-        new_for(site).run_until_end
-      end
-
-      contract Nanoc::Core::Site => Nanoc::Core::Compiler
-      def self.new_for(site)
-        Nanoc::Core::CompilerLoader.new.load(site)
-      end
-
       def run_until_preprocessed
         @_res_preprocessed ||= begin
           preprocess_stage.call

data/lib/nanoc/core/content.rb

@@ -5,6 +5,19 @@ module Nanoc
     class Content
       include Nanoc::Core::ContractsSupport
 
+      contract C::Or[self, String, Proc], C::KeywordArgs[binary: C::Optional[C::Bool], filename: C::Optional[C::Maybe[String]]] => self
+      def self.create(content, binary: false, filename: nil)
+        if content.nil?
+          raise ArgumentError, 'Cannot create nil content'
+        elsif content.is_a?(Nanoc::Core::Content)
+          content
+        elsif binary
+          Nanoc::Core::BinaryContent.new(content)
+        else
+          Nanoc::Core::TextualContent.new(content, filename: filename)
+        end
+      end
+
       contract C::None => C::Maybe[String]
       attr_reader :filename
 
@@ -24,19 +37,6 @@ module Nanoc
         self
       end
 
-      contract C::Or[self, String, Proc], C::KeywordArgs[binary: C::Optional[C::Bool], filename: C::Optional[C::Maybe[String]]] => self
-      def self.create(content, binary: false, filename: nil)
-        if content.nil?
-          raise ArgumentError, 'Cannot create nil content'
-        elsif content.is_a?(Nanoc::Core::Content)
-          content
-        elsif binary
-          Nanoc::Core::BinaryContent.new(content)
-        else
-          Nanoc::Core::TextualContent.new(content, filename: filename)
-        end
-      end
-
       contract C::None => C::Bool
       def binary?
         raise NotImplementedError

data/lib/nanoc/core/identifiable_collection.rb

@@ -20,7 +20,7 @@ module Nanoc
       # contract C::Or[Hash, C::Named['Nanoc::Core::Configuration']], C::IterOf[C::RespondTo[:identifier]], C::Maybe[String] => C::Any
       def initialize_basic(config, objects = [], name = nil)
         @config = config
-        @objects = Hamster::Vector.new(objects)
+        @objects = Immutable::Vector.new(objects)
         @name = name
       end
 

data/lib/nanoc/core/identifier.rb

@@ -164,7 +164,7 @@ module Nanoc
         end
 
         s = File.extname(@string)
-        s && s[1..-1]
+        s && s[1..]
       end
 
       contract C::None => String
@@ -195,7 +195,7 @@ module Nanoc
         if res.empty?
           []
         else
-          res[1..-1]
+          res[1..]
         end
       end
 

data/lib/nanoc/core/item.rb

@@ -6,6 +6,13 @@ module Nanoc
       def reference
         @_reference ||= "item:#{identifier}"
       end
+
+      def identifier=(new_identifier)
+        super(new_identifier)
+
+        # Invalidate memoization cache
+        @_reference = nil
+      end
     end
   end
 end

data/lib/nanoc/core/item_rep_builder.rb

@@ -6,6 +6,25 @@ module Nanoc
     class ItemRepBuilder
       include Nanoc::Core::ContractsSupport
 
+      contract Nanoc::Core::ActionSequence, Nanoc::Core::ItemRep => C::ArrayOf[Nanoc::Core::SnapshotDef]
+      def self.snapshot_defs_for(action_sequence, rep)
+        is_binary = rep.item.content.binary?
+        snapshot_defs = []
+
+        action_sequence.each do |action|
+          case action
+          when Nanoc::Core::ProcessingActions::Snapshot
+            action.snapshot_names.each do |snapshot_name|
+              snapshot_defs << Nanoc::Core::SnapshotDef.new(snapshot_name, binary: is_binary)
+            end
+          when Nanoc::Core::ProcessingActions::Filter
+            is_binary = Nanoc::Core::Filter.named!(action.filter_name).to_binary?
+          end
+        end
+
+        snapshot_defs
+      end
+
       attr_reader :reps
 
       contract Nanoc::Core::Site, Nanoc::Core::ActionProvider, Nanoc::Core::ItemRepRepo => C::Any
@@ -30,25 +49,6 @@ module Nanoc
 
         action_sequences
       end
-
-      contract Nanoc::Core::ActionSequence, Nanoc::Core::ItemRep => C::ArrayOf[Nanoc::Core::SnapshotDef]
-      def self.snapshot_defs_for(action_sequence, rep)
-        is_binary = rep.item.content.binary?
-        snapshot_defs = []
-
-        action_sequence.each do |action|
-          case action
-          when Nanoc::Core::ProcessingActions::Snapshot
-            action.snapshot_names.each do |snapshot_name|
-              snapshot_defs << Nanoc::Core::SnapshotDef.new(snapshot_name, binary: is_binary)
-            end
-          when Nanoc::Core::ProcessingActions::Filter
-            is_binary = Nanoc::Core::Filter.named!(action.filter_name).to_binary?
-          end
-        end
-
-        snapshot_defs
-      end
     end
   end
 end

data/lib/nanoc/core/layout.rb

@@ -6,6 +6,13 @@ module Nanoc
       def reference
         @_reference ||= "layout:#{identifier}"
       end
+
+      def identifier=(new_identifier)
+        super(new_identifier)
+
+        # Invalidate memoization cache
+        @_reference = nil
+      end
     end
   end
 end

data/lib/nanoc/core/outdatedness_checker.rb

@@ -80,8 +80,8 @@ module Nanoc
         )
       end
 
-      contract C_OBJ, Hamster::Set => C::Bool
-      def outdated_due_to_dependencies?(obj, processed = Hamster::Set.new)
+      contract C_OBJ, Immutable::Set => C::Bool
+      def outdated_due_to_dependencies?(obj, processed = Immutable::Set.new)
         # Convert from rep to item if necessary
         obj = obj.item if obj.is_a?(Nanoc::Core::ItemRep)
 
@@ -168,7 +168,7 @@ module Nanoc
         # outdatedness.
         matching_objects.any? do |obj|
           status = basic_outdatedness_statuses.fetch(obj)
-          status.reasons.any? { |r| Nanoc::Core::OutdatednessReasons::DocumentAdded == r }
+          status.reasons.any? { |r| r == Nanoc::Core::OutdatednessReasons::DocumentAdded }
         end
       end
 

data/lib/nanoc/core/outdatedness_rule.rb

@@ -7,19 +7,16 @@ module Nanoc
       include Nanoc::Core::ContractsSupport
       include Singleton
 
-      def call(obj, outdatedness_checker)
-        Nanoc::Core::Instrumentor.call(:outdatedness_rule_ran, self.class) do
-          apply(obj, outdatedness_checker)
-        end
+      def self.affects_path?
+        @affects_path
       end
 
-      def apply(_obj, _outdatedness_checker)
-        raise NotImplementedError.new('Nanoc::Core::OutdatednessRule subclasses must implement #apply')
+      def self.affects_attributes?
+        @affects_attributes
       end
 
-      contract C::None => String
-      def inspect
-        "#{self.class.name}(#{reason})"
+      def self.affects_compiled_content?
+        @affects_compiled_content
       end
 
       def self.affects_props(*names)
@@ -46,16 +43,19 @@ module Nanoc
         @affects_raw_content
       end
 
-      def self.affects_attributes?
-        @affects_attributes
+      def call(obj, outdatedness_checker)
+        Nanoc::Core::Instrumentor.call(:outdatedness_rule_ran, self.class) do
+          apply(obj, outdatedness_checker)
+        end
       end
 
-      def self.affects_compiled_content?
-        @affects_compiled_content
+      def apply(_obj, _outdatedness_checker)
+        raise NotImplementedError.new('Nanoc::Core::OutdatednessRule subclasses must implement #apply')
       end
 
-      def self.affects_path?
-        @affects_path
+      contract C::None => String
+      def inspect
+        "#{self.class.name}(#{reason})"
       end
     end
   end

data/lib/nanoc/core/processing_action.rb

@@ -15,7 +15,7 @@ module Nanoc
         format(
           '<%s %s>',
           self.class.to_s,
-          serialize[1..-1].map(&:inspect).join(', '),
+          serialize[1..].map(&:inspect).join(', '),
         )
       end
     end

data/lib/nanoc/core/pruner.rb

@@ -34,7 +34,7 @@ module Nanoc
       contract String => String
       def strip_output_dir(filename)
         if filename.start_with?(@config.output_dir)
-          filename[@config.output_dir.size..-1]
+          filename[@config.output_dir.size..]
         else
           filename
         end

data/lib/nanoc/core/site_loader.rb

@@ -4,16 +4,15 @@ module Nanoc
   module Core
     class SiteLoader
       ENCODING_REGEX = /\A#\s+(-\*-\s+)?(en)?coding: (?<encoding>[^\s]+)(\s+-\*-\s*)?\n{0,2}/.freeze
-
-      def new_from_cwd
-        site_from_config(Nanoc::Core::ConfigLoader.new.new_from_cwd)
-      end
-
       # @return [Boolean]
       def self.cwd_is_nanoc_site?
         Nanoc::Core::ConfigLoader.cwd_is_nanoc_site?
       end
 
+      def new_from_cwd
+        site_from_config(Nanoc::Core::ConfigLoader.new.new_from_cwd)
+      end
+
       def gen_data_source_for_config(config)
         data_sources_to_aggregate =
           with_data_sources(config) do |data_sources|

data/lib/nanoc/core/store.rb

@@ -13,6 +13,22 @@ module Nanoc
     class Store
       include Nanoc::Core::ContractsSupport
 
+      # Logic for building tmp path from active environment and store name
+      # @api private
+      contract C::KeywordArgs[config: Nanoc::Core::Configuration, store_name: String] => C::AbsolutePathString
+      def self.tmp_path_for(store_name:, config:)
+        File.absolute_path(
+          File.join(tmp_path_prefix(config.output_dir), store_name),
+          config.dir,
+        )
+      end
+
+      contract String => String
+      def self.tmp_path_prefix(output_dir)
+        dir = Digest::SHA1.hexdigest(output_dir)[0..12]
+        File.join('tmp', 'nanoc', dir)
+      end
+
       # @return [String] The name of the file where data will be loaded from and
       #   stored to.
       attr_reader :filename
@@ -35,22 +51,6 @@ module Nanoc
         @version  = version
       end
 
-      # Logic for building tmp path from active environment and store name
-      # @api private
-      contract C::KeywordArgs[config: Nanoc::Core::Configuration, store_name: String] => C::AbsolutePathString
-      def self.tmp_path_for(store_name:, config:)
-        File.absolute_path(
-          File.join(tmp_path_prefix(config.output_dir), store_name),
-          config.dir,
-        )
-      end
-
-      contract String => String
-      def self.tmp_path_prefix(output_dir)
-        dir = Digest::SHA1.hexdigest(output_dir)[0..12]
-        File.join('tmp', 'nanoc', dir)
-      end
-
       # @group Loading and storing data
 
       # @return The data that should be written to the disk

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.14'
+    VERSION = '4.12.16'
   end
 end

data/lib/nanoc/core.rb

@@ -14,7 +14,7 @@ require 'concurrent-ruby'
 require 'json_schema'
 require 'ddmetrics'
 require 'ddplugin'
-require 'hamster'
+require 'immutable'
 require 'memo_wise'
 require 'slow_enumerator_tools'
 require 'tty-platform'
@@ -47,7 +47,7 @@ module Nanoc
     #
     # @api private
     def self.version_information
-      "Nanoc #{Nanoc::VERSION} © 2007–2022 Denis Defreyne.\n" \
+      "Nanoc #{Nanoc::VERSION} © 2007–… Denis Defreyne.\n" \
       "Running #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} with RubyGems #{Gem::VERSION}.\n"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.14
+  version: 4.12.16
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-03 00:00:00.000000000 Z
+date: 2023-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hamster
+  name: immutable-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: json_schema
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Core of Nanoc