@@ -23,6 +23,7 @@ module Merb # resource. # :keys<Array>: # A list of the keys to be used instead of :id with the resource in the order of the url. + # :singular<Symbol> # # ==== Block parameters # next_level<Behavior>:: The child behavior. @@ -68,7 +69,7 @@ module Merb def resources(name, *args, &block) name = name.to_s options = extract_options_from_args!(args) || {} - singular = Extlib::Inflection.singularize(name) + singular = options[:singular] ? options[:singular].to_s : Extlib::Inflection.singularize(name) klass = args.first ? args.first.to_s : Extlib::Inflection.classify(singular) keys = [ options.delete(:keys) || :id ].flatten params = { :controller => options.delete(:controller) || name } lib/merb-core/dispatch/router/resources.rb @@ -138,6 +138,15 @@ describe "When generating URLs," do url(:user_foo, :user_id => 2, :foo => "foo-123").should == "/users/2/foo-123" end + it "should allow the singular name to be set" do + Merb::Router.prepare do + resources :blogposts, :singular => :blogpoost + end + + url(:blogposts).should == "/blogposts" + url(:blogpoost, 1).should == "/blogposts/1" + end + end describe "a resource object route" do spec/public/router/generation/resources_spec.rb 59a2e88f92eaeab86817b933d63d272e02f17213 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/62bbcc46c28e3921a1efb43b02da4f20b51d080e 62bbcc46c28e3921a1efb43b02da4f20b51d080e 2008-09-30T10:48:29-07:00 2008-09-30T10:48:29-07:00 Added a :singular option to resource route building 9a007532d61fbb479a5a380abe9388c8b2590048 Carl Lerche carllerche@mac.com