nanoc 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebe690aeb8d31bf2425569f41d9df2e5b8dcbe81
-  data.tar.gz: 8b41f5683d233d963a3fd6a9c5384052d7265d8e
+  metadata.gz: 308b361e14b750d6171037c0167935bf806c7a5f
+  data.tar.gz: bf2db4108dc18dd6fa2602a3451ed5a2636af11e
 SHA512:
-  metadata.gz: 4527c9d34fbe098dc58cac90906a1f1e643b595736006c92d18a222c0558c2965226f06db271cb01ca1ce8f939b05ea13013f1b0650293b53a659fcf8bd10fbd
-  data.tar.gz: 59dbc24916845b1c98adfac716162fdc1c9b0984564d307741377da08c34c9ef3057574192ce9cd620eb89ed34d45bb45820dcde999f6f07bf23a77dedefbce3
+  metadata.gz: 820db95cb94318cca8afc1e6942f33e4131beb2bcc53eb0e4866079180dab65f6164e274117c53b88799b29bab3e069d245250b972a630bb5386dd3036f3a287
+  data.tar.gz: bdff99a92e4a2ff4ea4c6486bc3341728986ef259f5fe9c270c80355bf49d38d1cae5cf2f1c9b3178bce2c573313a423faca57009b7717ca1332abcab01019f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.2.2)
+    nanoc (4.2.3)
       cri (~> 2.3)
       hamster (~> 3.0)
 

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.2.3 (2016-07-03)
+
+Fixes:
+
+* Fixed issue with `#inspect` raising a `WeakRef::RefError` (#877, #897)
+
+Enhancements:
+
+* Sped up compiler (#894)
+* Improved `#inspect` output of some classes (#896)
+* Deprecated `Item#modified` and replaced it with `Item#modified_reps` (#898)
+
 ## 4.2.2 (2016-07-02)
 
 Fixes:

data/lib/nanoc.rb

@@ -20,6 +20,9 @@ module Nanoc
   end
 end
 
+# Load external dependencies
+require 'hamster'
+
 # Load general requirements
 require 'digest'
 require 'enumerator'

data/lib/nanoc/base/checksummer.rb

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

data/lib/nanoc/base/compilation/compiler.rb

@@ -191,7 +191,8 @@ module Nanoc::Int
       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)

data/lib/nanoc/base/compilation/outdatedness_checker.rb

@@ -136,7 +136,7 @@ module Nanoc::Int
     #   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)
 

data/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,7 +77,7 @@ module Nanoc::Int
         if method_cache.key?(args)
           value =
             begin
-              method_cache[args].value
+              method_cache[args].ref.value
             rescue WeakRef::RefError
               NONE
             end
@@ -71,7 +85,7 @@ module Nanoc::Int
 
         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

data/lib/nanoc/base/plugin_registry.rb

@@ -196,9 +196,7 @@ module Nanoc::Int
 
     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

data/lib/nanoc/base/views/item_rep_view.rb

@@ -77,5 +77,9 @@ module Nanoc
     def binary?
       @item_rep.binary?
     end
+
+    def inspect
+      "<#{self.class} item.identifier=#{item.identifier} name=#{name}>"
+    end
   end
 end

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

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

data/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

data/lib/nanoc/base/views/view.rb

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

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.2.2'.freeze
+  VERSION = '4.2.3'.freeze
 end

data/test/base/test_compiler.rb

@@ -208,21 +208,6 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     end
   end
 
-  def test_compile_should_recompile_all_reps
-    Nanoc::CLI.run %w(create_site bar)
-
-    FileUtils.cd('bar') do
-      Nanoc::CLI.run %w(compile)
-
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-
-      # At this point, even the already compiled items in the previous pass
-      # should have their compiled content assigned, so this should work:
-      site.compiler.reps[site.items['/index.*']][0].compiled_content
-    end
-  end
-
   def test_disallow_multiple_snapshots_with_the_same_name
     # Create site
     Nanoc::CLI.run %w(create_site bar)

data/test/base/test_memoization.rb

@@ -25,6 +25,15 @@ class Nanoc::Int::MemoizationTest < Nanoc::TestCase
     memoize :run
   end
 
+  class Upcaser
+    extend Nanoc::Int::Memoization
+
+    def run(value)
+      value.upcase
+    end
+    memoize :run
+  end
+
   def test_normal
     sample1a = Sample1.new(10)
     sample1b = Sample1.new(15)
@@ -38,4 +47,17 @@ class Nanoc::Int::MemoizationTest < Nanoc::TestCase
       assert_equal 100 * 25 + 7, sample2b.run(7)
     end
   end
+
+  def test_weak_inspect
+    upcaser = Upcaser.new
+    10_000.times do |i|
+      upcaser.run("hello world #{i}")
+    end
+
+    GC.start
+    GC.start
+
+    # Should not raise
+    upcaser.inspect
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.