lib/hobo/model_router.rb in hobo-0.8.10 vs lib/hobo/model_router.rb in hobo-0.9.0
- old
+ new
@@ -225,18 +225,18 @@
def lifecycle_routes
model::Lifecycle.creators.values.where.publishable?.*.name.each do |creator|
linkable_route("do_#{singular}_#{creator}", "#{plural}/#{creator}", "do_#{creator}",
- :conditions => { :method => :post }, :format => false, :linkable_action => creator)
- linkable_route("#{singular}_#{creator}", "#{plural}/#{creator}", creator, :conditions => { :method => :get }, :format => false)
+ :conditions => { :method => :post }, :linkable_action => creator)
+ linkable_route("#{singular}_#{creator}", "#{plural}/#{creator}", creator, :conditions => { :method => :get })
end
model::Lifecycle.transitions.where.publishable?.*.name.each do |transition|
linkable_route("do_#{singular}_#{transition}", "#{plural}/:id/#{transition}", "do_#{transition}",
- :conditions => { :method => :put }, :format => false, :linkable_action => transition)
+ :conditions => { :method => :put }, :linkable_action => transition)
linkable_route("#{singular}_#{transition}", "#{plural}/:id/#{transition}", transition,
- :conditions => { :method => :get }, :format => false)
+ :conditions => { :method => :get })
end
end
def user_routes
@@ -250,12 +250,16 @@
def named_route(name, route, options={})
if controller.public_instance_methods.include?(options[:action].to_s)
options.reverse_merge!(:controller => route_with_subsite(plural))
name = name_with_subsite(name)
route = route_with_subsite(route)
- format_route = options.delete(:format) != false
- map.named_route(name, route, options)
- map.named_route("formatted_#{name}", "#{route}.:format", options) if format_route
+ if HoboSupport::RAILS_AT_LEAST_23
+ map.named_route(name, "#{route}.:format", options)
+ else
+ # kick it old-skool
+ map.named_route(name, route, options)
+ map.named_route("formatted_#{name}", "#{route}.:format", options)
+ end
true
else
false
end
end