nanoc 4.7.5 → 4.7.6

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

@@ -3,14 +3,14 @@ module Nanoc::Int::OutdatednessRules
     affects_props :raw_content, :attributes, :path
 
     def apply(obj, outdatedness_checker)
-      mem = outdatedness_checker.action_sequence_for(obj)
-      if any_always_outdated?(mem)
+      seq = outdatedness_checker.action_sequence_for(obj)
+      if any_always_outdated?(seq)
         Nanoc::Int::OutdatednessReasons::UsesAlwaysOutdatedFilter
       end
     end
 
-    def any_always_outdated?(mem)
-      mem
+    def any_always_outdated?(seq)
+      seq
         .select { |a| a.is_a?(Nanoc::Int::ProcessingActions::Filter) }
         .map { |a| Nanoc::Filter.named(a.filter_name) }
         .compact

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

@@ -11,8 +11,6 @@ module ::Nanoc::Checking::Checks
     identifiers :external_links, :elinks
 
     def run
-      require 'nokogiri'
-
       # Find all broken external hrefs
       # TODO: de-duplicate this (duplicated in internal links check)
       filenames = output_filenames.select { |f| File.extname(f) == '.html' && !excluded_file?(f) }

data/lib/nanoc/cli.rb

@@ -214,7 +214,7 @@ module Nanoc::CLI
   def self.enable_utf8?(io)
     return true unless io.tty?
 
-    %w(LC_ALL LC_CTYPE LANG).any? { |e| ENV[e] =~ /UTF/i }
+    %w[LC_ALL LC_CTYPE LANG].any? { |e| ENV[e] =~ /UTF/i }
   end
 
   # @return [Boolean] true if color support is present, false if not

data/lib/nanoc/cli/commands/compile_listeners/timing_recorder.rb

@@ -17,13 +17,14 @@ module Nanoc::CLI::Commands::CompileListeners
     def start
       stage_stopwatch = Nanoc::Telemetry::Stopwatch.new
 
-      on(:stage_started) do |_stage_name|
+      on(:stage_started) do |_klass|
         stage_stopwatch.start
       end
 
-      on(:stage_ended) do |stage_name|
+      on(:stage_ended) do |klass|
         stage_stopwatch.stop
-        @telemetry.summary(:stages).observe(stage_stopwatch.duration, stage_name.to_s)
+        name = klass.to_s.sub(/.*::/, '')
+        @telemetry.summary(:stages).observe(stage_stopwatch.duration, name)
         stage_stopwatch = Nanoc::Telemetry::Stopwatch.new
       end
 
@@ -40,7 +41,8 @@ module Nanoc::CLI::Commands::CompileListeners
         stopwatch = stopwatches.fetch(obj)
         stopwatch.stop
 
-        @telemetry.summary(:outdatedness_rules).observe(stopwatch.duration, klass.to_s.sub(/.*::/, ''))
+        name = klass.to_s.sub(/.*::/, '')
+        @telemetry.summary(:outdatedness_rules).observe(stopwatch.duration, name)
       end
 
       filter_stopwatches = {}
@@ -143,7 +145,7 @@ module Nanoc::CLI::Commands::CompileListeners
     end
 
     def table_for_memoization
-      headers = %w(memoization hit miss %)
+      headers = %w[memoization hit miss %]
 
       rows_raw = @telemetry.counter(:memoization).map do |(name, type), counter|
         { name: name, type: type, count: counter.value }

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

@@ -300,7 +300,7 @@ EOS
       path = arguments[0]
 
       # Check whether site exists
-      if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - %w(. ..)).empty?) && !options[:force]
+      if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - %w[. ..]).empty?) && !options[:force]
         raise(
           Nanoc::Int::Errors::GenericTrivial,
           "The site was not created because '#{path}' already exists. " \

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

@@ -1,5 +1,6 @@
 usage 'nanoc command [options] [arguments]'
 summary 'Nanoc, a static site compiler written in Ruby'
+default_subcommand 'compile'
 
 opt :l, :color, 'enable color' do
   $stdout.remove_stream_cleaner(Nanoc::CLI::StreamCleaners::ANSIColors)
@@ -37,7 +38,3 @@ end
 opt :w, :warn, 'enable warnings' do
   $-w = true
 end
-
-run do |_opts, _args, cmd|
-  cmd.command_named('compile').run([])
-end

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

@@ -41,7 +41,7 @@ module Nanoc::CLI::Commands
         puts
 
         # Print plugins organised by subtype
-        %i(builtin custom).each do |type|
+        %i[builtin custom].each do |type|
           # Find relevant plugins
           relevant_plugins = plugins_with_this_superclass[type]
 

data/lib/nanoc/cli/error_handler.rb

@@ -42,7 +42,7 @@ module Nanoc::CLI
     # @return [void]
     def handle_while(&_block)
       # Set exit handler
-      %w(INT TERM).each do |signal|
+      %w[INT TERM].each do |signal|
         Signal.trap(signal) do
           puts
           exit!(0)
@@ -193,6 +193,7 @@ module Nanoc::CLI
       'maruku'         => 'maruku',
       'mime/types'     => 'mime-types',
       'nokogiri'       => 'nokogiri',
+      'nokogumbo'      => 'nokogumbo',
       'pry'            => 'pry',
       'rack'           => 'rack',
       'rack/cache'     => 'rack-cache',

data/lib/nanoc/deploying/deployers/git.rb

@@ -61,7 +61,7 @@ module Nanoc::Deploying::Deployers
         # Verify existence of remote, if remote is not a URL
         if remote_is_name?(remote)
           begin
-            run_cmd(%W(git config --get remote.#{remote}.url))
+            run_cmd(%W[git config --get remote.#{remote}.url])
           rescue Nanoc::Extra::Piper::Error
             raise Errors::RemoteDoesNotExist.new(remote)
           end
@@ -69,7 +69,7 @@ module Nanoc::Deploying::Deployers
 
         # If the branch exists then switch to it, otherwise prompt the user to create one.
         begin
-          run_cmd_unless_dry(%W(git checkout #{branch}))
+          run_cmd_unless_dry(%W[git checkout #{branch}])
         rescue Nanoc::Extra::Piper::Error
           raise Errors::BranchDoesNotExist.new(branch)
         end
@@ -78,13 +78,13 @@ module Nanoc::Deploying::Deployers
 
         msg = "Automated commit at #{Time.now.utc} by Nanoc #{Nanoc::VERSION}"
         author = 'Nanoc <>'
-        run_cmd_unless_dry(%w(git add -A))
-        run_cmd_unless_dry(%W(git commit -a --author #{author} -m #{msg}))
+        run_cmd_unless_dry(%w[git add -A])
+        run_cmd_unless_dry(%W[git commit -a --author #{author} -m #{msg}])
 
         if forced
-          run_cmd_unless_dry(%W(git push -f #{remote} #{branch}))
+          run_cmd_unless_dry(%W[git push -f #{remote} #{branch}])
         else
-          run_cmd_unless_dry(%W(git push #{remote} #{branch}))
+          run_cmd_unless_dry(%W[git push #{remote} #{branch}])
         end
       end
     end
@@ -111,7 +111,7 @@ module Nanoc::Deploying::Deployers
     def clean_repo?
       stdout = StringIO.new
       piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: $stderr)
-      piper.run(%w(git status --porcelain), nil)
+      piper.run(%w[git status --porcelain], nil)
       stdout.string.empty?
     end
   end

data/lib/nanoc/extra/link_collector.rb

@@ -44,11 +44,11 @@ module ::Nanoc::Extra
     end
 
     def hrefs_in_file(filename)
-      uris_in_file filename, %w(a img)
+      uris_in_file filename, %w[a img]
     end
 
     def resource_uris_in_file(filename)
-      uris_in_file filename, %w(audio form img iframe link script video)
+      uris_in_file filename, %w[audio form img iframe link script video]
     end
 
     private

data/lib/nanoc/filters/asciidoc.rb

@@ -13,7 +13,7 @@ module Nanoc::Filters
       stdout = StringIO.new
       stderr = $stderr
       piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
-      piper.run(%w(asciidoc -o - -), content)
+      piper.run(%w[asciidoc -o - -], content)
       stdout.string
     end
   end

data/lib/nanoc/filters/colorize_syntax.rb

@@ -92,19 +92,11 @@ module Nanoc::Filters
         @colorizers[language] = colorizer
       end
 
-      # Determine syntax (HTML or XML)
-      syntax = params[:syntax] || :html
-      case syntax
-      when :html
-        klass = Nokogiri::HTML
-      when :xml, :xhtml
-        klass = Nokogiri::XML
-      else
-        raise "unknown syntax: #{syntax.inspect} (expected :html or :xml)"
-      end
+      syntax = params.fetch(:syntax, :html)
+      parser = parser_for(syntax)
 
       # Colorize
-      doc = parse(content, klass, params.fetch(:is_fullpage, false))
+      doc = parse(content, parser, params.fetch(:is_fullpage, false))
       selector = params[:outside_pre] ? 'code' : 'pre > code'
       doc.css(selector).each do |element|
         # Get language
@@ -128,7 +120,7 @@ module Nanoc::Filters
         # Highlight
         raw = strip(element.inner_text)
         highlighted_code = highlight(raw, language, params)
-        element.children = Nokogiri::HTML.fragment(strip(highlighted_code), 'utf-8')
+        element.children = parse_fragment(parser, strip(highlighted_code))
 
         # Add language-something class
         unless has_class
@@ -141,8 +133,44 @@ module Nanoc::Filters
         highlight_postprocess(language, element.parent)
       end
 
-      method = "to_#{syntax}".to_sym
-      doc.send(method, encoding: 'UTF-8')
+      serialize(doc, syntax)
+    end
+
+    def parser_for(syntax)
+      case syntax
+      when :html
+        require 'nokogiri'
+        Nokogiri::HTML
+      when :html5
+        require 'nokogumbo'
+        Nokogiri::HTML5
+      when :xml, :xhtml
+        require 'nokogiri'
+        Nokogiri::XML
+      else
+        raise "unknown syntax: #{syntax.inspect} (expected :html, :html5, or :xml)"
+      end
+    end
+
+    def serialize(doc, syntax)
+      case syntax
+      when :html5
+        doc.to_html
+      else
+        doc.send("to_#{syntax}", encoding: 'UTF-8')
+      end
+    end
+
+    def parse_full(parser_class, content)
+      if parser_class.to_s == 'Nokogiri::HTML5'
+        parser_class.parse(content)
+      else
+        parser_class.parse(content, nil, 'UTF-8')
+      end
+    end
+
+    def parse_fragment(parser_class, content)
+      parser_class.fragment(content)
     end
 
     # Parses the given content using the given class. This method also handles
@@ -151,16 +179,15 @@ module Nanoc::Filters
     #
     # @param [String] content The content to parse
     #
-    # @param [Class] klass The Nokogiri parser class (either Nokogiri::HTML
-    #   or Nokogiri::XML)
+    # @param [Class] klass The Nokogiri parser class
     #
     # @param [Boolean] is_fullpage true if the given content is a full page,
     #   false if it is a fragment
     def parse(content, klass, is_fullpage)
       if is_fullpage
-        klass.parse(content, nil, 'UTF-8')
+        parse_full(klass, content)
       else
-        klass.fragment(content)
+        parse_fragment(klass, content)
       end
     rescue => e
       if e.message =~ /can't modify frozen string/
@@ -358,7 +385,7 @@ module Nanoc::Filters
 
     protected
 
-    KNOWN_COLORIZERS = %i(coderay dummy pygmentize pygmentsrb simon_highlight rouge).freeze
+    KNOWN_COLORIZERS = %i[coderay dummy pygmentize pygmentsrb simon_highlight rouge].freeze
 
     # Removes the first blank lines and any whitespace at the end.
     def strip(s)

data/lib/nanoc/filters/relativize_paths.rb

@@ -38,7 +38,7 @@ module Nanoc::Filters
       case params[:type]
       when :css
         relativize_css(content)
-      when :html, :xml, :xhtml
+      when :html, :html5, :xml, :xhtml
         relativize_html_like(content, params)
       else
         raise 'The relativize_paths needs to know the type of content to ' \
@@ -63,22 +63,40 @@ module Nanoc::Filters
       namespaces = params.fetch(:namespaces, {})
       type       = params.fetch(:type)
 
-      require 'nokogiri'
+      parser = parser_for(type)
+      content = fix_content(content, type)
+
+      nokogiri_process(content, selectors, namespaces, parser, type)
+    end
+
+    def parser_for(type)
       case type
       when :html
-        klass = ::Nokogiri::HTML
+        require 'nokogiri'
+        ::Nokogiri::HTML
+      when :html5
+        require 'nokogumbo'
+        ::Nokogiri::HTML5
       when :xml
-        klass = ::Nokogiri::XML
+        require 'nokogiri'
+        ::Nokogiri::XML
+      when :xhtml
+        require 'nokogiri'
+        ::Nokogiri::XML
+      end
+    end
+
+    def fix_content(content, type)
+      case type
       when :xhtml
-        klass = ::Nokogiri::XML
         # FIXME: cleanup because it is ugly
         # this cleans the XHTML namespace to process fragments and full
         # documents in the same way. At least, Nokogiri adds this namespace
         # if detects the `html` element.
-        content = content.sub(%r{(<html[^>]+)xmlns="http://www.w3.org/1999/xhtml"}, '\1')
+        content.sub(%r{(<html[^>]+)xmlns="http://www.w3.org/1999/xhtml"}, '\1')
+      else
+        content
       end
-
-      nokogiri_process(content, selectors, namespaces, klass, type)
     end
 
     def nokogiri_process(content, selectors, namespaces, klass, type)
@@ -95,7 +113,13 @@ module Nanoc::Filters
           end
         end
       end
-      doc.send("to_#{type}")
+
+      case type
+      when :html5
+        doc.to_html
+      else
+        doc.send("to_#{type}")
+      end
     end
 
     def nokogiri_process_comment(node, doc, selectors, namespaces, klass, type)

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -54,10 +54,6 @@ module Nanoc::RuleDSL
       end
     end
 
-    # @param [Nanoc::Int::ItemRep] rep The item representation to get the rule
-    #   memory for
-    #
-    # @return [Nanoc::Int::ActionSequence]
     def new_action_sequence_for_rep(rep)
       dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
       view_context = @site.compiler.compilation_context.create_view_context(dependency_tracker)
@@ -82,7 +78,7 @@ module Nanoc::RuleDSL
         executor.snapshot(:pre)
       end
 
-      copy_paths_from_routing_rules(action_sequence.compact_snapshots, rep: rep)
+      copy_paths_from_routing_rules(compact_snapshots(action_sequence), rep: rep)
     end
 
     # @param [Nanoc::Int::Layout] layout
@@ -100,8 +96,20 @@ module Nanoc::RuleDSL
       end
     end
 
-    def copy_paths_from_routing_rules(mem, rep:)
-      mem.map do |action|
+    def compact_snapshots(seq)
+      actions = []
+      seq.actions.each do |action|
+        if [actions.last, action].all? { |a| a.is_a?(Nanoc::Int::ProcessingActions::Snapshot) }
+          actions[-1] = actions.last.update(snapshot_names: action.snapshot_names, paths: action.paths)
+        else
+          actions << action
+        end
+      end
+      Nanoc::Int::ActionSequence.new(seq.item_rep, actions: actions)
+    end
+
+    def copy_paths_from_routing_rules(seq, rep:)
+      seq.map do |action|
         if action.is_a?(Nanoc::Int::ProcessingActions::Snapshot) && action.paths.empty?
           copy_path_from_routing_rule(action, rep: rep)
         else

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.7.5'.freeze
+  VERSION = '4.7.6'.freeze
 end

data/nanoc.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.1.0'
 
-  s.add_runtime_dependency('cri', '~> 2.3')
+  s.add_runtime_dependency('cri', '~> 2.8')
   s.add_runtime_dependency('hamster', '~> 3.0')
   s.add_runtime_dependency('ref', '~> 2.0')
   s.add_runtime_dependency('ddplugin', '~> 1.0')

data/spec/nanoc/base/checksummer_spec.rb

@@ -69,11 +69,11 @@ describe Nanoc::Int::Checksummer do
   end
 
   context 'Array' do
-    let(:obj) { %w(hello goodbye) }
+    let(:obj) { %w[hello goodbye] }
     it { is_expected.to eql('Array<String<hello>,String<goodbye>,>') }
 
     context 'different order' do
-      let(:obj) { %w(goodbye hello) }
+      let(:obj) { %w[goodbye hello] }
       it { is_expected.to eql('Array<String<goodbye>,String<hello>,>') }
     end