From 14f9904e0fc6d8a1e5627ac64c4b5b14e95177c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 29 Sep 2010 11:18:31 +0200
Subject: Avoid (@_var ||= nil) pattern by using initialize methods and
 ensuring everyone calls super as expected.

---
 actionpack/lib/action_dispatch/middleware/stack.rb    | 4 ++++
 actionpack/lib/action_dispatch/middleware/static.rb   | 3 +--
 actionpack/lib/action_dispatch/routing/url_for.rb     | 6 +++++-
 actionpack/lib/action_dispatch/testing/integration.rb | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 9ea188c3e2..e3cd779756 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -41,7 +41,11 @@ module ActionDispatch
       end
     end
 
+    # Use this instead of super to work around a warning.
+    alias :array_initialize :initialize
+
     def initialize(*args)
+      array_initialize(*args)
       yield(self) if block_given?
     end
 
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 6d442b91f5..cf13938331 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -4,10 +4,9 @@ module ActionDispatch
   class FileHandler
     def initialize(at, root)
       @at, @root = at.chomp('/'), root.chomp('/')
-      @compiled_at = Regexp.compile(/^#{Regexp.escape(at)}/) unless @at.blank?
+      @compiled_at = (Regexp.compile(/^#{Regexp.escape(at)}/) unless @at.blank?)
       @compiled_root = Regexp.compile(/^#{Regexp.escape(root)}/)
       @file_server = ::Rack::File.new(root)
-      @compiled_at ||= nil
     end
 
     def match?(path)
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 7be0f2769a..bfdea41f60 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -98,6 +98,11 @@ module ActionDispatch
         end
       end
 
+      def initialize(*)
+        @_routes = nil
+        super
+      end
+
       def url_options
         default_url_options
       end
@@ -136,7 +141,6 @@ module ActionDispatch
 
       protected
         def _with_routes(routes)
-          @_routes ||= nil
           old_routes, @_routes = @_routes, routes
           yield
         ensure
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 8c05462d0d..4d25bb8d7b 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -171,6 +171,7 @@ module ActionDispatch
 
       # Create and initialize a new Session instance.
       def initialize(app)
+        super
         @app = app
 
         # If the app is a Rails app, make url_helpers available on the session
-- 
cgit v1.2.3