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

data/CHANGELOG

@@ -1,4 +1,8 @@
-*0.2.0.pre.1*
+*0.2.0.pre.3*
+
+* ISSUE: Whelp, needed to account for parent contexts being ActionController handlers. Fixed [jaknowlden]
+
+*0.2.0.pre.2*
 
 * 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]
 

data/VERSION

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

data/lib/riot/action_controller/context_middleware.rb

@@ -3,22 +3,25 @@ module RiotRails
     register
 
     def call(context)
-      if handle?(context)
-        setup_context_macros(context)
-        setup_situation(context)
-      end
+      setup_situation(context) if handle?(context.description)
+      setup_context_macros(context) if nested_handle?(context)
       middleware.call(context)
     end
   private
-    def handle?(context)
-      description = context.description
+    def handle?(description)
       description.kind_of?(Class) && description.ancestors.include?(::ActionController::Base)
     end
 
+    # Walking the description chain looking to see if any of them are serviceable
+    #
+    # TODO: see if we can't define a method on the context to observe instead of calling
+    # action_controller_description? each time
+    def nested_handle?(context)
+      (handle?(context.description) || nested_handle?(context.parent)) if context.respond_to?(:description)
+    end
+
     def setup_context_macros(context)
-      context.class_eval do
-        include RiotRails::ActionController::AssertsResponse
-      end
+      context.class_eval { include RiotRails::ActionController::AssertsResponse }
     end
 
     def setup_situation(context)

data/riot-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot-rails}
-  s.version = "0.2.0.pre.2"
+  s.version = "0.2.0.pre.3"
 
   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-15}
+  s.date = %q{2010-06-19}
   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_macros/asserts_response_test.rb

@@ -32,4 +32,13 @@ context "An asserts_response context macro" do
     asserts(:to_s).equals("asserts response #status")
     asserts("output of running the test") { topic.run(situation).first }.equals(:pass)
   end
+
+  context "used in the child context of an ActionController context" do
+    setup do
+      child_context = topic.context("child") {}
+      child_context.asserts_response.run(situation)
+    end
+  
+    asserts_topic.equals([:pass, ""])
+  end # used in the child context of an ActionController context
 end # An asserts_response context macro

metadata

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