nanoc 3.6.7 → 3.6.8

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

@@ -97,7 +97,7 @@ module Nanoc
       # @return [void]
       def setup
         @setup ||= begin
-          self.requires.each { |r| require r }
+          requires.each { |r| require r }
           true
         end
       end
@@ -108,7 +108,7 @@ module Nanoc
     #
     # @param [Hash] hash A hash containing variables that should be made
     #   available during filtering.
-    def initialize(hash={})
+    def initialize(hash = {})
       @assigns = hash
       super
     end
@@ -119,7 +119,7 @@ module Nanoc
     # @see {#run}
     def setup_and_run(*args)
       self.class.setup
-      self.run(*args)
+      run(*args)
     end
 
     # Runs the filter on the given content or filename.
@@ -136,8 +136,8 @@ 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={})
-      raise NotImplementedError.new("Nanoc::Filter subclasses must implement #run")
+    def run(content_or_filename, params = {})
+      raise NotImplementedError.new('Nanoc::Filter subclasses must implement #run')
     end
 
     # Returns a filename that is used to write data to. This method is only

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

@@ -42,7 +42,7 @@ module Nanoc
     #   filter's #run method
     #
     # @return [void]
-    def filter(name, args={})
+    def filter(name, args = {})
       set_assigns
       @item_rep.filter(name, args)
     end
@@ -59,7 +59,7 @@ module Nanoc
     # @param [String] layout_identifier The identifier of the layout to use
     #
     # @return [void]
-    def layout(layout_identifier, extra_filter_args={})
+    def layout(layout_identifier, extra_filter_args = {})
       set_assigns
 
       layout = layout_with_identifier(layout_identifier)

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

@@ -49,14 +49,14 @@ module Nanoc
     # @return [void]
     #
     # @see Nanoc::ItemRepProxy#filter, Nanoc::ItemRep#filter
-    def filter(name, args={})
+    def filter(name, args = {})
       @rule_memory << [ :filter, name, args ]
     end
 
     # @return [void]
     #
     # @see Nanoc::ItemRepProxy#layout, Nanoc::ItemRep#layout
-    def layout(layout_identifier, extra_filter_args=nil)
+    def layout(layout_identifier, extra_filter_args = nil)
       if extra_filter_args
         @rule_memory << [ :layout, layout_identifier, extra_filter_args ]
       else
@@ -67,7 +67,7 @@ module Nanoc
     # @return [void]
     #
     # @see Nanoc::ItemRep#snapshot
-    def snapshot(snapshot_name, params={})
+    def snapshot(snapshot_name, params = {})
       @rule_memory << [ :snapshot, snapshot_name, params ]
 
       # Count

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

@@ -17,13 +17,16 @@ module Nanoc
     #
     # @option params [Nanoc::DependencyTracker] :dependency_tracker (nil) The
     #   dependency tracker for the given site.
-    def initialize(params={})
-      @site = params[:site] or raise ArgumentError,
-        'Nanoc::OutdatednessChecker#initialize needs a :site parameter'
-      @checksum_store = params[:checksum_store] or raise ArgumentError,
-        'Nanoc::OutdatednessChecker#initialize needs a :checksum_store parameter'
-      @dependency_tracker = params[:dependency_tracker] or raise ArgumentError,
-        'Nanoc::OutdatednessChecker#initialize needs a :dependency_tracker parameter'
+    def initialize(params = {})
+      @site = params.fetch(:site) do
+        raise ArgumentError, 'Nanoc::OutdatednessChecker#initialize needs a :site parameter'
+      end
+      @checksum_store = params.fetch(:checksum_store) do
+        raise ArgumentError, 'Nanoc::OutdatednessChecker#initialize needs a :checksum_store parameter'
+      end
+      @dependency_tracker = params.fetch(:dependency_tracker) do
+        raise ArgumentError, 'Nanoc::OutdatednessChecker#initialize needs a :dependency_tracker parameter'
+      end
 
       @basic_outdatedness_reasons = {}
       @outdatedness_reasons = {}
@@ -83,43 +86,43 @@ module Nanoc
     #   given object is outdated, or nil if the object is not outdated.
     def basic_outdatedness_reason_for(obj)
       case obj.type
-        when :item_rep
-          # Outdated if rules outdated
-          return Nanoc::OutdatednessReasons::RulesModified if
-            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)
-
-          # Outdated if compiled file doesn't exist (yet)
-          return Nanoc::OutdatednessReasons::NotWritten if obj.raw_path && !File.file?(obj.raw_path)
-
-          # Outdated if code snippets outdated
-          return Nanoc::OutdatednessReasons::CodeSnippetsModified if site.code_snippets.any? do |cs|
-            object_modified?(cs)
-          end
-
-          # Outdated if configuration outdated
-          return Nanoc::OutdatednessReasons::ConfigurationModified if object_modified?(site.config)
-
-          # Not outdated
-          return nil
-        when :item
-          obj.reps.find { |rep| basic_outdatedness_reason_for(rep) }
-        when :layout
-          # Outdated if rules outdated
-          return Nanoc::OutdatednessReasons::RulesModified if
-            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)
-
-          # Not outdated
-          return nil
-        else
-          raise RuntimeError, "do not know how to check outdatedness of #{obj.inspect}"
+      when :item_rep
+        # Outdated if rules outdated
+        return Nanoc::OutdatednessReasons::RulesModified if
+          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)
+
+        # Outdated if compiled file doesn't exist (yet)
+        return Nanoc::OutdatednessReasons::NotWritten if obj.raw_path && !File.file?(obj.raw_path)
+
+        # Outdated if code snippets outdated
+        return Nanoc::OutdatednessReasons::CodeSnippetsModified if site.code_snippets.any? do |cs|
+          object_modified?(cs)
+        end
+
+        # Outdated if configuration outdated
+        return Nanoc::OutdatednessReasons::ConfigurationModified if object_modified?(site.config)
+
+        # Not outdated
+        return nil
+      when :item
+        obj.reps.find { |rep| basic_outdatedness_reason_for(rep) }
+      when :layout
+        # Outdated if rules outdated
+        return Nanoc::OutdatednessReasons::RulesModified if
+          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)
+
+        # Not outdated
+        return nil
+      else
+        raise "do not know how to check outdatedness of #{obj.inspect}"
       end
     end
     memoize :basic_outdatedness_reason_for
@@ -135,12 +138,12 @@ module Nanoc
     #   indefinitely. It should not be necessary to pass this a custom value.
     #
     # @return [Boolean] true if the object is outdated, false otherwise
-    def outdated_due_to_dependencies?(obj, processed=Set.new)
+    def outdated_due_to_dependencies?(obj, processed = Set.new)
       # Convert from rep to item if necessary
       obj = obj.item if obj.type == :item_rep
 
       # Get from cache
-      if @objects_outdated_due_to_dependencies.has_key?(obj)
+      if @objects_outdated_due_to_dependencies.key?(obj)
         return @objects_outdated_due_to_dependencies[obj]
       end
 

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

@@ -36,7 +36,7 @@ module Nanoc
     # @option params [Symbol, nil] :snapshot (nil) The name of the snapshot
     #   this rule will apply to. Ignored for compilation rules, but used for
     #   routing rules.
-    def initialize(identifier_regex, rep_name, block, params={})
+    def initialize(identifier_regex, rep_name, block, params = {})
       @identifier_regex = identifier_regex
       @rep_name         = rep_name.to_sym
       @snapshot_name    = params[:snapshot_name]
@@ -62,10 +62,12 @@ module Nanoc
     # @raise [ArgumentError] if no compiler is passed
     #
     # @return [void]
-    def apply_to(rep, params={})
-      compiler = params[:compiler] or raise ArgumentError, "Required :compiler option is missing"
+    def apply_to(rep, params = {})
+      compiler = params.fetch(:compiler) do
+        raise ArgumentError, 'Required :compiler option is missing'
+      end
       rep = Nanoc::ItemRepProxy.new(rep, compiler) unless rep.is_proxy?
-      Nanoc::RuleContext.new(:rep => rep, :compiler => compiler).instance_eval &@block
+      Nanoc::RuleContext.new(:rep => rep, :compiler => compiler).instance_eval(&@block)
     end
 
   end

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Nanoc
 
   # Provides a context in which compilation and routing rules can be executed.
@@ -24,9 +26,13 @@ module Nanoc
     #
     # @raise [ArgumentError] if the `:rep` or the `:compiler` option is
     #   missing
-    def initialize(params={})
-      rep      = params[:rep]      or raise ArgumentError, "Required :rep option is missing"
-      compiler = params[:compiler] or raise ArgumentError, "Required :compiler option is missing"
+    def initialize(params = {})
+      rep = params.fetch(:rep) do
+        raise ArgumentError, 'Required :rep option is missing'
+      end
+      compiler = params.fetch(:compiler) do
+        raise ArgumentError, 'Required :compiler option is missing'
+      end
 
       super({
         :rep      => rep,
@@ -51,7 +57,7 @@ module Nanoc
     #   the filter's #run method
     #
     # @return [void]
-    def filter(filter_name, filter_args={})
+    def filter(filter_name, filter_args = {})
       rep.filter(filter_name, filter_args)
     end
 

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

@@ -12,24 +12,25 @@ module Nanoc
 
     # @option params [Nanoc::RulesCollection] rules_collection The rules
     #   collection
-    def initialize(params={})
-      @rules_collection = params[:rules_collection] or
-        raise ArgumentError, "Required :rules_collection option is missing"
+    def initialize(params = {})
+      @rules_collection = params.fetch(:rules_collection) do
+        raise ArgumentError, 'Required :rules_collection option is missing'
+      end
     end
 
     # @param [#reference] obj The object to calculate the rule memory for
     #
     # @return [Array] The caluclated rule memory for the given object
     def [](obj)
-      result = case obj.type
+      result =
+        case obj.type
         when :item_rep
           @rules_collection.new_rule_memory_for_rep(obj)
         when :layout
           @rules_collection.new_rule_memory_for_layout(obj)
         else
-          raise RuntimeError,
-            "Do not know how to calculate the rule memory for #{obj.inspect}"
-      end
+          raise "Do not know how to calculate the rule memory for #{obj.inspect}"
+        end
 
       result
     end

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

@@ -10,10 +10,10 @@ module Nanoc
 
     # @option params [Nanoc::Site] site The site where this rule memory store
     #   belongs to
-    def initialize(params={})
+    def initialize(params = {})
       super('tmp/rule_memory', 1)
 
-      @site = params[:site] if params.has_key?(:site)
+      @site = params[:site] if params.key?(:site)
 
       @rule_memories = {}
     end

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

@@ -125,7 +125,7 @@ module Nanoc
       @item_routing_rules.each do |rule|
         next if !rule.applicable_to?(rep.item)
         next if rule.rep_name != rep.name
-        next if rules.has_key?(rule.snapshot_name)
+        next if rules.key?(rule.snapshot_name)
 
         rules[rule.snapshot_name] = rule
       end
@@ -136,7 +136,7 @@ module Nanoc
     #
     # @param [Nanoc::Layout] layout The layout for which to fetch the filter.
     #
-    # @return [Array, nil] A tuple containing the filter name and the filter 
+    # @return [Array, nil] A tuple containing the filter name and the filter
     #   arguments for the given layout.
     def filter_for_layout(layout)
       @layout_filter_mapping.each_pair do |layout_identifier, filter_name_and_args|

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

@@ -9,7 +9,7 @@ module Nanoc::ArrayExtensions
   # @return [Array] The converted array
   def symbolize_keys_recursively
     array = []
-    self.each do |element|
+    each do |element|
       array << (element.respond_to?(:symbolize_keys_recursively) ? element.symbolize_keys_recursively : element)
     end
     array
@@ -26,7 +26,7 @@ module Nanoc::ArrayExtensions
   #
   # @return [Array] The converted array
   def stringify_keys_recursively
-    inject([]) do |array, element|
+    reduce([]) do |array, element|
       array + [ element.respond_to?(:stringify_keys_recursively) ? element.stringify_keys_recursively : element ]
     end
   end

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'date'
 
 begin
@@ -5,12 +7,12 @@ begin
   d.freeze
   d.year
   needs_patch = false
-rescue => e
+rescue
   needs_patch = true
 end
 
 if needs_patch
- 
+
   class ::Date
 
     [ :amjd, :jd, :day_fraction, :mjd, :ld, :civil, :ordinal, :commercial, :weeknum0, :weeknum1, :time, :wday, :julian?, :gregorian?, :leap? ].each do |m|

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

@@ -9,7 +9,7 @@ module Nanoc::HashExtensions
   # @return [Hash] The converted hash
   def symbolize_keys_recursively
     hash = {}
-    self.each_pair do |key, value|
+    each_pair do |key, value|
       new_key   = key.respond_to?(:to_sym) ? key.to_sym : key
       new_value = value.respond_to?(:symbolize_keys_recursively) ? value.symbolize_keys_recursively : value
       hash[new_key] = new_value
@@ -28,7 +28,7 @@ module Nanoc::HashExtensions
   #
   # @return [Hash] The converted hash
   def stringify_keys_recursively
-    inject({}) do |hash, (key, value)|
+    reduce({}) do |hash, (key, value)|
       hash.merge(key.to_s => value.respond_to?(:stringify_keys_recursively) ? value.stringify_keys_recursively : value)
     end
   end
@@ -66,7 +66,7 @@ module Nanoc::HashExtensions
   #
   # @api private
   def checksum
-    array = self.to_a.sort_by { |kv| kv[0].to_s }
+    array = to_a.sort_by { |kv| kv[0].to_s }
     array.checksum
   end
 

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

@@ -9,7 +9,7 @@ module Nanoc::PathnameExtensions
   #
   # @api private
   def checksum
-    stat = File.stat(self.to_s)
+    stat = File.stat(to_s)
     stat.size.to_s + '-' + stat.mtime.to_s
   end
 

data/lib/nanoc/base/directed_graph.rb

@@ -9,21 +9,21 @@ module Nanoc
   #
   #   # Create a graph with three vertices
   #   graph = Nanoc::DirectedGraph.new(%w( a b c d ))
-  #   
+  #
   #   # Add edges
   #   graph.add_edge('a', 'b')
   #   graph.add_edge('b', 'c')
   #   graph.add_edge('c', 'd')
-  #   
+  #
   #   # Get (direct) predecessors
   #   graph.direct_predecessors_of('d').sort
   #     # => %w( c )
   #   graph.predecessors_of('d').sort
   #     # => %w( a b c )
-  #   
+  #
   #   # Modify edges
   #   graph.delete_edge('a', 'b')
-  #   
+  #
   #   # Get (direct) predecessors again
   #   graph.direct_predecessors_of('d').sort
   #     # => %w( c )
@@ -36,7 +36,7 @@ module Nanoc
     # Creates a new directed graph with the given vertices.
     def initialize(vertices)
       @vertices = {}
-      vertices.each_with_index do |v,i|
+      vertices.each_with_index do |v, i|
         @vertices[v] = i
       end
 
@@ -102,7 +102,7 @@ module Nanoc
     #
     # @since 3.2.0
     def add_vertex(v)
-      return if @vertices.has_key?(v)
+      return if @vertices.key?(v)
 
       @vertices[v] = @vertices.size
 

data/lib/nanoc/base/errors.rb

@@ -81,7 +81,7 @@ module Nanoc
     class NoRulesFileFound < Generic
 
       def initialize
-        super("This site does not have a rules file, which is required for nanoc sites.")
+        super('This site does not have a rules file, which is required for nanoc sites.')
       end
 
     end

data/lib/nanoc/base/memoization.rb

@@ -21,9 +21,9 @@ module Nanoc
     # @example A fast fib function due to memoization
     #
     #     class FibFast
-    # 
+    #
     #       extend Nanoc::Memoization
-    # 
+    #
     #       def run(n)
     #         if n == 0
     #           0
@@ -34,7 +34,7 @@ module Nanoc
     #         end
     #       end
     #       memoize :run
-    # 
+    #
     #     end
     #
     # @param [Symbol, String] method_name The name of the method to memoize
@@ -52,7 +52,7 @@ module Nanoc
         @__memoization_cache[method_name] ||= {}
 
         # Recalculate if necessary
-        if !@__memoization_cache[method_name].has_key?(args)
+        if !@__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

@@ -27,7 +27,7 @@ module Nanoc
       # @yield [*args] Will be executed with the arguments passed to {.post}
       #
       # @return [void]
-      def on(name, id=nil, &block)
+      def on(name, id = nil, &block)
         initialize_if_necessary(name)
 
         # Add observer