Merge branch 'release-4.2.x'

Author: denisdefreyne

lib/nanoc.rb

@@ -20,6 +20,9 @@ def self.on_windows?
   end
 end
 
+# Load external dependencies
+require 'hamster'
+
 # Load general requirements
 require 'digest'
 require 'enumerator'

lib/nanoc/base/checksummer.rb

@@ -1,5 +1,3 @@
-require 'hamster'
-
 module Nanoc::Int
   # Creates checksums for given objects.
   #

lib/nanoc/base/compilation/compiler.rb

@@ -191,7 +191,8 @@ def compile_reps
       end
 
       # Find item reps to compile and compile them
-      selector = Nanoc::Int::ItemRepSelector.new(@reps)
+      outdated_reps = @reps.select { |r| outdatedness_checker.outdated?(r) }
+      selector = Nanoc::Int::ItemRepSelector.new(outdated_reps)
       selector.each do |rep|
         @stack = []
         compile_rep(rep)

lib/nanoc/base/compilation/outdatedness_checker.rb

@@ -136,7 +136,7 @@ def basic_outdatedness_reason_for(obj)
     #   indefinitely. It should not be necessary to pass this a custom value.
     #
     # @return [Boolean] true if the object is outdated, false otherwise
-    def outdated_due_to_dependencies?(obj, processed = Set.new)
+    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::Int::ItemRep)
 

lib/nanoc/base/memoization.rb

@@ -8,6 +8,20 @@ module Nanoc::Int
   # @since 3.2.0
   module Memoization
     class Wrapper
+      attr_reader :ref
+
+      def initialize(ref)
+        @ref = ref
+      end
+
+      def inspect
+        @ref.inspect
+      rescue WeakRef::RefError
+        '<weak ref collected>'
+      end
+    end
+
+    class Value
       attr_reader :value
 
       def initialize(value)
@@ -63,15 +77,15 @@ def memoize(method_name)
         if method_cache.key?(args)
           value =
             begin
-              method_cache[args].value
+              method_cache[args].ref.value
             rescue WeakRef::RefError
               NONE
             end
         end
 
         if value.equal?(NONE)
           send(original_method_name, *args).tap do |r|
-            method_cache[args] = WeakRef.new(Wrapper.new(r))
+            method_cache[args] = Wrapper.new(WeakRef.new(Value.new(r)))
           end
         else
           value

lib/nanoc/base/plugin_registry.rb

@@ -196,9 +196,7 @@ def all
 
     def resolve(class_or_name, _klass)
       if class_or_name.is_a?(String)
-        class_or_name.scan(/\w+/).reduce(Kernel) do |memo, part|
-          memo.const_get(part)
-        end
+        Kernel.const_get(class_or_name)
       else
         class_or_name
       end

lib/nanoc/base/views/item_rep_view.rb

@@ -77,5 +77,9 @@ def raw_path(snapshot: :last)
     def binary?
       @item_rep.binary?
     end
+
+    def inspect
+      "<#{self.class} item.identifier=#{item.identifier} name=#{name}>"
+    end
   end
 end

lib/nanoc/base/views/mixins/document_view_mixin.rb

@@ -76,5 +76,9 @@ def reference
     def raw_content
       unwrap.content.string
     end
+
+    def inspect
+      "<#{self.class} identifier=#{unwrap.identifier}>"
+    end
   end
 end

lib/nanoc/base/views/post_compile_item_view.rb

@@ -1,7 +1,12 @@
 module Nanoc
   class PostCompileItemView < Nanoc::ItemWithRepsView
+    # @deprecated Use {#modified_reps} instead
     def modified
-      reps.select { |rep| rep.unwrap.modified }
+      modified_reps
+    end
+
+    def modified_reps
+      reps.select { |rep| rep.unwrap.modified? }
     end
   end
 end

lib/nanoc/base/views/view.rb

@@ -23,5 +23,9 @@ def unwrap
     def frozen?
       unwrap.frozen?
     end
+
+    def inspect
+      "<#{self.class}>"
+    end
   end
 end