nanoc-core 4.12.3 → 4.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc7e6692696f6b2b0bbf15a7c5f0aa607af851182de259323b3f18869117ef0
-  data.tar.gz: a6964648a0eb41ffbffbda9fd9b18da1f80dd83a1a86d8564aee05f6bd5be16d
+  metadata.gz: 696f833c95259f4ac196571804aad577bf848fefe59d4f52900ddf7be3ba1866
+  data.tar.gz: 4e058aa3ebc13f7140166d69a1e8668be7740fbcfd3dcf0cdb9c5d698d17bd0c
 SHA512:
-  metadata.gz: 4ee96bf469d44eb81ee815f6adf1439dadcd7efa34fdb9f71c057888ac4b690d799506d24b3fce04d54530deca15deb3564894cd340f519fde93fdeb80295487
-  data.tar.gz: cfa697a3471cb5efb04c8d9e7f919c39b399f958b2f20a8232bd6c3d2d5214fd2a3acf4fb4308a4b094cbf02c4bb87ae050379c6a3b0421092101c2576e69432
+  metadata.gz: 6fba91ec4738cc64277c5cf0976704fee75355e5f6113691413b6d17b409aa08335221e0148f08de5ce4958cf8ad3a7b07cb315cd290be443b2b809728cc0b43
+  data.tar.gz: '09a8b04c706fa8e58e62510a19e7f8b426d826fd6209d12c092d99ec44abbd80db5665d9f34bc3f030bca8949435c52fd2d60f69f346940cf202ddce44d83cf8'

data/lib/nanoc/core/action_sequence.rb

@@ -3,9 +3,9 @@
 module Nanoc
   module Core
     class ActionSequence
-      include Nanoc::Core::ContractsSupport
+      # include Nanoc::Core::ContractsSupport
       include Enumerable
-      DDMemoize.activate(self)
+      prepend MemoWise
 
       attr_reader :item_rep
       attr_reader :actions
@@ -15,42 +15,43 @@ module Nanoc
         @actions = actions
       end
 
-      contract C::None => Numeric
+      # contract C::None => Numeric
       def size
         @actions.size
       end
 
-      contract Numeric => C::Maybe[Nanoc::Core::ProcessingAction]
+      # contract Numeric => C::Maybe[Nanoc::Core::ProcessingAction]
       def [](idx)
         @actions[idx]
       end
 
-      contract C::None => C::ArrayOf[Nanoc::Core::ProcessingAction]
+      # contract C::None => C::ArrayOf[Nanoc::Core::ProcessingAction]
       def snapshot_actions
         @actions.select { |a| a.is_a?(Nanoc::Core::ProcessingActions::Snapshot) }
       end
 
-      contract C::None => Array
+      # contract C::None => Array
       def paths
         snapshot_actions.map { |a| [a.snapshot_names, a.paths] }
       end
 
-      memoized def serialize
+      def serialize
         serialize_uncached
       end
+      memo_wise :serialize
 
-      contract C::None => Array
+      # contract C::None => Array
       def serialize_uncached
         to_a.map(&:serialize)
       end
 
-      contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
+      # contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
       def each
         @actions.each { |a| yield(a) }
         self
       end
 
-      contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
+      # contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
       def map
         self.class.new(
           @item_rep,

data/lib/nanoc/core/content.rb

@@ -11,7 +11,7 @@ module Nanoc
       contract C::Maybe[String] => C::Any
       def initialize(filename)
         if filename && Pathname.new(filename).relative?
-          raise ArgumentError, 'Content filename is not absolute'
+          raise ArgumentError, "Content filename #{filename} is not absolute"
         end
 
         @filename = filename

data/lib/nanoc/core/identifiable_collection.rb

@@ -3,9 +3,9 @@
 module Nanoc
   module Core
     class IdentifiableCollection
-      DDMemoize.activate(self)
+      prepend MemoWise
 
-      include Nanoc::Core::ContractsSupport
+      # include Nanoc::Core::ContractsSupport
       include Enumerable
 
       extend Forwardable
@@ -17,19 +17,19 @@ module Nanoc
         raise 'IdentifiableCollection is abstract and cannot be instantiated'
       end
 
-      contract C::Or[Hash, C::Named['Nanoc::Core::Configuration']], C::IterOf[C::RespondTo[:identifier]], C::Maybe[String] => C::Any
+      # 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)
         @name = name
       end
 
-      contract C::None => String
+      # contract C::None => String
       def inspect
         "<#{self.class}>"
       end
 
-      contract C::None => self
+      # contract C::None => self
       def freeze
         @objects.freeze
         each(&:freeze)
@@ -37,7 +37,7 @@ module Nanoc
         super
       end
 
-      contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+      # contract C::Any => C::Maybe[C::RespondTo[:identifier]]
       def [](arg)
         if frozen?
           get_memoized(arg)
@@ -46,7 +46,7 @@ module Nanoc
         end
       end
 
-      contract C::Any => C::IterOf[C::RespondTo[:identifier]]
+      # contract C::Any => C::IterOf[C::RespondTo[:identifier]]
       def find_all(arg)
         if frozen?
           find_all_memoized(arg)
@@ -55,27 +55,27 @@ module Nanoc
         end
       end
 
-      contract C::None => C::ArrayOf[C::RespondTo[:identifier]]
+      # contract C::None => C::ArrayOf[C::RespondTo[:identifier]]
       def to_a
         @objects.to_a
       end
 
-      contract C::None => C::Bool
+      # contract C::None => C::Bool
       def empty?
         @objects.empty?
       end
 
-      contract C::RespondTo[:identifier] => self
+      # contract C::RespondTo[:identifier] => self
       def add(obj)
         self.class.new(@config, @objects.add(obj))
       end
 
-      contract C::Func[C::RespondTo[:identifier] => C::Any] => self
+      # contract C::Func[C::RespondTo[:identifier] => C::Any] => self
       def reject(&block)
         self.class.new(@config, @objects.reject(&block))
       end
 
-      contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+      # contract C::Any => C::Maybe[C::RespondTo[:identifier]]
       def object_with_identifier(identifier)
         if frozen?
           @mapping[identifier.to_s]
@@ -86,7 +86,7 @@ module Nanoc
 
       protected
 
-      contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+      # contract C::Any => C::Maybe[C::RespondTo[:identifier]]
       def get_unmemoized(arg)
         case arg
         when Nanoc::Core::Identifier
@@ -100,21 +100,23 @@ module Nanoc
         end
       end
 
-      contract C::Any => C::Maybe[C::RespondTo[:identifier]]
-      memoized def get_memoized(arg)
-        get_unmemoized(arg)
+      # contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+      def get_memoized(_arg)
+        # TODO: Figure out how to get memo_wise to work with subclasses
+        raise 'implement in subclasses'
       end
 
-      contract C::Any => C::IterOf[C::RespondTo[:identifier]]
+      # contract C::Any => C::IterOf[C::RespondTo[:identifier]]
       def find_all_unmemoized(arg)
         pat = Pattern.from(arg)
         select { |i| pat.match?(i.identifier) }
       end
 
-      contract C::Any => C::IterOf[C::RespondTo[:identifier]]
-      memoized def find_all_memoized(arg)
+      # contract C::Any => C::IterOf[C::RespondTo[:identifier]]
+      def find_all_memoized(arg)
         find_all_unmemoized(arg)
       end
+      memo_wise :find_all_memoized
 
       def object_matching_glob(glob)
         if use_globs?
@@ -130,7 +132,7 @@ module Nanoc
         end
       end
 
-      contract C::None => C::Bool
+      # contract C::None => C::Bool
       def use_globs?
         @config[:string_pattern_type] == 'glob'
       end

data/lib/nanoc/core/item_collection.rb

@@ -3,10 +3,18 @@
 module Nanoc
   module Core
     class ItemCollection < IdentifiableCollection
+      prepend MemoWise
+
       def initialize(config, objects = [])
         initialize_basic(config, objects, 'items')
       end
 
+      # contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+      def get_memoized(arg)
+        get_unmemoized(arg)
+      end
+      memo_wise :get_memoized
+
       def reference
         'items'
       end

data/lib/nanoc/core/layout_collection.rb

@@ -3,10 +3,18 @@
 module Nanoc
   module Core
     class LayoutCollection < IdentifiableCollection
+      prepend MemoWise
+
       def initialize(config, objects = [])
         initialize_basic(config, objects, 'layouts')
       end
 
+      # contract C::Any => C::Maybe[C::RespondTo[:identifier]]
+      def get_memoized(arg)
+        get_unmemoized(arg)
+      end
+      memo_wise :get_memoized
+
       def reference
         'layouts'
       end

data/lib/nanoc/core/outdatedness_checker.rb

@@ -7,9 +7,9 @@ module Nanoc
     # @api private
     class OutdatednessChecker
       class Basic
-        DDMemoize.activate(self)
+        prepend MemoWise
 
-        include Nanoc::Core::ContractsSupport
+        # include Nanoc::Core::ContractsSupport
 
         Rules = Nanoc::Core::OutdatednessRules
 
@@ -46,16 +46,16 @@ module Nanoc
             Rules::LayoutCollectionExtended,
           ].freeze
 
-        C_OBJ_MAYBE_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection]
+        # C_OBJ_MAYBE_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection]
 
-        contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Core::ItemRepRepo] => C::Any
+        # contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Core::ItemRepRepo] => C::Any
         def initialize(outdatedness_checker:, reps:)
           @outdatedness_checker = outdatedness_checker
           @reps = reps
         end
 
-        contract C_OBJ_MAYBE_REP => C::Maybe[Nanoc::Core::OutdatednessStatus]
-        memoized def outdatedness_status_for(obj)
+        # contract C_OBJ_MAYBE_REP => C::Maybe[Nanoc::Core::OutdatednessStatus]
+        def outdatedness_status_for(obj)
           case obj
           when Nanoc::Core::ItemRep
             apply_rules(RULES_FOR_ITEM_REP, obj)
@@ -73,10 +73,11 @@ module Nanoc
             raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
           end
         end
+        memo_wise :outdatedness_status_for
 
         private
 
-        contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, Nanoc::Core::OutdatednessStatus => C::Maybe[Nanoc::Core::OutdatednessStatus]
+        # contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, Nanoc::Core::OutdatednessStatus => C::Maybe[Nanoc::Core::OutdatednessStatus]
         def apply_rules(rules, obj, status = Nanoc::Core::OutdatednessStatus.new)
           rules.inject(status) do |acc, rule|
             if !acc.useful_to_apply?(rule)
@@ -92,15 +93,15 @@ module Nanoc
           end
         end
 
-        contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[Nanoc::Core::OutdatednessStatus]
+        # contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[Nanoc::Core::OutdatednessStatus]
         def apply_rules_multi(rules, objs)
           objs.inject(Nanoc::Core::OutdatednessStatus.new) { |acc, elem| apply_rules(rules, elem, acc) }
         end
       end
 
-      DDMemoize.activate(self)
+      prepend MemoWise
 
-      include Nanoc::Core::ContractsSupport
+      # include Nanoc::Core::ContractsSupport
 
       attr_reader :checksum_store
       attr_reader :checksums
@@ -111,11 +112,11 @@ module Nanoc
 
       Reasons = Nanoc::Core::OutdatednessReasons
 
-      C_OBJ = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection]
-      C_ITEM_OR_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep]
-      C_ACTION_SEQUENCES = C::HashOf[C_OBJ => Nanoc::Core::ActionSequence]
+      # C_OBJ = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection]
+      # C_ITEM_OR_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep]
+      # C_ACTION_SEQUENCES = C::HashOf[C_OBJ => Nanoc::Core::ActionSequence]
 
-      contract C::KeywordArgs[site: Nanoc::Core::Site, checksum_store: Nanoc::Core::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Core::DependencyStore, action_sequence_store: Nanoc::Core::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Core::ItemRepRepo] => C::Any
+      # contract C::KeywordArgs[site: Nanoc::Core::Site, checksum_store: Nanoc::Core::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Core::DependencyStore, action_sequence_store: Nanoc::Core::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Core::ItemRepRepo] => C::Any
       def initialize(site:, checksum_store:, checksums:, dependency_store:, action_sequence_store:, action_sequences:, reps:)
         @site = site
         @checksum_store = checksum_store
@@ -132,12 +133,12 @@ module Nanoc
         @action_sequences.fetch(rep)
       end
 
-      contract C_OBJ => C::Bool
+      # contract C_OBJ => C::Bool
       def outdated?(obj)
         outdatedness_reasons_for(obj).any?
       end
 
-      contract C_OBJ => C::IterOf[Reasons::Generic]
+      # contract C_OBJ => C::IterOf[Reasons::Generic]
       def outdatedness_reasons_for(obj)
         reasons = basic.outdatedness_status_for(obj).reasons
         if reasons.any?
@@ -151,12 +152,12 @@ module Nanoc
 
       private
 
-      contract C::None => Basic
+      # contract C::None => Basic
       def basic
         @_basic ||= Basic.new(outdatedness_checker: self, reps: @reps)
       end
 
-      contract C_OBJ, Hamster::Set => C::Bool
+      # contract C_OBJ, Hamster::Set => C::Bool
       def outdated_due_to_dependencies?(obj, processed = Hamster::Set.new)
         # Convert from rep to item if necessary
         obj = obj.item if obj.is_a?(Nanoc::Core::ItemRep)
@@ -188,7 +189,7 @@ module Nanoc
         is_outdated
       end
 
-      contract Nanoc::Core::Dependency => C::Bool
+      # contract Nanoc::Core::Dependency => C::Bool
       def dependency_causes_outdatedness?(dependency)
         return true if dependency.from.nil?
 

data/lib/nanoc/core/outdatedness_rules/code_snippets_modified.rb

@@ -4,9 +4,9 @@ module Nanoc
   module Core
     module OutdatednessRules
       class CodeSnippetsModified < Nanoc::Core::OutdatednessRule
-        DDMemoize.activate(self)
+        prepend MemoWise
 
-        include Nanoc::Core::ContractsSupport
+        # include Nanoc::Core::ContractsSupport
 
         affects_props :raw_content, :attributes, :compiled_content, :path
 
@@ -18,13 +18,14 @@ module Nanoc
 
         private
 
-        memoized def any_snippets_modified?(outdatedness_checker)
+        def any_snippets_modified?(outdatedness_checker)
           outdatedness_checker.site.code_snippets.any? do |cs|
             ch_old = outdatedness_checker.checksum_store[cs]
             ch_new = outdatedness_checker.checksums.checksum_for(cs)
             ch_old != ch_new
           end
         end
+        memo_wise :any_snippets_modified?
       end
     end
   end

data/lib/nanoc/core/version.rb

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

data/lib/nanoc/core.rb

@@ -11,10 +11,10 @@ require 'yaml'
 # External gems
 require 'concurrent-ruby'
 require 'json_schema'
-require 'ddmemoize'
 require 'ddmetrics'
 require 'ddplugin'
 require 'hamster'
+require 'memo_wise'
 require 'slow_enumerator_tools'
 require 'tty-platform'
 require 'zeitwerk'
@@ -38,7 +38,7 @@ module Nanoc
     #
     # @api private
     def self.version_information
-      "Nanoc #{Nanoc::VERSION} © 2007–2021 Denis Defreyne.\n" \
+      "Nanoc #{Nanoc::VERSION} © 2007–2022 Denis Defreyne.\n" \
       "Running #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} with RubyGems #{Gem::VERSION}.\n"
     end
 
@@ -51,8 +51,6 @@ module Nanoc
   end
 end
 
-DDMemoize.enable_metrics
-
 inflector_class = Class.new(Zeitwerk::Inflector) do
   def camelize(basename, abspath)
     case basename

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.3
+  version: 4.12.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-09 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: ddmemoize
+  name: ddmetrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ddmetrics
+  name: ddplugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ddplugin
+  name: hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: hamster
+  name: json_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: json_schema
+  name: memo_wise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: slow_enumerator_tools
   requirement: !ruby/object:Gem::Requirement
@@ -284,7 +284,8 @@ files:
 homepage: https://nanoc.ws/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -300,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Core of Nanoc