nanoc-core 4.11.3 → 4.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81268371fca3b0d630f91ce6290ca35c685092b8a0f62ead810cc973d4a24d68
-  data.tar.gz: 101af420b1fcd1701dd3c21392bdf6623121e952d64a3be09eed90ba4dde67b4
+  metadata.gz: 7ae42507c2bd9926280d8ad198a38578676110ddb6864b7f23d9d743a6c4e6ec
+  data.tar.gz: 76a1b941f030ee96ad01133b23e78cb1b74861e2ddd5f89147caf58fbccc8bc4
 SHA512:
-  metadata.gz: 7b82d40f993402eae07367d4ae9170b3d7ad7fc80013f3f8ab8c42d944a2fa240bb37a01b693f6cfb305490eed65992d14334ecf581bc470550fcd61f5b9be8d
-  data.tar.gz: 3bfe0233488f5c1df56f09af4059031fef6b622a99c8bbd7e23981a1f4aaa48c81854b19854ae086b22e24a6b8ac870d0c07914a67e24edff9f63dd3eb1a36a0
+  metadata.gz: b3ddf024cd0850616dd067a9c120519d1eea6e24efd236e78ce0fb9de30065f34117c52b429ff0e4045a1872ab34f15891c618a67ce084d6313c9e19febfac25
+  data.tar.gz: ed2c07319632a3f4f4222f95fa280c1bd5f460d9b4a3561a62c35c1eba1291cae8c19a5028db18cbdea8b269d6f600fa8ed73222c6366bc84b72c4050a5f7744

data/lib/nanoc/core/aggregate_data_source.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    class AggregateDataSource < ::Nanoc::Core::DataSource
+      def initialize(data_sources, config)
+        super({}, '/', '/', {})
+
+        @data_sources = data_sources
+        @config = config
+      end
+
+      def items
+        @_items ||= begin
+          objs = @data_sources.flat_map(&:items)
+          Nanoc::Core::ItemCollection.new(@config, objs)
+        end
+      end
+
+      def layouts
+        @_layouts ||= begin
+          objs = @data_sources.flat_map(&:layouts)
+          Nanoc::Core::LayoutCollection.new(@config, objs)
+        end
+      end
+
+      def item_changes
+        SlowEnumeratorTools.merge(@data_sources.map(&:item_changes))
+      end
+
+      def layout_changes
+        SlowEnumeratorTools.merge(@data_sources.map(&:layout_changes))
+      end
+    end
+  end
+end

data/lib/nanoc/core/in_mem_data_source.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    class InMemDataSource < Nanoc::Core::DataSource
+      attr_reader :items
+      attr_reader :layouts
+
+      def initialize(items, layouts, orig_data_source = nil)
+        super({}, '/', '/', {})
+
+        @items = items
+        @layouts = layouts
+        @orig_data_source = orig_data_source
+      end
+
+      def item_changes
+        @orig_data_source ? @orig_data_source.item_changes : super
+      end
+
+      def layout_changes
+        @orig_data_source ? @orig_data_source.layout_changes : super
+      end
+    end
+  end
+end

data/lib/nanoc/core/version.rb

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

data/lib/nanoc/core.rb

@@ -10,6 +10,7 @@ require 'ddmemoize'
 require 'ddmetrics'
 require 'ddplugin'
 require 'hamster'
+require 'slow_enumerator_tools'
 require 'zeitwerk'
 
 module Nanoc
@@ -25,7 +26,7 @@ inflector_class = Class.new(Zeitwerk::Inflector) do
     when 'version'
       'VERSION'
     else
-      super(basename.tr('-', '_'), abspath.tr('-', '_'))
+      super
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.3
+  version: 4.11.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ddmemoize
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: slow_enumerator_tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +121,7 @@ files:
 - lib/nanoc/core/action_provider.rb
 - lib/nanoc/core/action_sequence.rb
 - lib/nanoc/core/action_sequence_builder.rb
+- lib/nanoc/core/aggregate_data_source.rb
 - lib/nanoc/core/binary_content.rb
 - lib/nanoc/core/checksum_collection.rb
 - lib/nanoc/core/checksummer.rb
@@ -125,6 +140,7 @@ files:
 - 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/instrumentor.rb
 - lib/nanoc/core/item.rb
 - lib/nanoc/core/item_collection.rb