nanoc 4.7.9 → 4.7.10

data/lib/nanoc/filters/maruku.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Maruku < Nanoc::Filter

data/lib/nanoc/filters/mustache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Mustache < Nanoc::Filter

data/lib/nanoc/filters/pandoc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Pandoc < Nanoc::Filter

data/lib/nanoc/filters/rainpress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Rainpress < Nanoc::Filter

data/lib/nanoc/filters/rdiscount.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class RDiscount < Nanoc::Filter

data/lib/nanoc/filters/rdoc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class RDoc < Nanoc::Filter

data/lib/nanoc/filters/redcarpet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Redcarpet < Nanoc::Filter

data/lib/nanoc/filters/redcloth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class RedCloth < Nanoc::Filter

data/lib/nanoc/filters/relativize_paths.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class RelativizePaths < Nanoc::Filter
@@ -104,13 +106,12 @@ module Nanoc::Filters
       namespaces = namespaces.reduce({}) { |new, (prefix, uri)| new.merge(prefix.to_s => uri) }
 
       doc = content =~ /<html[\s>]/ ? klass.parse(content) : klass.fragment(content)
-      selectors.map { |sel| "descendant-or-self::#{sel}" }.each do |selector|
-        doc.xpath(selector, namespaces).each do |node|
-          if node.name == 'comment'
-            nokogiri_process_comment(node, doc, selectors, namespaces, klass, type)
-          elsif path_is_relativizable?(node.content)
-            node.content = relative_path_to(node.content)
-          end
+      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)
+        elsif path_is_relativizable?(node.content)
+          node.content = relative_path_to(node.content)
         end
       end
 

data/lib/nanoc/filters/rubypants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class RubyPants < Nanoc::Filter

data/lib/nanoc/filters/sass.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Sass < Nanoc::Filter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api private
 class ::Sass::Importers::Filesystem
   alias _orig_find _find

data/lib/nanoc/filters/slim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Slim < Nanoc::Filter
@@ -20,7 +22,7 @@ module Nanoc::Filters
       # Create context
       context = ::Nanoc::Int::Context.new(assigns)
 
-      ::Slim::Template.new(params) { content }.render(context) { assigns[:content] }
+      ::Slim::Template.new(filename, params) { content }.render(context) { assigns[:content] }
     end
   end
 end

data/lib/nanoc/filters/typogruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class Typogruby < Nanoc::Filter

data/lib/nanoc/filters/uglify_js.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class UglifyJS < Nanoc::Filter

data/lib/nanoc/filters/xsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class XSL < Nanoc::Filter

data/lib/nanoc/filters/yui_compressor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Filters
   # @api private
   class YUICompressor < Nanoc::Filter

data/lib/nanoc/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
 end
 

data/lib/nanoc/helpers/blogging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#blogging
   module Blogging
@@ -50,7 +52,7 @@ module Nanoc::Helpers
       end
 
       def build
-        buffer = ''
+        buffer = String.new
         xml = Builder::XmlMarkup.new(target: buffer, indent: 2)
         build_for_feed(xml)
         buffer

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#breadcrumbs
   module Breadcrumbs

data/lib/nanoc/helpers/capturing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#capturing
   module Capturing
@@ -128,7 +130,7 @@ module Nanoc::Helpers
               "of the capture, optionally params, and the content) but got #{args.size} instead"
           end
 
-        _erbout = '' # rubocop:disable Lint/UnderscorePrefixedVariableName
+        _erbout = String.new # rubocop:disable Lint/UnderscorePrefixedVariableName
         SetContent.new(name, params, @item).run { _erbout << content }
       else # Get content
         if args.size != 2
@@ -155,7 +157,7 @@ module Nanoc::Helpers
       erbout_addition = erbout[erbout_length..-1]
 
       # Remove addition
-      erbout[erbout_length..-1] = ''
+      erbout[erbout_length..-1] = String.new
 
       # Depending on how the filter outputs, the result might be a
       # single string or an array of strings (slim outputs the latter).

data/lib/nanoc/helpers/child_parent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#childparent
   module ChildParent

data/lib/nanoc/helpers/filtering.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#filtering
   module Filtering

data/lib/nanoc/helpers/html_escape.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#filtering
   module HTMLEscape

data/lib/nanoc/helpers/link_to.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#linkto
   module LinkTo

data/lib/nanoc/helpers/rendering.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#rendering
   module Rendering

data/lib/nanoc/helpers/tagging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#tagging
   module Tagging

data/lib/nanoc/helpers/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#text
   module Text

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#xmlsitemap
   module XMLSitemap
@@ -13,7 +15,7 @@ module Nanoc::Helpers
       select_proc = params.fetch(:rep_select, nil)
 
       # Create builder
-      buffer = ''
+      buffer = String.new
       xml = Builder::XmlMarkup.new(target: buffer, indent: 2)
 
       # Check for required attributes

data/lib/nanoc/rule_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'rule_dsl/compiler_dsl'
 require_relative 'rule_dsl/action_provider'
 require_relative 'rule_dsl/recording_executor'

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::RuleDSL
   class ActionProvider < Nanoc::Int::ActionProvider
     identifier :rule_dsl

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::RuleDSL
   # Calculates action sequences for objects that can be run through a rule (item
   # representations and layouts).

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Nanoc::RuleDSL
   # Contains methods that will be executed by the site’s `Rules` file.
   #
   # @api private
-  class CompilerDSL
+  class CompilerDSL < Nanoc::Int::Context
     # The current rules filename.
     #
     # @return [String] The current rules filename.
@@ -21,6 +23,7 @@ module Nanoc::RuleDSL
     def initialize(rules_collection, config)
       @rules_collection = rules_collection
       @config = config
+      super({ config: config })
     end
 
     # Creates a preprocessor block that will be executed after all data is

data/lib/nanoc/rule_dsl/recording_executor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc
   module RuleDSL
     class RecordingExecutor

data/lib/nanoc/rule_dsl/rule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::RuleDSL
   # Contains the processing information for a item.
   #

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::RuleDSL
   # Provides a context in which compilation and routing rules can be executed.
   # It provides access to the item representation that is being compiled or

data/lib/nanoc/rule_dsl/rules_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::RuleDSL
   # Keeps track of the rules in a site.
   #

data/lib/nanoc/rule_dsl/rules_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::RuleDSL
   # @api private
   class RulesLoader

data/lib/nanoc/spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc
   # @api private
   module Spec
@@ -11,7 +13,7 @@ module Nanoc
       def initialize(mod)
         @mod = mod
 
-        @erbout = ''
+        @erbout = String.new
         @action_sequence = {}
         @config = Nanoc::Int::Configuration.new.with_defaults
         @reps = Nanoc::Int::ItemRepRepo.new

data/lib/nanoc/telemetry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc
   # @api private
   module Telemetry
@@ -15,3 +17,5 @@ require_relative 'telemetry/labelled_summary'
 
 require_relative 'telemetry/registry'
 require_relative 'telemetry/stopwatch'
+
+require_relative 'telemetry/table'

data/lib/nanoc/telemetry/counter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Telemetry
   class Counter
     attr_reader :value

data/lib/nanoc/telemetry/labelled_counter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Telemetry
   class LabelledCounter
     def initialize

data/lib/nanoc/telemetry/labelled_summary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Telemetry
   class LabelledSummary
     def initialize

data/lib/nanoc/telemetry/registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Telemetry
   class Registry
     def initialize

data/lib/nanoc/telemetry/stopwatch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Telemetry
   class Stopwatch
     attr_reader :duration

data/lib/nanoc/telemetry/summary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nanoc::Telemetry
   class Summary
     class EmptySummaryError < StandardError

data/lib/nanoc/telemetry/table.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Nanoc::Telemetry
+  class Table
+    def initialize(rows)
+      @rows = rows
+    end
+
+    def to_s
+      columns = @rows.transpose
+      column_lengths = columns.map { |c| c.map(&:size).max }
+
+      [].tap do |lines|
+        lines << row_to_s(@rows[0], column_lengths)
+        lines << separator(column_lengths)
+        lines.concat(@rows.map { |r| row_to_s(r, column_lengths) })
+      end.join("\n")
+    end
+
+    private
+
+    def row_to_s(row, column_lengths)
+      values = row.zip(column_lengths).map { |text, length| text.rjust(length) }
+      values[0] + ' │ ' + values[1..-1].join('   ')
+    end
+
+    def separator(column_lengths)
+      String.new.tap do |s|
+        s << '─' * column_lengths[0]
+        s << '─┼─'
+        s << column_lengths[1..-1].map { |l| '─' * l }.join('───')
+      end
+    end
+  end
+end