@@ -31,4 +31,9 @@ end ActionController::Routing::RouteSet.send :include, SubdomainFu::RouteSetExtensions ActionController::Routing::Route.send :include, SubdomainFu::RouteExtensions -ActionController::UrlRewriter::RESERVED_OPTIONS << :subdomain \ No newline at end of file + +# UrlRewriter::RESERVED_OPTIONS is only available in Rails >= 2.2 +# http://www.portallabs.com/blog/2008/12/02/fixing-subdomain_fu-with-named-routes-rails-22/ +if Rails::VERSION::MAJOR >= 2 and Rails::VERSION::MINOR >= 2 + ActionController::UrlRewriter::RESERVED_OPTIONS << :subdomain +end \ No newline at end of file lib/subdomain_fu/routing_extensions.rb @@ -27,18 +27,20 @@ module ActionController alias_method_chain :rewrite_url, :subdomains end - # hack for http://www.portallabs.com/blog/?p=8 - module Routing - module Optimisation - class PositionalArgumentsWithAdditionalParams - def guard_condition_with_subdomains - # don't allow optimisation if a subdomain is present - fixes a problem - # with the subdomain appearing in the query instead of being rewritten - # see http://mbleigh.lighthouseapp.com/projects/13148/tickets/8-improper-generated-urls-with-named-routes-for-a-singular-resource - guard_condition_without_subdomains + " && !args.last.has_key?(:subdomain)" - end + if Rails::VERSION::MAJOR >= 2 and Rails::VERSION::MINOR <= 1 + # hack for http://www.portallabs.com/blog/2008/10/22/fixing-subdomain_fu-with-named-routes/ + module Routing + module Optimisation + class PositionalArgumentsWithAdditionalParams + def guard_condition_with_subdomains + # don't allow optimisation if a subdomain is present - fixes a problem + # with the subdomain appearing in the query instead of being rewritten + # see http://mbleigh.lighthouseapp.com/projects/13148/tickets/8-improper-generated-urls-with-named-routes-for-a-singular-resource + guard_condition_without_subdomains + " && !args.last.has_key?(:subdomain)" + end - alias_method_chain :guard_condition, :subdomains + alias_method_chain :guard_condition, :subdomains + end end end end lib/subdomain_fu/url_rewriter.rb 81c2a9ce5bb54de7888d31d94cf060b253edb7ae Jacob Coby jcoby@portallabs.com http://github.com/mbleigh/subdomain-fu/commit/483704e8129da0afd8d4e02f3fc7e02ef8e30d70 483704e8129da0afd8d4e02f3fc7e02ef8e30d70 2009-01-12T07:31:06-08:00 2009-01-09T11:28:27-08:00 added conditionals around rails 2.x and 2.2 subdomain hacks. Signed-off-by: Michael Bleigh <michael@intridea.com> 041f63b7d40f88feadb884885ddeab585f3711a7 Michael Bleigh michael@intridea.com