nanoc 3.7.3 → 3.7.4

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

@@ -14,7 +14,7 @@ module Nanoc
     extend Forwardable
 
     def_delegators :@item_rep, :item, :name, :binary, :binary?, :compiled_content, :has_snapshot?, :raw_path, :path
-    def_delegator  :@item_rep, :snapshot
+    def_delegator :@item_rep, :snapshot
 
     # @param [Nanoc::ItemRep] item_rep The item representation that this
     #   proxy should behave like
@@ -76,13 +76,14 @@ module Nanoc
     #
     # @return [true]
     #
-    # @see Nanoc::ItemRep#is_proxy?
-    # @see Nanoc::ItemRepRecorderProxy#is_proxy?
-    def is_proxy?
+    # @see Nanoc::ItemRep#proxy?
+    # @see Nanoc::ItemRepRecorderProxy#proxy?
+    def proxy?
       true
     end
+    alias_method :is_proxy?, :proxy?
 
-  private
+    private
 
     def set_assigns
       @item_rep.assigns = @compiler.assigns_for(@item_rep)

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

@@ -50,7 +50,7 @@ module Nanoc
     #
     # @see Nanoc::ItemRepProxy#filter, Nanoc::ItemRep#filter
     def filter(name, args = {})
-      @rule_memory << [ :filter, name, args ]
+      @rule_memory << [:filter, name, args]
     end
 
     # @return [void]
@@ -58,9 +58,9 @@ module Nanoc
     # @see Nanoc::ItemRepProxy#layout, Nanoc::ItemRep#layout
     def layout(layout_identifier, extra_filter_args = nil)
       if extra_filter_args
-        @rule_memory << [ :layout, layout_identifier, extra_filter_args ]
+        @rule_memory << [:layout, layout_identifier, extra_filter_args]
       else
-        @rule_memory << [ :layout, layout_identifier ]
+        @rule_memory << [:layout, layout_identifier]
       end
     end
 
@@ -68,7 +68,7 @@ module Nanoc
     #
     # @see Nanoc::ItemRep#snapshot
     def snapshot(snapshot_name, params = {})
-      @rule_memory << [ :snapshot, snapshot_name, params ]
+      @rule_memory << [:snapshot, snapshot_name, params]
 
       # Count
       existing = Set.new
@@ -91,11 +91,12 @@ module Nanoc
     #
     # @return [true]
     #
-    # @see Nanoc::ItemRep#is_proxy?
-    # @see Nanoc::ItemRepProxy#is_proxy?
-    def is_proxy?
+    # @see Nanoc::ItemRep#proxy?
+    # @see Nanoc::ItemRepProxy#proxy?
+    def proxy?
       true
     end
+    alias_method :is_proxy?, :proxy?
 
   end
 

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

@@ -60,7 +60,7 @@ module Nanoc
     end
     memoize :outdatedness_reason_for
 
-  private
+    private
 
     # Checks whether the given object is outdated and therefore needs to be
     # recompiled. This method does not take dependencies into account; use
@@ -92,8 +92,8 @@ module Nanoc
           rule_memory_differs_for(obj)
 
         # Outdated if checksums are missing or different
-        return Nanoc::OutdatednessReasons::NotEnoughData if !checksums_available?(obj.item)
-        return Nanoc::OutdatednessReasons::SourceModified if !checksums_identical?(obj.item)
+        return Nanoc::OutdatednessReasons::NotEnoughData unless checksums_available?(obj.item)
+        return Nanoc::OutdatednessReasons::SourceModified unless checksums_identical?(obj.item)
 
         # Outdated if compiled file doesn't exist (yet)
         return Nanoc::OutdatednessReasons::NotWritten if obj.raw_path && !File.file?(obj.raw_path)
@@ -116,8 +116,8 @@ module Nanoc
           rule_memory_differs_for(obj)
 
         # Outdated if checksums are missing or different
-        return Nanoc::OutdatednessReasons::NotEnoughData if !checksums_available?(obj)
-        return Nanoc::OutdatednessReasons::SourceModified if !checksums_identical?(obj)
+        return Nanoc::OutdatednessReasons::NotEnoughData unless checksums_available?(obj)
+        return Nanoc::OutdatednessReasons::SourceModified unless checksums_identical?(obj)
 
         # Not outdated
         return nil
@@ -179,7 +179,7 @@ module Nanoc
     # @return [Boolean] false if either the new or the old checksum for the
     #   given object is not available, true if both checksums are available
     def checksums_available?(obj)
-      !!checksum_store[obj] && obj.checksum
+      checksum_store[obj] && obj.checksum
     end
     memoize :checksums_available?
 

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

@@ -66,7 +66,7 @@ module Nanoc
       compiler = params.fetch(:compiler) do
         raise ArgumentError, 'Required :compiler option is missing'
       end
-      rep = Nanoc::ItemRepProxy.new(rep, compiler) unless rep.is_proxy?
+      rep = Nanoc::ItemRepProxy.new(rep, compiler) unless rep.proxy?
       Nanoc::RuleContext.new(:rep => rep, :compiler => compiler).instance_eval(&@block)
     end
 

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

@@ -36,7 +36,7 @@ module Nanoc
       @rule_memories[obj.reference] = rule_memory
     end
 
-  protected
+    protected
 
     # @see Nanoc::Store#data
     def data

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

@@ -76,7 +76,7 @@ module Nanoc
     # @return [void]
     def load
       # Find rules file
-      rules_filenames = [ 'Rules', 'rules', 'Rules.rb', 'rules.rb' ]
+      rules_filenames = ['Rules', 'rules', 'Rules.rb', 'rules.rb']
       rules_filename = rules_filenames.find { |f| File.file?(f) }
       raise Nanoc::Errors::NoRulesFileFound.new if rules_filename.nil?
 
@@ -141,7 +141,7 @@ module Nanoc
     def routing_rules_for(rep)
       rules = {}
       @item_routing_rules.each do |rule|
-        next if !rule.applicable_to?(rep.item)
+        next unless rule.applicable_to?(rep.item)
         next if rule.rep_name != rep.name
         next if rules.key?(rule.snapshot_name)
 
@@ -193,7 +193,7 @@ module Nanoc
     def new_rule_memory_for_rep(rep)
       recording_proxy = rep.to_recording_proxy
       compilation_rule_for(rep).apply_to(recording_proxy, :compiler => @compiler)
-      recording_proxy.rule_memory << [ :write, rep.path ]
+      recording_proxy.rule_memory << [:write, rep.path]
       make_rule_memory_serializable(recording_proxy.rule_memory)
     end
     memoize :new_rule_memory_for_rep
@@ -208,7 +208,7 @@ module Nanoc
     def make_rule_memory_serializable(rs)
       rs.map do |r|
         if r[0] == :filter
-          [ r[0], r[1], r[2].to_a.map { |a| Nanoc::Checksummer.calc(a) }  ]
+          [r[0], r[1], r[2].to_a.map { |a| Nanoc::Checksummer.calc(a) }]
         else
           r
         end
@@ -231,7 +231,7 @@ module Nanoc
     #   a Boolean indicating whether the snapshot is final or not
     def snapshots_for(rep)
       new_rule_memory_for_rep(rep).select { |e| e[0] == :snapshot }.map do |e|
-        [ e[1], e[2].fetch(:final) { true } ]
+        [e[1], e[2].fetch(:final) { true }]
       end
     end
 

data/lib/nanoc/base/context.rb

@@ -31,7 +31,7 @@ module Nanoc
         instance_variable_set('@' + key.to_s, value)
 
         # Define method
-        metaclass = (class << self ; self ; end)
+        metaclass = (class << self; self; end)
         metaclass.send(:define_method, key) { value }
       end
     end

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

@@ -27,7 +27,7 @@ module Nanoc::ArrayExtensions
   # @return [Array] The converted array
   def stringify_keys_recursively
     reduce([]) do |array, element|
-      array + [ element.respond_to?(:stringify_keys_recursively) ? element.stringify_keys_recursively : element ]
+      array + [element.respond_to?(:stringify_keys_recursively) ? element.stringify_keys_recursively : element]
     end
   end
 

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

@@ -15,7 +15,7 @@ if needs_patch
 
   class ::Date
 
-    [ :amjd, :jd, :day_fraction, :mjd, :ld, :civil, :ordinal, :commercial, :weeknum0, :weeknum1, :time, :wday, :julian?, :gregorian?, :leap? ].each do |m|
+    [:amjd, :jd, :day_fraction, :mjd, :ld, :civil, :ordinal, :commercial, :weeknum0, :weeknum1, :time, :wday, :julian?, :gregorian?, :leap?].each do |m|
       module_eval <<EOS
         alias_method :__orig_#{m}, :#{m}
         def #{m}

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

@@ -50,7 +50,7 @@ module Nanoc::HashExtensions
   def freeze_recursively
     return if self.frozen?
     freeze
-    each_pair do |key, value|
+    each_pair do |_key, value|
       if value.respond_to?(:freeze_recursively)
         value.freeze_recursively
       else

data/lib/nanoc/base/directed_graph.rb

@@ -211,7 +211,7 @@ module Nanoc
       result = []
       @vertices.each_pair do |v1, i1|
         direct_successors_of(v1).map { |v2| @vertices[v2] }.each do |i2|
-          result << [ i1, i2 ]
+          result << [i1, i2]
         end
       end
       result
@@ -233,7 +233,7 @@ module Nanoc
       delete_edge(from, to)
     end
 
-  private
+    private
 
     # Invalidates cached data. This method should be called when the internal
     # graph representation is changed.
@@ -249,7 +249,7 @@ module Nanoc
       all_vertices = Set.new
 
       processed_vertices   = Set.new
-      unprocessed_vertices = [ start ]
+      unprocessed_vertices = [start]
 
       until unprocessed_vertices.empty?
         # Get next unprocessed vertex

data/lib/nanoc/base/memoization.rb

@@ -52,7 +52,7 @@ module Nanoc
         @__memoization_cache[method_name] ||= {}
 
         # Recalculate if necessary
-        if !@__memoization_cache[method_name].key?(args)
+        unless @__memoization_cache[method_name].key?(args)
           result = send(original_method_name, *args)
           @__memoization_cache[method_name][args] = result
         end

data/lib/nanoc/base/notification_center.rb

@@ -70,7 +70,7 @@ module Nanoc
         @notifications[name].reject! { |i| i[:id] == id }
       end
 
-    private
+      private
 
       def initialize_if_necessary(name)
         @notifications ||= {}       # name => observers dictionary

data/lib/nanoc/base/ordered_hash.rb

@@ -206,7 +206,7 @@ class OrderedHash < ::Hash
         end
         class << self
           def to_yaml(opts = {})
-            @__yaml_inline ? @__yaml_inline_meth[ opts ] : super
+            @__yaml_inline ? @__yaml_inline_meth[opts] : super
           rescue
             @to_yaml_style = :inline
             super

data/lib/nanoc/base/plugin_registry.rb

@@ -188,7 +188,7 @@ module Nanoc
             plugins << {
               :class       => klass,
               :superclass  => superclass,
-              :identifiers => [ identifier ]
+              :identifiers => [identifier]
             }
           end
         end
@@ -202,9 +202,9 @@ module Nanoc
       find(self, name)
     end
 
-  protected
+    protected
 
-    def resolve(class_or_name, klass)
+    def resolve(class_or_name, _klass)
       if class_or_name.is_a?(String)
         class_or_name.scan(/\w+/).reduce(Kernel) do |memo, part|
           memo.const_get(part)

data/lib/nanoc/base/result_data/item_rep.rb

@@ -182,14 +182,14 @@ module Nanoc
     include Private
 
     # @return [Nanoc::Item] The item to which this rep belongs
-    attr_reader   :item
+    attr_reader :item
 
     # @return [Symbol] The representation's unique name
-    attr_reader   :name
+    attr_reader :name
 
     # @return [Boolean] true if this rep is currently binary; false otherwise
-    attr_reader   :binary
-    alias_method  :binary?, :binary
+    attr_reader :binary
+    alias_method :binary?, :binary
 
     # @return [Array] A list of snapshots, represented as arrays where the
     #   first element is the snapshot name (a Symbol) and the last element is
@@ -242,7 +242,7 @@ module Nanoc
 
       # Get name of last pre-layout snapshot
       snapshot = params.fetch(:snapshot) { @content[:pre] ? :pre : :last }
-      is_moving = [ :pre, :post, :last ].include?(snapshot)
+      is_moving = [:pre, :post, :last].include?(snapshot)
 
       # Check existance of snapshot
       if !is_moving && snapshots.find { |s| s.first == snapshot && s.last == true }.nil?
@@ -263,9 +263,10 @@ module Nanoc
     #   given name, false otherwise
     #
     # @since 3.2.0
-    def has_snapshot?(snapshot_name)
+    def snapshot?(snapshot_name)
       !@content[snapshot_name].nil?
     end
+    alias_method :has_snapshot?, :snapshot?
 
     # Returns the item rep’s raw path. It includes the path to the output
     # directory and the full filename.
@@ -444,11 +445,12 @@ module Nanoc
     #
     # @return [false]
     #
-    # @see Nanoc::ItemRepRecorderProxy#is_proxy?
-    # @see Nanoc::ItemRepProxy#is_proxy?
-    def is_proxy?
+    # @see Nanoc::ItemRepRecorderProxy#proxy?
+    # @see Nanoc::ItemRepProxy#proxy?
+    def proxy?
       false
     end
+    alias_method :is_proxy?, :proxy?
 
     # Returns an object that can be used for uniquely identifying objects.
     #
@@ -456,14 +458,14 @@ module Nanoc
     #
     # @return [Object] An unique reference to this object
     def reference
-      [ type, item.identifier, name ]
+      [type, item.identifier, name]
     end
 
     def inspect
       "<#{self.class} name=\"#{name}\" binary=#{self.binary?} raw_path=\"#{raw_path}\" item.identifier=\"#{item.identifier}\">"
     end
 
-  private
+    private
 
     def initialize_content
       # Initialize content and filenames

data/lib/nanoc/base/source_data/code_snippet.rb

@@ -24,7 +24,7 @@ module Nanoc
     #
     # @param [Time, Hash] params Extra parameters. Ignored by nanoc; it is
     #   only included for backwards compatibility.
-    def initialize(data, filename, params = nil)
+    def initialize(data, filename, _params = nil)
       @data     = data
       @filename = filename
     end
@@ -40,7 +40,7 @@ module Nanoc
     #
     # @return [Object] An unique reference to this object
     def reference
-      [ :code_snippet, filename ]
+      [:code_snippet, filename]
     end
 
     def inspect

data/lib/nanoc/base/source_data/data_source.rb

@@ -207,7 +207,7 @@ module Nanoc
     #   files that should be generated.
     #
     # @return [void]
-    def create_item(content, attributes, identifier, params = {})
+    def create_item(_content, _attributes, _identifier, _params = {})
       not_implemented('create_item')
     end
 
@@ -230,11 +230,11 @@ module Nanoc
     #   files that should be generated.
     #
     # @return [void]
-    def create_layout(content, attributes, identifier, params = {})
+    def create_layout(_content, _attributes, _identifier, _params = {})
       not_implemented('create_layout')
     end
 
-  private
+    private
 
     def not_implemented(name)
       raise NotImplementedError.new(

data/lib/nanoc/base/source_data/item.rb

@@ -26,15 +26,15 @@ module Nanoc
     attr_accessor :identifier
 
     # @return [Array<Nanoc::ItemRep>] This item’s list of item reps
-    attr_reader   :reps
+    attr_reader :reps
 
     # @return [String] This item's raw, uncompiled content of this item (only
     #   available for textual items)
-    attr_reader   :raw_content
+    attr_reader :raw_content
 
     # @return [String] The filename pointing to the file containing this
     #   item’s content
-    attr_reader   :raw_filename
+    attr_reader :raw_filename
 
     # @return [Nanoc::Site] The site this item belongs to
     attr_accessor :site
@@ -175,7 +175,7 @@ module Nanoc
       # TODO [in nanoc 4.0] remove me
       if key.to_s =~ /^content_for_(.*)$/
         @@_content_for_warning_issued ||= false
-        @@_Nanoc_Helpers_Capturing_included ||= false
+        @@_capturing_helper_included ||= false
 
         # Warn
         unless @@_content_for_warning_issued
@@ -184,9 +184,9 @@ module Nanoc
         end
 
         # Include capturing helper if necessary
-        unless @@_Nanoc_Helpers_Capturing_included
+        unless @@_capturing_helper_included
           self.class.send(:include, ::Nanoc::Helpers::Capturing)
-          @@_Nanoc_Helpers_Capturing_included = true
+          @@_capturing_helper_included = true
         end
 
         # Get content
@@ -207,7 +207,7 @@ module Nanoc
 
     # @return [Boolean] True if the item is binary; false if it is not
     def binary?
-      !!@is_binary
+      @is_binary
     end
 
     # Returns the type of this object. Will always return `:item`, because
@@ -226,7 +226,7 @@ module Nanoc
     #
     # @return [Object] An unique reference to this object
     def reference
-      [ type, identifier ]
+      [type, identifier]
     end
 
     # Prevents all further modifications to its attributes.