nanoc 4.9.3 → 4.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d01ae1a36cc8bd7ac120b0f9f26ec0017083ec01086d2c954a45f0e4814b0fa7
-  data.tar.gz: f2bb6242846d090fb321f1136a70f955dba3b43696a0266965c225fb0fb13d7a
+  metadata.gz: c20cba14ea42f548aa3d9b8d04673dfb71caeaf66196aa9ca23d7a48548ab55d
+  data.tar.gz: bdfec8da51cf47946e97dc3121027c3519ef5e735ad744c5dea93237e8366f3a
 SHA512:
-  metadata.gz: 2180c9c63d7d19d2e87aafa2ffe0094d9685e8b0b821b7bb171ad016009668850c3aab9860f5d78a0704b90f93602f34587c987bcff748aafce1910ca4b43782
-  data.tar.gz: 53285c7562eb828a349f3d2ba42a0c022f4dd83a0e801432e5cffdf7d659e8755e9d742b4bd253d8fe05bef2ea293886892f8d57e270f2109f4f352715ee79f5
+  metadata.gz: 59c881e40b1e5fbb07888cc80cce9f7d994d0b3869b8e03b5d8e8f21cd9f1272f594250345ad1ed0fb10b9926b3098672cb62e6e759e4979bcc79e1ef4f55b27
+  data.tar.gz: e6ce2fa2784b0c942690eeeb7c564fed7ae8a15924a4737fe9b84a519e71e8551c877ca476bceb463b2c6137352976e46d4a378aa21199a6dfe8ed0453fad779

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.9.4 (2018-08-19)
+
+Fixes:
+
+* Fixed an issue where compiled content of items generated in the preprocessor would not be available in the postprocessor (#1341, #1348)
+
 ## 4.9.3 (2018-06-09)
 
 Enhancements:
@@ -1133,7 +1139,7 @@ Fixes:
 
 * Removed the list of available deployers from the `deploy` help text and moved
   them into a new `--list-deployers` option [Damien Pollet]
-* Fixed warning about `__send__ `and `object_id` being redefined on Ruby
+* Fixed warning about `__send__` and `object_id` being redefined on Ruby
   1.8.x [Justin Hileman]
 
 Enhancements:
@@ -1523,7 +1529,7 @@ Deprecated:
 
 ## 3.0.2 (2009-11-07)
 
-* Children-only identifier patterns no longer erroneously also match parent (e.g.` /foo/*/` no longer matches `/foo/`)
+* Children-only identifier patterns no longer erroneously also match parent (e.g. `/foo/*/` no longer matches `/foo/`)
 * The `create_site` command no longer uses those ugly HTML entities
 * Install message now mentions the IRC channel
 
@@ -1658,9 +1664,9 @@ Changed:
 Removed:
 
 * Several filters have been removed and replaced by newer filters:
-	* `eruby`: use `erb` or `erubis` instead
-	* `markdown`: use `bluecloth`, `rdiscount` or `maruku` instead
-	* `textile`: use `redcloth` instead
+  * `eruby`: use `erb` or `erubis` instead
+  * `markdown`: use `bluecloth`, `rdiscount` or `maruku` instead
+  * `textile`: use `redcloth` instead
 
 ## 2.0.4 (2008-05-04)
 
@@ -1739,8 +1745,8 @@ Removed:
 * The `@pages` array now also contains uncompiled pages
 * Pages with `skip_output` set to true will not be outputted
 * Added new filters
-	* Textile/RedCloth
-	* Sass
+  * Textile/RedCloth
+  * Sass
 * nanoc now warns before overwriting in `create_site`, `create_page` and `create_template` (but not in compile)
 
 ## 1.2 (2007-06-05)

data/lib/nanoc/base.rb

@@ -9,6 +9,7 @@ require_relative 'base/contracts_support'
 require_relative 'base/error'
 require_relative 'base/errors'
 require_relative 'base/changes_stream'
+require_relative 'base/assertions'
 
 require_relative 'base/entities'
 require_relative 'base/feature'

data/lib/nanoc/base/assertions.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Assertions
+    class AssertionFailure < Nanoc::Int::Errors::InternalInconsistency
+    end
+
+    module Mixin
+      def assert(assertion)
+        return unless Nanoc::Int::ContractsSupport.enabled?
+
+        unless assertion.call
+          raise AssertionFailure, "assertion failed: #{assertion.class}"
+        end
+      end
+    end
+
+    class Base
+      def call
+        raise NotImplementedError
+      end
+    end
+
+    class AllItemRepsHaveCompiledContent < Nanoc::Assertions::Base
+      def initialize(compiled_content_cache:, item_reps:)
+        @compiled_content_cache = compiled_content_cache
+        @item_reps = item_reps
+      end
+
+      def call
+        @item_reps.all? do |rep|
+          @compiled_content_cache[rep]
+        end
+      end
+    end
+  end
+end

data/lib/nanoc/base/contracts_support.rb

@@ -99,6 +99,10 @@ module Nanoc::Int
       @_contracts_support__should_enable
     end
 
+    def self.enabled?
+      setup_once
+    end
+
     def self.included(base)
       should_enable = setup_once
 

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

@@ -120,11 +120,6 @@ module Nanoc::Int
       @wrapped[key] = value
     end
 
-    def merge_recursively(c1, c2)
-      c1.merge(c2) { |_, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? merge_recursively(v1, v2) : v2 }
-    end
-    private :merge_recursively
-
     contract C::Or[Hash, self] => self
     def merge(hash)
       self.class.new(hash: merge_recursively(@wrapped, hash.to_h), env_name: @env_name)
@@ -181,5 +176,17 @@ module Nanoc::Int
     def inspect
       "<#{self.class}>"
     end
+
+    private
+
+    def merge_recursively(config1, config2)
+      config1.merge(config2) do |_, value1, value2|
+        if value1.is_a?(Hash) && value2.is_a?(Hash)
+          merge_recursively(value1, value2)
+        else
+          value2
+        end
+      end
+    end
   end
 end

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

@@ -8,11 +8,10 @@ module Nanoc::Int
   class CompiledContentCache < ::Nanoc::Int::Store
     include Nanoc::Int::ContractsSupport
 
-    contract C::KeywordArgs[config: Nanoc::Int::Configuration, items: C::IterOf[Nanoc::Int::Item]] => C::Any
-    def initialize(config:, items:)
+    contract C::KeywordArgs[config: Nanoc::Int::Configuration] => C::Any
+    def initialize(config:)
       super(Nanoc::Int::Store.tmp_path_for(config: config, store_name: 'compiled_content'), 2)
 
-      @items = items
       @cache = {}
     end
 
@@ -36,6 +35,14 @@ module Nanoc::Int
       @cache[rep.item.identifier][rep.name] = content
     end
 
+    def prune(items:)
+      item_identifiers = Set.new(items.map(&:identifier))
+
+      @cache.keys.each do |key|
+        @cache.delete(key) unless item_identifiers.include?(key)
+      end
+    end
+
     protected
 
     def data
@@ -45,12 +52,8 @@ module Nanoc::Int
     def data=(new_data)
       @cache = {}
 
-      item_identifiers = Set.new(@items.map(&:identifier))
-
       new_data.each_pair do |item_identifier, content_per_rep|
-        if item_identifiers.include?(item_identifier)
-          @cache[item_identifier] ||= content_per_rep
-        end
+        @cache[item_identifier] ||= content_per_rep
       end
     end
   end

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

@@ -2,6 +2,9 @@
 
 module Nanoc::Int::Compiler::Stages
   class CompileReps < Nanoc::Int::Compiler::Stage
+    include Nanoc::Int::ContractsSupport
+    include Nanoc::Assertions::Mixin
+
     def initialize(reps:, outdatedness_store:, dependency_store:, action_sequences:, compilation_context:, compiled_content_cache:)
       @reps = reps
       @outdatedness_store = outdatedness_store
@@ -21,8 +24,14 @@ module Nanoc::Int::Compiler::Stages
           end
         end
       end
+
+      assert Nanoc::Assertions::AllItemRepsHaveCompiledContent.new(
+        compiled_content_cache: @compiled_content_cache,
+        item_reps: @reps,
+      )
     ensure
       @outdatedness_store.store
+      @compiled_content_cache.prune(items: @reps.map(&:item).uniq)
       @compiled_content_cache.store
     end
 

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

@@ -20,10 +20,7 @@ module Nanoc::Int
         Nanoc::Int::OutdatednessStore.new(config: site.config)
 
       compiled_content_cache =
-        Nanoc::Int::CompiledContentCache.new(
-          config: site.config,
-          items: site.items,
-        )
+        Nanoc::Int::CompiledContentCache.new(config: site.config)
 
       params = {
         compiled_content_cache: compiled_content_cache,

data/lib/nanoc/cli.rb

@@ -21,6 +21,7 @@ require_relative 'cli/cleaning_stream'
 require_relative 'cli/stream_cleaners'
 require_relative 'cli/error_handler'
 require_relative 'cli/stack_trace_writer'
+require_relative 'cli/transform'
 
 require_relative 'cli/commands/compile_listeners/abstract'
 require_relative 'cli/commands/compile_listeners/debug_printer'

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

@@ -5,6 +5,7 @@ summary 'compile items of this site'
 description <<~EOS
   Compile all items of the current site.
 EOS
+no_params
 
 flag nil, :diff, 'generate diff'
 if Nanoc::Feature.enabled?(Nanoc::Feature::LIVE_CMD)

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

@@ -5,6 +5,7 @@ aliases :create_site, :cs
 summary 'create a site'
 description 'Create a new site at the given path. The site will use the `filesystem` data source.'
 flag nil, :force, 'force creation of new site'
+param :path
 
 module Nanoc::CLI::Commands
   class CreateSite < ::Nanoc::CLI::CommandRunner
@@ -29,7 +30,7 @@ module Nanoc::CLI::Commands
       data_sources:
         - type: filesystem
           encoding: utf-8
-EOS
+    EOS
 
     DEFAULT_RULES = <<~EOS unless defined? DEFAULT_RULES
       #!/usr/bin/env ruby
@@ -59,7 +60,7 @@ EOS
       end
 
       layout '/**/*', :erb
-EOS
+    EOS
 
     DEFAULT_ITEM = <<~EOS unless defined? DEFAULT_ITEM
       ---
@@ -76,7 +77,7 @@ EOS
       </ul>
 
       <p>If you need any help with customizing your Nanoc web site, be sure to check out the documentation (see sidebar), and be sure to subscribe to the discussion group (also see sidebar). Enjoy!</p>
-EOS
+    EOS
 
     DEFAULT_STYLESHEET = <<~EOS unless defined? DEFAULT_STYLESHEET
       * {
@@ -180,7 +181,7 @@ EOS
 
         line-height: 20px;
       }
-EOS
+    EOS
 
     DEFAULT_LAYOUT = <<~EOS unless defined? DEFAULT_LAYOUT
       <!DOCTYPE HTML>
@@ -212,14 +213,10 @@ EOS
           </div>
         </body>
       </html>
-EOS
+    EOS
 
     def run
-      # Extract arguments
-      if arguments.length != 1
-        raise Nanoc::Int::Errors::GenericTrivial, "usage: #{command.usage}"
-      end
-      path = arguments[0]
+      path = arguments[:path]
 
       # Check whether site exists
       if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - %w[. ..]).empty?) && !options[:force]

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

@@ -10,6 +10,7 @@ description <<~EOS
   Also see the `auto_prune` configuration option in `nanoc.yaml` (`config.yaml`
   for older Nanoc sites), which will automatically prune after compilation.
 EOS
+no_params
 
 flag :y, :yes,       'confirm deletion'
 flag :n, :'dry-run', 'print files to be deleted instead of actually deleting them'

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

@@ -7,6 +7,7 @@ description "
 Open an IRB shell on a context that contains @items, @layouts, and @config.
 "
 flag :p, :preprocess, 'run preprocessor'
+no_params
 
 module Nanoc::CLI::Commands
   class Shell < ::Nanoc::CLI::CommandRunner

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

@@ -7,6 +7,7 @@ description <<~EOS
   Show information about all items, item representations and layouts in the
   current site, along with dependency information.
 EOS
+no_params
 
 module Nanoc::CLI::Commands
   class ShowData < ::Nanoc::CLI::CommandRunner

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

@@ -7,15 +7,11 @@ description <<~EOS
   Show a list of available plugins, including filters and data sources.
   If the current directory contains a Nanoc web site, the plugins defined in this site will be shown as well.
 EOS
+no_params
 
 module Nanoc::CLI::Commands
   class ShowPlugins < ::Nanoc::CLI::CommandRunner
     def run
-      # Check arguments
-      if arguments.any?
-        raise Nanoc::Int::Errors::GenericTrivial, "usage: #{command.usage}"
-      end
-
       # Get list of plugins (before and after)
       plugins_before = PLUGIN_CLASSES.keys.each_with_object({}) { |c, acc| acc[c] = c.all }
       site = load_site

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

@@ -6,6 +6,7 @@ summary 'describe the rules for each item'
 description "
 Prints the rules used for all items and layouts in the current site.
 "
+no_params
 
 module Nanoc::CLI::Commands
   class ShowRules < ::Nanoc::CLI::CommandRunner

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

@@ -9,9 +9,10 @@ description <<~EOS
 EOS
 
 required :H, :handler, 'specify the handler to use (webrick/mongrel/...)'
-required :o, :host,    'specify the host to listen on (default: 127.0.0.1)'
-required :p, :port,    'specify the port to listen on (default: 3000)'
+required :o, :host,    'specify the host to listen on (default: 127.0.0.1)', default: '127.0.0.1'
+required :p, :port,    'specify the port to listen on (default: 3000)', transform: Nanoc::CLI::Transform::Port, default: 3000
 flag :L, :'live-reload', 'reload on changes'
+no_params
 
 module Nanoc::CLI::Commands
   class View < ::Nanoc::CLI::CommandRunner
@@ -30,8 +31,8 @@ module Nanoc::CLI::Commands
           root: File.absolute_path(config[:output_dir]),
           live: options[:'live-reload'],
           index_filenames: config[:index_filenames],
-          host: (options[:host] || '127.0.0.1'),
-          port: (options[:port] || 3000).to_i,
+          host: options.fetch(:host),
+          port: options.fetch(:port),
           handler: options[:handler],
         )
 

data/lib/nanoc/cli/transform.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Nanoc::CLI
+  # @api private
+  module Transform
+    module Port
+      RANGE = 0x0001..0xffff
+
+      def self.call(data)
+        Integer(data).tap do |int|
+          raise 'not a valid port' unless RANGE.cover?(int)
+        end
+      end
+    end
+  end
+end

data/lib/nanoc/data_sources/filesystem/tools.rb

@@ -33,6 +33,8 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
       end
     end
 
+    module_function
+
     # Returns all files in the given directory and directories below it,
     # following symlinks up to a maximum of `recursion_limit` times.
     #
@@ -78,7 +80,6 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
         end
       end.compact.flatten
     end
-    module_function :all_files_in
 
     # Returns all files and directories in the given directory and
     # directories below it.
@@ -114,7 +115,6 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
       patterns = base_patterns + extra_patterns
       Dir.glob(patterns)
     end
-    module_function :all_files_and_dirs_in
 
     # Resolves the given symlink into an absolute path.
     #
@@ -147,7 +147,6 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
         raise UnsupportedFileTypeError.new(absolute_target)
       end
     end
-    module_function :resolve_symlink
 
     # Reads the content of the file with the given name and returns a string
     # in UTF-8 encoding. The original encoding of the string is derived from
@@ -186,6 +185,5 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
 
       data
     end
-    module_function :read_file
   end
 end

data/lib/nanoc/extra/jruby_nokogiri_warner.rb

@@ -21,7 +21,7 @@ module Nanoc::Extra
 
       For details, see https://github.com/nanoc/nanoc/pull/422.
       --------------------------------------------------------------------------------
-EOS
+    EOS
 
     def self.check_and_warn
       instance.check_and_warn

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.9.3
+  version: 4.9.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: ddmemoize
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,7 @@ files:
 - bin/nanoc
 - lib/nanoc.rb
 - lib/nanoc/base.rb
+- lib/nanoc/base/assertions.rb
 - lib/nanoc/base/changes_stream.rb
 - lib/nanoc/base/contracts_support.rb
 - lib/nanoc/base/core_ext.rb
@@ -340,6 +341,7 @@ files:
 - lib/nanoc/cli/stream_cleaners/abstract.rb
 - lib/nanoc/cli/stream_cleaners/ansi_colors.rb
 - lib/nanoc/cli/stream_cleaners/utf8.rb
+- lib/nanoc/cli/transform.rb
 - lib/nanoc/data_sources.rb
 - lib/nanoc/data_sources/filesystem.rb
 - lib/nanoc/data_sources/filesystem/errors.rb