nanoc 4.11.12 → 4.11.17

data/bin/nanoc

@@ -9,7 +9,7 @@ begin
 rescue LoadError
 end
 
-require 'nanoc/cli'
+require 'nanoc/orig_cli'
 
 if File.file?('Gemfile') && !defined?(Bundler)
   warn 'A Gemfile was detected, but Bundler is not loaded. This is probably not what you want. To run Nanoc with Bundler, use `bundle exec nanoc`.'

data/lib/nanoc.rb

@@ -8,38 +8,14 @@ require 'json'
 require 'parallel'
 
 module Nanoc
-  # @return [String] A string containing information about this Nanoc version
-  #   and its environment (Ruby engine and version, Rubygems version if any).
-  #
-  # @api private
-  def self.version_information
-    "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
-
-  # @return [Boolean] True if the current platform is Windows, false otherwise.
-  #
-  # @api private
-  def self.on_windows?
-    @_on_windows ||= TTY::Platform.new.windows?
-  end
-
-  # Similar to `nil` except that it can only be compared against using
-  # `UNDEFINED.equal?(x)`. Used in places where `nil` already has meaning, and
-  # thus cannot be used to mean the presence of nothing.
-  UNDEFINED = Object.new
 end
 
 # Load general requirements
 require 'base64'
 require 'cgi'
-require 'diff/lcs'
-require 'diff/lcs/hunk'
 require 'digest'
 require 'English'
-require 'fiber'
 require 'fileutils'
-require 'find'
 require 'forwardable'
 require 'logger'
 require 'net/http'
@@ -52,25 +28,26 @@ require 'stringio'
 require 'tempfile'
 require 'time'
 require 'timeout'
-require 'tomlrb'
 require 'tmpdir'
-require 'tty-platform'
 require 'tty-which'
 require 'uri'
-require 'yaml'
 
 # Load extracted Nanoc dependencies
 require 'nanoc-core'
+require 'nanoc-cli'
+require 'nanoc-checking'
+require 'nanoc-deploying'
 
 # Re-export from Nanoc::Core
 Nanoc::Identifier = Nanoc::Core::Identifier
 Nanoc::DataSource = Nanoc::Core::DataSource
+Nanoc::Filter = Nanoc::Core::Filter
+Nanoc::Error = Nanoc::Core::Error
+Nanoc::Check = Nanoc::Checking::Check
 
 # Load Nanoc
 require 'nanoc/version'
-require 'nanoc/base'
 require 'nanoc/checking'
-require 'nanoc/deploying'
 require 'nanoc/extra'
 require 'nanoc/data_sources'
 require 'nanoc/filters'

data/lib/nanoc/data_sources/filesystem.rb

@@ -48,6 +48,12 @@ module Nanoc::DataSources
   #
   # @api private
   class Filesystem < Nanoc::DataSource
+    class AmbiguousMetadataAssociationError < ::Nanoc::Core::Error
+      def initialize(content_filenames, meta_filename)
+        super("There are multiple content files (#{content_filenames.sort.join(', ')}) that could match the file containing metadata (#{meta_filename}).")
+      end
+    end
+
     identifiers :filesystem, :filesystem_unified
 
     # See {Nanoc::DataSource#up}.
@@ -85,9 +91,9 @@ module Nanoc::DataSources
     def changes_for_dir(dir)
       require 'listen'
 
-      Nanoc::ChangesStream.new do |cl|
+      Nanoc::Core::ChangesStream.new do |cl|
         listener =
-          Listen.to(dir, latency: 0.0, wait_for_delay: 0.0) do |_modifieds, _addeds, _deleteds|
+          Listen.to(dir, latency: 0.1, wait_for_delay: 0.0) do |_modifieds, _addeds, _deleteds|
             cl.unknown
           end
 
@@ -203,7 +209,7 @@ module Nanoc::DataSources
 
         have_possible_ambiguity = meta_filename && content_filenames.size > 1
         if have_possible_ambiguity && content_filenames.count { |fn| !parser.frontmatter?(fn) } != 1
-          raise Nanoc::Int::Errors::AmbiguousMetadataAssociation.new(content_filenames, meta_filename)
+          raise Nanoc::DataSources::Filesystem::AmbiguousMetadataAssociationError.new(content_filenames, meta_filename)
         end
 
         content_filenames.each do |content_filename|

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

@@ -6,7 +6,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
   # @api private
   module Tools
     # Error that is raised when too many symlink indirections are encountered.
-    class MaxSymlinkDepthExceededError < ::Nanoc::Int::Errors::GenericTrivial
+    class MaxSymlinkDepthExceededError < ::Nanoc::Core::TrivialError
       # @return [String] The last filename that was attempted to be
       #   resolved before giving up
       attr_reader :filename
@@ -21,7 +21,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
 
     # Error that is raised when a file of an unknown type is encountered
     # (something other than file, directory or link).
-    class UnsupportedFileTypeError < ::Nanoc::Int::Errors::GenericTrivial
+    class UnsupportedFileTypeError < ::Nanoc::Core::TrivialError
       # @return [String] The filename of the file whose type is not supported
       attr_reader :filename
 
@@ -93,7 +93,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
     #
     # @return [Array<String>] A list of files and directories
     #
-    # @raise [GenericTrivial] when pattern can not be handled
+    # @raise [Nanoc::Core::TrivialError] when pattern can not be handled
     def all_files_and_dirs_in(dir_name, extra_files)
       base_patterns = ["#{dir_name}/**/*"]
 
@@ -107,7 +107,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
           extra_files.map { |extra_file| "#{dir_name}/#{extra_file}" }
         else
           raise(
-            Nanoc::Int::Errors::GenericTrivial,
+            Nanoc::Core::TrivialError,
             "Do not know how to handle extra_files: #{extra_files.inspect}",
           )
         end

data/lib/nanoc/extra.rb

@@ -12,9 +12,10 @@ module Nanoc::Extra
   Deployer = Nanoc::Deploying::Deployer
 
   # @deprecated
-  Pruner = Nanoc::Pruner
+  Pruner = Nanoc::Core::Pruner
 end
 
 require_relative 'extra/link_collector'
 require_relative 'extra/jruby_nokogiri_warner'
+require_relative 'extra/srcset_parser'
 require_relative 'extra/core_ext'

data/lib/nanoc/extra/core_ext.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require 'nanoc/extra/core_ext/pathname'
 require 'nanoc/extra/core_ext/time'

data/lib/nanoc/extra/srcset_parser.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Extra
+    # @api private
+    class SrcsetParser
+      class InvalidFormat < ::Nanoc::Core::Error
+        def initialize
+          super('Invalid srcset format')
+        end
+      end
+
+      REGEX_REST =
+        /
+          (               # Zero or one of the following:
+            (             #   A width descriptor, consisting of:
+              \s+         #     ASCII whitespace
+              \d+         #     a valid non-negative integer
+              w           #     a U+0077 LATIN SMALL LETTER W character
+            )
+            |
+            (             #   A pixel density descriptor, consisting of
+              \s+         #     ASCII whitespace
+              (\d*\.)?\d+ #     a valid floating-point number
+              x           #     and a U+0078 LATIN SMALL LETTER X character.
+            )
+          )*
+        /x.freeze
+
+      def initialize(value)
+        @value = value
+      end
+
+      def call
+        matches = []
+
+        loop do
+          match = {}
+
+          scan(/\s*/)
+          match[:url] = scan(/[^, ]+/)
+          match[:rest] = scan(REGEX_REST)
+          scan(/\s*/)
+
+          matches << match
+
+          next if try_scan(/,/)
+          break if eos?
+
+          raise(InvalidFormat)
+        end
+
+        matches
+      rescue InvalidFormat
+        @value
+      end
+
+      private
+
+      def scan(pattern)
+        match = try_scan(pattern)
+
+        match || raise(InvalidFormat)
+      end
+
+      def try_scan(pattern)
+        scanner.scan(pattern)
+      end
+
+      def eos?
+        scanner.eos?
+      end
+
+      def scanner
+        @_scanner ||= StringScanner.new(@value)
+      end
+    end
+  end
+end

data/lib/nanoc/filters/colorize_syntax/colorizers.rb

@@ -4,7 +4,7 @@ module Nanoc::Filters::ColorizeSyntax::Colorizers
   class Abstract
     extend DDPlugin::Plugin
 
-    def process(_code, _language, params = {}) # rubocop:disable Lint/UnusedMethodArgument
+    def process(_code, _language, params = {})
       raise NotImplementedError
     end
 

data/lib/nanoc/filters/erb.rb

@@ -11,9 +11,6 @@ module Nanoc::Filters
     #
     # @param [String] content The content to filter
     #
-    # @option params [Integer] :safe_level (nil) The safe level (`$SAFE`) to
-    #   use while running this filter
-    #
     # @option params [String] :trim_mode (nil) The trim mode to use
     #
     # @return [String] The filtered content
@@ -29,9 +26,8 @@ module Nanoc::Filters
       assigns_binding = context.get_binding(&proc)
 
       # Get result
-      safe_level = params[:safe_level]
       trim_mode = params[:trim_mode]
-      erb = ::ERB.new(content, safe_level, trim_mode)
+      erb = ::ERB.new(content, nil, trim_mode)
       erb.filename = filename
       erb.result(assigns_binding)
     end

data/lib/nanoc/filters/relativize_paths.rb

@@ -10,7 +10,16 @@ module Nanoc::Filters
 
     DDMemoize.activate(self)
 
-    SELECTORS = ['*/@href', '*/@src', 'object/@data', 'param[@name="movie"]/@content', 'form/@action', 'comment()'].freeze
+    SELECTORS =
+      [
+        '*/@href',
+        '*/@src',
+        'object/@data',
+        'param[@name="movie"]/@value',
+        'form/@action',
+        'comment()',
+        { path: '*/@srcset', type: :srcset },
+      ].freeze
 
     GCSE_SEARCH_WORKAROUND = 'nanoc__gcse_search__f7ac3462f628a053f86fe6563c0ec98f1fe45cee'
 
@@ -135,14 +144,7 @@ module Nanoc::Filters
       content = apply_gcse_search_workaround(content)
 
       doc = /<html[\s>]/.match?(content) ? klass.parse(content) : klass.fragment(content)
-      selector = selectors.map { |sel| "descendant-or-self::#{sel}" }.join('|')
-      doc.xpath(selector, namespaces).each do |node|
-        if node.name == 'comment'
-          nokogiri_process_comment(node, doc, selectors, namespaces, klass, type, params)
-        elsif path_is_relativizable?(node.content, params)
-          node.content = relative_path_to(node.content)
-        end
-      end
+      handle_selectors(selectors, doc, namespaces, klass, type, params)
 
       output =
         case type
@@ -163,6 +165,33 @@ module Nanoc::Filters
       content.gsub(GCSE_SEARCH_WORKAROUND, 'gcse:search')
     end
 
+    def handle_selectors(selectors, doc, namespaces, klass, type, params)
+      selectors_by_type(selectors).each do |selector_type, sub_selectors|
+        selector = sub_selectors.map { |sel| "descendant-or-self::#{sel.fetch(:path)}" }.join('|')
+
+        doc.xpath(selector, namespaces).each do |node|
+          if node.name == 'comment'
+            nokogiri_process_comment(node, doc, sub_selectors, namespaces, klass, type, params)
+          elsif path_is_relativizable?(node.content, params)
+            node.content = relativize_node(node, selector_type)
+          end
+        end
+      end
+    end
+
+    def selectors_by_type(selectors)
+      typed_selectors =
+        selectors.map do |s|
+          if s.respond_to?(:keys)
+            s
+          else
+            { path: s, type: :basic }
+          end
+        end
+
+      typed_selectors.group_by { |s| s.fetch(:type) }
+    end
+
     def nokogiri_process_comment(node, doc, selectors, namespaces, klass, type, params)
       content = node.content.dup.sub(%r{^(\s*\[.+?\]>\s*)(.+?)(\s*<!\[endif\])}m) do |_m|
         beginning = Regexp.last_match[1]
@@ -175,8 +204,31 @@ module Nanoc::Filters
       node.replace(Nokogiri::XML::Comment.new(doc, content))
     end
 
+    def relativize_node(node, selector_type)
+      case selector_type
+      when :basic
+        relative_path_to(node.content)
+      when :srcset
+        handle_srcset_node(node)
+      else
+        raise Nanoc::Core::Errors::InternalInconsistency, "Unsupported selector type #{selector_type.inspect} in #{self.class}"
+      end
+    end
+
+    def handle_srcset_node(node)
+      parsed = Nanoc::Extra::SrcsetParser.new(node.content).call
+
+      if parsed.is_a?(Array)
+        parsed.map do |pair|
+          [relative_path_to(pair[:url]), pair[:rest]].join('')
+        end.join(',')
+      else
+        relative_path_to(parsed)
+      end
+    end
+
     def path_is_relativizable?(path, params)
-      path.start_with?('/') && !exclude?(path, params)
+      path.match?(/\A\s*\//) && !exclude?(path, params)
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ::Sass::Script::Functions
-  def nanoc(string, params)
+  def nanoc(string, params = {})
     assert_type string, :String
     assert_type params, :Hash
     result = options[:importer].filter.instance_eval(string.value)

data/lib/nanoc/helpers/blogging.rb

@@ -83,28 +83,28 @@ module Nanoc::Helpers
 
       def validate_config
         if @config[:base_url].nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: site configuration has no base_url')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: site configuration has no base_url')
         end
       end
 
       def validate_feed_item
         if title.nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no title in params, item or site config')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no title in params, item or site config')
         end
         if author_name.nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no author_name in params, item or site config')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no author_name in params, item or site config')
         end
         if author_uri.nil?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no author_uri in params, item or site config')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no author_uri in params, item or site config')
         end
       end
 
       def validate_articles
         if relevant_articles.empty?
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: no articles')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: no articles')
         end
         if relevant_articles.any? { |a| a[:created_at].nil? }
-          raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: one or more articles lack created_at')
+          raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: one or more articles lack created_at')
         end
       end
 
@@ -218,7 +218,7 @@ module Nanoc::Helpers
     def url_for(item)
       # Check attributes
       if @config[:base_url].nil?
-        raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: site configuration has no base_url')
+        raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: site configuration has no base_url')
       end
 
       # Build URL
@@ -235,7 +235,7 @@ module Nanoc::Helpers
     def feed_url
       # Check attributes
       if @config[:base_url].nil?
-        raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: site configuration has no base_url')
+        raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: site configuration has no base_url')
       end
 
       @item[:feed_url] || @config[:base_url] + @item.path

data/lib/nanoc/helpers/capturing.rb

@@ -68,7 +68,7 @@ module Nanoc::Helpers
 
           unless rep.compiled?
             # FIXME: is :last appropriate?
-            Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(rep, :last))
+            Fiber.yield(Nanoc::Core::Errors::UnmetDependency.new(rep, :last))
             return run
           end
         end