nanoc 4.11.8 → 4.11.9

data/lib/nanoc/base/services/outdatedness_rules/rules_modified.rb

@@ -3,19 +3,19 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class RulesModified < Nanoc::Int::OutdatednessRule
+      class RulesModified < Nanoc::Core::OutdatednessRule
         affects_props :compiled_content, :path
 
         def apply(obj, outdatedness_checker)
           # Check rules of obj itself
           if rules_modified?(obj, outdatedness_checker)
-            return Nanoc::Int::OutdatednessReasons::RulesModified
+            return Nanoc::Core::OutdatednessReasons::RulesModified
           end
 
           # Check rules of layouts used by obj
           layouts = layouts_touched_by(obj, outdatedness_checker)
           if layouts.any? { |layout| rules_modified?(layout, outdatedness_checker) }
-            return Nanoc::Int::OutdatednessReasons::RulesModified
+            return Nanoc::Core::OutdatednessReasons::RulesModified
           end
 
           nil

data/lib/nanoc/base/services/outdatedness_rules/uses_always_outdated_filter.rb

@@ -3,13 +3,13 @@
 module Nanoc
   module Int
     module OutdatednessRules
-      class UsesAlwaysOutdatedFilter < Nanoc::Int::OutdatednessRule
+      class UsesAlwaysOutdatedFilter < Nanoc::Core::OutdatednessRule
         affects_props :raw_content, :attributes, :path
 
         def apply(obj, outdatedness_checker)
           seq = outdatedness_checker.action_sequence_for(obj)
           if any_always_outdated?(seq)
-            Nanoc::Int::OutdatednessReasons::UsesAlwaysOutdatedFilter
+            Nanoc::Core::OutdatednessReasons::UsesAlwaysOutdatedFilter
           end
         end
 

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

@@ -10,7 +10,7 @@ module Nanoc
 
     # @param [Nanoc::Core::Configuration] config
     #
-    # @param [Nanoc::Int::ItemRepRepo] reps
+    # @param [Nanoc::Core::ItemRepRepo] reps
     #
     # @param [Boolean] dry_run true if the files to be deleted
     #   should only be printed instead of actually deleted, false if the files

data/lib/nanoc/base/views/view_context_for_compilation.rb

@@ -12,7 +12,7 @@ module Nanoc
     attr_reader :compiled_content_store
 
     contract C::KeywordArgs[
-      reps: Nanoc::Int::ItemRepRepo,
+      reps: Nanoc::Core::ItemRepRepo,
       items: Nanoc::Core::IdentifiableCollection,
       dependency_tracker: C::Any,
       compilation_context: C::Any,

data/lib/nanoc/base/views/view_context_for_pre_compilation.rb

@@ -12,7 +12,7 @@ module Nanoc
     def initialize(items:)
       @items = items
 
-      @dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
+      @dependency_tracker = Nanoc::Core::DependencyTracker::Null.new
     end
   end
 end

data/lib/nanoc/base/views/view_context_for_shell.rb

@@ -11,13 +11,13 @@ module Nanoc
 
     contract C::KeywordArgs[
       items: Nanoc::Core::IdentifiableCollection,
-      reps: Nanoc::Int::ItemRepRepo,
+      reps: Nanoc::Core::ItemRepRepo,
     ] => C::Any
     def initialize(items:, reps:)
       @items = items
       @reps = reps
 
-      @dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
+      @dependency_tracker = Nanoc::Core::DependencyTracker::Null.new
     end
   end
 end

data/lib/nanoc/checking/check.rb

@@ -12,6 +12,8 @@ module Nanoc::Checking
   class Check < Nanoc::Core::Context
     extend DDPlugin::Plugin
 
+    DDMemoize.activate(self)
+
     attr_reader :issues
 
     def self.define(ident, &block)
@@ -34,7 +36,7 @@ module Nanoc::Checking
       res = compiler.run_until_reps_built
       reps = res.fetch(:reps)
       compilation_context = compiler.compilation_context(reps: reps)
-      view_context = compilation_context.create_view_context(Nanoc::Int::DependencyTracker::Null.new)
+      view_context = compilation_context.create_view_context(Nanoc::Core::DependencyTracker::Null.new)
 
       context = {
         items: Nanoc::PostCompileItemCollectionView.new(site.items, view_context),
@@ -66,6 +68,20 @@ module Nanoc::Checking
       @issues << Issue.new(desc, subject, self.class)
     end
 
+    # @private
+    def output_filenames
+      super.reject { |f| excluded_patterns.any? { |pat| pat.match?(f) } }
+    end
+
+    # @private
+    memoized def excluded_patterns
+      @config
+        .fetch(:checks, {})
+        .fetch(:all, {})
+        .fetch(:exclude_files, [])
+        .map { |pattern| Regexp.new(pattern) }
+    end
+
     # @private
     def output_html_filenames
       output_filenames.select { |f| File.extname(f) =~ /\A\.x?html?\z/ }

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

@@ -28,7 +28,7 @@ module Nanoc::CLI::Commands
     end
 
     def self.reps_for(site)
-      Nanoc::Int::ItemRepRepo.new.tap do |reps|
+      Nanoc::Core::ItemRepRepo.new.tap do |reps|
         action_provider = Nanoc::Core::ActionProvider.named(site.config.action_provider).for(site)
         builder = Nanoc::Int::ItemRepBuilder.new(site, action_provider, reps)
         builder.run

data/lib/nanoc/cli/error_handler.rb

@@ -192,7 +192,6 @@ module Nanoc::CLI
       'escape' => 'escape',
       'fog' => 'fog',
       'haml' => 'haml',
-      'handlebars' => 'hbs',
       'json' => 'json',
       'kramdown' => 'kramdown',
       'less' => 'less',
@@ -212,6 +211,7 @@ module Nanoc::CLI
       'rdiscount' => 'rdiscount',
       'redcarpet' => 'redcarpet',
       'redcloth' => 'RedCloth',
+      'ruby-handlebars' => 'hbs',
       'rubypants' => 'rubypants',
       'sass' => 'sass',
       'slim' => 'slim',

data/lib/nanoc/filters/handlebars.rb

@@ -5,7 +5,7 @@ module Nanoc::Filters
   class Handlebars < Nanoc::Filter
     identifier :handlebars
 
-    requires 'handlebars'
+    requires 'ruby-handlebars'
 
     # Runs the content through
     # [Handlebars](http://handlebarsjs.com/) using
@@ -24,7 +24,7 @@ module Nanoc::Filters
         context[:layout] = assigns[:layout].attributes
       end
 
-      handlebars = ::Handlebars::Context.new
+      handlebars = ::Handlebars::Handlebars.new
       template = handlebars.compile(content)
       template.call(context)
     end

data/lib/nanoc/filters/sass/importer.rb

@@ -67,8 +67,9 @@ module Nanoc::Filters::SassCommon
       @raw_filename_to_item_map[config.object_id] ||=
         {}.tap do |map|
           items.each do |item|
-            if item.raw_filename
-              path = Pathname.new(item.raw_filename).realpath.to_s
+            filename_without_registering_dependency = item._unwrap.content.filename
+            if filename_without_registering_dependency
+              path = Pathname.new(filename_without_registering_dependency).realpath.to_s
               map[path] = item
             end
           end

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -54,7 +54,7 @@ module Nanoc::RuleDSL
     end
 
     def postprocess(site, compiler)
-      dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
+      dependency_tracker = Nanoc::Core::DependencyTracker::Null.new
 
       res = compiler.run_until_reps_built
       reps = res.fetch(:reps)

data/lib/nanoc/spec.rb

@@ -42,7 +42,7 @@ module Nanoc
     end
 
     class HelperContext
-      # @return [Nanoc::Int::DependencyTracker]
+      # @return [Nanoc::Core::DependencyTracker]
       attr_reader :dependency_tracker
 
       attr_reader :erbout
@@ -54,11 +54,11 @@ module Nanoc
         @erbout = +''
         @action_sequence = {}
         @config = Nanoc::Core::Configuration.new(dir: Dir.getwd).with_defaults
-        @reps = Nanoc::Int::ItemRepRepo.new
+        @reps = Nanoc::Core::ItemRepRepo.new
         @items = Nanoc::Core::ItemCollection.new(@config)
         @layouts = Nanoc::Core::LayoutCollection.new(@config)
-        @dependency_tracker = Nanoc::Int::DependencyTracker.new(Object.new)
-        @compiled_content_store = Nanoc::Int::CompiledContentStore.new
+        @dependency_tracker = Nanoc::Core::DependencyTracker.new(Object.new)
+        @compiled_content_store = Nanoc::Core::CompiledContentStore.new
         @action_provider = new_action_provider
       end
 

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.8
+  version: 4.11.9
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.8
+        version: 4.11.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.8
+        version: 4.11.9
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -168,26 +168,12 @@ files:
 - lib/nanoc/base.rb
 - lib/nanoc/base/assertions.rb
 - lib/nanoc/base/changes_stream.rb
-- lib/nanoc/base/entities.rb
-- lib/nanoc/base/entities/outdatedness_reasons.rb
-- lib/nanoc/base/entities/outdatedness_status.rb
 - lib/nanoc/base/error.rb
 - lib/nanoc/base/errors.rb
 - lib/nanoc/base/feature.rb
 - lib/nanoc/base/repos.rb
-- lib/nanoc/base/repos/action_sequence_store.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/item_rep_repo.rb
-- lib/nanoc/base/repos/outdatedness_store.rb
-- lib/nanoc/base/repos/prefixed_data_source.rb
 - lib/nanoc/base/repos/site_loader.rb
-- lib/nanoc/base/repos/store.rb
-- lib/nanoc/base/repos/textual_compiled_content_cache.rb
 - lib/nanoc/base/services.rb
 - lib/nanoc/base/services/compilation_context.rb
 - lib/nanoc/base/services/compiler.rb
@@ -214,7 +200,6 @@ files:
 - lib/nanoc/base/services/compiler/stages/store_post_compilation_state.rb
 - lib/nanoc/base/services/compiler/stages/store_pre_compilation_state.rb
 - lib/nanoc/base/services/compiler_loader.rb
-- lib/nanoc/base/services/dependency_tracker.rb
 - lib/nanoc/base/services/executor.rb
 - lib/nanoc/base/services/filter.rb
 - lib/nanoc/base/services/item_rep_builder.rb
@@ -222,7 +207,6 @@ files:
 - lib/nanoc/base/services/item_rep_selector.rb
 - lib/nanoc/base/services/item_rep_writer.rb
 - lib/nanoc/base/services/outdatedness_checker.rb
-- lib/nanoc/base/services/outdatedness_rule.rb
 - lib/nanoc/base/services/outdatedness_rules.rb
 - lib/nanoc/base/services/outdatedness_rules/attributes_modified.rb
 - lib/nanoc/base/services/outdatedness_rules/code_snippets_modified.rb
@@ -401,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.

data/lib/nanoc/base/entities.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-# Re-exported from Nanoc::Core
-Nanoc::Identifier = Nanoc::Core::Identifier
-
-require_relative 'entities/outdatedness_status'
-require_relative 'entities/outdatedness_reasons'

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

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    # Module that contains all outdatedness reasons.
-    #
-    # @api private
-    module OutdatednessReasons
-      # A generic outdatedness reason. An outdatedness reason is basically a
-      # descriptive message that explains why a given object is outdated.
-      class Generic
-        # @return [String] A descriptive message for this outdatedness reason
-        attr_reader :message
-
-        # @return [Nanoc::Core::DependencyProps]
-        attr_reader :props
-
-        # @param [String] message The descriptive message for this outdatedness
-        #   reason
-        def initialize(message, props = Nanoc::Core::DependencyProps.new)
-          @message = message
-          @props = props
-        end
-      end
-
-      CodeSnippetsModified = Generic.new(
-        'The code snippets have been modified since the last time the site was compiled.',
-        Nanoc::Core::DependencyProps.new(raw_content: true, attributes: true, compiled_content: true, path: true),
-      )
-
-      DependenciesOutdated = Generic.new(
-        'This item uses content or attributes that have changed since the last time the site was compiled.',
-      )
-
-      NotWritten = Generic.new(
-        'This item representation has not yet been written to the output directory (but it does have a path).',
-        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.',
-        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.',
-        Nanoc::Core::DependencyProps.new(raw_content: true, compiled_content: true),
-      )
-
-      class DocumentCollectionExtended < Generic
-        attr_reader :objects
-
-        def initialize(objects)
-          super(
-            'New items/layouts have been added to the site.',
-            Nanoc::Core::DependencyProps.new(raw_content: true),
-          )
-
-          @objects = objects
-        end
-      end
-
-      class ItemCollectionExtended < DocumentCollectionExtended
-      end
-
-      class LayoutCollectionExtended < DocumentCollectionExtended
-      end
-
-      class AttributesModified < Generic
-        attr_reader :attributes
-
-        def initialize(attributes)
-          super(
-            'The attributes of this item have been modified since the last time the site was compiled.',
-            Nanoc::Core::DependencyProps.new(attributes: true, compiled_content: true),
-          )
-
-          @attributes = attributes
-        end
-      end
-
-      UsesAlwaysOutdatedFilter = Generic.new(
-        'This item rep uses one or more filters that cannot track dependencies, and will thus always be considered as outdated.',
-        Nanoc::Core::DependencyProps.new(raw_content: true, attributes: true, compiled_content: true),
-      )
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    # @api private
-    class OutdatednessStatus
-      attr_reader :reasons
-      attr_reader :props
-
-      def initialize(reasons: [], props: Nanoc::Core::DependencyProps.new)
-        @reasons = reasons
-        @props = props
-      end
-
-      def useful_to_apply?(rule)
-        (rule.affected_props - @props.active).any?
-      end
-
-      def update(reason)
-        self.class.new(
-          reasons: @reasons + [reason],
-          props: @props.merge(reason.props),
-        )
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    # Stores action sequences for objects that can be run through a rule (item
-    # representations and layouts).
-    #
-    # @api private
-    class ActionSequenceStore < ::Nanoc::Int::Store
-      include Nanoc::Core::ContractsSupport
-
-      contract C::KeywordArgs[config: Nanoc::Core::Configuration] => C::Any
-      def initialize(config:)
-        super(Nanoc::Int::Store.tmp_path_for(config: config, store_name: 'rule_memory'), 1)
-
-        @action_sequences = {}
-      end
-
-      # @param [Nanoc::Core::ItemRep, Nanoc::Core::Layout] obj The item representation or
-      #   the layout to get the action sequence for
-      #
-      # @return [Array] The action sequence for the given object
-      def [](obj)
-        @action_sequences[obj.reference]
-      end
-
-      # @param [Nanoc::Core::ItemRep, Nanoc::Core::Layout] obj The item representation or
-      #   the layout to set the action sequence for
-      #
-      # @param [Array] action_sequence The new action sequence to be stored
-      #
-      # @return [void]
-      def []=(obj, action_sequence)
-        @action_sequences[obj.reference] = action_sequence
-      end
-
-      protected
-
-      # @see Nanoc::Int::Store#data
-      def data
-        @action_sequences
-      end
-
-      # @see Nanoc::Int::Store#data=
-      def data=(new_data)
-        @action_sequences = new_data
-      end
-    end
-  end
-end