nanoc 4.11.4 → 4.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85541e423de2233c7f25fe59e834db564e8bc0e5930c1ba019dceac4a8e031b
-  data.tar.gz: bdb60e52d7503d860ea5e3b8056d267d7e0c13611e210988f4bc604a227c7215
+  metadata.gz: 33e67e26b0ffd077aa8a4c28ecf16e992f75486e70d8695868b166b789ad2a66
+  data.tar.gz: 9b09738037843e30d6c3c947825c5b2c3cdfeb9597e398534c97c6036a50adaa
 SHA512:
-  metadata.gz: 3ce2694d3d47c3e2ed2ba3ed947cbc989b53fdacc2209ca81a555bc40e5768c8d57cb745b7ffe30dd1bf296e0428117d5be9602dd1770c85243fad4f7b923409
-  data.tar.gz: cee8be2b76dbb7a457454abc8bd1347422034f1c80692ebc5b3ce90d64d2a79f2981650a42858079858261b2a2767a017145278204c2bdcd0bb0da8b89ba367f
+  metadata.gz: 78a5a649be27147d22e1bed0a0599db2bf1d013233cc0af24476257e1703b49351f6f268f3d617eaebf9efd74514c1f68f3d37b5254005317393119a78c3a330
+  data.tar.gz: ac3fab845b4a1677d19577965ecc683b0977528391d447337fdf4cfd358f1acfd40108e12759ebf7aa8a284261496c92f3f671face43ec35d36fbaa81cea8fad

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.11.5 (2019-04-30)
+
+Fixes:
+
+* Fixed an incompatibility introduced in Cri 2.15.4 (#1423, #1426)
+
 ## 4.11.4 (2019-04-28)
 
 Fixes:

data/lib/nanoc.rb

@@ -2,6 +2,7 @@
 
 # Load external dependencies
 require 'addressable'
+require 'colored'
 require 'ddplugin'
 require 'json'
 require 'parallel'

data/lib/nanoc/base/entities.rb

@@ -3,9 +3,5 @@
 # Re-exported from Nanoc::Core
 Nanoc::Identifier = Nanoc::Core::Identifier
 
-require_relative 'entities/props'
-require_relative 'entities/site'
-
 require_relative 'entities/outdatedness_status'
 require_relative 'entities/outdatedness_reasons'
-require_relative 'entities/dependency'

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

@@ -12,12 +12,12 @@ module Nanoc
         # @return [String] A descriptive message for this outdatedness reason
         attr_reader :message
 
-        # @return [Nanoc::Int::Props]
+        # @return [Nanoc::Core::DependencyProps]
         attr_reader :props
 
         # @param [String] message The descriptive message for this outdatedness
         #   reason
-        def initialize(message, props = Nanoc::Int::Props.new)
+        def initialize(message, props = Nanoc::Core::DependencyProps.new)
           @message = message
           @props = props
         end
@@ -25,7 +25,7 @@ module Nanoc
 
       CodeSnippetsModified = Generic.new(
         'The code snippets have been modified since the last time the site was compiled.',
-        Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
+        Nanoc::Core::DependencyProps.new(raw_content: true, attributes: true, compiled_content: true, path: true),
       )
 
       DependenciesOutdated = Generic.new(
@@ -34,17 +34,17 @@ module Nanoc
 
       NotWritten = Generic.new(
         'This item representation has not yet been written to the output directory (but it does have a path).',
-        Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
+        Nanoc::Core::DependencyProps.new(raw_content: true, attributes: true, compiled_content: true, path: true),
       )
 
       RulesModified = Generic.new(
         'The rules file has been modified since the last time the site was compiled.',
-        Props.new(compiled_content: true, path: true),
+        Nanoc::Core::DependencyProps.new(compiled_content: true, path: true),
       )
 
       ContentModified = Generic.new(
         'The content of this item has been modified since the last time the site was compiled.',
-        Props.new(raw_content: true, compiled_content: true),
+        Nanoc::Core::DependencyProps.new(raw_content: true, compiled_content: true),
       )
 
       class DocumentCollectionExtended < Generic
@@ -53,7 +53,7 @@ module Nanoc
         def initialize(objects)
           super(
             'New items/layouts have been added to the site.',
-            Props.new(raw_content: true),
+            Nanoc::Core::DependencyProps.new(raw_content: true),
           )
 
           @objects = objects
@@ -72,7 +72,7 @@ module Nanoc
         def initialize(attributes)
           super(
             'The attributes of this item have been modified since the last time the site was compiled.',
-            Props.new(attributes: true, compiled_content: true),
+            Nanoc::Core::DependencyProps.new(attributes: true, compiled_content: true),
           )
 
           @attributes = attributes
@@ -81,7 +81,7 @@ module Nanoc
 
       UsesAlwaysOutdatedFilter = Generic.new(
         'This item rep uses one or more filters that cannot track dependencies, and will thus always be considered as outdated.',
-        Props.new(raw_content: true, attributes: true, compiled_content: true),
+        Nanoc::Core::DependencyProps.new(raw_content: true, attributes: true, compiled_content: true),
       )
     end
   end

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

@@ -7,7 +7,7 @@ module Nanoc
       attr_reader :reasons
       attr_reader :props
 
-      def initialize(reasons: [], props: Props.new)
+      def initialize(reasons: [], props: Nanoc::Core::DependencyProps.new)
         @reasons = reasons
         @props = props
       end

data/lib/nanoc/base/repos/dependency_store.rb

@@ -30,15 +30,15 @@ module Nanoc
       C_OBJ_SRC = Nanoc::Core::Item
       C_OBJ_DST = C::Or[Nanoc::Core::Item, Nanoc::Core::Layout, Nanoc::Core::Configuration, Nanoc::Core::IdentifiableCollection]
 
-      contract C_OBJ_SRC => C::ArrayOf[Nanoc::Int::Dependency]
+      contract C_OBJ_SRC => C::ArrayOf[Nanoc::Core::Dependency]
       def dependencies_causing_outdatedness_of(object)
         objects_causing_outdatedness_of(object).map do |other_object|
           props = props_for(other_object, object)
 
-          Nanoc::Int::Dependency.new(
+          Nanoc::Core::Dependency.new(
             other_object,
             object,
-            Nanoc::Int::Props.new(
+            Nanoc::Core::DependencyProps.new(
               raw_content: props.fetch(:raw_content, false),
               attributes: props.fetch(:attributes, false),
               compiled_content: props.fetch(:compiled_content, false),
@@ -114,8 +114,8 @@ module Nanoc
         src_ref = obj2ref(src)
         dst_ref = obj2ref(dst)
 
-        existing_props = Nanoc::Int::Props.new(@graph.props_for(dst_ref, src_ref) || {})
-        new_props = Nanoc::Int::Props.new(raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path)
+        existing_props = Nanoc::Core::DependencyProps.new(@graph.props_for(dst_ref, src_ref) || {})
+        new_props = Nanoc::Core::DependencyProps.new(raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path)
         props = existing_props.merge(new_props)
 
         @graph.add_edge(dst_ref, src_ref, props: props.to_h)

data/lib/nanoc/base/repos/site_loader.rb

@@ -31,7 +31,7 @@ module Nanoc
 
         data_source = gen_data_source_for_config(config)
 
-        Nanoc::Int::Site.new(
+        Nanoc::Core::Site.new(
           config: config,
           code_snippets: code_snippets,
           data_source: data_source,

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

@@ -21,12 +21,12 @@ module Nanoc
         @compiled_content_store = Nanoc::Int::CompiledContentStore.new
       end
 
-      contract Nanoc::Int::Site => C::Any
+      contract Nanoc::Core::Site => C::Any
       def self.compile(site)
         new_for(site).run_until_end
       end
 
-      contract Nanoc::Int::Site => Nanoc::Int::Compiler
+      contract Nanoc::Core::Site => Nanoc::Int::Compiler
       def self.new_for(site)
         Nanoc::Int::CompilerLoader.new.load(site)
       end

data/lib/nanoc/base/services/compiler/stages/preprocess.rb

@@ -16,7 +16,7 @@ module Nanoc
             return if @site.preprocessed?
 
             if @action_provider.need_preprocessing?
-              @site.data_source = Nanoc::Core::InMemDataSource.new(@site.items, @site.layouts, @site.data_source)
+              @site.data_source = Nanoc::Core::InMemoryDataSource.new(@site.items, @site.layouts, @site.data_source)
               @action_provider.preprocess(@site)
 
               @dependency_store.items = @site.items

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

@@ -115,7 +115,7 @@ module Nanoc
       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::Int::Site, checksum_store: Nanoc::Int::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Int::DependencyStore, action_sequence_store: Nanoc::Int::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Int::ItemRepRepo] => C::Any
+      contract C::KeywordArgs[site: Nanoc::Core::Site, checksum_store: Nanoc::Int::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Int::DependencyStore, action_sequence_store: Nanoc::Int::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Int::ItemRepRepo] => C::Any
       def initialize(site:, checksum_store:, checksums:, dependency_store:, action_sequence_store:, action_sequences:, reps:)
         @site = site
         @checksum_store = checksum_store
@@ -185,7 +185,7 @@ module Nanoc
         is_outdated
       end
 
-      contract Nanoc::Int::Dependency => C::Bool
+      contract Nanoc::Core::Dependency => C::Bool
       def dependency_causes_outdatedness?(dependency)
         return true if dependency.from.nil?
 

data/lib/nanoc/checking/checks/external_links.rb

@@ -78,7 +78,7 @@ module ::Nanoc::Checking::Checks
           return Result.new(href, 'redirection without a target location') if location.nil?
 
           if /^30[18]$/.match?(res.code)
-            return Result.new(href, "link have moved permanently to '#{location}'")
+            return Result.new(href, "link has moved permanently to '#{location}'")
           end
 
           url = URI.parse(location)

data/lib/nanoc/checking/runner.rb

@@ -5,7 +5,7 @@ module Nanoc::Checking
   #
   # @api private
   class Runner
-    # @param [Nanoc::Int::Site] site The Nanoc site this runner is for
+    # @param [Nanoc::Core::Site] site The Nanoc site this runner is for
     def initialize(site)
       @site = site
     end

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -50,7 +50,7 @@ module Nanoc::RuleDSL
       end
 
       site.data_source =
-        Nanoc::Core::InMemDataSource.new(ctx.items._unwrap, ctx.layouts._unwrap, site.data_source)
+        Nanoc::Core::InMemoryDataSource.new(ctx.items._unwrap, ctx.layouts._unwrap, site.data_source)
     end
 
     def postprocess(site, compiler)

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -31,7 +31,7 @@ module Nanoc::RuleDSL
     # @api private
     attr_accessor :rules_collection
 
-    # @param [Nanoc::Int::Site] site
+    # @param [Nanoc::Core::Site] site
     # @param [Nanoc::RuleDSL::RulesCollection] rules_collection
     def initialize(site:, rules_collection:)
       @site = site

data/lib/nanoc/rule_dsl/compilation_rule.rb

@@ -5,7 +5,7 @@ module Nanoc::RuleDSL
     include Nanoc::Core::ContractsSupport
 
     contract Nanoc::Core::ItemRep, C::KeywordArgs[
-      site: Nanoc::Int::Site,
+      site: Nanoc::Core::Site,
       recorder: Nanoc::RuleDSL::ActionRecorder,
       view_context: Nanoc::ViewContextForPreCompilation,
     ] => C::Any

data/lib/nanoc/rule_dsl/compilation_rule_context.rb

@@ -6,7 +6,7 @@ module Nanoc::RuleDSL
 
     contract C::KeywordArgs[
       rep: Nanoc::Core::ItemRep,
-      site: Nanoc::Int::Site,
+      site: Nanoc::Core::Site,
       recorder: Nanoc::RuleDSL::ActionRecorder,
       view_context: Nanoc::ViewContextForPreCompilation,
     ] => C::Any

data/lib/nanoc/rule_dsl/routing_rule.rb

@@ -15,7 +15,7 @@ module Nanoc::RuleDSL
     end
 
     contract Nanoc::Core::ItemRep, C::KeywordArgs[
-      site: Nanoc::Int::Site,
+      site: Nanoc::Core::Site,
       view_context: Nanoc::ViewContextForPreCompilation,
     ] => C::Any
     def apply_to(rep, site:, view_context:)

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -6,7 +6,7 @@ module Nanoc::RuleDSL
 
     contract C::KeywordArgs[
       rep: Nanoc::Core::ItemRep,
-      site: Nanoc::Int::Site,
+      site: Nanoc::Core::Site,
       view_context: Nanoc::ViewContextForPreCompilation,
     ] => C::Any
     def initialize(rep:, site:, view_context:)

data/lib/nanoc/spec.rb

@@ -208,10 +208,10 @@ module Nanoc
 
       def site
         @_site ||=
-          Nanoc::Int::Site.new(
+          Nanoc::Core::Site.new(
             config: @config,
             code_snippets: [],
-            data_source: Nanoc::Core::InMemDataSource.new(@items, @layouts),
+            data_source: Nanoc::Core::InMemoryDataSource.new(@items, @layouts),
           )
       end
 

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.11.4'
+  VERSION = '4.11.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.4
+  version: 4.11.5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.4
+        version: 4.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.4
+        version: 4.11.5
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -155,11 +169,8 @@ files:
 - lib/nanoc/base/assertions.rb
 - lib/nanoc/base/changes_stream.rb
 - lib/nanoc/base/entities.rb
-- lib/nanoc/base/entities/dependency.rb
 - lib/nanoc/base/entities/outdatedness_reasons.rb
 - lib/nanoc/base/entities/outdatedness_status.rb
-- lib/nanoc/base/entities/props.rb
-- lib/nanoc/base/entities/site.rb
 - lib/nanoc/base/error.rb
 - lib/nanoc/base/errors.rb
 - lib/nanoc/base/feature.rb

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

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    # @api private
-    # A dependency between two items/layouts.
-    class Dependency
-      include Nanoc::Core::ContractsSupport
-
-      C_OBJ_FROM = C::Or[Nanoc::Core::Item, Nanoc::Core::Layout, Nanoc::Core::Configuration, Nanoc::Core::IdentifiableCollection]
-      C_OBJ_TO   = Nanoc::Core::Item
-
-      contract C::None => C::Maybe[C_OBJ_FROM]
-      attr_reader :from
-
-      contract C::None => C::Maybe[C_OBJ_TO]
-      attr_reader :to
-
-      contract C::None => Nanoc::Int::Props
-      attr_reader :props
-
-      contract C::Maybe[C_OBJ_FROM], C::Maybe[C_OBJ_TO], Nanoc::Int::Props => C::Any
-      def initialize(from, to, props)
-        @from  = from
-        @to    = to
-        @props = props
-      end
-
-      contract C::None => String
-      def inspect
-        "Dependency(#{@from.inspect} -> #{@to.inspect}, #{@props.inspect})"
-      end
-    end
-  end
-end

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

@@ -1,150 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    # @api private
-    class Props
-      include Nanoc::Core::ContractsSupport
-
-      attr_reader :attributes
-      attr_reader :raw_content
-
-      # TODO: Split raw_content for documents and collections
-      C_RAW_CONTENT = C::Or[C::IterOf[C::Or[String, Regexp]], C::Bool]
-      C_ATTRS = C::Or[C::IterOf[Symbol], C::Bool]
-      contract C::KeywordArgs[raw_content: C::Optional[C_RAW_CONTENT], attributes: C::Optional[C_ATTRS], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
-      def initialize(raw_content: false, attributes: false, compiled_content: false, path: false)
-        @compiled_content = compiled_content
-        @path = path
-
-        @attributes =
-          case attributes
-          when Set
-            attributes
-          when Enumerable
-            Set.new(attributes)
-          else
-            attributes
-          end
-
-        @raw_content =
-          case raw_content
-          when Set
-            raw_content
-          when Enumerable
-            Set.new(raw_content)
-          else
-            raw_content
-          end
-      end
-
-      contract C::None => String
-      def inspect
-        (+'').tap do |s|
-          s << 'Props('
-          s << (raw_content? ? 'r' : '_')
-          s << (attributes? ? 'a' : '_')
-          s << (compiled_content? ? 'c' : '_')
-          s << (path? ? 'p' : '_')
-          s << ')'
-        end
-      end
-
-      contract C::None => String
-      def to_s
-        (+'').tap do |s|
-          s << (raw_content? ? 'r' : '_')
-          s << (attributes? ? 'a' : '_')
-          s << (compiled_content? ? 'c' : '_')
-          s << (path? ? 'p' : '_')
-        end
-      end
-
-      contract C::None => C::Bool
-      def raw_content?
-        case @raw_content
-        when Enumerable
-          @raw_content.any?
-        else
-          @raw_content
-        end
-      end
-
-      contract C::None => C::Bool
-      def attributes?
-        case @attributes
-        when Enumerable
-          @attributes.any?
-        else
-          @attributes
-        end
-      end
-
-      contract C::None => C::Bool
-      def compiled_content?
-        @compiled_content
-      end
-
-      contract C::None => C::Bool
-      def path?
-        @path
-      end
-
-      contract Nanoc::Int::Props => Nanoc::Int::Props
-      def merge(other)
-        Props.new(
-          raw_content: merge_raw_content(other),
-          attributes: merge_attributes(other),
-          compiled_content: compiled_content? || other.compiled_content?,
-          path: path? || other.path?,
-        )
-      end
-
-      def merge_raw_content(other)
-        merge_prop(raw_content, other.raw_content)
-      end
-
-      def merge_attributes(other)
-        merge_prop(attributes, other.attributes)
-      end
-
-      def merge_prop(own, other)
-        case own
-        when true
-          true
-        when false
-          other
-        else
-          case other
-          when true
-            true
-          when false
-            own
-          else
-            own + other
-          end
-        end
-      end
-
-      contract C::None => Set
-      def active
-        Set.new.tap do |pr|
-          pr << :raw_content if raw_content?
-          pr << :attributes if attributes?
-          pr << :compiled_content if compiled_content?
-          pr << :path if path?
-        end
-      end
-
-      contract C::None => Hash
-      def to_h
-        {
-          raw_content: raw_content,
-          attributes: attributes,
-          compiled_content: compiled_content?,
-          path: path?,
-        }
-      end
-    end
-  end
-end

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

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    # @api private
-    class Site
-      # Error that is raised when multiple items or layouts with the same identifier exist.
-      class DuplicateIdentifierError < ::Nanoc::Error
-        def initialize(identifier, type)
-          super("There are multiple #{type}s with the #{identifier} identifier.")
-        end
-      end
-
-      include Nanoc::Core::ContractsSupport
-
-      attr_reader :code_snippets
-      attr_reader :config
-      attr_accessor :data_source
-
-      contract C::KeywordArgs[config: Nanoc::Core::Configuration, code_snippets: C::IterOf[Nanoc::Core::CodeSnippet], data_source: C::Named['Nanoc::DataSource']] => C::Any
-      def initialize(config:, code_snippets:, data_source:)
-        @config = config
-        @code_snippets = code_snippets
-        @data_source = data_source
-
-        @preprocessed = false
-
-        ensure_identifier_uniqueness(@data_source.items, 'item')
-        ensure_identifier_uniqueness(@data_source.layouts, 'layout')
-      end
-
-      def mark_as_preprocessed
-        @preprocessed = true
-      end
-
-      def preprocessed?
-        @preprocessed
-      end
-
-      def items
-        @data_source.items
-      end
-
-      def layouts
-        @data_source.layouts
-      end
-
-      contract C::None => self
-      def freeze
-        config.freeze
-        items.freeze
-        layouts.freeze
-        code_snippets.__nanoc_freeze_recursively
-        self
-      end
-
-      contract C::IterOf[C::Or[Nanoc::Core::Item, Nanoc::Core::Layout]], String => self
-      def ensure_identifier_uniqueness(objects, type)
-        seen = Set.new
-        objects.each do |obj|
-          if seen.include?(obj.identifier)
-            raise DuplicateIdentifierError.new(obj.identifier, type)
-          end
-
-          seen << obj.identifier
-        end
-        self
-      end
-    end
-  end
-end