nanoc 3.6.7 → 3.6.8

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

@@ -67,11 +67,11 @@ module Nanoc
     #
     # @option params [Symbol, nil] :binary (true) Whether or not this item is
     #   binary
-    def initialize(raw_content_or_raw_filename, attributes, identifier, params=nil)
+    def initialize(raw_content_or_raw_filename, attributes, identifier, params = nil)
       # Parse params
       params ||= {}
       params = { :mtime => params } if params.is_a?(Time)
-      params[:binary] = false unless params.has_key?(:binary)
+      params[:binary] = false unless params.key?(:binary)
 
       if raw_content_or_raw_filename.nil?
         raise "attempted to create an item with no content/filename (identifier #{identifier})"
@@ -126,7 +126,7 @@ module Nanoc
     #   snapshot if no snapshot is specified)
     #
     # @see ItemRep#compiled_content
-    def compiled_content(params={})
+    def compiled_content(params = {})
       # Get rep
       rep_name = params[:rep] || :default
       rep = reps.find { |r| r.name == rep_name }
@@ -148,7 +148,7 @@ module Nanoc
     #
     # @return [String] The path of the given rep ( or the default rep if no
     #   rep is specified)
-    def path(params={})
+    def path(params = {})
       rep_name = params[:rep] || :default
 
       # Get rep
@@ -226,7 +226,7 @@ module Nanoc
     #
     # @return [Object] An unique reference to this object
     def reference
-      [ type, self.identifier ]
+      [ type, identifier ]
     end
 
     # Prevents all further modifications to its attributes.
@@ -241,21 +241,22 @@ module Nanoc
     end
 
     def inspect
-      "<#{self.class} identifier=\"#{self.identifier}\" binary?=#{self.binary?}>"
+      "<#{self.class} identifier=\"#{identifier}\" binary?=#{self.binary?}>"
     end
 
     # @return [String] The checksum for this object. If its contents change,
     #   the checksum will change as well.
     def checksum
-      content_checksum = if binary?
-        if File.exist?(raw_filename)
-          Pathname.new(raw_filename).checksum
+      content_checksum =
+        if binary?
+          if File.exist?(raw_filename)
+            Pathname.new(raw_filename).checksum
+          else
+            ''.checksum
+          end
         else
-          ''.checksum
+          @raw_content.checksum
         end
-      else
-        @raw_content.checksum
-      end
 
       attributes = @attributes.dup
       attributes.delete(:file)
@@ -266,11 +267,11 @@ module Nanoc
     memoize :checksum
 
     def hash
-      self.class.hash ^ self.identifier.hash
+      self.class.hash ^ identifier.hash
     end
 
     def eql?(other)
-      self.class == other.class && self.identifier == other.identifier
+      self.class == other.class && identifier == other.identifier
     end
 
     def ==(other)

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

@@ -27,13 +27,13 @@ module Nanoc
 
     def freeze
       @items.freeze
-      self.build_mapping
+      build_mapping
       super
     end
 
     def [](*args)
       if 1 == args.size && args.first.is_a?(String)
-        self.item_with_identifier(args.first)
+        item_with_identifier(args.first)
       else
         @items[*args]
       end
@@ -42,13 +42,13 @@ module Nanoc
 
     def at(arg)
       if arg.is_a?(String)
-        self.item_with_identifier(arg)
+        item_with_identifier(arg)
       else
         @items[arg]
       end
     end
 
-    protected
+  protected
 
     def item_with_identifier(identifier)
       if self.frozen?

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

@@ -33,7 +33,7 @@ module Nanoc
     # @option params [Time, nil] :mtime (nil) The time when this layout was
     #   last modified. Deprecated; pass the modification time as the `:mtime`
     #   attribute instead.
-    def initialize(raw_content, attributes, identifier, params=nil)
+    def initialize(raw_content, attributes, identifier, params = nil)
       @raw_content  = raw_content
       @attributes   = attributes.symbolize_keys_recursively
       @identifier   = identifier.cleaned_identifier.freeze
@@ -78,11 +78,11 @@ module Nanoc
     #
     # @return [Object] An unique reference to this object
     def reference
-      [ type, self.identifier ]
+      [ type, identifier ]
     end
 
     def inspect
-      "<#{self.class} identifier=\"#{self.identifier}\">"
+      "<#{self.class} identifier=\"#{identifier}\">"
     end
 
     # @return [String] The checksum for this object. If its contents change,
@@ -95,11 +95,11 @@ module Nanoc
     memoize :checksum
 
     def hash
-      self.class.hash ^ self.identifier.hash
+      self.class.hash ^ identifier.hash
     end
 
     def eql?(other)
-      self.class == other.class && self.identifier == other.identifier
+      self.class == other.class && identifier == other.identifier
     end
 
     def ==(other)

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

@@ -86,10 +86,10 @@ module Nanoc
           # Warn about deprecated data sources
           # TODO [in nanoc 4.0] remove me
           case data_source_hash[:type]
-            when 'filesystem'
-              warn "Warning: the 'filesystem' data source has been renamed to 'filesystem_verbose'. Using 'filesystem' will work in nanoc 3.1.x, but it will likely not work anymore in a future release of nanoc. Please update your data source configuration and replace 'filesystem' with 'filesystem_verbose'."
-            when 'filesystem_combined', 'filesystem_compact'
-              warn "Warning: the 'filesystem_combined' and 'filesystem_compact' data source has been merged into the new 'filesystem_unified' data source. Using 'filesystem_combined' and 'filesystem_compact' will work in nanoc 3.1.x, but it will likely not work anymore in a future release of nanoc. Please update your data source configuration and replace 'filesystem_combined' and 'filesystem_compact with 'filesystem_unified'."
+          when 'filesystem'
+            warn "Warning: the 'filesystem' data source has been renamed to 'filesystem_verbose'. Using 'filesystem' will work in nanoc 3.1.x, but it will likely not work anymore in a future release of nanoc. Please update your data source configuration and replace 'filesystem' with 'filesystem_verbose'."
+          when 'filesystem_combined', 'filesystem_compact'
+            warn "Warning: the 'filesystem_combined' and 'filesystem_compact' data source has been merged into the new 'filesystem_unified' data source. Using 'filesystem_combined' and 'filesystem_compact' will work in nanoc 3.1.x, but it will likely not work anymore in a future release of nanoc. Please update your data source configuration and replace 'filesystem_combined' and 'filesystem_compact with 'filesystem_unified'."
           end
 
           # Create data source
@@ -223,7 +223,7 @@ module Nanoc
 
     # @deprecated It is no longer necessary to explicitly load site data. It
     #   is safe to remove all {#load_data} calls.
-    def load_data(force=false)
+    def load_data(force = false)
       warn 'It is no longer necessary to call Nanoc::Site#load_data. This method no longer has any effect. All calls to this method can be safely removed.'
     end
 
@@ -281,7 +281,7 @@ module Nanoc
     #
     # @api private
     def self.cwd_is_nanoc_site?
-      !self.config_filename_for_cwd.nil?
+      !config_filename_for_cwd.nil?
     end
 
     # @return [String] filename of the nanoc config file in the current working directory, or nil if there is none

data/lib/nanoc/base/store.rb

@@ -44,7 +44,7 @@ module Nanoc
     #
     # @abstract This method must be implemented by the subclass.
     def data
-      raise NotImplementedError.new("Nanoc::Store subclasses must implement #data and #data=")
+      raise NotImplementedError.new('Nanoc::Store subclasses must implement #data and #data=')
     end
 
     # @param new_data The data that has been loaded from the disk
@@ -53,7 +53,7 @@ module Nanoc
     #
     # @return [void]
     def data=(new_data)
-      raise NotImplementedError.new("Nanoc::Store subclasses must implement #data and #data=")
+      raise NotImplementedError.new('Nanoc::Store subclasses must implement #data and #data=')
     end
 
     # Loads the data from the filesystem into memory. This method will set the
@@ -67,7 +67,7 @@ module Nanoc
       end
 
       # Check file existance
-      if !File.file?(self.filename)
+      if !File.file?(filename)
         no_data_found
         @loaded = true
         return
@@ -75,7 +75,7 @@ module Nanoc
 
       pstore.transaction do
         # Check version
-        if pstore[:version] != self.version
+        if pstore[:version] != version
           version_mismatch_detected
           @loaded = true
           return
@@ -98,11 +98,11 @@ module Nanoc
     #
     # @return [void]
     def store
-      FileUtils.mkdir_p(File.dirname(self.filename))
+      FileUtils.mkdir_p(File.dirname(filename))
 
       pstore.transaction do
-        pstore[:data]    = self.data
-        pstore[:version] = self.version
+        pstore[:data]    = data
+        pstore[:version] = version
       end
     end
 
@@ -127,7 +127,7 @@ module Nanoc
   private
 
     def pstore
-      @pstore ||= PStore.new(self.filename)
+      @pstore ||= PStore.new(filename)
     end
 
   end

data/lib/nanoc/cli/cleaning_stream.rb

@@ -41,15 +41,15 @@ module Nanoc::CLI
 
     # @see IO#write
     def write(s)
-      self._nanoc_swallow_broken_pipe_errors_while do
-        @stream.write(self._nanoc_clean(s))
+      _nanoc_swallow_broken_pipe_errors_while do
+        @stream.write(_nanoc_clean(s))
       end
     end
 
     # @see IO#<<
     def <<(s)
-      self._nanoc_swallow_broken_pipe_errors_while do
-        @stream.<<(self._nanoc_clean(s))
+      _nanoc_swallow_broken_pipe_errors_while do
+        @stream.<<(_nanoc_clean(s))
       end
     end
 
@@ -60,7 +60,7 @@ module Nanoc::CLI
 
     # @see IO#flush
     def flush
-      self._nanoc_swallow_broken_pipe_errors_while do
+      _nanoc_swallow_broken_pipe_errors_while do
         @stream.flush
       end
     end
@@ -72,15 +72,15 @@ module Nanoc::CLI
 
     # @see IO#print
     def print(s)
-      self._nanoc_swallow_broken_pipe_errors_while do
-        @stream.print(self._nanoc_clean(s))
+      _nanoc_swallow_broken_pipe_errors_while do
+        @stream.print(_nanoc_clean(s))
       end
     end
 
     # @see IO#puts
     def puts(*s)
-      self._nanoc_swallow_broken_pipe_errors_while do
-        @stream.puts(*s.map { |ss| self._nanoc_clean(ss) })
+      _nanoc_swallow_broken_pipe_errors_while do
+        @stream.puts(*s.map { |ss| _nanoc_clean(ss) })
       end
     end
 
@@ -116,13 +116,13 @@ module Nanoc::CLI
 
     # @see IO.winsize=
     def winsize=(arg)
-      @stream.winsize=(arg)
+      @stream.winsize = (arg)
     end
 
   protected
 
     def _nanoc_clean(s)
-      @stream_cleaners.inject(s) { |m,c| c.clean(m) }
+      @stream_cleaners.reduce(s) { |m, c| c.clean(m) }
     end
 
     def _nanoc_swallow_broken_pipe_errors_while
@@ -133,4 +133,3 @@ module Nanoc::CLI
   end
 
 end
-

data/lib/nanoc/cli/command_runner.rb

@@ -11,7 +11,7 @@ module Nanoc::CLI
     # @return [void]
     def call
       Nanoc::CLI::ErrorHandler.handle_while(:command => self) do
-        self.run
+        run
       end
     end
 
@@ -33,7 +33,7 @@ module Nanoc::CLI
     #
     # @see http://rubydoc.info/gems/cri/Cri/CommandDSL#runner-instance_method
     def self.call(opts, args, cmd)
-      self.new(opts, args, cmd).call
+      new(opts, args, cmd).call
     end
 
     # @return [Boolean] true if the current working directory is a nanoc site
@@ -49,7 +49,7 @@ module Nanoc::CLI
     # @return [void]
     def require_site
       if site.nil?
-        raise ::Nanoc::Errors::GenericTrivial, "The current working directory does not seem to be a nanoc site."
+        raise ::Nanoc::Errors::GenericTrivial, 'The current working directory does not seem to be a nanoc site.'
       end
     end
 
@@ -58,10 +58,10 @@ module Nanoc::CLI
     #
     # @return [void]
     def load_site
-      self.require_site
-      print "Loading site data… "
-      self.site.load
-      puts "done"
+      require_site
+      print 'Loading site data… '
+      site.load
+      puts 'done'
     end
 
     # @return [Boolean] true if debug output is enabled, false if not
@@ -101,7 +101,7 @@ module Nanoc::CLI
 
     # @return [Array] The compilation stack.
     def stack
-      (self.site && self.site.compiler.stack) || []
+      (site && site.compiler.stack) || []
     end
 
   end

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

@@ -33,8 +33,8 @@ module Nanoc::CLI::Commands
       require 'rack'
 
       # Make sure we are in a nanoc site directory
-      self.require_site
-      autocompile_config = self.site.config[:autocompile] || {}
+      require_site
+      autocompile_config = site.config[:autocompile] || {}
 
       # Set options
       options_for_rack = {
@@ -44,10 +44,11 @@ module Nanoc::CLI::Commands
 
       # Guess which handler we should use
       handler_option = options[:handler] || autocompile_config[:handler]
-      unless handler = Rack::Handler.get(handler_option)
+      handler = Rack::Handler.get(handler_option)
+      unless handler
         begin
           handler = Rack::Handler::Mongrel
-        rescue LoadError => e
+        rescue LoadError
           handler = Rack::Handler::WEBrick
         end
       end

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

@@ -2,9 +2,9 @@
 
 usage       'check [options] [names]'
 summary     'run issue checks'
-description <<-EOS
+description "
 Run issue checks on the current site. If the `--all` option is passed, all available issue checks will be run. If the `--deploy` option is passed, the issue checks marked for deployment will be run.
-EOS
+"
 
 flag :a, :all,    'run all checks'
 flag :L, :list,   'list all checks'
@@ -16,7 +16,7 @@ module Nanoc::CLI::Commands
 
     def run
       validate_options_and_arguments
-      self.require_site
+      require_site
 
       runner = Nanoc::Extra::Checking::Runner.new(site)
 
@@ -25,13 +25,14 @@ module Nanoc::CLI::Commands
         return
       end
 
-      success = if options[:all]
-        runner.run_all
-      elsif options[:deploy]
-        runner.run_for_deploy
-      else
-        runner.run_specific(arguments)
-      end
+      success =
+        if options[:all]
+          runner.run_all
+        elsif options[:deploy]
+          runner.run_for_deploy
+        else
+          runner.run_specific(arguments)
+        end
 
       unless success
         raise Nanoc::Errors::GenericTrivial, 'One or more checks failed'
@@ -43,7 +44,7 @@ module Nanoc::CLI::Commands
     def validate_options_and_arguments
       if arguments.empty? && !options[:all] && !options[:deploy] && !options[:list]
         raise Nanoc::Errors::GenericTrivial,
-          "nothing to do (pass either --all, --deploy or --list or a list of checks)"
+          'nothing to do (pass either --all, --deploy or --list or a list of checks)'
       end
     end