spec/controllers/stop_at_respond_to_spec.rb spec/fixtures/views/stop_at_respond_to_spec/the/index.atom.builder spec/fixtures/views/stop_at_respond_to_spec/the/index.html.erb @@ -6,6 +6,7 @@ module Ardes #:nodoc: extend ClassMethods alias_method_chain :default_render, :response_for alias_method_chain :template_exists?, :response_for + alias_method_chain :respond_to, :response_for end end @@ -134,7 +135,7 @@ module Ardes #:nodoc: # we rescue the case where there were no responses, so that the default_render # action will be performed def respond_to_action_responses - if (responses = self.class.action_responses[action_name]) && responses.any? + if !@respond_to_performed && (responses = self.class.action_responses[action_name]) && responses.any? respond_to do |responder| responses.each {|response| instance_exec(responder, &response) } end rescue Responder::NoResponsesError @@ -148,6 +149,11 @@ module Ardes #:nodoc: default_render_without_response_for unless performed? end + def respond_to_with_response_for(*args, &block) + @respond_to_performed = true + respond_to_without_response_for(*args, &block) + end + # included into ActionController::MimeResponds::Responder module Responder class NoResponsesError < RuntimeError; end lib/ardes/response_for.rb 0cb80d7a78efab2be80d2f99bfac3699a9c2dcdc Ian White ian.w.white@gmail.com http://github.com/ianwhite/response_for/commit/37c5ff4c91f2974a4493ed4233f84d4f6d757c26 37c5ff4c91f2974a4493ed4233f84d4f6d757c26 2008-10-19T15:11:00-07:00 2008-10-19T15:11:00-07:00 Fixed bug where response_for was clobbering the respond_to when the respond_to relied on default_render? [thanks to Tom Stuart for the report] 67546b4245358d6c872c4897379f2cc44b975db6 Ian White ian.w.white@gmail.com