rack-mount 0.6.3 → 0.6.4

data/README.rdoc

@@ -2,7 +2,7 @@
 
 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.
+Rack::Mount supports Rack's +X-Cascade+ convention to continue trying routes if the response returns +pass+. 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.
 
 === Usage
 
@@ -12,17 +12,25 @@ The API is extremely minimal and only 3 methods are exposed as the public API.
 
 <tt>Rack::Mount::RouteSet#add_route</tt>:: builder method for adding routes to the set
 <tt>Rack::Mount::RouteSet#call</tt>:: Rack compatible recognition and dispatching method
-<tt>Rack::Mount::RouteSet#url</tt>:: generates path from identifiers or significant keys
+<tt>Rack::Mount::RouteSet#generate</tt>:: generates a route condition from identifiers or significant keys
 
 === Example
 
   require 'rack/mount'
+
   Routes = Rack::Mount::RouteSet.new do |set|
     # add_route takes a rack application and conditions to match with
-    # conditions may be strings or regexps
+    #
+    # valid conditions methods are any method on Rack::Request
+    # the values to match against may be strings or regexps
+    #
     # See Rack::Mount::RouteSet#add_route for more options.
-    set.add_route FooApp, :method => 'get', :path => %{/foo}
+    set.add_route FooApp, { :request_method => 'GET', :path_info => %r{^/foo$} }, {}, :foo
   end
 
   # The route set itself is a simple rack app you mount
   run Routes
+
+
+  # generate path for route named "foo"
+  Routes.generate(:path_info, :foo) #=> "/foo"

data/lib/rack/mount/regexp_with_named_groups.rb

@@ -35,7 +35,7 @@ module Rack::Mount
         while scanner.skip_until(/\(/)
           if scanner.scan(/\?:<([^>]+)>/)
             @names << scanner[1]
-          elsif scanner.scan(/\?:/)
+          elsif scanner.scan(/\?(i?m?x?\-?i?m?x?)?:/)
             # ignore noncapture
           else
             @names << nil

data/lib/rack/mount/utils.rb

@@ -52,14 +52,16 @@ module Rack::Mount
       UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze
     end
 
+    Parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
+
     def escape_uri(uri)
-      URI.escape(uri.to_s, UNSAFE_PCHAR)
+      Parser.escape(uri.to_s, UNSAFE_PCHAR)
     end
     module_function :escape_uri
 
     if ''.respond_to?(:force_encoding)
       def unescape_uri(uri)
-        URI.unescape(uri).force_encoding('utf-8')
+        Parser.unescape(uri).force_encoding('utf-8')
       end
     else
       def unescape_uri(uri)

data/lib/rack/mount/version.rb

@@ -1,3 +1,3 @@
 module Rack::Mount
-  Version = '0.6.3'
+  Version = '0.6.4'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Joshua Peek
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -05:00
+date: 2010-06-11 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -72,23 +73,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Stackable dynamic tree based Rack router