padrino-core 0.9.16 → 0.9.17

data/lib/padrino-core/application/routing.rb

@@ -21,7 +21,7 @@ module Padrino
         def add_before_filter(filter)
           @before_filters ||= []
           @before_filters << filter
-          arbitrary { |env| catch(:pass) { router.runner.instance_eval(&filter); true } == true }
+          arbitrary { |req, ps, dest| catch(:pass) { router.runner.params = ps; router.runner.instance_eval(&filter); true } == true }
         end
 
         def add_after_filter(filter)
@@ -38,7 +38,7 @@ module Padrino
         end
 
         def custom_conditions=(custom_conditions)
-          custom_conditions.each { |blk| arbitrary { |env| router.runner.instance_eval(&blk) != false } } if custom_conditions
+          custom_conditions.each { |blk| arbitrary { |req, params, dest| router.runner.instance_eval(&blk) != false } } if custom_conditions
           @custom_conditions = custom_conditions
         end
       end
@@ -240,6 +240,7 @@ module Padrino
         names, params_array = args.partition{|a| a.is_a?(Symbol)}
         name = names.join("_").to_sym    # route name is concatenated with underscores
         if params.is_a?(Hash)
+          params.delete_if { |k,v| v.nil? }
           params[:format] = params[:format].to_s if params.has_key?(:format)
           params.each { |k,v| params[k] = v.to_param if v.respond_to?(:to_param) }
         end
@@ -367,8 +368,8 @@ module Padrino
             route.use_layout     = @layout
             route.controller     = Array(@_controller).first.to_s
           else
-            route.before_filters = []
-            route.after_filters  = []
+            route.before_filters = @before_filters || []
+            route.after_filters  = @after_filters || []
           end
 
           route.to(block)
@@ -394,7 +395,7 @@ module Padrino
 
           if path.kind_of?(Symbol) # path i.e :index or :show
             name = path                       # The route name
-            path = map || path.to_s           # The route path
+            path = map ? map.dup : path.to_s  # The route path
           end
 
           if path.kind_of?(String) # path i.e "/index" or "/show"
@@ -413,9 +414,11 @@ module Padrino
             # Build our controller
             controller = Array(@_controller).collect { |c| c.to_s }
 
+            absolute_map = map && map[0] == ?/
+
             unless controller.empty?
               # Now we need to add our controller path only if not mapped directly
-              if map.blank?
+              if map.blank? and !absolute_map
                 controller_path = controller.join("/")
                 path.gsub!(%r{^\(/\)|/\?}, "")
                 path = File.join(controller_path, path)
@@ -428,13 +431,13 @@ module Padrino
             end
 
             # Now we need to parse our 'parent' params and parent scope
-            if parent_params = options.delete(:parent) || @_parents
+            if !absolute_map and parent_params = options.delete(:parent) || @_parents
               parent_params = Array(@_parents) + Array(parent_params)
               path = process_path_for_parent_params(path, parent_params)
             end
 
             # Add any controller level map to the front of the path
-            path = "#{@_map}/#{path}".squeeze('/') unless @_map.blank?
+            path = "#{@_map}/#{path}".squeeze('/') unless absolute_map or @_map.blank?
 
             # Small reformats
             path.gsub!(%r{/?index/?}, '')                  # Remove index path

data/lib/padrino-core/version.rb

@@ -5,7 +5,7 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.16' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.17' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #

data/padrino-core.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = "lib"
   s.add_dependency("sinatra", ">= 1.0.0")
-  s.add_dependency("http_router", ">= 0.3.16")
-  s.add_dependency("thor", ">= 0.13.0")
+  s.add_dependency("http_router", "~> 0.4.0")
+  s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("tzinfo")
 end

data/test/test_routing.rb

@@ -501,6 +501,8 @@ class TestRouting < Test::Unit::TestCase
     end
     get "/"
     assert_equal "index", body
+    get @app.url(:admin, :index)
+    assert_equal "index", body
     get "/show/1"
     assert_equal "show 1", body
     get "/edit/1/product"
@@ -574,6 +576,9 @@ class TestRouting < Test::Unit::TestCase
       end
     end
     
+    assert_equal "/user/1/project", @app.url(:project, :index, :user_id => 1, :shop_id => nil)
+    assert_equal "/user/1/shop/23/project", @app.url(:project, :index, :user_id => 1, :shop_id => 23)
+
     user_project_url = "/user/1/project"
     get user_project_url
     assert_equal "index 1 ", body
@@ -900,6 +905,30 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "bar", body
   end
 
+  should 'ignore nil params' do
+    mock_app do
+      get(:testing, :provides => [:html, :json]) do
+      end
+    end
+    assert_equal '/testing.html', @app.url(:testing, :format => :html)
+    assert_equal '/testing', @app.url(:testing, :format => nil)
+  end
+
+  should 'be able to access params in a before filter' do
+    username_from_before_filter = nil
+    
+    mock_app do
+      before do
+        username_from_before_filter = params[:username]
+      end
+
+      get :users, :with => :username do
+      end
+    end
+    get '/users/josh'
+    assert_equal 'josh', username_from_before_filter
+  end
+
   should 'work with controller and arbitrary params' do
     mock_app do
       get(:testing) { params[:foo] }
@@ -970,6 +999,25 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "1, 2", body
   end
 
+  should 'use absolute and relative maps' do
+    mock_app do
+      controller :one do
+        parent :three
+        get :index, :map => 'one' do; end
+        get :index2, :map => '/one' do; end
+      end
+
+      controller :two, :map => 'two' do
+        parent :three
+        get :index, :map => 'two' do; end
+        get :index2, :map => '/two', :with => :id do; end
+      end
+    end
+    assert_equal "/three/three_id/one", @app.url(:one, :index, 'three_id')
+    assert_equal "/one", @app.url(:one, :index2)
+    assert_equal "/two/three/three_id/two", @app.url(:two, :index, 'three_id')
+    assert_equal "/two/four_id", @app.url(:two, :index2, 'four_id')
+  end
 
   should "work with params and parent options" do
     mock_app do

data/test/tmp/cache/%2Ffoo

@@ -1,2 +1,2 @@
 -1
-test page again
+test page

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 9
-  - 16
-  version: 0.9.16
+  - 17
+  version: 0.9.17
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +02:00
+date: 2010-10-04 00:00:00 +02:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,14 +43,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 16
-        version: 0.3.16
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -61,12 +61,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 33
         segments: 
         - 0
-        - 13
-        - 0
-        version: 0.13.0
+        - 14
+        - 3
+        version: 0.14.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency