From 07054fe369b0d30562642f15140f7c863dfc4328 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 28 Mar 2011 22:17:20 -0700
Subject: Fix grammar, formatting, and cross references

---
 actionpack/lib/action_dispatch/testing/integration.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 5c6416a19e..4706112a06 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -26,31 +26,31 @@ module ActionDispatch
       # object's <tt>@response</tt> instance variable will point to the same
       # response object.
       #
-      # You can also perform POST, PUT, DELETE, and HEAD requests with +post+,
-      # +put+, +delete+, and +head+.
+      # You can also perform POST, PUT, DELETE, and HEAD requests with +#post+,
+      # +#put+, +#delete+, and +#head+.
       def get(path, parameters = nil, headers = nil)
         process :get, path, parameters, headers
       end
 
-      # Performs a POST request with the given parameters. See get() for more
+      # Performs a POST request with the given parameters. See +#get+ for more
       # details.
       def post(path, parameters = nil, headers = nil)
         process :post, path, parameters, headers
       end
 
-      # Performs a PUT request with the given parameters. See get() for more
+      # Performs a PUT request with the given parameters. See +#get+ for more
       # details.
       def put(path, parameters = nil, headers = nil)
         process :put, path, parameters, headers
       end
 
-      # Performs a DELETE request with the given parameters. See get() for
+      # Performs a DELETE request with the given parameters. See +#get+ for
       # more details.
       def delete(path, parameters = nil, headers = nil)
         process :delete, path, parameters, headers
       end
 
-      # Performs a HEAD request with the given parameters. See get() for more
+      # Performs a HEAD request with the given parameters. See +#get+ for more
       # details.
       def head(path, parameters = nil, headers = nil)
         process :head, path, parameters, headers
@@ -59,7 +59,7 @@ module ActionDispatch
       # Performs an XMLHttpRequest request with the given parameters, mirroring
       # a request from the Prototype library.
       #
-      # The request_method is :get, :post, :put, :delete or :head; the
+      # The request_method is +:get+, +:post+, +:put+, +:delete+ or +:head+; the
       # parameters are +nil+, a hash, or a url-encoded or multipart string;
       # the headers are a hash.  Keys are automatically upcased and prefixed
       # with 'HTTP_' if not already.
@@ -384,7 +384,7 @@ module ActionDispatch
     end
   end
 
-  # An test that spans multiple controllers and actions,
+  # An integration test spans multiple controllers and actions,
   # tying them all together to ensure they work together as expected. It tests
   # more completely than either unit or functional tests do, exercising the
   # entire stack, from the dispatcher to the database.
-- 
cgit v1.2.3


From d7a5638dfbe68d0a92958c0e81f44054ddd7d291 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 4 Apr 2011 21:52:37 -0300
Subject: raise if someone tries to modify the flash when it was already
 streamed back to the client or converted to HTTP headers

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 21aeeb217a..410d3f7127 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -43,9 +43,15 @@ module ActionDispatch
     class FlashNow #:nodoc:
       def initialize(flash)
         @flash = flash
+        @closed = false
       end
 
+      attr_reader :closed
+      alias :closed? :closed
+      def close!; @closed = true end
+
       def []=(k, v)
+        raise ClosedError, "Cannot modify flash because it was closed. This means it was already streamed back to the client or converted to HTTP headers." if closed?
         @flash[k] = v
         @flash.discard(k)
         v
@@ -70,9 +76,15 @@ module ActionDispatch
       def initialize #:nodoc:
         super
         @used = Set.new
+        @closed = false
       end
 
+      attr_reader :closed
+      alias :closed? :closed
+      def close!; @closed = true end
+
       def []=(k, v) #:nodoc:
+        raise ClosedError, "Cannot modify flash because it was closed. This means it was already streamed back to the client or converted to HTTP headers." if closed?
         keep(k)
         super
       end
@@ -184,8 +196,11 @@ module ActionDispatch
       session    = env['rack.session'] || {}
       flash_hash = env['action_dispatch.request.flash_hash']
 
-      if flash_hash && (!flash_hash.empty? || session.key?('flash'))
+      if flash_hash
+       if !flash_hash.empty? || session.key?('flash')
         session["flash"] = flash_hash
+       end
+       flash_hash.close!
       end
 
       if session.key?('flash') && session['flash'].empty?
@@ -193,4 +208,7 @@ module ActionDispatch
       end
     end
   end
+
+  class ClosedError < StandardError #:nodoc:
+  end
 end
-- 
cgit v1.2.3


From 90ecad0bc944fc3adb847c0c754d8f0dc2bed4b5 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 6 Apr 2011 12:30:08 -0300
Subject: Add ClosedError message to the initializer

---
 actionpack/lib/action_dispatch/middleware/closed_error.rb | 7 +++++++
 actionpack/lib/action_dispatch/middleware/flash.rb        | 7 ++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 actionpack/lib/action_dispatch/middleware/closed_error.rb

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/closed_error.rb b/actionpack/lib/action_dispatch/middleware/closed_error.rb
new file mode 100644
index 0000000000..0a4db47f4b
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/closed_error.rb
@@ -0,0 +1,7 @@
+module ActionDispatch
+  class ClosedError < StandardError #:nodoc:
+    def initialize(kind)
+      super "Cannot modify #{kind} because it was closed. This means it was already streamed back to the client or converted to HTTP headers."
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 410d3f7127..6eda1f31a7 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -51,7 +51,7 @@ module ActionDispatch
       def close!; @closed = true end
 
       def []=(k, v)
-        raise ClosedError, "Cannot modify flash because it was closed. This means it was already streamed back to the client or converted to HTTP headers." if closed?
+        raise ClosedError, :flash if closed?
         @flash[k] = v
         @flash.discard(k)
         v
@@ -84,7 +84,7 @@ module ActionDispatch
       def close!; @closed = true end
 
       def []=(k, v) #:nodoc:
-        raise ClosedError, "Cannot modify flash because it was closed. This means it was already streamed back to the client or converted to HTTP headers." if closed?
+        raise ClosedError, :flash if closed?
         keep(k)
         super
       end
@@ -208,7 +208,4 @@ module ActionDispatch
       end
     end
   end
-
-  class ClosedError < StandardError #:nodoc:
-  end
 end
-- 
cgit v1.2.3


From 0c5aded0922f80bd1a31c7d2a3974469a18160a8 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 6 Apr 2011 12:05:58 -0300
Subject: raise if someone tries to modify the cookies when it was already
 streamed back to the client or converted to HTTP headers

---
 actionpack/lib/action_dispatch/middleware/cookies.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 7ac608f0a8..67c4b83d45 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -115,10 +115,15 @@ module ActionDispatch
         @delete_cookies = {}
         @host = host
         @secure = secure
+        @closed = false
 
         super()
       end
 
+      attr_reader :closed
+      alias :closed? :closed
+      def close!; @closed = true end
+
       # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
       def [](name)
         super(name.to_s)
@@ -145,6 +150,7 @@ module ActionDispatch
       # 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)
+        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
           value = options[:value]
@@ -225,6 +231,7 @@ module ActionDispatch
       end
 
       def []=(key, options)
+        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
         else
@@ -263,6 +270,7 @@ module ActionDispatch
       end
 
       def []=(key, options)
+        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
           options[:value] = @verifier.generate(options[:value])
@@ -305,6 +313,7 @@ module ActionDispatch
     end
 
     def call(env)
+      cookie_jar = nil
       status, headers, body = @app.call(env)
 
       if cookie_jar = env['action_dispatch.cookies']
@@ -315,6 +324,9 @@ module ActionDispatch
       end
 
       [status, headers, body]
+    ensure
+      cookie_jar = ActionDispatch::Request.new(env).cookie_jar unless cookie_jar
+      cookie_jar.close!
     end
   end
 end
-- 
cgit v1.2.3


From 0e4748cd415660eb91e63d50aa15cdd027c612dd Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 6 Apr 2011 16:37:55 -0300
Subject: Make process reuse the env var passed as argument

---
 actionpack/lib/action_dispatch/testing/integration.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 4706112a06..9b2f534457 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -243,7 +243,8 @@ module ActionDispatch
         end
 
         # Performs the actual request.
-        def process(method, path, parameters = nil, rack_environment = nil)
+        def process(method, path, parameters = nil, env = nil)
+          env ||= {}
           if path =~ %r{://}
             location = URI.parse(path)
             https! URI::HTTPS === location if location.scheme
@@ -259,7 +260,7 @@ module ActionDispatch
 
           hostname, port = host.split(':')
 
-          env = {
+          default_env = {
             :method => method,
             :params => parameters,
 
@@ -277,9 +278,7 @@ module ActionDispatch
 
           session = Rack::Test::Session.new(_mock_session)
 
-          (rack_environment || {}).each do |key, value|
-            env[key] = value
-          end
+          env.reverse_merge!(default_env)
 
           # NOTE: rack-test v0.5 doesn't build a default uri correctly
           # Make sure requested path is always a full uri
-- 
cgit v1.2.3


From 0ca69ca65f83b4bb34f81f077c1c38c66ad868b9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 6 Apr 2011 16:27:05 -0700
Subject: CookieJar should prefer composition over inheritance

---
 actionpack/lib/action_dispatch/middleware/cookies.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 67c4b83d45..24ebb8fed7 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -83,7 +83,7 @@ module ActionDispatch
     # Raised when storing more than 4K of session data.
     class CookieOverflow < StandardError; end
 
-    class CookieJar < Hash #:nodoc:
+    class CookieJar #:nodoc:
 
       # This regular expression is used to split the levels of a domain.
       # The top level domain can be any string without a period or
@@ -116,8 +116,7 @@ module ActionDispatch
         @host = host
         @secure = secure
         @closed = false
-
-        super()
+        @cookies = {}
       end
 
       attr_reader :closed
@@ -126,7 +125,12 @@ module ActionDispatch
 
       # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
       def [](name)
-        super(name.to_s)
+        @cookies[name.to_s]
+      end
+
+      def update(other_hash)
+        @cookies.update other_hash
+        self
       end
 
       def handle_options(options) #:nodoc:
@@ -159,7 +163,7 @@ module ActionDispatch
           options = { :value => value }
         end
 
-        value = super(key.to_s, value)
+        value = @cookies[key.to_s] = value
 
         handle_options(options)
 
@@ -176,7 +180,7 @@ module ActionDispatch
 
         handle_options(options)
 
-        value = super(key.to_s)
+        value = @cookies.delete(key.to_s)
         @delete_cookies[key] = options
         value
       end
-- 
cgit v1.2.3


From 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 6 Apr 2011 20:53:48 -0300
Subject: Use freeze instead of close!

---
 actionpack/lib/action_dispatch/middleware/cookies.rb |  7 ++-----
 actionpack/lib/action_dispatch/middleware/flash.rb   | 12 +++---------
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 24ebb8fed7..3ed5f1055f 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -115,13 +115,10 @@ module ActionDispatch
         @delete_cookies = {}
         @host = host
         @secure = secure
-        @closed = false
         @cookies = {}
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true end
+      alias :closed? :frozen?
 
       # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
       def [](name)
@@ -330,7 +327,7 @@ module ActionDispatch
       [status, headers, body]
     ensure
       cookie_jar = ActionDispatch::Request.new(env).cookie_jar unless cookie_jar
-      cookie_jar.close!
+      cookie_jar.freeze
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 6eda1f31a7..e7090ecf1b 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -43,12 +43,9 @@ module ActionDispatch
     class FlashNow #:nodoc:
       def initialize(flash)
         @flash = flash
-        @closed = false
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true end
+      alias :closed? :frozen?
 
       def []=(k, v)
         raise ClosedError, :flash if closed?
@@ -76,12 +73,9 @@ module ActionDispatch
       def initialize #:nodoc:
         super
         @used = Set.new
-        @closed = false
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true end
+      alias :closed? :frozen?
 
       def []=(k, v) #:nodoc:
         raise ClosedError, :flash if closed?
@@ -200,7 +194,7 @@ module ActionDispatch
        if !flash_hash.empty? || session.key?('flash')
         session["flash"] = flash_hash
        end
-       flash_hash.close!
+       flash_hash.freeze
       end
 
       if session.key?('flash') && session['flash'].empty?
-- 
cgit v1.2.3


From 76c2ea7882a83159408bdf1f7c363f442a65c4f1 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 6 Apr 2011 17:26:55 -0700
Subject: favor composition over inheritance, have FlashHash delegate to a Hash

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 47 ++++++++++++++++++----
 1 file changed, 40 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 6eda1f31a7..98dbe13438 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -72,11 +72,13 @@ module ActionDispatch
       end
     end
 
-    class FlashHash < Hash
+    class FlashHash
+      include Enumerable
+
       def initialize #:nodoc:
-        super
-        @used = Set.new
-        @closed = false
+        @used    = Set.new
+        @closed  = false
+        @flashes = {}
       end
 
       attr_reader :closed
@@ -86,19 +88,50 @@ module ActionDispatch
       def []=(k, v) #:nodoc:
         raise ClosedError, :flash if closed?
         keep(k)
-        super
+        @flashes[k] = v
+      end
+
+      def [](k)
+        @flashes[k]
       end
 
       def update(h) #:nodoc:
         h.keys.each { |k| keep(k) }
-        super
+        @flashes.update h
+        self
+      end
+
+      def keys
+        @flashes.keys
+      end
+
+      def delete(key)
+        @flashes.delete key
+        self
+      end
+
+      def to_hash
+        @flashes.dup
+      end
+
+      def empty?
+        @flashes.empty?
+      end
+
+      def clear
+        @flashes.clear
+      end
+
+      def each(&block)
+        @flashes.each(&block)
       end
 
       alias :merge! :update
 
       def replace(h) #:nodoc:
         @used = Set.new
-        super
+        @flashes.replace h
+        self
       end
 
       # Sets a flash that will not be available to the next action, only to the current.
-- 
cgit v1.2.3


From 32f876786aa1eb718f122b116203b01ee0260113 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 6 Apr 2011 18:01:03 -0700
Subject: getting the flash hash under test

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 98dbe13438..b5194c675c 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -105,6 +105,10 @@ module ActionDispatch
         @flashes.keys
       end
 
+      def key?(name)
+        @flashes.key? name
+      end
+
       def delete(key)
         @flashes.delete key
         self
-- 
cgit v1.2.3


From dffeda377021ba8691381195f5a2889f8e040b93 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 6 Apr 2011 22:25:07 -0300
Subject: Eagerly load Signed and Permanent cookies

---
 .../lib/action_dispatch/middleware/cookies.rb      | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 3ed5f1055f..820df8f499 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -116,6 +116,8 @@ module ActionDispatch
         @host = host
         @secure = secure
         @cookies = {}
+        @permanent = PermanentCookieJar.new(self, @secret)
+        @signed = @secret && SignedCookieJar.new(self, @secret)
       end
 
       alias :closed? :frozen?
@@ -193,9 +195,7 @@ module ActionDispatch
       #
       #   cookies.permanent.signed[:remember_me] = current_user.id
       #   # => Set-Cookie: remember_me=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
-      def permanent
-        @permanent ||= PermanentCookieJar.new(self, @secret)
-      end
+      attr_reader :permanent
 
       # 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
@@ -211,7 +211,8 @@ module ActionDispatch
       #
       #   cookies.signed[:discount] # => 45
       def signed
-        @signed ||= SignedCookieJar.new(self, @secret)
+        SignedCookieJar.ensure_secret_provided(@secret)
+        @signed
       end
 
       def write(headers)
@@ -228,7 +229,9 @@ module ActionDispatch
 
     class PermanentCookieJar < CookieJar #:nodoc:
       def initialize(parent_jar, secret)
-        @parent_jar, @secret = parent_jar, secret
+        @parent_jar = parent_jar
+        @secret = secret
+        @signed = @secret && SignedCookieJar.new(self, @secret)
       end
 
       def []=(key, options)
@@ -244,7 +247,8 @@ module ActionDispatch
       end
 
       def signed
-        @signed ||= SignedCookieJar.new(self, @secret)
+        SignedCookieJar.ensure_secret_provided(@secret)
+        @signed
       end
 
       def method_missing(method, *arguments, &block)
@@ -257,7 +261,8 @@ module ActionDispatch
       SECRET_MIN_LENGTH = 30 # Characters
 
       def initialize(parent_jar, secret)
-        ensure_secret_secure(secret)
+        self.class.ensure_secret_provided(secret)
+        self.class.ensure_secret_length(secret)
         @parent_jar = parent_jar
         @verifier   = ActiveSupport::MessageVerifier.new(secret)
       end
@@ -289,9 +294,7 @@ module ActionDispatch
 
     protected
 
-      # To prevent users from using something insecure like "Password" we make sure that the
-      # secret they've provided is at least 30 characters in length.
-      def ensure_secret_secure(secret)
+      def self.ensure_secret_provided(secret)
         if secret.blank?
           raise ArgumentError, "A secret is required to generate an " +
             "integrity hash for cookie session data. Use " +
@@ -299,7 +302,11 @@ module ActionDispatch
             "least #{SECRET_MIN_LENGTH} characters\"" +
             "in config/initializers/secret_token.rb"
         end
+      end
 
+      # To prevent users from using something insecure like "Password" we make sure that the
+      # secret they've provided is at least 30 characters in length.
+      def self.ensure_secret_length(secret)
         if secret.length < SECRET_MIN_LENGTH
           raise ArgumentError, "Secret should be something secure, " +
             "like \"#{ActiveSupport::SecureRandom.hex(16)}\".  The value you " +
-- 
cgit v1.2.3


From 5b0149a17aa423d0adbec10c8fb8449f15d16673 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 7 Apr 2011 09:20:56 -0300
Subject: Revert "Eagerly load Signed and Permanent cookies"

This reverts commit dffeda377021ba8691381195f5a2889f8e040b93.
---
 .../lib/action_dispatch/middleware/cookies.rb      | 27 ++++++++--------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 820df8f499..3ed5f1055f 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -116,8 +116,6 @@ module ActionDispatch
         @host = host
         @secure = secure
         @cookies = {}
-        @permanent = PermanentCookieJar.new(self, @secret)
-        @signed = @secret && SignedCookieJar.new(self, @secret)
       end
 
       alias :closed? :frozen?
@@ -195,7 +193,9 @@ module ActionDispatch
       #
       #   cookies.permanent.signed[:remember_me] = current_user.id
       #   # => Set-Cookie: remember_me=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
-      attr_reader :permanent
+      def permanent
+        @permanent ||= PermanentCookieJar.new(self, @secret)
+      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
@@ -211,8 +211,7 @@ module ActionDispatch
       #
       #   cookies.signed[:discount] # => 45
       def signed
-        SignedCookieJar.ensure_secret_provided(@secret)
-        @signed
+        @signed ||= SignedCookieJar.new(self, @secret)
       end
 
       def write(headers)
@@ -229,9 +228,7 @@ module ActionDispatch
 
     class PermanentCookieJar < CookieJar #:nodoc:
       def initialize(parent_jar, secret)
-        @parent_jar = parent_jar
-        @secret = secret
-        @signed = @secret && SignedCookieJar.new(self, @secret)
+        @parent_jar, @secret = parent_jar, secret
       end
 
       def []=(key, options)
@@ -247,8 +244,7 @@ module ActionDispatch
       end
 
       def signed
-        SignedCookieJar.ensure_secret_provided(@secret)
-        @signed
+        @signed ||= SignedCookieJar.new(self, @secret)
       end
 
       def method_missing(method, *arguments, &block)
@@ -261,8 +257,7 @@ module ActionDispatch
       SECRET_MIN_LENGTH = 30 # Characters
 
       def initialize(parent_jar, secret)
-        self.class.ensure_secret_provided(secret)
-        self.class.ensure_secret_length(secret)
+        ensure_secret_secure(secret)
         @parent_jar = parent_jar
         @verifier   = ActiveSupport::MessageVerifier.new(secret)
       end
@@ -294,7 +289,9 @@ module ActionDispatch
 
     protected
 
-      def self.ensure_secret_provided(secret)
+      # To prevent users from using something insecure like "Password" we make sure that the
+      # secret they've provided is at least 30 characters in length.
+      def ensure_secret_secure(secret)
         if secret.blank?
           raise ArgumentError, "A secret is required to generate an " +
             "integrity hash for cookie session data. Use " +
@@ -302,11 +299,7 @@ module ActionDispatch
             "least #{SECRET_MIN_LENGTH} characters\"" +
             "in config/initializers/secret_token.rb"
         end
-      end
 
-      # To prevent users from using something insecure like "Password" we make sure that the
-      # secret they've provided is at least 30 characters in length.
-      def self.ensure_secret_length(secret)
         if secret.length < SECRET_MIN_LENGTH
           raise ArgumentError, "Secret should be something secure, " +
             "like \"#{ActiveSupport::SecureRandom.hex(16)}\".  The value you " +
-- 
cgit v1.2.3


From 03d561ad77085f17ba816ebec619a3d359b2164e Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 7 Apr 2011 09:26:04 -0300
Subject: Revert "Use freeze instead of close!"

This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af.
---
 actionpack/lib/action_dispatch/middleware/cookies.rb |  7 +++++--
 actionpack/lib/action_dispatch/middleware/flash.rb   | 12 +++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 3ed5f1055f..24ebb8fed7 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -115,10 +115,13 @@ module ActionDispatch
         @delete_cookies = {}
         @host = host
         @secure = secure
+        @closed = false
         @cookies = {}
       end
 
-      alias :closed? :frozen?
+      attr_reader :closed
+      alias :closed? :closed
+      def close!; @closed = true end
 
       # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
       def [](name)
@@ -327,7 +330,7 @@ module ActionDispatch
       [status, headers, body]
     ensure
       cookie_jar = ActionDispatch::Request.new(env).cookie_jar unless cookie_jar
-      cookie_jar.freeze
+      cookie_jar.close!
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index e7090ecf1b..6eda1f31a7 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -43,9 +43,12 @@ module ActionDispatch
     class FlashNow #:nodoc:
       def initialize(flash)
         @flash = flash
+        @closed = false
       end
 
-      alias :closed? :frozen?
+      attr_reader :closed
+      alias :closed? :closed
+      def close!; @closed = true end
 
       def []=(k, v)
         raise ClosedError, :flash if closed?
@@ -73,9 +76,12 @@ module ActionDispatch
       def initialize #:nodoc:
         super
         @used = Set.new
+        @closed = false
       end
 
-      alias :closed? :frozen?
+      attr_reader :closed
+      alias :closed? :closed
+      def close!; @closed = true end
 
       def []=(k, v) #:nodoc:
         raise ClosedError, :flash if closed?
@@ -194,7 +200,7 @@ module ActionDispatch
        if !flash_hash.empty? || session.key?('flash')
         session["flash"] = flash_hash
        end
-       flash_hash.freeze
+       flash_hash.close!
       end
 
       if session.key?('flash') && session['flash'].empty?
-- 
cgit v1.2.3


From 0e624ce9eb9056c8986621f3e6b7f5ca67b4cb12 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 7 Apr 2011 09:27:00 -0300
Subject: Cache flash now

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 6eda1f31a7..0af86e4df9 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -112,7 +112,7 @@ module ActionDispatch
       #
       # Entries set via <tt>now</tt> are accessed the same way as standard entries: <tt>flash['my-key']</tt>.
       def now
-        FlashNow.new(self)
+        @now ||= FlashNow.new(self)
       end
 
       # Keeps either the entire current flash or a specific flash entry available for the next action:
-- 
cgit v1.2.3


From a9f3c9da01d721963d05949604ead909aaabbf36 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Mon, 11 Apr 2011 00:52:42 +0800
Subject: Using Object#in? and Object#either? in various places

There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
---
 actionpack/lib/action_dispatch/routing/mapper.rb              | 5 +++--
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 4 +++-
 actionpack/lib/action_dispatch/testing/assertions/selector.rb | 3 ++-
 actionpack/lib/action_dispatch/testing/integration.rb         | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 35be0b3a27..d054028bc3 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,6 +1,7 @@
 require 'erb'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/inclusion'
 require 'active_support/inflector'
 require 'action_dispatch/routing/redirection'
 
@@ -1345,11 +1346,11 @@ module ActionDispatch
           end
 
           def resource_scope? #:nodoc:
-            [:resource, :resources].include?(@scope[:scope_level])
+            @scope[:scope_level].either?(:resource, :resources)
           end
 
           def resource_method_scope? #:nodoc:
-            [:collection, :member, :new].include?(@scope[:scope_level])
+            @scope[:scope_level].either?(:collection, :member, :new)
           end
 
           def with_exclusive_scope
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 77a15f3e97..d3e7fa388f 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/inclusion'
+
 module ActionDispatch
   module Assertions
     # A small suite of assertions that test responses from \Rails applications.
@@ -33,7 +35,7 @@ module ActionDispatch
       def assert_response(type, message = nil)
         validate_request!
 
-        if [ :success, :missing, :redirect, :error ].include?(type) && @response.send("#{type}?")
+        if type.either?(:success, :missing, :redirect, :error) && @response.send("#{type}?")
           assert_block("") { true } # to count the assertion
         elsif type.is_a?(Fixnum) && @response.response_code == type
           assert_block("") { true } # to count the assertion
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 2b862fb7d6..3346fa2a04 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -1,4 +1,5 @@
 require 'action_controller/vendor/html-scanner'
+require 'active_support/core_ext/object/inclusion'
 
 #--
 # Copyright (c) 2006 Assaf Arkin (http://labnotes.org)
@@ -441,7 +442,7 @@ module ActionDispatch
 
         if matches
           assert_block("") { true } # to count the assertion
-          if block_given? && !([:remove, :show, :hide, :toggle].include? rjs_type)
+          if block_given? && !rjs_type.either?(:remove, :show, :hide, :toggle)
             begin
               @selected ||= nil
               in_scope, @selected = @selected, matches
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 9b2f534457..a508020368 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -1,6 +1,7 @@
 require 'stringio'
 require 'uri'
 require 'active_support/core_ext/kernel/singleton_class'
+require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/object/try'
 require 'rack/test'
 require 'test/unit/assertions'
@@ -320,7 +321,7 @@ module ActionDispatch
         define_method(method) do |*args|
           reset! unless integration_session
           # reset the html_document variable, but only for new get/post calls
-          @html_document = nil unless %w(cookies assigns).include?(method)
+          @html_document = nil unless method.either?("cookies", "assigns")
           integration_session.__send__(method, *args).tap do
             copy_session_variables!
           end
-- 
cgit v1.2.3


From d1575ae1b9658c91145d6a46ec2a144a5a089207 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 12 Apr 2011 00:23:07 +0200
Subject: Change Object#either? to Object#among? -- thanks to @jamesarosen for
 the suggestion!

---
 actionpack/lib/action_dispatch/routing/mapper.rb              | 4 ++--
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 2 +-
 actionpack/lib/action_dispatch/testing/assertions/selector.rb | 2 +-
 actionpack/lib/action_dispatch/testing/integration.rb         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index d054028bc3..13aef18ee1 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1346,11 +1346,11 @@ module ActionDispatch
           end
 
           def resource_scope? #:nodoc:
-            @scope[:scope_level].either?(:resource, :resources)
+            @scope[:scope_level].among?(:resource, :resources)
           end
 
           def resource_method_scope? #:nodoc:
-            @scope[:scope_level].either?(:collection, :member, :new)
+            @scope[:scope_level].among?(:collection, :member, :new)
           end
 
           def with_exclusive_scope
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index d3e7fa388f..16a6b93ce8 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -35,7 +35,7 @@ module ActionDispatch
       def assert_response(type, message = nil)
         validate_request!
 
-        if type.either?(:success, :missing, :redirect, :error) && @response.send("#{type}?")
+        if type.among?(:success, :missing, :redirect, :error) && @response.send("#{type}?")
           assert_block("") { true } # to count the assertion
         elsif type.is_a?(Fixnum) && @response.response_code == type
           assert_block("") { true } # to count the assertion
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 3346fa2a04..f41d3e5ddb 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -442,7 +442,7 @@ module ActionDispatch
 
         if matches
           assert_block("") { true } # to count the assertion
-          if block_given? && !rjs_type.either?(:remove, :show, :hide, :toggle)
+          if block_given? && !rjs_type.among?(:remove, :show, :hide, :toggle)
             begin
               @selected ||= nil
               in_scope, @selected = @selected, matches
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index a508020368..174babb9aa 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -321,7 +321,7 @@ module ActionDispatch
         define_method(method) do |*args|
           reset! unless integration_session
           # reset the html_document variable, but only for new get/post calls
-          @html_document = nil unless method.either?("cookies", "assigns")
+          @html_document = nil unless method.among?("cookies", "assigns")
           integration_session.__send__(method, *args).tap do
             copy_session_variables!
           end
-- 
cgit v1.2.3


From b878757c5073eac7e4fcfd2093d38d8b841db846 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 24 Mar 2011 23:51:17 +0100
Subject: removes assert_select_rjs

---
 .../action_dispatch/testing/assertions/selector.rb | 140 +--------------------
 1 file changed, 1 insertion(+), 139 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index f41d3e5ddb..39a2a9884a 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -19,7 +19,7 @@ module ActionDispatch
     # from the response HTML or elements selected by the enclosing assertion.
     #
     # In addition to HTML responses, you can make the following assertions:
-    # * +assert_select_rjs+ - Assertions on HTML content of RJS update and insertion operations.
+    #
     # * +assert_select_encoded+ - Assertions on HTML encoded inside XML, for example for dealing with feed item descriptions.
     # * +assert_select_email+ - Assertions on the HTML body of an e-mail.
     #
@@ -326,144 +326,6 @@ module ActionDispatch
         end
       end
 
-      # Selects content from the RJS response.
-      #
-      # === Narrowing down
-      #
-      # With no arguments, asserts that one or more elements are updated or
-      # inserted by RJS statements.
-      #
-      # Use the +id+ argument to narrow down the assertion to only statements
-      # that update or insert an element with that identifier.
-      #
-      # Use the first argument to narrow down assertions to only statements
-      # of that type. Possible values are <tt>:replace</tt>, <tt>:replace_html</tt>,
-      # <tt>:show</tt>, <tt>:hide</tt>, <tt>:toggle</tt>, <tt>:remove</tta>,
-      # <tt>:insert_html</tt> and <tt>:redirect</tt>.
-      #
-      # Use the argument <tt>:insert</tt> followed by an insertion position to narrow
-      # down the assertion to only statements that insert elements in that
-      # position. Possible values are <tt>:top</tt>, <tt>:bottom</tt>, <tt>:before</tt>
-      # and <tt>:after</tt>.
-      #
-      # Use the argument <tt>:redirect</tt> followed by a path to check that an statement
-      # which redirects to the specified path is generated.
-      #
-      # Using the <tt>:remove</tt> statement, you will be able to pass a block, but it will
-      # be ignored as there is no HTML passed for this statement.
-      #
-      # === Using blocks
-      #
-      # Without a block, +assert_select_rjs+ merely asserts that the response
-      # contains one or more RJS statements that replace or update content.
-      #
-      # With a block, +assert_select_rjs+ also selects all elements used in
-      # these statements and passes them to the block. Nested assertions are
-      # supported.
-      #
-      # Calling +assert_select_rjs+ with no arguments and using nested asserts
-      # asserts that the HTML content is returned by one or more RJS statements.
-      # Using +assert_select+ directly makes the same assertion on the content,
-      # but without distinguishing whether the content is returned in an HTML
-      # or JavaScript.
-      #
-      # ==== Examples
-      #
-      #   # Replacing the element foo.
-      #   # page.replace 'foo', ...
-      #   assert_select_rjs :replace, "foo"
-      #
-      #   # Replacing with the chained RJS proxy.
-      #   # page[:foo].replace ...
-      #   assert_select_rjs :chained_replace, 'foo'
-      #
-      #   # Inserting into the element bar, top position.
-      #   assert_select_rjs :insert, :top, "bar"
-      #
-      #   # Remove the element bar
-      #   assert_select_rjs :remove, "bar"
-      #
-      #   # Changing the element foo, with an image.
-      #   assert_select_rjs "foo" do
-      #     assert_select "img[src=/images/logo.gif""
-      #   end
-      #
-      #   # RJS inserts or updates a list with four items.
-      #   assert_select_rjs do
-      #     assert_select "ol>li", 4
-      #   end
-      #
-      #   # The same, but shorter.
-      #   assert_select "ol>li", 4
-      #
-      #   # Checking for a redirect.
-      #   assert_select_rjs :redirect, root_path
-      def assert_select_rjs(*args, &block)
-        rjs_type = args.first.is_a?(Symbol) ? args.shift : nil
-        id       = args.first.is_a?(String) ? args.shift : nil
-
-        # If the first argument is a symbol, it's the type of RJS statement we're looking
-        # for (update, replace, insertion, etc). Otherwise, we're looking for just about
-        # any RJS statement.
-        if rjs_type
-          if rjs_type == :insert
-            position  = args.shift
-            id = args.shift
-            insertion = "insert_#{position}".to_sym
-            raise ArgumentError, "Unknown RJS insertion type #{position}" unless RJS_STATEMENTS[insertion]
-            statement = "(#{RJS_STATEMENTS[insertion]})"
-          else
-            raise ArgumentError, "Unknown RJS statement type #{rjs_type}" unless RJS_STATEMENTS[rjs_type]
-            statement = "(#{RJS_STATEMENTS[rjs_type]})"
-          end
-        else
-          statement = "#{RJS_STATEMENTS[:any]}"
-        end
-
-        # Next argument we're looking for is the element identifier. If missing, we pick
-        # any element, otherwise we replace it in the statement.
-        pattern = Regexp.new(
-          id ? statement.gsub(RJS_ANY_ID, "\"#{id}\"") : statement
-        )
-
-        # Duplicate the body since the next step involves destroying it.
-        matches = nil
-        case rjs_type
-          when :remove, :show, :hide, :toggle
-            matches = @response.body.match(pattern)
-          else
-            @response.body.gsub(pattern) do |match|
-              html = unescape_rjs(match)
-              matches ||= []
-              matches.concat HTML::Document.new(html).root.children.select { |n| n.tag? }
-              ""
-            end
-        end
-
-        if matches
-          assert_block("") { true } # to count the assertion
-          if block_given? && !rjs_type.among?(:remove, :show, :hide, :toggle)
-            begin
-              @selected ||= nil
-              in_scope, @selected = @selected, matches
-              yield matches
-            ensure
-              @selected = in_scope
-            end
-          end
-          matches
-        else
-          # RJS statement not found.
-          case rjs_type
-            when :remove, :show, :hide, :toggle
-              flunk_message = "No RJS statement that #{rjs_type.to_s}s '#{id}' was rendered."
-            else
-              flunk_message = "No RJS statement that replaces or inserts HTML content."
-          end
-          flunk args.shift || flunk_message
-        end
-      end
-
       # Extracts the content of an element, treats it as encoded HTML and runs
       # nested assertion on it.
       #
-- 
cgit v1.2.3


From acdbc6ae41c9815a77469bd320be432d6c7b9b87 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 5 Apr 2011 16:03:36 +0200
Subject: renames response_from_page_or_rjs -> response_from_page, and extracts
 the RJS in it

---
 .../action_dispatch/testing/assertions/selector.rb | 63 ++--------------------
 1 file changed, 5 insertions(+), 58 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 39a2a9884a..c67a0664dc 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -80,7 +80,7 @@ module ActionDispatch
 
           return matches
         else
-          root = response_from_page_or_rjs
+          root = response_from_page
         end
 
         case arg
@@ -204,7 +204,7 @@ module ActionDispatch
           root.children.concat @selected
         else
           # Otherwise just operate on the response document.
-          root = response_from_page_or_rjs
+          root = response_from_page
         end
 
         # First or second argument is the selector: string and we pass
@@ -425,62 +425,9 @@ module ActionDispatch
       end
 
       protected
-        RJS_PATTERN_HTML  = "\"((\\\\\"|[^\"])*)\""
-        RJS_ANY_ID        = "\"([^\"])*\""
-        RJS_STATEMENTS    = {
-          :chained_replace      => "\\$\\(#{RJS_ANY_ID}\\)\\.replace\\(#{RJS_PATTERN_HTML}\\)",
-          :chained_replace_html => "\\$\\(#{RJS_ANY_ID}\\)\\.update\\(#{RJS_PATTERN_HTML}\\)",
-          :replace_html         => "Element\\.update\\(#{RJS_ANY_ID}, #{RJS_PATTERN_HTML}\\)",
-          :replace              => "Element\\.replace\\(#{RJS_ANY_ID}, #{RJS_PATTERN_HTML}\\)",
-          :redirect             => "window.location.href = #{RJS_ANY_ID}"
-        }
-        [:remove, :show, :hide, :toggle].each do |action|
-          RJS_STATEMENTS[action] = "Element\\.#{action}\\(#{RJS_ANY_ID}\\)"
-        end
-        RJS_INSERTIONS = ["top", "bottom", "before", "after"]
-        RJS_INSERTIONS.each do |insertion|
-          RJS_STATEMENTS["insert_#{insertion}".to_sym] = "Element.insert\\(#{RJS_ANY_ID}, \\{ #{insertion}: #{RJS_PATTERN_HTML} \\}\\)"
-        end
-        RJS_STATEMENTS[:insert_html] = "Element.insert\\(#{RJS_ANY_ID}, \\{ (#{RJS_INSERTIONS.join('|')}): #{RJS_PATTERN_HTML} \\}\\)"
-        RJS_STATEMENTS[:any] = Regexp.new("(#{RJS_STATEMENTS.values.join('|')})")
-        RJS_PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
-
-        # +assert_select+ and +css_select+ call this to obtain the content in the HTML
-        # page, or from all the RJS statements, depending on the type of response.
-        def response_from_page_or_rjs()
-          content_type = @response.content_type
-
-          if content_type && Mime::JS =~ content_type
-            body = @response.body.dup
-            root = HTML::Node.new(nil)
-
-            while true
-              next if body.sub!(RJS_STATEMENTS[:any]) do |match|
-                html = unescape_rjs(match)
-                matches = HTML::Document.new(html).root.children.select { |n| n.tag? }
-                root.children.concat matches
-                ""
-              end
-              break
-            end
-
-            root
-          else
-            html_document.root
-          end
-        end
-
-        # Unescapes a RJS string.
-        def unescape_rjs(rjs_string)
-          # RJS encodes double quotes and line breaks.
-          unescaped= rjs_string.gsub('\"', '"')
-          unescaped.gsub!(/\\\//, '/')
-          unescaped.gsub!('\n', "\n")
-          unescaped.gsub!('\076', '>')
-          unescaped.gsub!('\074', '<')
-          # RJS encodes non-ascii characters.
-          unescaped.gsub!(RJS_PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
-          unescaped
+        # +assert_select+ and +css_select+ call this to obtain the content in the HTML page.
+        def response_from_page
+          html_document.root
         end
     end
   end
-- 
cgit v1.2.3


From 733bfa63f5d8d3b963202b6d3e9f00b4db070b91 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Wed, 13 Apr 2011 00:04:40 +0800
Subject: Remove `#among?` from Active Support

After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now.

It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.
---
 actionpack/lib/action_dispatch/routing/mapper.rb              | 4 ++--
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 2 +-
 actionpack/lib/action_dispatch/testing/integration.rb         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 13aef18ee1..a65f6e1fce 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1346,11 +1346,11 @@ module ActionDispatch
           end
 
           def resource_scope? #:nodoc:
-            @scope[:scope_level].among?(:resource, :resources)
+            @scope[:scope_level].in?([:resource, :resources])
           end
 
           def resource_method_scope? #:nodoc:
-            @scope[:scope_level].among?(:collection, :member, :new)
+            @scope[:scope_level].in?([:collection, :member, :new])
           end
 
           def with_exclusive_scope
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 16a6b93ce8..8a04cfa886 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -35,7 +35,7 @@ module ActionDispatch
       def assert_response(type, message = nil)
         validate_request!
 
-        if type.among?(:success, :missing, :redirect, :error) && @response.send("#{type}?")
+        if type.in?([:success, :missing, :redirect, :error]) && @response.send("#{type}?")
           assert_block("") { true } # to count the assertion
         elsif type.is_a?(Fixnum) && @response.response_code == type
           assert_block("") { true } # to count the assertion
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 174babb9aa..7d707d03a9 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -321,7 +321,7 @@ module ActionDispatch
         define_method(method) do |*args|
           reset! unless integration_session
           # reset the html_document variable, but only for new get/post calls
-          @html_document = nil unless method.among?("cookies", "assigns")
+          @html_document = nil unless method.in?(["cookies", "assigns"])
           integration_session.__send__(method, *args).tap do
             copy_session_variables!
           end
-- 
cgit v1.2.3


From 199c0bb338568c801792933594d618caf0cdcd4c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 14 Apr 2011 11:27:27 -0700
Subject: generated session ids should be encoded as UTF-8

---
 actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 64d3a87fd0..1a811ce1b1 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -29,7 +29,9 @@ module ActionDispatch
       end
 
       def generate_sid
-        ActiveSupport::SecureRandom.hex(16)
+        sid = ActiveSupport::SecureRandom.hex(16)
+        sid.encode!('UTF-8') if sid.respond_to?(:encode!)
+        sid
       end
 
     protected
-- 
cgit v1.2.3


From d5ad92ced1786b742c3ecce3cb60d851c7200bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 15 Apr 2011 20:09:39 +0200
Subject: Make static faster as we don't have to serve multiple paths anymore.

---
 .../lib/action_dispatch/middleware/static.rb       | 43 ++++++++--------------
 1 file changed, 15 insertions(+), 28 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index c57f694c4d..348f7b86b8 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -2,25 +2,23 @@ require 'rack/utils'
 
 module ActionDispatch
   class FileHandler
-    def initialize(at, root)
-      @at, @root     = at.chomp('/'), root.chomp('/')
-      @compiled_at   = @at.blank? ? nil : /^#{Regexp.escape(at)}/
+    def initialize(root)
+      @root          = root.chomp('/')
       @compiled_root = /^#{Regexp.escape(root)}/
       @file_server   = ::Rack::File.new(@root)
     end
 
     def match?(path)
       path = path.dup
-      if !@compiled_at || path.sub!(@compiled_at, '')
-        full_path = path.empty? ? @root : File.join(@root, ::Rack::Utils.unescape(path))
-        paths = "#{full_path}#{ext}"
 
-        matches = Dir[paths]
-        match = matches.detect { |m| File.file?(m) }
-        if match
-          match.sub!(@compiled_root, '')
-          match
-        end
+      full_path = path.empty? ? @root : File.join(@root, ::Rack::Utils.unescape(path))
+      paths = "#{full_path}#{ext}"
+
+      matches = Dir[paths]
+      match = matches.detect { |m| File.file?(m) }
+      if match
+        match.sub!(@compiled_root, '')
+        match
       end
     end
 
@@ -39,9 +37,9 @@ module ActionDispatch
   class Static
     FILE_METHODS = %w(GET HEAD).freeze
 
-    def initialize(app, roots)
+    def initialize(app, path)
       @app = app
-      @file_handlers = create_file_handlers(roots)
+      @file_handler = FileHandler.new(path)
     end
 
     def call(env)
@@ -49,24 +47,13 @@ module ActionDispatch
       method = env['REQUEST_METHOD']
 
       if FILE_METHODS.include?(method)
-        @file_handlers.each do |file_handler|
-          if match = file_handler.match?(path)
-            env["PATH_INFO"] = match
-            return file_handler.call(env)
-          end
+        if match = @file_handler.match?(path)
+          env["PATH_INFO"] = match
+          return @file_handler.call(env)
         end
       end
 
       @app.call(env)
     end
-
-    private
-      def create_file_handlers(roots)
-        roots = { '' => roots } unless roots.is_a?(Hash)
-
-        roots.map do |at, root|
-          FileHandler.new(at, root) if File.exist?(root)
-        end.compact
-      end
   end
 end
-- 
cgit v1.2.3