nanoc 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62464e0106788a92d1c8ebe9ff6b186fe6f00f10
-  data.tar.gz: a6d7768e4124360a3d48f5805d1b1fd4aa86dd69
+  metadata.gz: bcf1b9df213270119c9391459276baf1156c8c2b
+  data.tar.gz: 57939ccb41f7b9800f3e60309d425a7e3232e3e8
 SHA512:
-  metadata.gz: be55ec0837f06213c9673cb0ebe91e8a973f494a8b90a4c63c6757cdb7083401825a075ed952f994158f3ef72bdee204e98fe516b9c72806ab5c5a27f87effff
-  data.tar.gz: af81c35ffea130df18be4018e5f20ed18f5d348f9b923c2ebb2521113512d89e2e05238d6a955eadc339c1d553abfd6568f672b8441a61a94cde5a8cb43076e0
+  metadata.gz: 103f4ea43eb903dfdaab16054ea0dfaab142d061bc905a48493dfbdcbeccf04c4846239ed9ea5cb85c92c0c3b69c83f3f97481d4e559a791f00c9a99ce4ff5ef
+  data.tar.gz: 9e93d95dd041a8492c3c29a472dc26b8422442a80646f8389ba8603fc0c11276b2b03e8aebeb6b181a949835b8a6cdff8b3c5bf3b1ee69afa71e28bb15ea721b

data/Gemfile

@@ -3,8 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :devel do
+  gem 'contracts', '~> 0.14'
   gem 'coveralls', require: false
   gem 'guard-rake'
+  gem 'fuubar'
   gem 'minitest', '~> 5.0'
   gem 'mocha'
   gem 'pry'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.2.0)
+    nanoc (4.2.1)
       cri (~> 2.3)
 
 GEM
@@ -12,7 +12,7 @@ GEM
     addressable (2.4.0)
     adsf (1.2.1)
       rack (>= 1.0.0)
-    ast (2.2.0)
+    ast (2.3.0)
     bluecloth (2.2.0)
     builder (3.2.2)
     chunky_png (1.3.5)
@@ -35,6 +35,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    contracts (0.14.0)
     coveralls (0.8.13)
       json (~> 1.8)
       simplecov (~> 0.11.0)
@@ -155,7 +156,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.1)
+    fog-softlayer (1.1.2)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -170,7 +171,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.7.0)
+    fog-vsphere (0.8.0)
       fog-core
       rbvmomi (~> 1.8)
     fog-xenserver (0.2.3)
@@ -180,6 +181,9 @@ GEM
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
+    fuubar (2.0.0)
+      rspec (~> 3.0)
+      ruby-progressbar (~> 1.4)
     guard (2.14.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -219,21 +223,23 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.9.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     mustache (1.0.3)
     nenv (0.3.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
     parser (2.3.1.2)
       ast (~> 2.2)
+    pkg-config (1.1.7)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
     pry (0.10.3)
@@ -246,7 +252,7 @@ GEM
     rack (1.6.4)
     rainbow (2.1.0)
     rainpress (1.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -259,7 +265,7 @@ GEM
       json (~> 1.4)
     redcarpet (3.3.4)
     ref (2.0.0)
-    rouge (1.10.1)
+    rouge (2.0.1)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -334,9 +340,11 @@ DEPENDENCIES
   coderay
   coffee-script
   compass
+  contracts (~> 0.14)
   coveralls
   erubis
   fog
+  fuubar
   guard-rake
   haml
   handlebars
@@ -377,4 +385,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.12.4
+   1.12.5

data/NEWS.md

@@ -1,5 +1,12 @@
 # Nanoc news
 
+## 4.2.1 (2016-06-19)
+
+Fixes:
+
+* Fixed an occasional `WeakRef::RefError` (#863, #865)
+* Fixed `show-data` command not running preprocessor (#867, #870)
+
 ## 4.2 (2016-06-04)
 
 Enhancements:

data/lib/nanoc/base.rb

@@ -22,6 +22,7 @@ module Nanoc::Int
 end
 
 require_relative 'base/core_ext'
+require_relative 'base/contracts_support'
 
 require_relative 'base/entities'
 require_relative 'base/repos'

data/lib/nanoc/base/contracts_support.rb

@@ -0,0 +1,60 @@
+require 'singleton'
+
+module Nanoc::Int
+  # @api private
+  module ContractsSupport
+    class Ignorer
+      include Singleton
+
+      def method_missing(*_args)
+        self
+      end
+    end
+
+    module DisabledContracts
+      Any         = Ignorer.instance
+      Bool        = Ignorer.instance
+      Num         = Ignorer.instance
+      KeywordArgs = Ignorer.instance
+      Optional    = Ignorer.instance
+      Maybe       = Ignorer.instance
+      None        = Ignorer.instance
+      ArrayOf     = Ignorer.instance
+      Or          = Ignorer.instance
+      Func        = Ignorer.instance
+      RespondTo   = Ignorer.instance
+
+      def contract(*args)
+      end
+    end
+
+    module EnabledContracts
+      def contract(*args)
+        Contract(*args)
+      end
+    end
+
+    def self.included(base)
+      contracts_loadable =
+        begin
+          require 'contracts'
+          true
+        rescue LoadError
+          false
+        end
+
+      should_enable = contracts_loadable && !ENV.key?('DISABLE_CONTRACTS')
+
+      if should_enable
+        unless base.include?(::Contracts::Core)
+          base.include(::Contracts::Core)
+          base.extend(EnabledContracts)
+          base.const_set('C', ::Contracts)
+        end
+      else
+        base.extend(DisabledContracts)
+        base.const_set('C', DisabledContracts)
+      end
+    end
+  end
+end

data/lib/nanoc/base/entities.rb

@@ -1,16 +1,17 @@
+require_relative 'entities/identifier'
+require_relative 'entities/content'
+require_relative 'entities/rule_memory_action'
+require_relative 'entities/rule_memory_actions'
+
 require_relative 'entities/code_snippet'
 require_relative 'entities/configuration'
 require_relative 'entities/lazy_value'
-require_relative 'entities/content'
 require_relative 'entities/document'
-require_relative 'entities/identifier'
 require_relative 'entities/identifiable_collection'
 require_relative 'entities/item'
 require_relative 'entities/item_rep'
 require_relative 'entities/layout'
 require_relative 'entities/pattern'
 require_relative 'entities/rule_memory'
-require_relative 'entities/rule_memory_action'
-require_relative 'entities/rule_memory_actions'
 require_relative 'entities/site'
 require_relative 'entities/snapshot_def'

data/lib/nanoc/base/entities/code_snippet.rb

@@ -3,6 +3,8 @@ module Nanoc::Int
   #
   # @api private
   class CodeSnippet
+    include Nanoc::Int::ContractsSupport
+
     # A string containing the actual code in this code snippet.
     #
     # @return [String]
@@ -13,6 +15,7 @@ module Nanoc::Int
     # @return [String]
     attr_reader :filename
 
+    contract String, String => C::Any
     # Creates a new code snippet.
     #
     # @param [String] data The raw source code which will be executed before
@@ -24,11 +27,13 @@ module Nanoc::Int
       @filename = filename
     end
 
+    contract C::None => nil
     # Loads the code by executing it.
     #
     # @return [void]
     def load
       eval(@data, TOPLEVEL_BINDING, @filename)
+      nil
     end
 
     # Returns an object that can be used for uniquely identifying objects.

data/lib/nanoc/base/entities/configuration.rb

@@ -3,6 +3,8 @@ module Nanoc::Int
   #
   # @api private
   class Configuration
+    include Nanoc::Int::ContractsSupport
+
     NONE = Object.new.freeze
 
     # The default configuration for a data source. A data source's
@@ -31,6 +33,7 @@ module Nanoc::Int
       string_pattern_type: 'glob',
     }.freeze
 
+    contract Hash => C::Any
     # Creates a new configuration with the given hash.
     #
     # @param [Hash] hash The actual configuration hash
@@ -38,6 +41,7 @@ module Nanoc::Int
       @wrapped = hash.__nanoc_symbolize_keys_recursively
     end
 
+    contract C::None => self
     def with_defaults
       new_wrapped = DEFAULT_CONFIG.merge(@wrapped)
       new_wrapped[:data_sources] = new_wrapped[:data_sources].map do |ds|
@@ -47,18 +51,22 @@ module Nanoc::Int
       self.class.new(new_wrapped)
     end
 
+    contract C::None => Hash
     def to_h
       @wrapped
     end
 
+    contract C::Any => C::Bool
     def key?(key)
       @wrapped.key?(key)
     end
 
+    contract C::Any => C::Any
     def [](key)
       @wrapped[key]
     end
 
+    contract C::Any, C::Maybe[C::Any], C::Maybe[C::Func[C::None => C::Any]] => C::Any
     def fetch(key, fallback = NONE, &_block)
       @wrapped.fetch(key) do
         if !fallback.equal?(NONE)
@@ -71,30 +79,38 @@ module Nanoc::Int
       end
     end
 
+    contract C::Any, C::Any => C::Any
     def []=(key, value)
       @wrapped[key] = value
     end
 
+    contract C::Or[Hash, self] => self
     def merge(hash)
       self.class.new(@wrapped.merge(hash.to_h))
     end
 
+    contract C::Any => self
     def without(key)
       self.class.new(@wrapped.reject { |k, _v| k == key })
     end
 
+    contract C::Any => self
     def update(hash)
       @wrapped.update(hash)
+      self
     end
 
+    contract C::Func[C::Any, C::Any => C::Any] => self
     def each
       @wrapped.each { |k, v| yield(k, v) }
       self
     end
 
+    contract C::None => self
     def freeze
       super
       @wrapped.__nanoc_freeze_recursively
+      self
     end
 
     # Returns an object that can be used for uniquely identifying objects.

data/lib/nanoc/base/entities/content.rb

@@ -10,9 +10,12 @@ module Nanoc
     #
     # @api private
     class Content
+      include Nanoc::Int::ContractsSupport
+
       # @return [String, nil]
       attr_reader :filename
 
+      contract C::Maybe[String] => C::Any
       # @param [String, nil] filename
       def initialize(filename)
         if filename && Pathname.new(filename).relative?
@@ -22,14 +25,17 @@ module Nanoc
         @filename = filename
       end
 
+      contract C::None => self
       def freeze
         super
         @filename.freeze
+        self
       end
 
-      # @param [String, Proc] content The uncompiled item content (if it is textual
-      #   content) or the path to the filename containing the content (if this
-      #   is binary content).
+      contract C::Or[Nanoc::Int::Content, String, Proc], C::KeywordArgs[binary: C::Optional[C::Bool], filename: C::Optional[C::Maybe[String]]] => self
+      # @param [Nanoc::Int::Content, String, Proc] content The uncompiled item
+      #   content (if it is textual content) or the path to the filename
+      #   containing the content (if this is binary content).
       #
       # @param [Boolean] binary Whether or not this item is binary
       #
@@ -57,29 +63,36 @@ module Nanoc
 
     # @api private
     class TextualContent < Content
+      contract C::None => String
       # @return [String]
       def string
         @string.value
       end
 
+      contract C::Or[String, Proc], C::KeywordArgs[filename: C::Optional[C::Maybe[String]]] => C::Any
       def initialize(string, filename: nil)
         super(filename)
         @string = Nanoc::Int::LazyValue.new(string)
       end
 
+      contract C::None => self
       def freeze
         super
         @string.freeze
+        self
       end
 
+      contract C::None => C::Bool
       def binary?
         false
       end
 
+      # TODO: Add contract
       def marshal_dump
         [filename, string]
       end
 
+      # TODO: Add contract
       def marshal_load(array)
         @filename = array[0]
         @string = Nanoc::Int::LazyValue.new(array[1])
@@ -88,6 +101,7 @@ module Nanoc
 
     # @api private
     class BinaryContent < Content
+      contract C::None => C::Bool
       def binary?
         true
       end

data/lib/nanoc/base/entities/document.rb

@@ -2,6 +2,8 @@ module Nanoc
   module Int
     # @api private
     class Document
+      include Nanoc::Int::ContractsSupport
+
       # @return [Nanoc::Int::Content]
       attr_reader :content
 
@@ -16,6 +18,12 @@ module Nanoc
       # @return [String, nil]
       attr_accessor :checksum_data
 
+      c_content = C::Or[String, Nanoc::Int::Content]
+      c_attributes = C::Or[Hash, Proc]
+      c_identifier = C::Or[String, Nanoc::Identifier]
+      c_checksum_data = C::Optional[C::Maybe[String]]
+
+      contract c_content, c_attributes, c_identifier, C::KeywordArgs[checksum_data: c_checksum_data] => C::Any
       # @param [String, Nanoc::Int::Content] content
       #
       # @param [Hash, Proc] attributes
@@ -30,13 +38,16 @@ module Nanoc
         @checksum_data = checksum_data
       end
 
+      contract C::None => self
       # @return [void]
       def freeze
         super
         @content.freeze
         @attributes.freeze
+        self
       end
 
+      contract C::None => String
       # @abstract
       #
       # @return Unique reference to this object
@@ -44,14 +55,17 @@ module Nanoc
         raise NotImplementedError
       end
 
+      contract C::None => String
       def inspect
         "<#{self.class} identifier=\"#{identifier}\">"
       end
 
+      contract C::None => C::Num
       def hash
         self.class.hash ^ identifier.hash
       end
 
+      contract C::Any => C::Bool
       def ==(other)
         other.respond_to?(:identifier) && identifier == other.identifier
       end

data/lib/nanoc/base/entities/identifiable_collection.rb

@@ -1,6 +1,7 @@
 module Nanoc::Int
   # @api private
   class IdentifiableCollection
+    include Nanoc::Int::ContractsSupport
     include Enumerable
 
     extend Forwardable
@@ -10,12 +11,15 @@ module Nanoc::Int
     def_delegator :@objects, :<<
     def_delegator :@objects, :concat
 
+    # FIXME: use Nanoc::Int::Configuration
+    contract C::Any => C::Any
     def initialize(config)
       @config = config
 
       @objects = []
     end
 
+    contract C::None => self
     def freeze
       @objects.freeze
       @objects.each(&:freeze)
@@ -23,6 +27,7 @@ module Nanoc::Int
       super
     end
 
+    contract C::Any => C::Maybe[C::RespondTo[:identifier]]
     def [](arg)
       case arg
       when Nanoc::Identifier
@@ -36,16 +41,20 @@ module Nanoc::Int
       end
     end
 
+    contract C::None => C::ArrayOf[C::RespondTo[:identifier]]
     def to_a
       @objects
     end
 
+    contract C::None => C::Bool
     def empty?
       @objects.empty?
     end
 
+    contract C::Func[C::RespondTo[:identifier] => C::Bool] => self
     def delete_if(&block)
       @objects.delete_if(&block)
+      self
     end
 
     protected

data/lib/nanoc/base/entities/identifier.rb

@@ -1,6 +1,7 @@
 module Nanoc
   class Identifier
     include Comparable
+    include Nanoc::Int::ContractsSupport
 
     # @api private
     class InvalidIdentifierError < ::Nanoc::Error
@@ -37,6 +38,7 @@ module Nanoc
       end
     end
 
+    contract C::Any => self
     def self.from(obj)
       case obj
       when Nanoc::Identifier
@@ -48,6 +50,7 @@ module Nanoc
       end
     end
 
+    contract String, C::KeywordArgs[type: C::Optional[Symbol]] => C::Any
     def initialize(string, type: :full)
       @type = type
 
@@ -64,6 +67,7 @@ module Nanoc
       end
     end
 
+    contract C::Any => C::Bool
     def ==(other)
       case other
       when Nanoc::Identifier, String
@@ -74,40 +78,48 @@ module Nanoc
     end
     alias eql? ==
 
+    contract C::None => C::Num
     def hash
       self.class.hash ^ to_s.hash
     end
 
+    contract C::Any => C::Maybe[C::Num]
     def =~(other)
       Nanoc::Int::Pattern.from(other).match?(to_s) ? 0 : nil
     end
 
+    contract C::Any => C::Num
     def <=>(other)
       to_s <=> other.to_s
     end
 
+    contract C::None => C::Bool
     # @return [Boolean] True if this is a full-type identifier (i.e. includes
     #   the extension), false otherwise
     def full?
       @type == :full
     end
 
+    contract C::None => C::Bool
     # @return [Boolean] True if this is a legacy identifier (i.e. does not
     #   include the extension), false otherwise
     def legacy?
       @type == :legacy
     end
 
+    contract C::None => String
     # @return [String]
     def chop
       to_s.chop
     end
 
+    contract String => String
     # @return [String]
     def +(other)
       to_s + other
     end
 
+    contract String => self
     # @return [Nanoc::Identifier]
     def prefix(string)
       if string !~ /\A\//
@@ -116,6 +128,7 @@ module Nanoc
       Nanoc::Identifier.new(string.sub(/\/+\z/, '') + @string, type: @type)
     end
 
+    contract C::None => String
     # @return [String]
     def without_ext
       unless full?
@@ -131,7 +144,8 @@ module Nanoc
       end
     end
 
-    # @return [String] The extension, without a leading dot.
+    contract C::None => C::Maybe[String]
+    # @return [String, nil] The extension, without a leading dot.
     def ext
       unless full?
         raise UnsupportedLegacyOperationError
@@ -141,6 +155,7 @@ module Nanoc
       s && s[1..-1]
     end
 
+    contract C::None => String
     # @return [String]
     def without_exts
       extname = exts.join('.')
@@ -151,6 +166,7 @@ module Nanoc
       end
     end
 
+    contract C::None => C::ArrayOf[String]
     # @return [Array] List of extensions, without a leading dot.
     def exts
       unless full?
@@ -161,6 +177,7 @@ module Nanoc
       s ? s.split('.', -1).drop(1) : []
     end
 
+    contract C::None => C::ArrayOf[String]
     def components
       res = to_s.split('/')
       if res.empty?
@@ -170,14 +187,17 @@ module Nanoc
       end
     end
 
+    contract C::None => String
     def to_s
       @string
     end
 
+    contract C::None => String
     def to_str
       @string
     end
 
+    contract C::None => String
     def inspect
       "<Nanoc::Identifier type=#{@type} #{to_s.inspect}>"
     end

data/lib/nanoc/base/entities/item_rep.rb

@@ -1,6 +1,8 @@
 module Nanoc::Int
   # @api private
   class ItemRep
+    include Nanoc::Int::ContractsSupport
+
     # @return [Hash<Symbol,Nanoc::Int::Content>]
     attr_accessor :snapshot_contents
 
@@ -27,6 +29,7 @@ module Nanoc::Int
     attr_accessor :modified
     alias modified? modified
 
+    contract Nanoc::Int::Item, Symbol => C::Any
     # @param [Nanoc::Int::Item] item
     #
     # @param [Symbol] name
@@ -45,10 +48,12 @@ module Nanoc::Int
       @compiled = false
     end
 
+    contract C::None => C::Bool
     def binary?
       @snapshot_contents[:last].binary?
     end
 
+    contract C::KeywordArgs[snapshot: C::Optional[C::Maybe[Symbol]]] => String
     # Returns the compiled content from a given snapshot.
     #
     # @param [Symbol] snapshot The name of the snapshot from which to
@@ -90,6 +95,7 @@ module Nanoc::Int
       @snapshot_contents[snapshot_name].string
     end
 
+    contract Symbol => C::Bool
     # Checks whether content exists at a given snapshot.
     #
     # @return [Boolean] True if content exists for the snapshot with the
@@ -101,6 +107,7 @@ module Nanoc::Int
     end
     alias has_snapshot? snapshot?
 
+    contract C::KeywordArgs[snapshot: C::Optional[Symbol]] => C::Maybe[String]
     # Returns the item rep’s raw path. It includes the path to the output
     # directory and the full filename.
     #
@@ -112,6 +119,7 @@ module Nanoc::Int
       @raw_paths[snapshot]
     end
 
+    contract C::KeywordArgs[snapshot: C::Optional[Symbol]] => C::Maybe[String]
     # Returns the item rep’s path, as used when being linked to. It starts
     # with a slash and it is relative to the output directory. It does not
     # include the path to the output directory. It will not include the
@@ -125,6 +133,7 @@ module Nanoc::Int
       @paths[snapshot]
     end
 
+    contract C::None => nil
     # Resets the compilation progress for this item representation. This is
     # necessary when an unmet dependency is detected during compilation.
     #
@@ -133,6 +142,7 @@ module Nanoc::Int
     # @return [void]
     def forget_progress
       initialize_content
+      nil
     end
 
     # Returns an object that can be used for uniquely identifying objects.

data/lib/nanoc/base/entities/lazy_value.rb

@@ -3,6 +3,8 @@ module Nanoc::Int
   #
   # @api private
   class LazyValue
+    include Nanoc::Int::ContractsSupport
+
     # @param [Object, Proc] value_or_proc A value or a proc to generate the value
     def initialize(value_or_proc)
       @value = { raw: value_or_proc }
@@ -18,6 +20,7 @@ module Nanoc::Int
       @value[:final]
     end
 
+    contract C::Func[C::Any => C::Any] => self
     # Returns a new lazy value that will apply the given transformation when the value is requested.
     #
     # @yield resolved value
@@ -27,10 +30,12 @@ module Nanoc::Int
       Nanoc::Int::LazyValue.new(-> { yield(value) })
     end
 
+    contract C::None => self
     # @return [void]
     def freeze
       super
       @value.__nanoc_freeze_recursively unless @value[:raw]
+      self
     end
   end
 end

data/lib/nanoc/base/entities/pattern.rb

@@ -1,6 +1,9 @@
 module Nanoc::Int
   # @api private
   class Pattern
+    include Nanoc::Int::ContractsSupport
+
+    contract C::Any => self
     def self.from(obj)
       case obj
       when Nanoc::Int::StringPattern, Nanoc::Int::RegexpPattern
@@ -28,41 +31,49 @@ module Nanoc::Int
   end
 
   # @api private
-  class StringPattern
+  class StringPattern < Pattern
     MATCH_OPTS = File::FNM_PATHNAME | File::FNM_EXTGLOB
 
+    contract String => C::Any
     def initialize(string)
       @string = string
     end
 
+    contract C::Or[Nanoc::Identifier, String] => C::Bool
     def match?(identifier)
       File.fnmatch(@string, identifier.to_s, MATCH_OPTS)
     end
 
+    contract C::Or[Nanoc::Identifier, String] => nil
     def captures(_identifier)
       nil
     end
 
+    contract C::None => String
     def to_s
       @string
     end
   end
 
   # @api private
-  class RegexpPattern
+  class RegexpPattern < Pattern
+    contract Regexp => C::Any
     def initialize(regexp)
       @regexp = regexp
     end
 
+    contract C::Or[Nanoc::Identifier, String] => C::Bool
     def match?(identifier)
       (identifier.to_s =~ @regexp) != nil
     end
 
+    contract C::Or[Nanoc::Identifier, String] => C::Maybe[C::ArrayOf[String]]
     def captures(identifier)
       matches = @regexp.match(identifier.to_s)
       matches && matches.captures
     end
 
+    contract C::None => String
     def to_s
       @regexp.to_s
     end

data/lib/nanoc/base/entities/rule_memory.rb

@@ -1,5 +1,6 @@
 module Nanoc::Int
   class RuleMemory
+    include Nanoc::Int::ContractsSupport
     include Enumerable
 
     def initialize(item_rep)
@@ -7,41 +8,54 @@ module Nanoc::Int
       @actions = []
     end
 
+    contract C::None => Numeric
     def size
       @actions.size
     end
 
+    contract Numeric => C::Maybe[Nanoc::Int::RuleMemoryAction]
     def [](idx)
       @actions[idx]
     end
 
+    contract Symbol, Hash => self
     def add_filter(filter_name, params)
       @actions << Nanoc::Int::RuleMemoryActions::Filter.new(filter_name, params)
+      self
     end
 
+    contract String, C::Maybe[Hash] => self
     def add_layout(layout_identifier, params)
       @actions << Nanoc::Int::RuleMemoryActions::Layout.new(layout_identifier, params)
+      self
     end
 
+    contract Symbol, C::Bool, C::Maybe[String] => self
     def add_snapshot(snapshot_name, final, path)
       will_add_snapshot(snapshot_name) if final
       @actions << Nanoc::Int::RuleMemoryActions::Snapshot.new(snapshot_name, final, path)
+      self
     end
 
+    contract C::None => C::ArrayOf[Nanoc::Int::RuleMemoryAction]
     def snapshot_actions
       @actions.select { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Snapshot) }
     end
 
+    contract C::None => C::Bool
     def any_layouts?
       @actions.any? { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Layout) }
     end
 
+    # TODO: Add contract
     def serialize
       map(&:serialize)
     end
 
+    contract C::Func[Nanoc::Int::RuleMemoryAction => C::Any] => self
     def each
       @actions.each { |a| yield(a) }
+      self
     end
 
     private

data/lib/nanoc/base/entities/site.rb

@@ -1,8 +1,11 @@
 module Nanoc::Int
   # @api private
   class Site
+    include Nanoc::Int::ContractsSupport
+
     attr_accessor :compiler
 
+    contract C::KeywordArgs[config: Nanoc::Int::Configuration, code_snippets: C::RespondTo[:each], items: C::RespondTo[:each], layouts: C::RespondTo[:each]] => C::Any
     # @param [Nanoc::Int::Configuration] config
     # @param [Enumerable<Nanoc::Int::CodeSnippet>] code_snippets
     # @param [Enumerable<Nanoc::Int::Item>] items
@@ -17,6 +20,7 @@ module Nanoc::Int
       ensure_identifier_uniqueness(@layouts, 'layout')
     end
 
+    contract C::None => self
     # Compiles the site.
     #
     # @return [void]
@@ -24,8 +28,10 @@ module Nanoc::Int
     # @since 3.2.0
     def compile
       compiler.run_all
+      self
     end
 
+    contract C::None => Nanoc::Int::Compiler
     # Returns the compiler for this site. Will create a new compiler if none
     # exists yet.
     #
@@ -39,6 +45,7 @@ module Nanoc::Int
     attr_reader :items
     attr_reader :layouts
 
+    contract C::None => self
     # Prevents all further modifications to itself, its items, its layouts etc.
     #
     # @return [void]
@@ -47,8 +54,10 @@ module Nanoc::Int
       items.freeze
       layouts.freeze
       code_snippets.__nanoc_freeze_recursively
+      self
     end
 
+    contract C::RespondTo[:each], String => self
     def ensure_identifier_uniqueness(objects, type)
       seen = Set.new
       objects.each do |obj|
@@ -57,6 +66,7 @@ module Nanoc::Int
         end
         seen << obj.identifier
       end
+      self
     end
   end
 end

data/lib/nanoc/base/entities/snapshot_def.rb

@@ -1,13 +1,17 @@
 module Nanoc
   module Int
     class SnapshotDef
+      include Nanoc::Int::ContractsSupport
+
       attr_reader :name
 
+      contract Symbol, C::Bool => C::Any
       def initialize(name, is_final)
         @name = name
         @is_final = is_final
       end
 
+      contract C::None => C::Bool
       def final?
         @is_final
       end

data/lib/nanoc/base/memoization.rb

@@ -15,6 +15,8 @@ module Nanoc::Int
       end
     end
 
+    NONE = Object.new
+
     # Memoizes the method with the given name. The modified method will cache
     # the results of the original method, so that calling a method twice with
     # the same arguments will short-circuit and return the cached results
@@ -57,12 +59,22 @@ module Nanoc::Int
         @__memoization_cache[method_name] ||= {}
         method_cache = @__memoization_cache[method_name]
 
-        if method_cache.key?(args) && method_cache[args].weakref_alive?
-          method_cache[args].value
-        else
+        value = NONE
+        if method_cache.key?(args)
+          value =
+            begin
+              method_cache[args].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))
           end
+        else
+          value
         end
       end
     end

data/lib/nanoc/cli/command_runner.rb

@@ -44,7 +44,7 @@ module Nanoc::CLI
     # Asserts that the current working directory contains a site and loads the site into memory.
     #
     # @return [void]
-    def load_site
+    def load_site(preprocess: false)
       print 'Loading site… '
       $stdout.flush
 
@@ -52,6 +52,10 @@ module Nanoc::CLI
         raise ::Nanoc::Int::Errors::GenericTrivial, 'The current working directory does not seem to be a Nanoc site.'
       end
 
+      if preprocess
+        site.compiler.action_provider.preprocess(site)
+      end
+
       puts 'done'
     end
 

data/lib/nanoc/cli/commands/check.rb

@@ -12,8 +12,7 @@ module Nanoc::CLI::Commands
   class Check < ::Nanoc::CLI::CommandRunner
     def run
       validate_options_and_arguments
-      load_site
-      site.compiler.action_provider.preprocess(site)
+      load_site(preprocess: true)
 
       runner = Nanoc::Extra::Checking::Runner.new(site)
 

data/lib/nanoc/cli/commands/deploy.rb

@@ -13,7 +13,7 @@ option :n, :'dry-run',      'show what would be deployed'
 module Nanoc::CLI::Commands
   class Deploy < ::Nanoc::CLI::CommandRunner
     def run
-      prepare
+      load_site(preprocess: true)
 
       if options[:'list-deployers']
         list_deployers
@@ -26,12 +26,6 @@ module Nanoc::CLI::Commands
 
     private
 
-    def prepare
-      load_site
-      # FIXME: ugly to preprocess here
-      site.compiler.action_provider.preprocess(site)
-    end
-
     def list_deployers
       deployers      = Nanoc::Int::PluginRegistry.instance.find_all(Nanoc::Extra::Deployer)
       deployer_names = deployers.keys.sort_by(&:to_s)

data/lib/nanoc/cli/commands/prune.rb

@@ -15,9 +15,7 @@ flag :n, :'dry-run', 'print files to be deleted instead of actually deleting the
 module Nanoc::CLI::Commands
   class Prune < ::Nanoc::CLI::CommandRunner
     def run
-      load_site
-      # FIXME: ugly to preprocess here
-      site.compiler.action_provider.preprocess(site)
+      load_site(preprocess: true)
       site.compiler.build_reps
 
       if options.key?(:yes)

data/lib/nanoc/cli/commands/show-data.rb

@@ -9,7 +9,7 @@ EOS
 module Nanoc::CLI::Commands
   class ShowData < ::Nanoc::CLI::CommandRunner
     def run
-      load_site
+      load_site(preprocess: true)
 
       # Get data
       items   = site.items

data/lib/nanoc/version.rb

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

data/tasks/test.rake

@@ -17,7 +17,7 @@ namespace :test do
 end
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '-r ./spec/spec_helper.rb --color'
+  t.rspec_opts = '-r ./spec/spec_helper.rb --format Fuubar --color'
   t.verbose = false
 end
 

data/test/base/test_item_rep.rb

@@ -4,7 +4,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.snapshot_contents = {
       last: Nanoc::Int::TextualContent.new('last content'),
     }
@@ -19,7 +19,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre content'),
       last: Nanoc::Int::TextualContent.new('last content'),
@@ -35,7 +35,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre content'),
       last: Nanoc::Int::TextualContent.new('last content'),
@@ -51,7 +51,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre content'),
       last: Nanoc::Int::TextualContent.new('last content'),
@@ -68,7 +68,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.expects(:compiled?).returns(false)
 
     # Check
@@ -82,7 +82,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.expects(:compiled?).returns(false)
     rep.snapshot_contents = {
       pre: Nanoc::Int::TextualContent.new('pre!'),
@@ -100,7 +100,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.expects(:compiled?).returns(false)
     rep.snapshot_defs = [
       Nanoc::Int::SnapshotDef.new(:pre, true),
@@ -120,7 +120,7 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
     item = Nanoc::Int::Item.new(
       'blah blah', {}, '/'
     )
-    rep = Nanoc::Int::ItemRep.new(item, nil)
+    rep = Nanoc::Int::ItemRep.new(item, :donkeys)
     rep.expects(:compiled?).returns(false)
     rep.snapshot_defs = [
       Nanoc::Int::SnapshotDef.new(:pre, false),

data/test/filters/test_colorize_syntax.rb

@@ -406,7 +406,7 @@ after
 EOS
       expected_output = <<EOS
 before
-<pre><code class=\"language-ruby highlight\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
+<pre><code class=\"language-ruby\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
   <span class=\"k\">end</span></code></pre>
 after
 EOS
@@ -416,31 +416,4 @@ EOS
       assert_equal(expected_output, actual_output)
     end
   end
-
-  def test_rouge_with_css_class
-    if_have 'rouge', 'nokogiri' do
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = <<EOS
-before
-<pre><code class="language-ruby">
-  def foo
-  end
-</code></pre>
-after
-EOS
-      expected_output = <<EOS
-before
-<pre><code class=\"language-ruby my-class\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
-  <span class=\"k\">end</span></code></pre>
-after
-EOS
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, default_colorizer: :rouge, rouge: { css_class: 'my-class' })
-      assert_equal(expected_output, actual_output)
-    end
-  end
 end

data/test/helper.rb

@@ -1,9 +1,8 @@
+$VERBOSE = false
+
 require 'simplecov'
 SimpleCov.start
 
-require 'minitest/test'
-require 'minitest/spec'
-require 'minitest/mock'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -80,6 +80,7 @@ files:
 - lib/nanoc/base/compilation/outdatedness_checker.rb
 - lib/nanoc/base/compilation/outdatedness_reasons.rb
 - lib/nanoc/base/context.rb
+- lib/nanoc/base/contracts_support.rb
 - lib/nanoc/base/core_ext.rb
 - lib/nanoc/base/core_ext/array.rb
 - lib/nanoc/base/core_ext/hash.rb