riot-rails 0.2.0.pre.1 → 0.2.0.pre.2

data/CHANGELOG

@@ -1,5 +1,9 @@
 *0.2.0.pre.1*
 
+* When rails does redirects, it does not set action_controller.instance as you might expect; users should still have access to the response, though. This fixes that [jaknowlden]
+
+*0.2.0.pre.1*
+
 * Actually relying on riot-0.11.1. Whoops. [jaknowlden]
 
 *0.2.0.pre*

data/VERSION

@@ -1 +1 @@
-0.2.0.pre.1
+0.2.0.pre.2

data/lib/riot/action_controller/context_middleware.rb

@@ -24,17 +24,12 @@ module RiotRails
     def setup_situation(context)
       context.helper(:app) { @app }
       context.helper(:env) { @env }
-      context.helper(:controller) { env["action_controller.instance"] }
-
-      context.helper(:request) do
-        return controller.request if controller
-        raise Exception, "No request made yet"
+      context.helper(:controller) do
+        env["action_controller.instance"] || raise(Exception, "Instance of controller not found")
       end
 
-      context.helper(:response) do
-        return controller.response if controller
-        raise Exception, "No response since no request made yet"
-      end
+      context.helper(:request) { controller.request }
+      context.helper(:response) { @response || raise(Exception, "No response found") }
 
       context.setup(true) do
         self.class_eval { include RiotRails::ActionController::HttpMethods }

data/lib/riot/action_controller/http_methods.rb

@@ -8,11 +8,10 @@ module RiotRails
       def delete(uri, params={}); perform_request("DELETE", uri, params); end
     private
       def perform_request(request_method, uri, params)
-        http_reset
         params = params.inject({}) { |acc,(key,val)| acc[key] = val.to_s; acc }
         @env = ::Rack::MockRequest.env_for(uri, {:params => params, :method => request_method}).merge(@env)
         @env['action_dispatch.show_exceptions'] = false
-        @app.call(@env)
+        @app.call(@env).tap { |state| @response = state.last }
       end
     end # HttpMethods
   end # ActionController

data/riot-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot-rails}
-  s.version = "0.2.0.pre.1"
+  s.version = "0.2.0.pre.2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-06-15}
   s.description = %q{Riot specific test support for Rails apps. Protest the slow app.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [

data/test/action_controller/context_middleware_test.rb

@@ -20,15 +20,12 @@ context "ActionController middleware" do
     asserts("@env") { assigned(:@env) }.equals({})
     asserts("helper env") { topic.env }.equals { assigned(:@env) }
 
-    asserts("helper controller") { topic.controller }.equals { assigned(:@controller) }
+    asserts("helper controller") do
+      topic.controller
+    end.raises(Exception, "Instance of controller not found")
 
-    asserts("request before any request made") do
-      topic.request
-    end.raises(Exception, "No request made yet")
-
-    asserts("response before any request made") do
-      topic.response
-    end.raises(Exception, "No response since no request made yet")
+    asserts(:request).raises(Exception, "Instance of controller not found")
+    asserts(:response).raises(Exception, "No response found")
 
     asserts_topic.responds_to(:get)
     asserts_topic.responds_to(:post)
@@ -59,8 +56,8 @@ context "ActionController middleware" do
       topic.env["action_controller.instance"]
     end.kind_of(RoomsController)
 
-    asserts("helper request") { topic.request }.kind_of(Rack::Request)
-    asserts("helper response") { topic.response }.kind_of(Rack::Response)
+    asserts(:request).kind_of(Rack::Request)
+    asserts(:response).kind_of(Rack::Response)
   end # post-request state
 
 end # ActionController middleware

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - pre
-  - 1
-  version: 0.2.0.pre.1
+  - 2
+  version: 0.2.0.pre.2
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -05:00
+date: 2010-06-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency