@@ -162,7 +162,7 @@ module Ardes #:nodoc: # This allows actions without an explicit respond_to block to be decorated # with response_for def render_with_response_for(*args, &block) - if !instance_variable_get('@performed_respond_to') && !block_given? && args.reject(&:nil?) == [] && self.class.send(:action_responses)[action_name] + if !instance_variable_get('@performed_respond_to') && self.class.send(:action_responses)[action_name] && !block_given? && args.reject{|a| a.nil? || a.empty?}.empty? respond_to return if performed? end lib/ardes/response_for.rb @@ -11,6 +11,10 @@ class FooController < ApplicationController respond_to(:json) erase_render_results end + + def baz + # no respond_to block in here, but we can still supplu one with response_for + end end class XmlFooController < FooController spec/app.rb @@ -5,6 +5,10 @@ class FooAController < FooController response_for :foo do |format| format.html { a } end + + response_for :baz do |format| + format.html { bazza } + end end class FooBController < FooAController @@ -16,12 +20,18 @@ end describe FooAController do before do @controller.stub!(:a) + @controller.stub!(:bazza) end - it "get :foo should call :b" do + it "get :foo should call a" do @controller.should_receive(:a) get :foo end + + it "get :baz should call bazza (inside the response_for block)" do + @controller.should_receive(:bazza) + get :baz + end end describe FooBController do @@ -29,7 +39,7 @@ describe FooBController do @controller.stub!(:b) end - it "get :foo should call :b" do + it "get :foo should call b" do @controller.should_receive(:b) get :foo end spec/controllers/inerited_controllers_spec.rb 8ab63ae5dcbff171a619e5a7c9e2bfe29fcc9085 Ian White ian.w.white@gmail.com http://github.com/ianwhite/response_for/commit/1b82c3926db29402ab28207f3ac4e9e1c6c8c9b7 1b82c3926db29402ab28207f3ac4e9e1c6c8c9b7 2008-04-30T08:43:59-07:00 2008-04-30T08:43:59-07:00 Added some specs to bring C2 up to 100%, caught a bug introduced by changes in edge 135e52e28be0ef98b10c1234dd62b1ccca7ea4fc Ian White ian.w.white@gmail.com