joshbuddy-usher 0.3.5 → 0.3.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
 :major: 0
 :minor: 3
+:patch: 6

data/lib/usher.rb

@@ -1,5 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'cgi'
 require 'usher/node'
 require 'usher/route'
 require 'usher/grapher'
@@ -162,7 +163,8 @@ class Usher
   def generate_url(route, params = {}, options = {})
     check_variables = options.key?(:check_variables) ? options.delete(:check_variables) : false
     delimiter = options.key?(:delimiter) ? options.delete(:delimiter) : @delimiters.first
-
+    extra_params = options.key?(:extra_params) ? options.delete(:extra_params) : {}
+    
     path = case route
     when Symbol
       @named_routes[route]
@@ -174,10 +176,10 @@ class Usher
       route
     end
     raise UnrecognizedException.new unless path
-    params_hash = {}
+    params_hash = extra_params
     param_list = case params
     when Hash
-      params_hash = params
+      params_hash.merge!(params)
       path.dynamic_parts.collect{|k| params_hash.delete(k.name) {|el| raise MissingParameterException.new(k.name)} }
     when Array
       path.dynamic_parts.size == params.size ? params : raise(MissingParameterException.new("got #{params.size} arguments, expected #{path.dynamic_parts.size}"))

data/spec/generate_spec.rb

@@ -43,6 +43,11 @@ describe "Usher URL generation" do
     route_set.generate_url(:sample, {:first => 'maz', :second => 'zoo', :third => 'zanz'}).should == '/sample/maz/zoo?third=zanz'
   end
 
+  it "should generate append extra hash variables to the end (when the first parts are an array)" do
+    route_set.add_named_route(:sample, '/sample/:first/:second', :controller => 'sample')
+    ['/sample/maz/zoo?four=jane&third=zanz', '/sample/maz/zoo?third=zanz&four=jane'].include?(route_set.generate_url(:sample, ['maz', 'zoo'], :extra_params => {:third => 'zanz', :four => 'jane'})).should == true
+  end
+
   it "should generate append extra hash variables to the end using [] syntax if its an array" do
     route_set.add_named_route(:sample, '/sample/:first/:second', :controller => 'sample')
     route_set.generate_url(:sample, {:first => 'maz', :second => 'zoo', :third => ['zanz', 'susie']}).should == '/sample/maz/zoo?third%5B%5D=zanz&third%5B%5D=susie'

data/spec/rails/recognize_spec.rb

@@ -52,7 +52,7 @@ describe "Usher (for rails) route recognition" do
   
   it "should raise based upon an invalid route" do
     route_set.add_named_route(:sample, '/sample', :controller => 'sample', :action => 'test')
-    proc { route_set.recognize(build_request_mock('/test/asdqwe', :post, {})) }.should raise_error(ActionController::RoutingError)
+    proc { route_set.recognize(build_request_mock('/test/asdqwe', :post, {})) }.should raise_error
   end
   
   it "should add /:controller and /:controller/:action if /:controller/:action/:id is added" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-10 00:00:00 -07:00
+date: 2009-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency