rack-test 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,19 @@
+== 0.4.0 / 2009-06-25
+
+* Minor enhancements
+
+  * Expose hook for building Rack::MockSessions for frameworks that need
+    to configure them before use
+  * Support passing in arrays of raw cookies in addition to a newline
+    separated string
+  * Support after_request callbacks in MockSession for things like running
+    background jobs
+  * Allow multiple named sessions using with_session
+  * Initialize Rack::Test::Sessions with Rack::MockSessions instead of apps.
+    This change should help integration with other Ruby web frameworks
+    (like Merb).
+  * Support sending bodies for PUT requests (Larry Diehl)
+
 == 0.3.0 / 2009-05-17
 
 * Major enhancements

data/lib/rack/mock_session.rb

@@ -3,12 +3,18 @@ module Rack
   class MockSession
     attr_writer :cookie_jar
     attr_reader :last_response
+    attr_reader :default_host
 
     def initialize(app, default_host = Rack::Test::DEFAULT_HOST)
       @app = app
+      @after_request = []
       @default_host = default_host
     end
 
+    def after_request(&block)
+      @after_request << block
+    end
+
     def clear_cookies
       @cookie_jar = Rack::Test::CookieJar.new([], @default_host)
     end
@@ -24,6 +30,7 @@ module Rack
       @last_response = MockResponse.new(status, headers, body, env["rack.errors"].flush)
       cookie_jar.merge(last_response.headers["Set-Cookie"], uri)
 
+      @after_request.each { |hook| hook.call }
       @last_response
     end
 

data/lib/rack/test.rb

@@ -14,7 +14,7 @@ require "rack/test/uploaded_file"
 module Rack
   module Test
 
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
@@ -29,10 +29,10 @@ module Rack
       def_delegators :@rack_mock_session, :clear_cookies, :set_cookie, :last_response, :last_request
 
       # Initialize a new session for the given Rack app
-      def initialize(app, default_host = DEFAULT_HOST)
+      def initialize(mock_session)
         @headers = {}
-        @default_host = default_host
-        @rack_mock_session = Rack::MockSession.new(app, default_host)
+        @rack_mock_session = mock_session
+        @default_host = mock_session.default_host
       end
 
       # Issue a GET request for the given URI with the given params and Rack
@@ -147,7 +147,8 @@ module Rack
         env.update("HTTPS" => "on")                if URI::HTTPS === uri
         env["X-Requested-With"] = "XMLHttpRequest" if env[:xhr]
 
-        if (env[:method] == "POST" || env["REQUEST_METHOD"] == "POST") && !env.has_key?(:input)
+        if (env[:method] == "POST" || env["REQUEST_METHOD"] == "POST" ||
+            env[:method] == "PUT" || env["REQUEST_METHOD"] == "PUT") && !env.has_key?(:input)
           env["CONTENT_TYPE"] = "application/x-www-form-urlencoded"
 
           multipart = (Hash === env[:params]) &&

data/lib/rack/test/cookie_jar.rb

@@ -116,7 +116,7 @@ module Rack
       def merge(raw_cookies, uri = nil)
         return unless raw_cookies
 
-        raw_cookies.each_line do |raw_cookie|
+        Array(raw_cookies).join("\n").split("\n").each do |raw_cookie|
           cookie = Cookie.new(raw_cookie, uri, @default_host)
           self << cookie if cookie.valid?(uri)
         end

data/lib/rack/test/methods.rb

@@ -5,12 +5,40 @@ module Rack
     module Methods
       extend Forwardable
 
-      def rack_test_session
-        @_rack_test_session ||= Rack::Test::Session.new(app)
+      def rack_mock_session(name = :default)
+        return build_rack_mock_session unless name
+
+        @_rack_mock_sessions ||= {}
+        @_rack_mock_sessions[name] ||= build_rack_mock_session
+      end
+
+      def build_rack_mock_session
+        Rack::MockSession.new(app)
+      end
+
+      def rack_test_session(name = :default)
+        return build_rack_test_session(name) unless name
+
+        @_rack_test_sessions ||= {}
+        @_rack_test_sessions[name] ||= build_rack_test_session(name)
+      end
+
+      def build_rack_test_session(name)
+        Rack::Test::Session.new(rack_mock_session(name))
+      end
+
+      def current_session
+        rack_test_session(_current_session_names.last)
+      end
+
+      def with_session(name)
+        _current_session_names.push(name)
+        yield rack_test_session(name)
+        _current_session_names.pop
       end
 
-      def rack_mock_session
-        @_rack_mock_session ||= Rack::MockSession.new(app)
+      def _current_session_names
+        @_current_session_names ||= [:default]
       end
 
       METHODS = [
@@ -39,7 +67,7 @@ module Rack
         :last_request
       ]
 
-      def_delegators :rack_test_session, *METHODS
+      def_delegators :current_session, *METHODS
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-test
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 -04:00
+date: 2009-06-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Simple testing API built on Rack