@@ -98,14 +98,19 @@ module Halcyon # url(:admin_permissons) # => "/admin/permissions" # url(:user, @user) # => "/users/1" # - # Based on the identical method of Merb's controller. + # Based on the +generate_url+ method of Merb's controller. # - def url(name, rparams={}) - Halcyon::Application::Router.generate(name, rparams, - { :controller => controller_name, - :action => method - } - ) + def url(name, *args) + unless Symbol === name + args.unshift(name) + name = :default + end + + unless route = Halcyon::Application::Router.named_routes[name] + raise ArgumentError.new("Named route #{name.inspect} not found") + end + + route.generate(args, {:controller => controller_name, :action => method}) end #-- lib/halcyon/controller.rb f37a8f71a3ae728e97b4a5bf36b06a00bbd35929 Matt Todd chiology@gmail.com http://github.com/mtodd/halcyon/commit/59b183e39445832c81ded4e02b9aceca4aa94c30 59b183e39445832c81ded4e02b9aceca4aa94c30 2008-09-24T22:27:34-07:00 2008-09-24T22:27:34-07:00 Updated URL generator to follow the new design. Specs fail at extract_options_from_args! but this may be resolved with the next push of changes to the 0.9.8 Router changes. 707d85a8d85205a066112826b2ba90297c4e9676 Matt Todd chiology@gmail.com