nanoc 4.11.3 → 4.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5efc6d26dd09a85227e75e05633aa88a5af1fad6a141831e7958d22777c457
-  data.tar.gz: 53db1fb790e25df48988c9aa3c4ce08806bfd6e57217ffb44c6d35cabf6626d5
+  metadata.gz: f85541e423de2233c7f25fe59e834db564e8bc0e5930c1ba019dceac4a8e031b
+  data.tar.gz: bdb60e52d7503d860ea5e3b8056d267d7e0c13611e210988f4bc604a227c7215
 SHA512:
-  metadata.gz: 84eada303df7cef2126c6cf0c655e4bb1053ea50162827bf14f21b308e72ab4107e90c39530c73414db9c8bf0ec2ef5d46bb872dcc650f2bef337db59ffae6fd
-  data.tar.gz: 4db294481349814d49966c8612e780a9a789dc2c1cf74a0b92ffe9cafa42ad3db0fd3403f090043bef806d7778e33639efa64efe98af1d221b894020cd3225d9
+  metadata.gz: 3ce2694d3d47c3e2ed2ba3ed947cbc989b53fdacc2209ca81a555bc40e5768c8d57cb745b7ffe30dd1bf296e0428117d5be9602dd1770c85243fad4f7b923409
+  data.tar.gz: cee8be2b76dbb7a457454abc8bd1347422034f1c80692ebc5b3ce90d64d2a79f2981650a42858079858261b2a2767a017145278204c2bdcd0bb0da8b89ba367f

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2018 Denis Defreyne and contributors
+Copyright (c) 2007–… Denis Defreyne and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.11.4 (2019-04-28)
+
+Fixes:
+
+* Fixed an issue which could cause `#compiled_content` to sometimes return compiled content that erroneously includes the layout (#1412, #1421)
+
 ## 4.11.3 (2019-04-27)
 
 Enhancements:

data/lib/nanoc.rb

@@ -5,7 +5,6 @@ require 'addressable'
 require 'ddplugin'
 require 'json'
 require 'parallel'
-require 'slow_enumerator_tools'
 
 module Nanoc
   # @return [String] A string containing information about this Nanoc version
@@ -13,7 +12,7 @@ module Nanoc
   #
   # @api private
   def self.version_information
-    "Nanoc #{Nanoc::VERSION} © 2007-2018 Denis Defreyne.\n" \
+    "Nanoc #{Nanoc::VERSION} © 2007–2019 Denis Defreyne.\n" \
     "Running #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} with RubyGems #{Gem::VERSION}.\n"
   end
 

data/lib/nanoc/base/repos.rb

@@ -16,6 +16,4 @@ require_relative 'repos/outdatedness_store'
 require_relative 'repos/action_sequence_store'
 require_relative 'repos/site_loader'
 require_relative 'repos/compiled_content_store'
-require_relative 'repos/in_mem_data_source'
-require_relative 'repos/aggregate_data_source'
 require_relative 'repos/prefixed_data_source'

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

@@ -44,7 +44,8 @@ module Nanoc
       contract C::KeywordArgs[rep: Nanoc::Core::ItemRep, snapshot: C::Optional[C::Maybe[Symbol]]] => Nanoc::Core::Content
       def raw_compiled_content(rep:, snapshot: nil)
         # Get name of last pre-layout snapshot
-        snapshot_name = snapshot || (get(rep, :pre) ? :pre : :last)
+        has_pre = rep.snapshot_defs.any? { |sd| sd.name == :pre }
+        snapshot_name = snapshot || (has_pre ? :pre : :last)
 
         # Check existance of snapshot
         snapshot_def = rep.snapshot_defs.reverse.find { |sd| sd.name == snapshot_name }

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

@@ -20,7 +20,7 @@ module Nanoc
             end
           end
 
-        Nanoc::Int::AggregateDataSource.new(data_sources_to_aggregate, config)
+        Nanoc::Core::AggregateDataSource.new(data_sources_to_aggregate, config)
       end
 
       private

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::Int::InMemDataSource.new(@site.items, @site.layouts, @site.data_source)
+              @site.data_source = Nanoc::Core::InMemDataSource.new(@site.items, @site.layouts, @site.data_source)
               @action_provider.preprocess(@site)
 
               @dependency_store.items = @site.items

data/lib/nanoc/cli.rb

@@ -128,7 +128,7 @@ module Nanoc::CLI
       begin
         Bundler.require(:nanoc)
       rescue Bundler::GemfileNotFound
-        # When running nanoc with Bundler being defined but
+        # When running Nanoc with Bundler being defined but
         # no gemfile being present (rubygems automatically loads
         # Bundler when executing from command line), don't crash.
       end

data/lib/nanoc/cli/commands/create-site.rb

@@ -242,7 +242,7 @@ module Nanoc::CLI::Commands
         write('layouts/default.html', DEFAULT_LAYOUT)
       end
 
-      puts "Created a blank nanoc site at '#{path}'. Enjoy!"
+      puts "Created a blank Nanoc site at '#{path}'. Enjoy!"
     end
 
     private

data/lib/nanoc/rule_dsl/action_provider.rb

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

data/lib/nanoc/spec.rb

@@ -211,7 +211,7 @@ module Nanoc
           Nanoc::Int::Site.new(
             config: @config,
             code_snippets: [],
-            data_source: Nanoc::Int::InMemDataSource.new(@items, @layouts),
+            data_source: Nanoc::Core::InMemDataSource.new(@items, @layouts),
           )
       end
 

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 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: addressable
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.3
+        version: 4.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.3
+        version: 4.11.4
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !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: tomlrb
   requirement: !ruby/object:Gem::Requirement
@@ -179,14 +165,12 @@ files:
 - lib/nanoc/base/feature.rb
 - lib/nanoc/base/repos.rb
 - lib/nanoc/base/repos/action_sequence_store.rb
-- lib/nanoc/base/repos/aggregate_data_source.rb
 - lib/nanoc/base/repos/binary_compiled_content_cache.rb
 - lib/nanoc/base/repos/checksum_store.rb
 - lib/nanoc/base/repos/compiled_content_cache.rb
 - lib/nanoc/base/repos/compiled_content_store.rb
 - lib/nanoc/base/repos/config_loader.rb
 - lib/nanoc/base/repos/dependency_store.rb
-- lib/nanoc/base/repos/in_mem_data_source.rb
 - lib/nanoc/base/repos/item_rep_repo.rb
 - lib/nanoc/base/repos/outdatedness_store.rb
 - lib/nanoc/base/repos/prefixed_data_source.rb

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    class AggregateDataSource < Nanoc::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/base/repos/in_mem_data_source.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    class InMemDataSource < Nanoc::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