@@ -1,3 +1,7 @@ require 'ardes/response_for' ActionController::Base.send :include, Ardes::ResponseFor -ActionController::MimeResponds::Responder.send :include, Ardes::ResponseFor::Responder \ No newline at end of file + +if Rails.version < "2.3.0" + require 'ardes/response_for/bc' + ActionController::Base.send :include, Ardes::ResponseFor::Bc +end \ No newline at end of file init.rb @@ -5,7 +5,7 @@ module Ardes #:nodoc: base.class_eval do extend ClassMethods alias_method_chain :default_render, :response_for - alias_method_chain :template_exists?, :response_for + ::ActionController::MimeResponds::Responder.send :include, Responder end end @@ -129,12 +129,6 @@ module Ardes #:nodoc: (response && response.content_type) ? true : false end - # we extend template_exists? to return true if a template OR a response exists corresponding to the current action. - # This is so that a default render will be triggered when no action, but a repsonse does exist. - def template_exists_with_response_for? - action_responses.any? || template_exists_without_response_for? - end - # if the response.content_type has not been set (if it has, then responthere are responses for the current action, then respond_to them # # we rescue the case where there were no responses, so that the default_render @@ -152,6 +146,8 @@ module Ardes #:nodoc: def default_render_with_response_for respond_to_action_responses default_render_without_response_for unless performed? + rescue ActionView::MissingTemplate => e + respond_to_action_responses end # included into ActionController::MimeResponds::Responder @@ -172,8 +168,8 @@ module Ardes #:nodoc: module VERSION #:nodoc: MAJOR = 0 - MINOR = 2 - TINY = 2 + MINOR = 3 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end lib/ardes/response_for.rb @@ -1,7 +1,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper')) describe Ardes::ResponseFor::VERSION do - it "STRING should be 0.2.2" do - Ardes::ResponseFor::VERSION::STRING.should == '0.2.2' + it "STRING should be 0.3.0" do + Ardes::ResponseFor::VERSION::STRING.should == '0.3.0' end end \ No newline at end of file spec/lib/version_spec.rb 4bdecf2f25098e8e485b2af634ebe5d9592b20d4 Ian White ian.w.white@gmail.com http://github.com/ianwhite/response_for/commit/7e50de088cf412093f45fba73b13d0e6c77dcf3b 7e50de088cf412093f45fba73b13d0e6c77dcf3b 2009-02-03T00:28:13-08:00 2009-02-03T00:28:13-08:00 Extracted template_exists? stuff into BC module for Rails < 2.3 63827c854b860d49ecbb265c0f155ba944ffdf87 Ian White ian.w.white@gmail.com