rack-mount 0.5.2 → 0.6.0

data/lib/rack/mount/generation/route.rb

@@ -28,7 +28,8 @@ module Rack::Mount
 
       def generate(methods, params = {}, recall = {}, options = {})
         if methods.is_a?(Array)
-          result = methods.map { |m| generate_method(m, params, recall, options) || (return nil) }
+          result = methods.map { |m| generate_method(m, params, recall, options) }
+          return nil if result.all? { |e| e.nil? }
         else
           result = generate_method(methods, params, recall, options)
         end

data/lib/rack/mount/generation/route_set.rb

@@ -20,28 +20,45 @@ module Rack::Mount
         route
       end
 
-      # Generates path from identifiers or significant keys.
+      # Generates a url from Rack env and identifiers or significant keys.
       #
       # To generate a url by named route, pass the name in as a +Symbol+.
-      #   url(:dashboard) # => "/dashboard"
+      #   url(env, :dashboard) # => "/dashboard"
       #
       # Additional parameters can be passed in as a hash
-      #   url(:people, :id => "1") # => "/people/1"
+      #   url(env, :people, :id => "1") # => "/people/1"
       #
       # If no name route is given, it will fall back to a slower
       # generation search.
-      #   url(:controller => "people", :action => "show", :id => "1")
+      #   url(env, :controller => "people", :action => "show", :id => "1")
       #     # => "/people/1"
-      def url(*args)
-        named_route, params, recall, options = extract_params!(*args)
+      def url(env, *args)
+        named_route, params = nil, {}
+
+        case args.length
+        when 2
+          named_route, params = args[0], args[1].dup
+        when 1
+          if args[0].is_a?(Hash)
+            params = args[0].dup
+          else
+            named_route = args[0]
+          end
+        else
+          raise ArgumentError
+        end
 
-        options[:parameterize] ||= lambda { |name, param| Utils.escape_uri(param) }
+        only_path = params.delete(:only_path)
+        recall = env[@parameters_key] || {}
 
-        unless result = generate(:path_info, named_route, params, recall, options)
+        unless result = generate([:host, :path_info], named_route, params, recall,
+            :parameterize => lambda { |name, param| Utils.escape_uri(param) })
           return
         end
 
-        uri, params = result
+        parts, params = result
+        return unless parts
+
         params.each do |k, v|
           if v
             params[k] = v
@@ -50,7 +67,10 @@ module Rack::Mount
           end
         end
 
-        uri << "?#{Utils.build_nested_query(params)}" if uri && params.any?
+        req = @request_class.new(env)
+        uri = only_path ? '' : "#{req.scheme}://#{parts[0] || req.host}"
+        uri = "#{uri}#{req.script_name}#{parts[1]}"
+        uri << "?#{Utils.build_nested_query(params)}" if params.any?
         uri
       end
 

data/lib/rack/mount.rb

@@ -1,7 +1,16 @@
 require 'rack'
 
 module Rack #:nodoc:
-  module Mount #:nodoc:
+  # A stackable dynamic tree based Rack router.
+  #
+  # Rack::Mount supports Rack's Cascade style of trying several routes until
+  # it finds one that is not a 404. This allows multiple routes to be nested
+  # or stacked on top of each other. Since the application endpoint can
+  # trigger the router to continue matching, middleware can be used to add
+  # arbitrary conditions to any route. This allows you to route based on
+  # other request attributes, session information, or even data dynamically
+  # pulled from a database.
+  module Mount
     autoload :GeneratableRegexp, 'rack/mount/generatable_regexp'
     autoload :Mixover, 'rack/mount/mixover'
     autoload :Multimap, 'rack/mount/multimap'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -06:00
+date: 2010-02-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency