usher 0.8.2 → 0.8.3

data/lib/usher/route.rb

@@ -83,7 +83,8 @@ class Usher
     end
 
     def find_matching_path(params)
-      matching_path = if params.nil? || params.empty?
+      significant_param_keys = (params && params.is_a?(Hash)) ? (params.keys & grapher.significant_keys) : nil
+      matching_path = if significant_param_keys.nil? || significant_param_keys.empty?
         @paths.first
       else
         @paths.size == 1 ? @paths.first : grapher.find_matching_path(params)

data/spec/private/generate_spec.rb

@@ -19,6 +19,11 @@ describe "Usher URL generation" do
     @route_set.generator.generate(:sample, {:action => 'action'}).should == '/sample/action'
   end
 
+  it "should generate a simple URL and ignore the optional part" do
+    @route_set.add_named_route(:test, '/test1/url2(.:format)')
+    @route_set.generator.generate(:test, {:foo => 'baz'}).should == '/test1/url2?foo=baz'
+  end
+
   it "should generate a simple URL with a single variable (and escape)" do
     @route_set.add_named_route(:sample, '/sample/:action', :controller => 'sample')
     @route_set.generator.generate(:sample, {:action => 'action time'}).should == '/sample/action%20time'

data/usher.gemspec

@@ -5,7 +5,7 @@ require "base64"
 
 Gem::Specification.new do |s|
   s.name = "usher"
-  s.version = "0.8.2"
+  s.version = "0.8.3"
   s.authors = ["Daniel Neighman", "Daniel Vartanov", "Jakub Šťastný", "Joshua Hull", "Davide D'Agostino"].sort
   s.homepage = "http://github.com/joshbuddy/usher"
   s.summary = "Pure ruby general purpose router with interfaces for rails, rack, email or choose your own adventure"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-05-20 00:00:00 -04:00
+date: 2010-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency