nanoc 3.7.4 → 3.7.5

data/lib/nanoc/base/compilation/compiler_dsl.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Contains methods that will be executed by the site’s `Rules` file.
   class CompilerDSL
-
     # The current rules filename.
     #
     # @return [String] The current rules filename.
@@ -122,7 +120,7 @@ module Nanoc
       snapshot_name = params[:snapshot] || :last
 
       # Create rule
-      rule = Rule.new(identifier_to_regex(identifier), rep_name, block, :snapshot_name => snapshot_name)
+      rule = Rule.new(identifier_to_regex(identifier), rep_name, block, snapshot_name: snapshot_name)
       @rules_collection.add_item_routing_rule(rule)
     end
 
@@ -199,7 +197,7 @@ module Nanoc
         # data source.
         item[:extension].nil? || (item[:content_filename].nil? && item.identifier =~ %r{#{item[:extension]}/$}) ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
       end
-      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, routing_block, :snapshot_name => :last)
+      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, routing_block, snapshot_name: :last)
       @rules_collection.add_item_routing_rule(routing_rule)
     end
 
@@ -230,7 +228,7 @@ module Nanoc
       compilation_rule = Rule.new(identifier_to_regex(identifier), rep_name, proc {})
       @rules_collection.add_item_compilation_rule(compilation_rule)
 
-      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, proc {}, :snapshot_name => :last)
+      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, proc {}, snapshot_name: :last)
       @rules_collection.add_item_routing_rule(routing_rule)
     end
 
@@ -271,7 +269,5 @@ module Nanoc
         identifier
       end
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/dependency_tracker.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Responsible for remembering dependencies between items and layouts. It is
   # used to speed up compilation by only letting an item be recompiled when it
   # is outdated or any of its dependencies (or dependencies’ dependencies,
@@ -20,7 +19,6 @@ module Nanoc
   #
   # @api private
   class DependencyTracker < ::Nanoc::Store
-
     # @return [Array<Nanoc::Item, Nanoc::Layout>] The list of items and
     #   layouts that are being tracked by the dependency tracker
     attr_reader :objects
@@ -176,8 +174,8 @@ module Nanoc
 
     def data
       {
-        :edges    => @graph.edges,
-        :vertices => @graph.vertices.map { |obj| obj && obj.reference }
+        edges: @graph.edges,
+        vertices: @graph.vertices.map { |obj| obj && obj.reference }
       }
     end
 
@@ -207,7 +205,5 @@ module Nanoc
         end
       end
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/filter.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Nanoc::Filter is responsible for filtering items. It is the superclass
   # for all textual filters.
   #
@@ -27,7 +26,6 @@ module Nanoc
   #
   # @abstract Subclass and override {#run} to implement a custom filter.
   class Filter < Context
-
     TMP_BINARY_ITEMS_DIR = 'binary_items'
 
     # A hash containing variables that will be made available during
@@ -39,7 +37,6 @@ module Nanoc
     extend Nanoc::PluginRegistry::PluginMethods
 
     class << self
-
       # Sets the new type for the filter. The type can be `:binary` (default)
       # or `:text`. The given argument can either be a symbol indicating both
       # “from” and “to” types, or a hash where the only key is the “from” type
@@ -100,7 +97,6 @@ module Nanoc
           true
         end
       end
-
     end
 
     # Creates a new filter that has access to the given assigns.
@@ -135,7 +131,7 @@ module Nanoc
     # @return [String, void] If the filter output binary content, the return
     #   value is undefined; if the filter outputs textual content, the return
     #   value will be the filtered content.
-    def run(_content_or_filename, _params = {})
+    def run(content_or_filename, params = {}) # rubocop:disable Lint/UnusedMethodArgument
       raise NotImplementedError.new('Nanoc::Filter subclasses must implement #run')
     end
 
@@ -186,7 +182,5 @@ module Nanoc
         raise Nanoc::Errors::UnmetDependency.new(rep) if rep
       end
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/item_rep_proxy.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Represents an item representation, but provides an interface that is
   # easier to use when writing compilation and routing rules. It is also
   # responsible for fetching the necessary information from the compiler, such
@@ -10,7 +9,6 @@ module Nanoc
   # The API provided by item representation proxies allows layout identifiers
   # to be given as literals instead of as references to {Nanoc::Layout}.
   class ItemRepProxy
-
     extend Forwardable
 
     def_delegators :@item_rep, :item, :name, :binary, :binary?, :compiled_content, :has_snapshot?, :raw_path, :path
@@ -98,7 +96,5 @@ module Nanoc
       raise Nanoc::Errors::UnknownLayout.new(layout_identifier) if layout.nil?
       layout
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/item_rep_recorder_proxy.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Represents a fake iem representation that does not actually perform any
   # actual filtering, layouting or snapshotting, but instead keeps track of
   # what would happen if a real item representation would have been used
@@ -15,7 +14,6 @@ module Nanoc
   #
   # @api private
   class ItemRepRecorderProxy
-
     extend Forwardable
 
     def_delegators :@item_rep, :item, :name, :binary, :binary?, :compiled_content, :has_snapshot?, :raw_path, :path, :assigns, :assigns=
@@ -97,7 +95,5 @@ module Nanoc
       true
     end
     alias_method :is_proxy?, :proxy?
-
   end
-
 end

data/lib/nanoc/base/compilation/outdatedness_checker.rb

@@ -1,12 +1,10 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Responsible for determining whether an item or a layout is outdated.
   #
   # @api private
   class OutdatednessChecker
-
     extend Nanoc::Memoization
 
     # @option params [Nanoc::Site] :site (nil) The site this outdatedness
@@ -220,7 +218,5 @@ module Nanoc
     def site
       @site
     end
-
   end
-
 end

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

@@ -1,14 +1,11 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Module that contains all outdatedness reasons.
   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
 
@@ -17,7 +14,6 @@ module Nanoc
       def initialize(message)
         @message = message
       end
-
     end
 
     CodeSnippetsModified = Generic.new(
@@ -40,7 +36,5 @@ module Nanoc
 
     SourceModified = Generic.new(
       'The source file of this item has been modified since the last time the site was compiled.')
-
   end
-
 end

data/lib/nanoc/base/compilation/rule.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Contains the processing information for a item.
   class Rule
-
     # @return [Regexp] The regex that determines which items this rule can be
     #   applied to. This rule can be applied to items with a identifier
     #   matching this regex.
@@ -67,9 +65,7 @@ module Nanoc
         raise ArgumentError, 'Required :compiler option is missing'
       end
       rep = Nanoc::ItemRepProxy.new(rep, compiler) unless rep.proxy?
-      Nanoc::RuleContext.new(:rep => rep, :compiler => compiler).instance_eval(&@block)
+      Nanoc::RuleContext.new(rep: rep, compiler: compiler).instance_eval(&@block)
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/rule_context.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Provides a context in which compilation and routing rules can be executed.
   # It provides access to the item representation that is being compiled or
   # routed.
@@ -17,7 +16,6 @@ module Nanoc
   #
   # @api private
   class RuleContext < Context
-
     # @option params [Nanoc::ItemRep] :rep The item representation that will
     #   be processed in this rule context
     #
@@ -35,13 +33,13 @@ module Nanoc
       end
 
       super({
-        :rep      => rep,
-        :item_rep => rep,
-        :item     => rep.item,
-        :site     => compiler.site,
-        :config   => compiler.site.config,
-        :items    => compiler.site.items,
-        :layouts  => compiler.site.layouts
+        rep: rep,
+        item_rep: rep,
+        item: rep.item,
+        site: compiler.site,
+        config: compiler.site.config,
+        items: compiler.site.items,
+        layouts: compiler.site.layouts
       })
     end
 
@@ -85,7 +83,5 @@ module Nanoc
     def snapshot(snapshot_name)
       rep.snapshot(snapshot_name)
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/rule_memory_calculator.rb

@@ -1,13 +1,11 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Calculates rule memories for objects that can be run through a rule (item
   # representations and layouts).
   #
   # @api private
   class RuleMemoryCalculator
-
     extend Nanoc::Memoization
 
     # @option params [Nanoc::RulesCollection] rules_collection The rules
@@ -35,7 +33,5 @@ module Nanoc
       result
     end
     memoize :[]
-
   end
-
 end

data/lib/nanoc/base/compilation/rule_memory_store.rb

@@ -1,13 +1,11 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Stores rule memories for objects that can be run through a rule (item
   # representations and layouts).
   #
   # @api private
   class RuleMemoryStore < ::Nanoc::Store
-
     # @option params [Nanoc::Site] site The site where this rule memory store
     #   belongs to
     def initialize(params = {})
@@ -47,7 +45,5 @@ module Nanoc
     def data=(new_data)
       @rule_memories = new_data
     end
-
   end
-
 end

data/lib/nanoc/base/compilation/rules_collection.rb

@@ -1,12 +1,10 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Keeps track of the rules in a site.
   #
   # @api private
   class RulesCollection
-
     # @return [String] the contents of the Rules file
     #
     # @api private
@@ -41,8 +39,8 @@ module Nanoc
 
       @item_compilation_rules = []
       @item_routing_rules     = []
-      @layout_filter_mapping  = OrderedHash.new
-      @preprocessors          = OrderedHash.new
+      @layout_filter_mapping  = {}
+      @preprocessors          = {}
     end
 
     # Add the given rule to the list of item compilation rules.
@@ -101,8 +99,8 @@ module Nanoc
     def unload
       @item_compilation_rules = []
       @item_routing_rules     = []
-      @layout_filter_mapping  = OrderedHash.new
-      @preprocessors          = OrderedHash.new
+      @layout_filter_mapping  = {}
+      @preprocessors          = {}
     end
 
     # Finds the first matching compilation rule for the given item
@@ -192,7 +190,7 @@ module Nanoc
     # @return [Array] The rule memory for the given item representation
     def new_rule_memory_for_rep(rep)
       recording_proxy = rep.to_recording_proxy
-      compilation_rule_for(rep).apply_to(recording_proxy, :compiler => @compiler)
+      compilation_rule_for(rep).apply_to(recording_proxy, compiler: @compiler)
       recording_proxy.rule_memory << [:write, rep.path]
       make_rule_memory_serializable(recording_proxy.rule_memory)
     end
@@ -253,7 +251,5 @@ module Nanoc
     def rule_memory_calculator
       @compiler.rule_memory_calculator
     end
-
   end
-
 end

data/lib/nanoc/base/context.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 
 module Nanoc
-
   # Provides a context and a binding for use in filters such as the ERB and
   # Haml ones.
   class Context
-
     # Creates a new context based off the contents of the hash.
     #
     # Each pair in the hash will be converted to an instance variable and an
@@ -42,6 +40,5 @@ module Nanoc
     def get_binding
       binding
     end
-
   end
 end

data/lib/nanoc/base/core_ext.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'nanoc/base/core_ext/array'
-require 'nanoc/base/core_ext/date'
 require 'nanoc/base/core_ext/hash'
 require 'nanoc/base/core_ext/pathname'
 require 'nanoc/base/core_ext/string'

data/lib/nanoc/base/core_ext/array.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc::ArrayExtensions
-
   # Returns a new array where all items' keys are recursively converted to
   # symbols by calling {Nanoc::ArrayExtensions#symbolize_keys_recursively} or
   # {Nanoc::HashExtensions#symbolize_keys_recursively}.
@@ -66,7 +65,6 @@ module Nanoc::ArrayExtensions
   def checksum
     Nanoc::Checksummer.calc(self)
   end
-
 end
 
 class Array

data/lib/nanoc/base/core_ext/hash.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 module Nanoc::HashExtensions
-
   # Returns a new hash where all keys are recursively converted to symbols by
   # calling {Nanoc::ArrayExtensions#symbolize_keys_recursively} or
   # {Nanoc::HashExtensions#symbolize_keys_recursively}.
@@ -68,7 +67,6 @@ module Nanoc::HashExtensions
   def checksum
     Nanoc::Checksummer.calc(self)
   end
-
 end
 
 class Hash