padrino-core 0.9.17 → 0.9.18

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

@@ -21,7 +21,17 @@ module Padrino
         def add_before_filter(filter)
           @before_filters ||= []
           @before_filters << filter
-          arbitrary { |req, ps, dest| catch(:pass) { router.runner.params = ps; router.runner.instance_eval(&filter); true } == true }
+          arbitrary { |req, params, dest|
+            old_params = router.runner.params
+            result = catch(:pass) {
+              router.runner.params ||= {}
+              router.runner.params.merge!(params)
+              router.runner.instance_eval(&filter)
+              true
+            } == true
+            router.runner.params = old_params
+            result
+          }
         end
 
         def add_after_filter(filter)
@@ -494,7 +504,7 @@ module Padrino
             url_format        = $1.to_sym if $1
 
             if !url_format && matching_types.first
-              type = Rack::Mime::MIME_TYPES.find { |k, v| v == matching_types.first }[0].sub(/\./,'').to_sym
+              type = ::Rack::Mime::MIME_TYPES.find { |k, v| v == matching_types.first }[0].sub(/\./,'').to_sym
               accept_format = CONTENT_TYPE_ALIASES[type] || type
             end
 

data/lib/padrino-core/version.rb

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

data/test/test_routing.rb

@@ -929,6 +929,17 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'josh', username_from_before_filter
   end
 
+  should "be able to access params normally when a before filter is specified" do
+    mock_app do
+      before { }
+      get :index do
+        params.inspect
+      end
+    end
+    get '/?test=what'
+    assert_equal '{"test"=>"what"}', body
+  end
+
   should 'work with controller and arbitrary params' do
     mock_app do
       get(:testing) { params[:foo] }
@@ -1126,4 +1137,4 @@ class TestRouting < Test::Unit::TestCase
     post @app.url(:posts, :create, :format => :js, :bar => 'bar', :baz => 'baz', :id => 5)
     assert_equal "POST CREATE bar - baz - 5", body, "should properly post to create action"
   end
-end
+end

data/test/tmp/cache/%2Ffoo

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 9
-  - 17
-  version: 0.9.17
+  - 18
+  version: 0.9.18
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +02:00
+date: 2010-10-05 00:00:00 -07:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency