padrino-routing 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/padrino-routing/helpers.rb

@@ -7,14 +7,18 @@ module Padrino
       # url_for(:account, :id => 5) => '/account/5'
       # url_for(:admin, show, :id => 5, :name => "demo") => '/admin/path/5/demo'
       def url_for(*route_name)
-        values = route_name.extract_options!
-        mapped_url = self.class.named_paths[route_name] || self.class.named_paths[route_name.dup.unshift(self.class.app_name.to_sym)]
+        params = route_name.extract_options!.reject { |name, val| val.blank? }
+        route_name.unshift(self.class.app_name.to_sym) unless route_name.first == self.class.app_name.to_sym
+        mapped_url = self.class.named_paths[route_name]
         raise Padrino::RouteNotFound.new("Route alias #{route_name.inspect} is not mapped to a url") unless mapped_url
         result_url = String.new(File.join(self.class.uri_root, mapped_url))
         result_url.scan(%r{/?(:\S+?)(?:/|$)}).each do |placeholder|
-          value_key = placeholder[0][1..-1].to_sym
-          result_url.gsub!(Regexp.new(placeholder[0]), values[value_key].to_s)
+          param_key = placeholder[0][1..-1].to_sym
+          param_obj = params.delete(param_key)
+          param_value = param_obj.respond_to?(:to_param) ? param_obj.to_param : param_obj
+          result_url.gsub!(Regexp.new(placeholder[0]), param_value.to_s)
         end
+        result_url << "?" + params.to_params if params.any?
         result_url
       end
     end

data/padrino-routing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-routing}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2009-11-23}
+  s.date = %q{2009-11-30}
   s.description = %q{Enhances padrino with a named route mapping system allowing for advanced routes}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [

data/test/fixtures/adv_routing_app/Gemfile

@@ -3,7 +3,6 @@ source 'http://gemcutter.org'
  
 # Base requirements
 gem 'sinatra', :require_as => 'sinatra/base'
-gem 'rack-flash'
  
 # Component requirements
 gem 'haml'

data/test/fixtures/adv_routing_app/app.rb

@@ -1,3 +1,3 @@
 class AdvRoutingDemo < Padrino::Application
-  set :app_file, __FILE__
+
 end

data/test/fixtures/adv_routing_app/config/apps.rb

@@ -1 +1 @@
-Padrino.mount_core(:app_class => "AdvRoutingDemo")
+Padrino.mount_core("adv_routing_demo", :app_file => Padrino.root('app.rb'))

data/test/test_padrino_adv_routing.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestPadrinoAdvRouting < Test::Unit::TestCase
   silence_logger { require File.dirname(__FILE__) + '/fixtures/adv_routing_app/config/boot' }
-  require File.dirname(__FILE__) + '/fixtures/adv_routing_app/app'
   
   def app
     AdvRoutingDemo.tap { |app| app.set :environment, :test }

data/test/test_padrino_routing.rb

@@ -5,6 +5,46 @@ class TestPadrinoRouting < Test::Unit::TestCase
   def app
     RoutingDemo.tap { |app| app.set :environment, :test }
   end
+  
+  context 'for url_for method' do
+    should "support finding known urls" do
+      demo = app.new
+      demo.class.map(:admin, :demo).to('/admin/demo/:name')
+      assert_equal '/admin/demo/john', demo.url_for(:admin, :demo, :name => 'john')
+    end
+    should "support finding known urls ignoring blank extra param" do
+      demo = app.new
+      demo.class.map(:admin, :demo).to('/admin/demo')
+      assert_equal '/admin/demo', demo.url_for(:admin, :demo, :foo => '')
+    end
+    should "support calling to_param on an object which supports the call" do
+      obj = stub(:to_param => '25', :to_s => "<Fake>")
+      demo = app.new
+      demo.class.map(:admin, :demo).to('/admin/demo/:foo')
+      assert_equal '/admin/demo/25', demo.url_for(:admin, :demo, :foo => obj)
+    end
+    should "support finding known urls with named param ignoring blank extra param" do
+      demo = app.new
+      demo.class.map(:admin, :demo).to('/admin/demo/:name')
+      assert_equal '/admin/demo/john', demo.url_for(:admin, :demo, :name => 'john', :foo => ' ')
+    end
+    should "support finding known urls with one extra param" do
+      demo = app.new
+      demo.class.map(:admin, :demo).to('/admin/demo/:name')
+      assert_equal '/admin/demo/john?foo=bar', demo.url_for(:admin, :demo, :name => 'john', :foo => 'bar')
+    end
+    should "support finding known urls with extra params" do
+      demo = app.new
+      demo.class.map(:demo).to('/demo/:name')
+      assert_equal '/demo/john?bar=foo&foo=bar', demo.url_for(:demo, :name => 'john', :foo => 'bar', :bar => 'foo')
+    end
+    should "support finding known urls with multiple named params with extra params" do
+      demo = app.new
+      demo.class.map(:demo).to('/demo/:name/id/:id')
+      actual_url = demo.url_for(:demo, :name => 'john', :foo => 'bar', :bar => 'foo', :id => 5)
+      assert_equal '/demo/john/id/5?bar=foo&foo=bar', actual_url
+    end
+  end
 
   context 'for links list displaying routes' do
     setup { visit '/links' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-routing
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency