@@ -430,7 +430,7 @@ class Merb::AbstractController # ==== # TODO: Update this documentation def url(name, *args) - args << params + args << {} Merb::Router.url(name, *args) end @@ -452,17 +452,19 @@ class Merb::AbstractController # ==== Alternatives # If a hash is used as the first argument, a default route will be # generated based on it and rparams. - def absolute_url(name, rparams={}) + def absolute_url(name, *args) # FIXME: arrgh, why request.protocol returns http://? # :// is not part of protocol name - if rparams.is_a?(Hash) - protocol = rparams.delete(:protocol) - host = rparams.delete(:host) - end + options = extract_options_from_args!(args) || {} + protocol = options.delete(:protocol) + host = options.delete(:host) + + raise ArgumentError, "The :protocol option must be specified" unless protocol + raise ArgumentError, "The :host option must be specified" unless host + + args << options - (protocol || request.protocol) + "://" + - (host || request.host) + - url(name, rparams) + protocol + "://" + host + url(name, *args) end # Generates a URL for a single or nested resource. lib/merb-core/controller/abstract_controller.rb @@ -218,6 +218,33 @@ class Merb::Controller < Merb::AbstractController # ==== Returns # Hash:: The parameters from the request object def params() request.params end + + # ==== Parameters + # name<~to_sym, Hash>:: The name of the URL to generate. + # rparams<Hash>:: Parameters for the route generation. + # + # ==== Returns + # String:: The generated URL. + # + # ==== Alternatives + # If a hash is used as the first argument, a default route will be + # generated based on it and rparams. + # ==== + # TODO: Update this documentation + def url(name, *args) + args << params + Merb::Router.url(name, *args) + end + + alias_method :relative_url, :url + + def absolute_url(*args) + options = extract_options_from_args!(args) || {} + options[:protocol] ||= request.protocol + options[:host] ||= request.host + args << options + super(args.first, *args[1..-1]) + end # The results of the controller's render, to be returned to Rack. # lib/merb-core/controller/merb_controller.rb 62bbcc46c28e3921a1efb43b02da4f20b51d080e Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/b085564bc37ed1a46d1a727b533cd4a03097e2ab b085564bc37ed1a46d1a727b533cd4a03097e2ab 2008-09-30T13:54:10-07:00 2008-09-30T13:54:10-07:00 Reorganized URL generation methods across Controller classes Organized the #url, #relative_url, and #absolute_url methods across Merb::AbstractController and Merb::Controller b232b0e212afef5bf1caa827ccd7eb141a130984 Carl Lerche carllerche@mac.com