nanoc 4.9.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed74af636c6e396ec74288c853dca19336227108e99d4db697f83a655c50d3fc
-  data.tar.gz: 9e38014cee26d2f3f88e4e77ea1d9f2c493c78f5613e6e7ea6867d3d0828ce94
+  metadata.gz: 9ab127f94d9ffc710fc374831e36f805e16e1fd1bf1dcadfc65d48ce8009d4f8
+  data.tar.gz: 4f167936c1d475ce4625875ec5788d99d1f0e22fb0499644e5c632d26bfe0ef1
 SHA512:
-  metadata.gz: 44254d1810d3d2bfbbf12b9155035c968d641cdf1880fef342baee260cc4e0fc2fd17731df76b7108292917becb1b2c48902aa87feee47422b33b3941ada97ea
-  data.tar.gz: 271d3c575afbf515409eb5d635eaf53b0a387e97bea37eaf18a8a424d522a961a2138d36d85cb49b988cfdaae782ab5145b2bc596744b3ef5c3b24853a191f59
+  metadata.gz: 3ce94577815ee770cb5e572d232357a60fd4447ab68c101d0a6215e9b45c1f25866433ac90e478475dbccf92cbbf97d5a01c1b6a40198a715a6e5364f68f6064
+  data.tar.gz: 38dec7119c8a3239ec8ab5a2922fe4aca8857645446100f6601bffebe75c6ff2414d0b0886bebc633b95f7df8c12ef25a6d59926e1101cc63917584ad13170de

data/NEWS.md

@@ -1,5 +1,21 @@
 # Nanoc news
 
+## 4.9.1 (2018-02-22)
+
+Fixes:
+
+* Fixed issue which could cause terminal output to be jumbled up (#1312, #1316)
+* Made pruner ignore `output_dir` configuration attribute when checking for excludes (#1313, #1317)
+* Fixed handling of interrupts (SIGINT) in the `shell` command (#1309, #1318)
+* Added workaround for `relativize_paths` mangling `gcse:search` elements (#1319, #1320)
+
+Enhancements:
+
+* Allowed overriding `<id>` and `<link rel="alternate">` elements in Atom feed generator (#1301) [Ian Young]
+* Made `sh` an alias for the `shell` command (#1308)
+* Simplified the default configuration (#1311)
+* Removed routing rules from newly-created sites (#1310)
+
 ## 4.9.0 (2018-01-31)
 
 Features:

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

@@ -33,6 +33,7 @@ module Nanoc::Int
       enable_output_diff: false,
       prune: { auto_prune: false, exclude: ['.git', '.hg', '.svn', 'CVS'] },
       string_pattern_type: 'glob',
+      action_provider: 'rule_dsl',
     }.freeze
 
     # @return [String, nil] The active environment for the configuration
@@ -158,6 +159,11 @@ module Nanoc::Int
       self[:output_dir]
     end
 
+    contract C::None => Symbol
+    def action_provider
+      self[:action_provider].to_sym
+    end
+
     contract C::None => C::IterOf[String]
     def output_dirs
       envs = @wrapped.fetch(ENVIRONMENTS_CONFIG_KEY, {})

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

@@ -13,7 +13,7 @@ module Nanoc::Int
       raise NotImplementedError
     end
 
-    def action_sequence_for(_rep)
+    def action_sequence_for(_obj)
       raise NotImplementedError
     end
 

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

@@ -176,7 +176,7 @@ module Nanoc::Int
 
     class UnwrapUpdateBehavior < UpdateBehavior
       def self.update(obj, _digest)
-        yield(obj.unwrap)
+        yield(obj._unwrap)
       end
     end
 

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

@@ -14,7 +14,7 @@ module Nanoc::Int
       checksum_store =
         Nanoc::Int::ChecksumStore.new(config: site.config, objects: objects)
 
-      action_provider ||= Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
+      action_provider ||= Nanoc::Int::ActionProvider.named(site.config.action_provider).for(site)
 
       outdatedness_store =
         Nanoc::Int::OutdatednessStore.new(config: site.config)

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

@@ -43,10 +43,18 @@ module Nanoc
     #
     # @return [Boolean] true if the given file is excluded, false otherwise
     def filename_excluded?(filename)
-      pathname = Pathname.new(filename)
+      pathname = Pathname.new(strip_output_dir(filename))
       @exclude.any? { |e| pathname_components(pathname).include?(e) }
     end
 
+    def strip_output_dir(filename)
+      if filename.start_with?(@config[:output_dir])
+        filename[@config[:output_dir].size..-1]
+      else
+        filename
+      end
+    end
+
     def pathname_components(pathname)
       components = []
       tmp = pathname

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

@@ -17,7 +17,7 @@ module Nanoc
     end
 
     # @api private
-    def unwrap
+    def _unwrap
       @item_reps
     end
 

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

@@ -14,7 +14,7 @@ module Nanoc
     end
 
     # @api private
-    def unwrap
+    def _unwrap
       @item_rep
     end
 
@@ -41,7 +41,7 @@ module Nanoc
     end
 
     def snapshot?(name)
-      @context.dependency_tracker.bounce(unwrap.item, compiled_content: true)
+      @context.dependency_tracker.bounce(_unwrap.item, compiled_content: true)
       @item_rep.snapshot?(name)
     end
 
@@ -55,7 +55,7 @@ module Nanoc
     #
     # @return [String] The item rep’s path.
     def path(snapshot: :last)
-      @context.dependency_tracker.bounce(unwrap.item, path: true)
+      @context.dependency_tracker.bounce(_unwrap.item, path: true)
       @item_rep.path(snapshot: snapshot)
     end
 
@@ -68,8 +68,8 @@ module Nanoc
 
     # @api private
     def binary?
-      snapshot_def = unwrap.snapshot_defs.find { |sd| sd.name == :last }
-      raise Nanoc::Int::Errors::NoSuchSnapshot.new(unwrap, :last) if snapshot_def.nil?
+      snapshot_def = _unwrap.snapshot_defs.find { |sd| sd.name == :last }
+      raise Nanoc::Int::Errors::NoSuchSnapshot.new(_unwrap, :last) if snapshot_def.nil?
       snapshot_def.binary?
     end
 

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

@@ -9,11 +9,11 @@ module Nanoc
     #
     # @return [Enumerable<Nanoc::CompilationItemView>]
     def children
-      unless unwrap.identifier.legacy?
-        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
+      unless _unwrap.identifier.legacy?
+        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(_unwrap.identifier)
       end
 
-      children_pattern = Nanoc::Int::Pattern.from(unwrap.identifier.to_s + '*/')
+      children_pattern = Nanoc::Int::Pattern.from(_unwrap.identifier.to_s + '*/')
       children = @context.items.select { |i| children_pattern.match?(i.identifier) }
 
       children.map { |i| self.class.new(i, @context) }.freeze
@@ -26,11 +26,11 @@ module Nanoc
     #
     # @return [nil] if the item has no parent
     def parent
-      unless unwrap.identifier.legacy?
-        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
+      unless _unwrap.identifier.legacy?
+        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(_unwrap.identifier)
       end
 
-      parent_identifier = '/' + unwrap.identifier.components[0..-2].join('/') + '/'
+      parent_identifier = '/' + _unwrap.identifier.components[0..-2].join('/') + '/'
       parent_identifier = '/' if parent_identifier == '//'
 
       parent = @context.items[parent_identifier]
@@ -40,12 +40,12 @@ module Nanoc
 
     # @return [Boolean] True if the item is binary, false otherwise
     def binary?
-      unwrap.content.binary?
+      _unwrap.content.binary?
     end
 
     # @api private
     def raw_filename
-      unwrap.content.filename
+      _unwrap.content.filename
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Nanoc
     #
     # @return [String] The item rep’s raw path.
     def raw_path(snapshot: :last)
-      @context.dependency_tracker.bounce(unwrap.item, compiled_content: true)
+      @context.dependency_tracker.bounce(_unwrap.item, compiled_content: true)
 
       res = @item_rep.raw_path(snapshot: snapshot)
 
@@ -42,8 +42,8 @@ module Nanoc
     #
     # @return [String] The content at the given snapshot.
     def compiled_content(snapshot: nil)
-      @context.dependency_tracker.bounce(unwrap.item, compiled_content: true)
-      @context.snapshot_repo.compiled_content(rep: unwrap, snapshot: snapshot)
+      @context.dependency_tracker.bounce(_unwrap.item, compiled_content: true)
+      @context.snapshot_repo.compiled_content(rep: _unwrap, snapshot: snapshot)
     end
   end
 end

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

@@ -39,7 +39,7 @@ module Nanoc
     #
     # @return [Nanoc::BasicItemRepCollectionView]
     def reps
-      Nanoc::CompilationItemRepCollectionView.new(@context.reps[unwrap], @context)
+      Nanoc::CompilationItemRepCollectionView.new(@context.reps[_unwrap], @context)
     end
   end
 end

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

@@ -12,13 +12,13 @@ module Nanoc
     end
 
     # @api private
-    def unwrap
+    def _unwrap
       @config
     end
 
     # @see Hash#fetch
     def fetch(key, fallback = NONE, &_block)
-      @context.dependency_tracker.bounce(unwrap, attributes: [key])
+      @context.dependency_tracker.bounce(_unwrap, attributes: [key])
       @config.fetch(key) do
         if !fallback.equal?(NONE)
           fallback
@@ -32,25 +32,25 @@ module Nanoc
 
     # @see Hash#key?
     def key?(key)
-      @context.dependency_tracker.bounce(unwrap, attributes: [key])
+      @context.dependency_tracker.bounce(_unwrap, attributes: [key])
       @config.key?(key)
     end
 
     # @see Hash#[]
     def [](key)
-      @context.dependency_tracker.bounce(unwrap, attributes: [key])
+      @context.dependency_tracker.bounce(_unwrap, attributes: [key])
       @config[key]
     end
 
     # @see Hash#each
     def each(&block)
-      @context.dependency_tracker.bounce(unwrap, attributes: true)
+      @context.dependency_tracker.bounce(_unwrap, attributes: true)
       @config.each(&block)
     end
 
     # @see Hash#dig
     def dig(*keys)
-      @context.dependency_tracker.bounce(unwrap, attributes: keys.take(1))
+      @context.dependency_tracker.bounce(_unwrap, attributes: keys.take(1))
       @config.dig(*keys)
     end
   end

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

@@ -13,7 +13,7 @@ module Nanoc
     end
 
     # @api private
-    def unwrap
+    def _unwrap
       @objects
     end
 
@@ -32,14 +32,14 @@ module Nanoc
     #
     # @return [self]
     def each
-      @context.dependency_tracker.bounce(unwrap, raw_content: true)
+      @context.dependency_tracker.bounce(_unwrap, raw_content: true)
       @objects.each { |i| yield view_class.new(i, @context) }
       self
     end
 
     # @return [Integer]
     def size
-      @context.dependency_tracker.bounce(unwrap, raw_content: true)
+      @context.dependency_tracker.bounce(_unwrap, raw_content: true)
       @objects.size
     end
 
@@ -50,7 +50,7 @@ module Nanoc
     # @return [Enumerable]
     def find_all(arg = NOTHING, &block)
       if NOTHING.equal?(arg)
-        @context.dependency_tracker.bounce(unwrap, raw_content: true)
+        @context.dependency_tracker.bounce(_unwrap, raw_content: true)
         return @objects.select(&block).map { |i| view_class.new(i, @context) }
       end
 
@@ -64,7 +64,7 @@ module Nanoc
           true
         end
 
-      @context.dependency_tracker.bounce(unwrap, raw_content: prop_attribute)
+      @context.dependency_tracker.bounce(_unwrap, raw_content: prop_attribute)
       @objects.find_all(arg).map { |i| view_class.new(i, @context) }
     end
 
@@ -101,7 +101,7 @@ module Nanoc
           true
         end
 
-      @context.dependency_tracker.bounce(unwrap, raw_content: prop_attribute)
+      @context.dependency_tracker.bounce(_unwrap, raw_content: prop_attribute)
       res = @objects[arg]
       res && view_class.new(res, @context)
     end

data/lib/nanoc/base/views/mixins/document_view_mixin.rb

@@ -12,7 +12,7 @@ module Nanoc
     end
 
     # @api private
-    def unwrap
+    def _unwrap
       @document
     end
 
@@ -33,28 +33,28 @@ module Nanoc
 
     # @return [Nanoc::Identifier]
     def identifier
-      unwrap.identifier
+      _unwrap.identifier
     end
 
     # @see Hash#[]
     def [](key)
-      @context.dependency_tracker.bounce(unwrap, attributes: [key])
-      unwrap.attributes[key]
+      @context.dependency_tracker.bounce(_unwrap, attributes: [key])
+      _unwrap.attributes[key]
     end
 
     # @return [Hash]
     def attributes
       # TODO: Refine dependencies
-      @context.dependency_tracker.bounce(unwrap, attributes: true)
-      unwrap.attributes
+      @context.dependency_tracker.bounce(_unwrap, attributes: true)
+      _unwrap.attributes
     end
 
     # @see Hash#fetch
     def fetch(key, fallback = NONE, &_block)
-      @context.dependency_tracker.bounce(unwrap, attributes: [key])
+      @context.dependency_tracker.bounce(_unwrap, attributes: [key])
 
-      if unwrap.attributes.key?(key)
-        unwrap.attributes[key]
+      if _unwrap.attributes.key?(key)
+        _unwrap.attributes[key]
       elsif !fallback.equal?(NONE)
         fallback
       elsif block_given?
@@ -66,23 +66,23 @@ module Nanoc
 
     # @see Hash#key?
     def key?(key)
-      @context.dependency_tracker.bounce(unwrap, attributes: [key])
-      unwrap.attributes.key?(key)
+      @context.dependency_tracker.bounce(_unwrap, attributes: [key])
+      _unwrap.attributes.key?(key)
     end
 
     # @api private
     def reference
-      unwrap.reference
+      _unwrap.reference
     end
 
     # @api private
     def raw_content
-      @context.dependency_tracker.bounce(unwrap, raw_content: true)
-      unwrap.content.string
+      @context.dependency_tracker.bounce(_unwrap, raw_content: true)
+      _unwrap.content.string
     end
 
     def inspect
-      "<#{self.class} identifier=#{unwrap.identifier}>"
+      "<#{self.class} identifier=#{_unwrap.identifier}>"
     end
   end
 end

data/lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb

@@ -16,7 +16,7 @@ module Nanoc
     end
 
     def raw_content=(arg)
-      unwrap.content = Nanoc::Int::Content.create(arg)
+      _unwrap.content = Nanoc::Int::Content.create(arg)
     end
 
     # Sets the value for the given attribute.
@@ -35,14 +35,14 @@ module Nanoc
         raise DisallowedAttributeValueError.new(value)
       end
 
-      unwrap.set_attribute(key, value)
+      _unwrap.set_attribute(key, value)
     end
 
     # Sets the identifier to the given argument.
     #
     # @param [String, Nanoc::Identifier] arg
     def identifier=(arg)
-      unwrap.identifier = Nanoc::Identifier.from(arg)
+      _unwrap.identifier = Nanoc::Identifier.from(arg)
     end
 
     # Updates the attributes based on the given hash.
@@ -51,7 +51,7 @@ module Nanoc
     #
     # @return [self]
     def update_attributes(hash)
-      hash.each { |k, v| unwrap.set_attribute(k, v) }
+      hash.each { |k, v| _unwrap.set_attribute(k, v) }
       self
     end
   end

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

@@ -8,17 +8,17 @@ module Nanoc
 
     def compiled_content(snapshot: nil)
       compilation_context = @context.compilation_context
-      snapshot_contents = compilation_context.compiled_content_cache[unwrap]
+      snapshot_contents = compilation_context.compiled_content_cache[_unwrap]
 
       snapshot_name = snapshot || (snapshot_contents[:pre] ? :pre : :last)
 
       unless snapshot_contents[snapshot_name]
-        raise Nanoc::Int::Errors::NoSuchSnapshot.new(unwrap, snapshot_name)
+        raise Nanoc::Int::Errors::NoSuchSnapshot.new(_unwrap, snapshot_name)
       end
 
       content = snapshot_contents[snapshot_name]
       if content.binary?
-        raise Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem.new(unwrap)
+        raise Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem.new(_unwrap)
       end
 
       content.string

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

@@ -3,7 +3,7 @@
 module Nanoc
   class PostCompileItemView < Nanoc::CompilationItemView
     def reps
-      Nanoc::PostCompileItemRepCollectionView.new(@context.reps[unwrap], @context)
+      Nanoc::PostCompileItemRepCollectionView.new(@context.reps[_unwrap], @context)
     end
 
     # @deprecated Use {#modified_reps} instead
@@ -12,7 +12,7 @@ module Nanoc
     end
 
     def modified_reps
-      reps.select { |rep| rep.unwrap.modified? }
+      reps.select { |rep| rep._unwrap.modified? }
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Nanoc
     end
 
     # @api private
-    def unwrap
+    def _unwrap
       raise NotImplementedError
     end
 
@@ -23,7 +23,7 @@ module Nanoc
     #
     # @see Object#frozen?
     def frozen?
-      unwrap.frozen?
+      _unwrap.frozen?
     end
 
     def inspect

data/lib/nanoc/checking/checks/stale.rb

@@ -24,7 +24,7 @@ module Nanoc::Checking::Checks
         Set.new(
           @items
             .flat_map(&:reps)
-            .map(&:unwrap)
+            .map(&:_unwrap)
             .flat_map(&:raw_paths)
             .flat_map(&:values)
             .flatten,

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

@@ -18,103 +18,30 @@ module Nanoc::CLI::Commands
     end
 
     DEFAULT_CONFIG = <<~EOS unless defined? DEFAULT_CONFIG
-      # The syntax to use for patterns in the Rules file. Can be either `"glob"`
-      # (default) or `"legacy"`. The former will enable glob patterns, which behave
-      # like Ruby’s File.fnmatch. The latter will enable Nanoc 3.x-style patterns.
-      string_pattern_type: glob
-
       # A list of file extensions that Nanoc will consider to be textual rather than
       # binary. If an item with an extension not in this list is found,  the file
       # will be considered as binary.
       text_extensions: #{array_to_yaml(Nanoc::Int::Configuration::DEFAULT_CONFIG[:text_extensions])}
 
-      # The path to the directory where all generated files will be written to. This
-      # can be an absolute path starting with a slash, but it can also be path
-      # relative to the site directory.
-      output_dir: #{Nanoc::Int::Configuration::DEFAULT_CONFIG[:output_dir]}
-
-      # A list of index filenames, i.e. names of files that will be served by a web
-      # server when a directory is requested. Usually, index files are named
-      # “index.html”, but depending on the web server, this may be something else,
-      # such as “default.htm”. This list is used by Nanoc to generate pretty URLs.
-      index_filenames: #{array_to_yaml(Nanoc::Int::Configuration::DEFAULT_CONFIG[:index_filenames])}
-
-      # Whether or not to generate a diff of the compiled content when compiling a
-      # site. The diff will contain the differences between the compiled content
-      # before and after the last site compilation.
-      enable_output_diff: false
-
       prune:
-        # Whether to automatically remove files not managed by Nanoc from the output
-        # directory.
         auto_prune: true
 
-        # Which files and directories you want to exclude from pruning. If you version
-        # your output directory, you should probably exclude VCS directories such as
-        # .git, .svn etc.
-        exclude: [ '.git', '.hg', '.svn', 'CVS' ]
-
-      # The data sources where Nanoc loads its data from. This is an array of
-      # hashes; each array element represents a single data source. By default,
-      # there is only a single data source that reads data from the “content/” and
-      # “layout/” directories in the site directory.
       data_sources:
-        -
-          # The type is the identifier of the data source.
-          type: #{Nanoc::Int::Configuration::DEFAULT_DATA_SOURCE_CONFIG[:type]}
-
-          # The path where items should be mounted (comparable to mount points in
-          # Unix-like systems). This is “/” by default, meaning that items will have
-          # “/” prefixed to their identifiers. If the items root were “/en/”
-          # instead, an item at content/about.html would have an identifier of
-          # “/en/about/” instead of just “/about/”.
-          items_root: #{Nanoc::Int::Configuration::DEFAULT_DATA_SOURCE_CONFIG[:items_root]}
-
-          # The path where layouts should be mounted. The layouts root behaves the
-          # same as the items root, but applies to layouts rather than items.
-          layouts_root: #{Nanoc::Int::Configuration::DEFAULT_DATA_SOURCE_CONFIG[:layouts_root]}
-
-          # The encoding to use for input files. If your input files are not in
-          # UTF-8 (which they should be!), change this.
+        - type: filesystem
           encoding: utf-8
-
-          # The kind of identifier to use for items and layouts. The default is
-          # “full”, meaning that identifiers include file extensions. This can also
-          # be “legacy”, primarily used by older Nanoc sites.
-          identifier_type: full
-
-      # Configuration for the “check” command, which run unit tests on the site.
-      checks:
-        # Configuration for the “internal_links” checker, which checks whether all
-        # internal links are valid.
-        internal_links:
-          # A list of patterns, specified as regular expressions, to exclude from the check.
-          # If an internal link matches this pattern, the validity check will be skipped.
-          # E.g.:
-          #   exclude: ['^/server_status']
-          exclude: []
-
-        # Configuration for the “external_links” checker, which checks whether all
-        # external links are valid.
-        external_links:
-          # A list of patterns, specified as regular expressions, to exclude from the check.
-          # If an external link matches this pattern, the validity check will be skipped.
-          # E.g.:
-          #   exclude: ['^http://example.com$']
-          exclude: []
-
-          # A list of file patterns, specified as regular expressions, to exclude from the check.
-          # If a file matches this pattern, the links from this file will not be checked.
-          # E.g.:
-          #   exclude_files: ['blog/page']
-          exclude_files: []
 EOS
 
     DEFAULT_RULES = <<~EOS unless defined? DEFAULT_RULES
       #!/usr/bin/env ruby
 
+      compile '/index.html' do
+        layout '/default.*'
+        write '/index.html'
+      end
+
       compile '/**/*.html' do
         layout '/default.*'
+        write item.identifier.without_ext + '/index.html'
       end
 
       # This is an example rule that matches Markdown (.md) files, and filters them
@@ -124,16 +51,9 @@ EOS
       #compile '/**/*.md' do
       #  filter :kramdown
       #  layout '/default.*'
+      #  write item.identifier.without_ext + '/index.html'
       #end
 
-      route '/**/*.{html,md}' do
-        if item.identifier =~ '/index.*'
-          '/index.html'
-        else
-          item.identifier.without_ext + '/index.html'
-        end
-      end
-
       compile '/**/*' do
         write item.identifier.to_s
       end

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

@@ -2,7 +2,7 @@
 
 usage 'shell'
 summary 'open a shell on the Nanoc environment'
-aliases 'console'
+aliases 'console', 'sh'
 description "
 Open an IRB shell on a context that contains @items, @layouts, and @config.
 "
@@ -13,6 +13,9 @@ module Nanoc::CLI::Commands
     def run
       require 'pry'
 
+      # Needed to make pry behave properly sometimes -- see nanoc/nanoc#1309
+      Signal.trap('SIGINT') { raise Interrupt }
+
       @site = load_site
       Nanoc::Int::Compiler.new_for(@site).run_until_preprocessed if options[:preprocess]
 
@@ -25,7 +28,7 @@ module Nanoc::CLI::Commands
 
     def self.reps_for(site)
       Nanoc::Int::ItemRepRepo.new.tap do |reps|
-        action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
+        action_provider = Nanoc::Int::ActionProvider.named(site.config.action_provider).for(site)
         builder = Nanoc::Int::ItemRepBuilder.new(site, action_provider, reps)
         builder.run
       end

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

@@ -15,7 +15,7 @@ module Nanoc::CLI::Commands
       res = Nanoc::Int::Compiler.new_for(site).run_until_reps_built
       reps = res.fetch(:reps)
 
-      action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
+      action_provider = Nanoc::Int::ActionProvider.named(site.config.action_provider).for(site)
       rules = action_provider.rules_collection
 
       items = site.items.sort_by(&:identifier)

data/lib/nanoc/cli/logger.rb

@@ -28,6 +28,7 @@ module Nanoc::CLI
 
     def initialize
       @level = :high
+      @mutex = Mutex.new
     end
 
     # Logs a file-related action.
@@ -63,11 +64,12 @@ module Nanoc::CLI
     #
     # @return [void]
     def log(level, message, io = $stdout)
-      # Don't log when logging is disabled
       return if @level == :off
+      return if @level != :low && @level != level
 
-      # Log when level permits it
-      io.puts(message) if @level == :low || @level == level
+      @mutex.synchronize do
+        io.puts(message)
+      end
     end
   end
 end

data/lib/nanoc/filters/relativize_paths.rb

@@ -10,6 +10,8 @@ module Nanoc::Filters
 
     SELECTORS = ['*/@href', '*/@src', 'object/@data', 'param[@name="movie"]/@content', 'form/@action', 'comment()'].freeze
 
+    GCSE_SEARCH_WORKAROUND = 'nanoc__gcse_search__f7ac3462f628a053f86fe6563c0ec98f1fe45cee'
+
     # Relativizes all paths in the given content, which can be HTML, XHTML, XML
     # or CSS. This filter is quite useful if a site needs to be hosted in a
     # subdirectory instead of a subdomain. In HTML, all `href` and `src`
@@ -106,6 +108,8 @@ module Nanoc::Filters
       # Ensure that all prefixes are strings
       namespaces = namespaces.reduce({}) { |new, (prefix, uri)| new.merge(prefix.to_s => uri) }
 
+      content = apply_gcse_search_workaround(content)
+
       doc = content =~ /<html[\s>]/ ? klass.parse(content) : klass.fragment(content)
       selector = selectors.map { |sel| "descendant-or-self::#{sel}" }.join('|')
       doc.xpath(selector, namespaces).each do |node|
@@ -116,12 +120,23 @@ module Nanoc::Filters
         end
       end
 
-      case type
-      when :html5
-        doc.to_html(save_with: nokogiri_save_options)
-      else
-        doc.send("to_#{type}", save_with: nokogiri_save_options)
-      end
+      output =
+        case type
+        when :html5
+          doc.to_html(save_with: nokogiri_save_options)
+        else
+          doc.send("to_#{type}", save_with: nokogiri_save_options)
+        end
+
+      revert_gcse_search_workaround(output)
+    end
+
+    def apply_gcse_search_workaround(content)
+      content.gsub('gcse:search', GCSE_SEARCH_WORKAROUND)
+    end
+
+    def revert_gcse_search_workaround(content)
+      content.gsub(GCSE_SEARCH_WORKAROUND, 'gcse:search')
     end
 
     def nokogiri_process_comment(node, doc, selectors, namespaces, klass, type)

data/lib/nanoc/helpers/blogging.rb

@@ -29,6 +29,8 @@ module Nanoc::Helpers
 
       attr_accessor :config
 
+      attr_accessor :alt_link
+      attr_accessor :id
       attr_accessor :limit
       attr_accessor :relevant_articles
       attr_accessor :preserve_order
@@ -110,14 +112,14 @@ module Nanoc::Helpers
         xml.instruct!
         xml.feed(xmlns: 'http://www.w3.org/2005/Atom', 'xml:base' => root_url) do
           # Add primary attributes
-          xml.id root_url
+          xml.id(id || root_url)
           xml.title title
 
           # Add date
           xml.updated(updated.__nanoc_to_iso8601_time)
 
           # Add links
-          xml.link(rel: 'alternate', href: root_url)
+          xml.link(rel: 'alternate', href: (alt_link || root_url))
           xml.link(rel: 'self',      href: feed_url)
 
           # Add author information
@@ -175,6 +177,8 @@ module Nanoc::Helpers
     # @option params [Boolean] :preserve_order
     # @option params [Proc] :content_proc
     # @option params [Proc] :excerpt_proc
+    # @option params [String] :alt_link
+    # @option params [String] :id
     # @option params [String] :title
     # @option params [String] :author_name
     # @option params [String] :author_uri
@@ -189,6 +193,8 @@ module Nanoc::Helpers
       builder = AtomFeedBuilder.new(@config, @item)
 
       # Fill builder
+      builder.alt_link          = params[:alt_link]
+      builder.id                = params[:id]
       builder.limit             = params[:limit] || 5
       builder.relevant_articles = params[:articles] || articles || []
       builder.preserve_order    = params.fetch(:preserve_order, false)

data/lib/nanoc/helpers/capturing.rb

@@ -21,7 +21,7 @@ module Nanoc::Helpers
 
         # Get existing contents and prep for store
         snapshot_repo = @item._context.snapshot_repo
-        rep = @item.reps[:default].unwrap
+        rep = @item.reps[:default]._unwrap
         capture_name = "__capture_#{@name}".to_sym
         old_content_string =
           case existing_behavior
@@ -59,12 +59,12 @@ module Nanoc::Helpers
       end
 
       def run
-        rep = @requested_item.reps[:default].unwrap
+        rep = @requested_item.reps[:default]._unwrap
 
         # Create dependency
-        if @item.nil? || @requested_item != @item.unwrap
+        if @item.nil? || @requested_item != @item._unwrap
           dependency_tracker = @config._context.dependency_tracker
-          dependency_tracker.bounce(@requested_item.unwrap, compiled_content: true)
+          dependency_tracker.bounce(@requested_item._unwrap, compiled_content: true)
 
           unless rep.compiled?
             Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(rep))

data/lib/nanoc/helpers/filtering.rb

@@ -30,9 +30,9 @@ module Nanoc::Helpers
       filter = klass.new(assigns)
 
       # Filter captured data
-      Nanoc::Int::NotificationCenter.post(:filtering_started, @item_rep.unwrap, filter_name)
+      Nanoc::Int::NotificationCenter.post(:filtering_started, @item_rep._unwrap, filter_name)
       filtered_data = filter.setup_and_run(data, arguments)
-      Nanoc::Int::NotificationCenter.post(:filtering_ended, @item_rep.unwrap, filter_name)
+      Nanoc::Int::NotificationCenter.post(:filtering_ended, @item_rep._unwrap, filter_name)
 
       # Append filtered data to buffer
       buffer = eval('_erbout', block.binding)

data/lib/nanoc/helpers/rendering.rb

@@ -18,7 +18,7 @@ module Nanoc::Helpers
       layout_view = @layouts[identifier]
       layout_view ||= @layouts[identifier.__nanoc_cleaned_identifier]
       raise Nanoc::Int::Errors::UnknownLayout.new(identifier) if layout_view.nil?
-      layout = layout_view.unwrap
+      layout = layout_view._unwrap
 
       # Visit
       dependency_tracker = @config._context.dependency_tracker

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -34,8 +34,8 @@ module Nanoc::RuleDSL
       matching_rules.map(&:rep_name).uniq
     end
 
-    def action_sequence_for(rep)
-      @action_sequence_calculator[rep]
+    def action_sequence_for(obj)
+      @action_sequence_calculator[obj]
     end
 
     def need_preprocessing?
@@ -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::Int::InMemDataSource.new(ctx.items._unwrap, ctx.layouts._unwrap, site.data_source)
     end
 
     def postprocess(site, compiler)

data/lib/nanoc/spec.rb

@@ -98,7 +98,7 @@ module Nanoc
       # @param [String] path The path of the `:last` snapshot of this item representation
       # @param [Symbol] rep The rep name to create
       def create_rep(item, path, rep = :default)
-        rep = Nanoc::Int::ItemRep.new(item.unwrap, rep)
+        rep = Nanoc::Int::ItemRep.new(item._unwrap, rep)
         rep.paths[:last] = [path]
         @reps << rep
         self
@@ -112,11 +112,11 @@ module Nanoc
       end
 
       def item=(item)
-        @item = item ? item.unwrap : nil
+        @item = item ? item._unwrap : nil
       end
 
       def item_rep=(item_rep)
-        @item_rep = item_rep ? item_rep.unwrap : nil
+        @item_rep = item_rep ? item_rep._unwrap : nil
       end
 
       # @return [Nanoc::MutableConfigView]

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -423,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.