nanoc-core 4.11.4 → 4.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ae42507c2bd9926280d8ad198a38578676110ddb6864b7f23d9d743a6c4e6ec
-  data.tar.gz: 76a1b941f030ee96ad01133b23e78cb1b74861e2ddd5f89147caf58fbccc8bc4
+  metadata.gz: 92b6e637e84298375cd003e335ee6bf5226551e27cbe5113ab5d78696f57f68c
+  data.tar.gz: 70ebd03b63bbbb75f3f40c3147c8db7d1805bbaa4242f96cc25e38184873494f
 SHA512:
-  metadata.gz: b3ddf024cd0850616dd067a9c120519d1eea6e24efd236e78ce0fb9de30065f34117c52b429ff0e4045a1872ab34f15891c618a67ce084d6313c9e19febfac25
-  data.tar.gz: ed2c07319632a3f4f4222f95fa280c1bd5f460d9b4a3561a62c35c1eba1291cae8c19a5028db18cbdea8b269d6f600fa8ed73222c6366bc84b72c4050a5f7744
+  metadata.gz: 7c7c2f35bbd945c28e6d0a42e5f69a10545c892728230bd51d501ece35ba2b9016bd1ed4fbb401f9003703231f04064060c04933aae058cdf2c4c39a53779a46
+  data.tar.gz: 07d70bd63c2d69ee64a214df9b7b8ecd57220232d53dfb89ad4c9e9ae34544cd373d66fce8f6ff7f27c31d6d59de2c99f5a228fb7ed9e5c651f30e4662ef0658

data/lib/nanoc/core/configuration.rb

@@ -19,7 +19,7 @@ module Nanoc
       }.freeze
 
       # The default configuration for a site. A site's configuration overrides
-      # these options: when a {Nanoc::Int::Site} is created with a configuration
+      # these options: when a {Nanoc::Core::Site} is created with a configuration
       # that lacks some options, the default value will be taken from
       # `DEFAULT_CONFIG`.
       DEFAULT_CONFIG = {

data/lib/nanoc/core/dependency.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    # @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::Core::DependencyProps
+      attr_reader :props
+
+      contract C::Maybe[C_OBJ_FROM], C::Maybe[C_OBJ_TO], Nanoc::Core::DependencyProps => 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/core/dependency_props.rb

@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    # @api private
+    class DependencyProps
+      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::Core::DependencyProps => Nanoc::Core::DependencyProps
+      def merge(other)
+        DependencyProps.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/core/{in_mem_data_source.rb → in_memory_data_source.rb}

@@ -2,7 +2,7 @@
 
 module Nanoc
   module Core
-    class InMemDataSource < Nanoc::Core::DataSource
+    class InMemoryDataSource < Nanoc::Core::DataSource
       attr_reader :items
       attr_reader :layouts
 

data/lib/nanoc/core/site.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    # @api private
+    class Site
+      # Error that is raised when multiple items or layouts with the same identifier exist.
+      class DuplicateIdentifierError < ::Nanoc::Core::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::Core::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

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.11.4'
+    VERSION = '4.11.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 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: ddmemoize
@@ -135,12 +135,14 @@ files:
 - lib/nanoc/core/core_ext/hash.rb
 - lib/nanoc/core/core_ext/string.rb
 - lib/nanoc/core/data_source.rb
+- lib/nanoc/core/dependency.rb
+- lib/nanoc/core/dependency_props.rb
 - lib/nanoc/core/directed_graph.rb
 - lib/nanoc/core/document.rb
 - lib/nanoc/core/error.rb
 - lib/nanoc/core/identifiable_collection.rb
 - lib/nanoc/core/identifier.rb
-- lib/nanoc/core/in_mem_data_source.rb
+- lib/nanoc/core/in_memory_data_source.rb
 - lib/nanoc/core/instrumentor.rb
 - lib/nanoc/core/item.rb
 - lib/nanoc/core/item_collection.rb
@@ -156,6 +158,7 @@ files:
 - lib/nanoc/core/processing_actions/layout.rb
 - lib/nanoc/core/processing_actions/snapshot.rb
 - lib/nanoc/core/regexp_pattern.rb
+- lib/nanoc/core/site.rb
 - lib/nanoc/core/snapshot_def.rb
 - lib/nanoc/core/string_pattern.rb
 - lib/nanoc/core/temp_filename_factory.rb