Silence some trivial warnings: shadowed local vars, indentation mismatches

10 files changed, 201 insertions, 206 deletions

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 46760bba7c..4073e9b386 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -20,7 +20,7 @@ module AbstractController
       end
 
       def clear_template_caches!
-        @found_layouts.clear if @found_layouts
+        @found_layouts.clear if defined? @found_layouts
         super
       end
 
diff --git a/actionpack/lib/abstract_controller/localized_cache.rb b/actionpack/lib/abstract_controller/localized_cache.rb
index ee7b43cb9f..bf648af60a 100644
--- a/actionpack/lib/abstract_controller/localized_cache.rb
+++ b/actionpack/lib/abstract_controller/localized_cache.rb
@@ -1,6 +1,6 @@
 module AbstractController
   class HashKey
-    @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } }
+    @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|sh,sk| sh[sk] = {} } }
 
     def self.get(klass, formats, locale)
       @hash_keys[klass][formats][locale] ||= new(klass, formats, locale)
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index b436de9878..f445ca70ee 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -85,7 +85,7 @@ module ActionController
     end
 
     class ActionEndpoint
-      @@endpoints = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } }
+      @@endpoints = Hash.new {|h,k| h[k] = Hash.new {|sh,sk| sh[sk] = {} } }
 
       def self.for(controller, action, stack)
         @@endpoints[controller][action][stack] ||= begin
diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb
index 8d5f0d7199..5b51bd21d0 100644
--- a/actionpack/lib/action_controller/metal/cookies.rb
+++ b/actionpack/lib/action_controller/metal/cookies.rb
@@ -58,140 +58,140 @@ module ActionController #:nodoc:
       def cookies
         @cookies ||= CookieJar.build(request, response)
       end
-    end
+  end
 
-    class CookieJar < Hash #:nodoc:
-      def self.build(request, response)
-        new.tap do |hash|
-          hash.update(request.cookies)
-          hash.response = response
-        end
+  class CookieJar < Hash #:nodoc:
+    def self.build(request, response)
+      new.tap do |hash|
+        hash.update(request.cookies)
+        hash.response = response
       end
+    end
 
-      attr_accessor :response
+    attr_accessor :response
 
-      # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
-      def [](name)
-        super(name.to_s)
-      end
+    # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
+    def [](name)
+      super(name.to_s)
+    end
 
-      # Sets the cookie named +name+. The second argument may be the very cookie
-      # value, or a hash of options as documented above.
-      def []=(key, options)
-        if options.is_a?(Hash)
-          options.symbolize_keys!
-          value = options[:value]
-        else
-          value = options
-          options = { :value => value }
-        end
-
-        super(key.to_s, value)
-      
-        options[:path] ||= "/"
-        response.set_cookie(key, options)
+    # Sets the cookie named +name+. The second argument may be the very cookie
+    # value, or a hash of options as documented above.
+    def []=(key, options)
+      if options.is_a?(Hash)
+        options.symbolize_keys!
+        value = options[:value]
+      else
+        value = options
+        options = { :value => value }
       end
 
-      # Removes the cookie on the client machine by setting the value to an empty string
-      # and setting its expiration date into the past. Like <tt>[]=</tt>, you can pass in
-      # an options hash to delete cookies with extra data such as a <tt>:path</tt>.
-      def delete(key, options = {})
+      super(key.to_s, value)
+
+      options[:path] ||= "/"
+      response.set_cookie(key, options)
+    end
+
+    # Removes the cookie on the client machine by setting the value to an empty string
+    # and setting its expiration date into the past. Like <tt>[]=</tt>, you can pass in
+    # an options hash to delete cookies with extra data such as a <tt>:path</tt>.
+    def delete(key, options = {})
+      options.symbolize_keys!
+      options[:path] ||= "/"
+      value = super(key.to_s)
+      response.delete_cookie(key, options)
+      value
+    end
+
+    # Returns a jar that'll automatically set the assigned cookies to have an expiration date 20 years from now. Example:
+    #
+    #   cookies.permanent[:prefers_open_id] = true
+    #   # => Set-Cookie: prefers_open_id=true; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+    #
+    # This jar is only meant for writing. You'll read permanent cookies through the regular accessor.
+    #
+    # This jar allows chaining with the signed jar as well, so you can set permanent, signed cookies. Examples:
+    #
+    #   cookies.permanent.signed[:remember_me] = current_user.id
+    #   # => Set-Cookie: discount=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+    def permanent
+      @permanent ||= PermanentCookieJar.new(self)
+    end
+
+    # Returns a jar that'll automatically generate a signed representation of cookie value and verify it when reading from
+    # the cookie again. This is useful for creating cookies with values that the user is not supposed to change. If a signed
+    # cookie was tampered with by the user (or a 3rd party), an ActiveSupport::MessageVerifier::InvalidSignature exception will
+    # be raised.
+    #
+    # This jar requires that you set a suitable secret for the verification on ActionController::Base.cookie_verifier_secret.
+    #
+    # Example:
+    #
+    #   cookies.signed[:discount] = 45
+    #   # => Set-Cookie: discount=BAhpMg==--2c1c6906c90a3bc4fd54a51ffb41dffa4bf6b5f7; path=/
+    #
+    #   cookies.signed[:discount] # => 45
+    def signed
+      @signed ||= SignedCookieJar.new(self)
+    end
+  end
+
+  class PermanentCookieJar < CookieJar #:nodoc:
+    def initialize(parent_jar)
+      @parent_jar = parent_jar
+    end
+
+    def []=(key, options)
+      if options.is_a?(Hash)
         options.symbolize_keys!
-        options[:path] ||= "/"
-        value = super(key.to_s)
-        response.delete_cookie(key, options)
-        value
+      else
+        options = { :value => options }
       end
 
-      # Returns a jar that'll automatically set the assigned cookies to have an expiration date 20 years from now. Example:
-      #
-      #   cookies.permanent[:prefers_open_id] = true
-      #   # => Set-Cookie: prefers_open_id=true; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
-      #
-      # This jar is only meant for writing. You'll read permanent cookies through the regular accessor.
-      #
-      # This jar allows chaining with the signed jar as well, so you can set permanent, signed cookies. Examples:
-      #
-      #   cookies.permanent.signed[:remember_me] = current_user.id
-      #   # => Set-Cookie: discount=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
-      def permanent
-        @permanent ||= PermanentCookieJar.new(self)
-      end
-    
-      # Returns a jar that'll automatically generate a signed representation of cookie value and verify it when reading from
-      # the cookie again. This is useful for creating cookies with values that the user is not supposed to change. If a signed
-      # cookie was tampered with by the user (or a 3rd party), an ActiveSupport::MessageVerifier::InvalidSignature exception will
-      # be raised.
-      #
-      # This jar requires that you set a suitable secret for the verification on ActionController::Base.cookie_verifier_secret.
-      #
-      # Example:
-      #
-      #   cookies.signed[:discount] = 45
-      #   # => Set-Cookie: discount=BAhpMg==--2c1c6906c90a3bc4fd54a51ffb41dffa4bf6b5f7; path=/
-      #
-      #   cookies.signed[:discount] # => 45
-      def signed
-        @signed ||= SignedCookieJar.new(self)
-      end
+      options[:expires] = 20.years.from_now
+      @parent_jar[key] = options
     end
-    
-    class PermanentCookieJar < CookieJar #:nodoc:
-      def initialize(parent_jar)
-        @parent_jar = parent_jar
-      end
-    
-      def []=(key, options)
-        if options.is_a?(Hash)
-          options.symbolize_keys!
-        else
-          options = { :value => options }
-        end
-        
-        options[:expires] = 20.years.from_now
-        @parent_jar[key] = options
-      end
-    
-      def signed
-        @signed ||= SignedCookieJar.new(self)
-      end
-    
-      def controller
-        @parent_jar.controller
-      end
-    
-      def method_missing(method, *arguments, &block)
-        @parent_jar.send(method, *arguments, &block)
-      end
+
+    def signed
+      @signed ||= SignedCookieJar.new(self)
     end
-    
-    class SignedCookieJar < CookieJar #:nodoc:
-      def initialize(parent_jar)
-        unless ActionController::Base.cookie_verifier_secret
-          raise "You must set ActionController::Base.cookie_verifier_secret to use signed cookies"
-        end
-    
-        @parent_jar = parent_jar
-        @verifier = ActiveSupport::MessageVerifier.new(ActionController::Base.cookie_verifier_secret)
-      end
-      
-      def [](name)
-        @verifier.verify(@parent_jar[name])
-      end
-      
-      def []=(key, options)
-        if options.is_a?(Hash)
-          options.symbolize_keys!
-          options[:value] = @verifier.generate(options[:value])
-        else
-          options = { :value => @verifier.generate(options) }
-        end
-        
-        @parent_jar[key] = options
+
+    def controller
+      @parent_jar.controller
+    end
+
+    def method_missing(method, *arguments, &block)
+      @parent_jar.send(method, *arguments, &block)
+    end
+  end
+
+  class SignedCookieJar < CookieJar #:nodoc:
+    def initialize(parent_jar)
+      unless ActionController::Base.cookie_verifier_secret
+        raise "You must set ActionController::Base.cookie_verifier_secret to use signed cookies"
       end
-      
-      def method_missing(method, *arguments, &block)
-        @parent_jar.send(method, *arguments, &block)
+
+      @parent_jar = parent_jar
+      @verifier = ActiveSupport::MessageVerifier.new(ActionController::Base.cookie_verifier_secret)
+    end
+
+    def [](name)
+      @verifier.verify(@parent_jar[name])
+    end
+
+    def []=(key, options)
+      if options.is_a?(Hash)
+        options.symbolize_keys!
+        options[:value] = @verifier.generate(options[:value])
+      else
+        options = { :value => @verifier.generate(options) }
       end
+
+      @parent_jar[key] = options
+    end
+
+    def method_missing(method, *arguments, &block)
+      @parent_jar.send(method, *arguments, &block)
+    end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb
index 581ff6109e..682f90e23b 100644
--- a/actionpack/lib/action_controller/metal/flash.rb
+++ b/actionpack/lib/action_controller/metal/flash.rb
@@ -123,80 +123,79 @@ module ActionController #:nodoc:
         session["flash"] = self
       end
 
-    private
-      # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-      #     use()               # marks the entire flash as used
-      #     use('msg')          # marks the "msg" entry as used
-      #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
-      #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
-      # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
-      # if no key is passed.
-      def use(key = nil, used = true)
-        Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
-        return key ? self[key] : self
-      end
-  end
-
-  # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
-  # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
-  # to put a new one.
-  def flash #:doc:
-    unless @_flash
-      @_flash = session["flash"] || FlashHash.new
-      @_flash.sweep
+      private
+        # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
+        #     use()               # marks the entire flash as used
+        #     use('msg')          # marks the "msg" entry as used
+        #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
+        #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
+        # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
+        # if no key is passed.
+        def use(key = nil, used = true)
+          Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
+          return key ? self[key] : self
+        end
     end
 
-    @_flash
-  end
-
-  # Convenience accessor for flash[:alert]
-  def alert
-    flash[:alert]
-  end
-
-  # Convenience accessor for flash[:alert]=
-  def alert=(message)
-    flash[:alert] = message
-  end
+    # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
+    # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
+    # to put a new one.
+    def flash #:doc:
+      unless @_flash
+        @_flash = session["flash"] || FlashHash.new
+        @_flash.sweep
+      end
 
-  # Convenience accessor for flash[:notice]
-  def notice
-    flash[:notice]
-  end
+      @_flash
+    end
 
-  # Convenience accessor for flash[:notice]=
-  def notice=(message)
-    flash[:notice] = message
-  end
+    # Convenience accessor for flash[:alert]
+    def alert
+      flash[:alert]
+    end
 
+    # Convenience accessor for flash[:alert]=
+    def alert=(message)
+      flash[:alert] = message
+    end
 
-  protected
-    def process_action(method_name)
-      @_flash = nil
-      super
-      @_flash.store(session) if @_flash
-      @_flash = nil
+    # Convenience accessor for flash[:notice]
+    def notice
+      flash[:notice]
     end
 
-    def reset_session
-      super
-      @_flash = nil
+    # Convenience accessor for flash[:notice]=
+    def notice=(message)
+      flash[:notice] = message
     end
 
-    def redirect_to(options = {}, response_status_and_flash = {}) #:doc:
-      if alert = response_status_and_flash.delete(:alert)
-        flash[:alert] = alert
+    protected
+      def process_action(method_name)
+        @_flash = nil
+        super
+        @_flash.store(session) if @_flash
+        @_flash = nil
       end
 
-      if notice = response_status_and_flash.delete(:notice)
-        flash[:notice] = notice
+      def reset_session
+        super
+        @_flash = nil
       end
 
-      if other_flashes = response_status_and_flash.delete(:flash)
-        flash.update(other_flashes)
-      end
+      def redirect_to(options = {}, response_status_and_flash = {}) #:doc:
+        if alert = response_status_and_flash.delete(:alert)
+          flash[:alert] = alert
+        end
 
-      super(options, response_status_and_flash)
-    end
+        if notice = response_status_and_flash.delete(:notice)
+          flash[:notice] = notice
+        end
+
+        if other_flashes = response_status_and_flash.delete(:flash)
+          flash.update(other_flashes)
+        end
+
+        super(options, response_status_and_flash)
+      end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index 2a41b4dbad..1e43104f0a 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -6,13 +6,13 @@ module ActionDispatch
       extend ActiveSupport::Memoizable
 
       def initialize(*args)
-         if args.size == 1 && args[0].is_a?(Hash)
-           super()
-           update(args[0])
-         else
-           super
-         end
-       end
+        if args.size == 1 && args[0].is_a?(Hash)
+          super()
+          update(args[0])
+        else
+          super
+        end
+      end
 
       def [](header_name)
         if include?(header_name)
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index c30897b32a..e681b6340d 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -104,7 +104,7 @@ module Mime
 
         SET << Mime.const_get(symbol.to_s.upcase)
 
-        ([string] + mime_type_synonyms).each { |string| LOOKUP[string] = SET.last } unless skip_lookup
+        ([string] + mime_type_synonyms).each { |str| LOOKUP[str] = SET.last } unless skip_lookup
         ([symbol.to_s] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext] = SET.last }
       end
 
diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
index 5a46a27893..221d1bd5c5 100644
--- a/actionpack/lib/action_view/template/handler.rb
+++ b/actionpack/lib/action_view/template/handler.rb
@@ -17,8 +17,8 @@ module ActionView
         end
 
         def compile(template)
-           raise "Need to implement #{self.class.name}#compile(template)"
-         end
+          raise "Need to implement #{self.class.name}#compile(template)"
+        end
       end
     end
 
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index a2f4ab2ef5..c6a17907ff 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -108,13 +108,9 @@ module ActionView
         query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << '}'
       end
 
-      Dir[query].map do |path|
-        next if File.directory?(path)
-        source = File.read(path)
-        identifier = Pathname.new(path).expand_path.to_s
-
-        Template.new(source, identifier, *path_to_details(path))
-      end.compact
+      Dir[query].reject { |p| File.directory?(p) }.map do |p|
+        Template.new(File.read(p), File.expand_path(p), *path_to_details(p))
+      end
     end
 
     # # TODO: fix me
@@ -162,4 +158,4 @@ module ActionView
       @paths.first.to_s
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 67e9b0103f..97e2a478b5 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -467,8 +467,8 @@ module ActiveSupport
       # method that took into consideration the per_key conditions. This
       # is a speed improvement for ActionPack.
       #
-      def set_callback(name, *filters, &block)
-        __update_callbacks(name, filters, block) do |chain, type, filters, options|
+      def set_callback(name, *filter_list, &block)
+        __update_callbacks(name, filter_list, block) do |chain, type, filters, options|
           filters.map! do |filter|
             chain.delete_if {|c| c.matches?(type, filter) }
             Callback.new(chain, filter, type, options.dup, self)
@@ -480,8 +480,8 @@ module ActiveSupport
 
       # Skip a previously defined callback for a given type.
       #
-      def skip_callback(name, *filters, &block)
-        __update_callbacks(name, filters, block) do |chain, type, filters, options|
+      def skip_callback(name, *filter_list, &block)
+        __update_callbacks(name, filter_list, block) do |chain, type, filters, options|
           chain = send("_#{name}_callbacks=", chain.clone(self))
 
           filters.each do |filter|