nanoc 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d007123a8daf12e6e2a49eec0faedcde6a9bfe
-  data.tar.gz: 6350ddff74b8837e0338e319bbb495dea5c8969b
+  metadata.gz: 2c17ae1096ea2748ca3eb851435e6a5f26829e1e
+  data.tar.gz: 4eae8aec9f2fc44b0ef889074d107d8ab17cc261
 SHA512:
-  metadata.gz: d67dfeb6608496945aa0cf341199b39fd137d7c12f790b1ae8eeea6ec28aa6491daf4f20cb566c5d61a50a78e870fb510a4ad8642820a902708d46e7b8b67696
-  data.tar.gz: 64a00a9a64a0b9d4b1e2e6a0953fae371b3a72e95b510b5264e9033cbda85ff877333220ef67d18c3af0dba822881251c1a8e6ade5da50dbb1f66ee4f8d18830
+  metadata.gz: 616d975f7cfdce6e6c5249e1d3366a0c55fa5ac49025410de95c7283869633767e1413739564ead853ca099634550c436dab249e02a7e96114b9cccb06bbfcf0
+  data.tar.gz: 81b97ba18790fc3755ffcc36d2ecc91c9fd0ce6f99c1f5fe26936db42b878a73021d1c8572b68297030bd3e2670bfb44b9b77474e4e4891f61e5adcd58bd1e18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.3.0)
+    nanoc (4.3.1)
       cri (~> 2.3)
       hamster (~> 3.0)
       ref (~> 2.0)
@@ -52,7 +52,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    excon (0.51.0)
+    excon (0.52.0)
     execjs (2.7.0)
     ffi (1.9.14)
     fission (0.5.0)
@@ -184,8 +184,8 @@ GEM
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
-    fuubar (2.1.1)
-      rspec (~> 3.0)
+    fuubar (2.2.0)
+      rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     guard (2.14.0)
       formatador (>= 0.2.4)
@@ -261,10 +261,11 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
+    rbvmomi (1.9.1)
+      builder (~> 3.2)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      trollop (~> 2.1)
     rdiscount (2.2.0.1)
     rdoc (4.2.1)
     redcarpet (3.3.4)

data/NEWS.md

@@ -1,5 +1,13 @@
 # Nanoc news
 
+## 4.3.1 (???)
+
+Fixes:
+
+* Fixed “outdatedness of LayoutView” error (#927, #931)
+* Fixed bug causing some checks not to appear in `nanoc check --list` (#928, #930)
+* Fixed `@item`, … not being accessible in filters defined with `Nanoc::Filter.define` (#932, #934)
+
 ## 4.3 (2016-08-21)
 
 Features:
@@ -128,7 +136,7 @@ Enhancements:
 
 * Made `#breadcrumbs_trail` explicitly fail when using full identifiers (#781, #783)
 
-## 4.1.0 (2015-12-18)
+## 4.1 (2015-12-18)
 
 Fixes:
 
@@ -212,7 +220,7 @@ Enhancements:
 
 * Lowered minimum required Ruby version from 2.2 to 2.1 (#732)
 
-## 4.0.0 (2015-11-07)
+## 4.0 (2015-11-07)
 
 Enhancements:
 
@@ -361,7 +369,7 @@ This is a major upgrade. For details on upgrading, see the [nanoc 4 upgrade guid
 
 This release provides no new features, but streamlines the API and functionality, in order to easen future development, both for features and for optimisations.
 
-## 3.8.0 (2015-05-04)
+## 3.8 (2015-05-04)
 
 Features:
 
@@ -435,7 +443,7 @@ Fixes:
 
 * Fixed bug which would cause nanoc to crash if no Gemfile is present (#447, #449)
 
-## 3.7.0 (2014-06-08)
+## 3.7 (2014-06-08)
 
 New features:
 

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

@@ -12,11 +12,14 @@ module Nanoc::Int
       end
     end
 
+    include Nanoc::Int::ContractsSupport
+
     def initialize(dependency_store)
       @dependency_store = dependency_store
       @stack = []
     end
 
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
     def enter(obj)
       unless @stack.empty?
         Nanoc::Int::NotificationCenter.post(:dependency_created, @stack.last, obj)
@@ -26,10 +29,12 @@ module Nanoc::Int
       @stack.push(obj)
     end
 
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
     def exit(_obj)
       @stack.pop
     end
 
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
     def bounce(obj)
       enter(obj)
       exit(obj)

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

@@ -38,10 +38,10 @@ module Nanoc
     extend Nanoc::Int::PluginRegistry::PluginMethods
 
     class << self
-      def define(ident)
+      def define(ident, &block)
         filter_class = Class.new(::Nanoc::Filter) { identifier(ident) }
         filter_class.send(:define_method, :run) do |content, params|
-          yield(content, params)
+          instance_exec(content, params, &block)
         end
       end
 

data/lib/nanoc/base/plugin_registry.rb

@@ -24,7 +24,8 @@ module Nanoc::Int
       #   @return [Array<Symbol>] The identifiers for this plugin
       def identifiers(*identifiers)
         if identifiers.empty?
-          Nanoc::Int::PluginRegistry.instance.identifiers_of(superclass, self)
+          registry = Nanoc::Int::PluginRegistry.instance
+          registry.identifiers_of(registry.root_class_of(self), self)
         else
           register(self, *identifiers)
         end
@@ -45,7 +46,8 @@ module Nanoc::Int
         if identifier
           identifiers(identifier)
         else
-          Nanoc::Int::PluginRegistry.instance.identifiers_of(superclass, self).first
+          registry = Nanoc::Int::PluginRegistry.instance
+          registry.identifiers_of(registry.root_class_of(self), self).first
         end
       end
 
@@ -59,13 +61,9 @@ module Nanoc::Int
       #
       # @return [void]
       def register(class_or_name, *identifiers)
-        # Find plugin class
-        klass = self
-        klass = klass.superclass while klass.superclass.respond_to?(:register)
-
-        # Register
         registry = Nanoc::Int::PluginRegistry.instance
-        registry.register(klass, class_or_name, *identifiers)
+        root = registry.root_class_of(self)
+        registry.register(root, class_or_name, *identifiers)
       end
 
       # @return [Hash<Symbol, Class>] All plugins of this type, with keys
@@ -159,6 +157,17 @@ module Nanoc::Int
       res
     end
 
+    # @param [Class] klass
+    #
+    # @return [Class]
+    #
+    # @api private
+    def root_class_of(subclass)
+      root_class = subclass
+      root_class = root_class.superclass while root_class.superclass.respond_to?(:register)
+      root_class
+    end
+
     # Returns a list of all plugins. The returned list of plugins is an array
     # with array elements in the following format:
     #

data/lib/nanoc/helpers/rendering.rb

@@ -13,9 +13,10 @@ module Nanoc::Helpers
     # @return [String, nil]
     def render(identifier, other_assigns = {}, &block)
       # Find layout
-      layout = @layouts[identifier]
-      layout ||= @layouts[identifier.__nanoc_cleaned_identifier]
-      raise Nanoc::Int::Errors::UnknownLayout.new(identifier) if layout.nil?
+      layout_view = @layouts[identifier]
+      layout_view ||= @layouts[identifier.__nanoc_cleaned_identifier]
+      raise Nanoc::Int::Errors::UnknownLayout.new(identifier) if layout_view.nil?
+      layout = layout_view.unwrap
 
       # Visit
       dependency_tracker = @config._context.dependency_tracker
@@ -30,7 +31,7 @@ module Nanoc::Helpers
         item: @item,
         item_rep: @item_rep,
         items: @items,
-        layout: layout,
+        layout: layout_view,
         layouts: @layouts,
         config: @config,
       }.merge(other_assigns)
@@ -51,7 +52,7 @@ module Nanoc::Helpers
         Nanoc::Int::NotificationCenter.post(:processing_started, layout)
 
         # Layout
-        content = layout.unwrap.content
+        content = layout.content
         arg = content.binary? ? content.filename : content.string
         result = filter.setup_and_run(arg, filter_args)
 

data/lib/nanoc/version.rb

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

data/test/base/test_dependency_tracker.rb

@@ -87,7 +87,10 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
   end
 
   def test_enter_and_exit
-    items = [mock, mock]
+    items = [
+      Nanoc::Int::Item.new('Foo', {}, '/foo.md'),
+      Nanoc::Int::Item.new('Bar', {}, '/bar.md'),
+    ]
 
     store = Nanoc::Int::DependencyStore.new(items)
     tracker = Nanoc::Int::DependencyTracker.new(store)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri