kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

simplify handling of captures

Browse source
This commit is contained in:
Konstantin Haase 2011-10-30 12:36:09 -07:00
parent fe34d41939
commit 1e0477f570
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/sinatra/base.rb
View file

@ -802,21 +802,8 @@ module Sinatra
route = '/' if route.empty? and not settings.empty_path_info?
if match = pattern.match(route)
values += match.captures.to_a.map { |v| force_encoding URI.decode(v) if v }
params =
if keys.any?
keys.zip(values).inject({}) do |hash,(k,v)|
if k == 'splat'
(hash[k] ||= []) << v
else
hash[k] = v
end
hash
end
elsif values.any?
{'captures' => values}
else
{}
end
params = {'splat' => [], 'captures' => values}
keys.zip(values) { |k,v| (params[k] ||= '') << v if v }
@params = @original_params.merge(params)
@block_params = values
catch(:pass) do

3
test/routing_test.rb
View file

@ -370,7 +370,8 @@ class RoutingTest < Test::Unit::TestCase
"firefox" => {"engine" => {"name"=>"spidermonkey", "version"=>"1.7.0"}},
"chrome" => {"engine" => {"name"=>"V8", "version"=>"1.0"}}
},
"paste" => {"name"=>"hello world", "syntax"=>"ruby"}
"paste" => {"name"=>"hello world", "syntax"=>"ruby"},
"splat"=>[], "captures"=>[]
}
mock_app {
get '/foo' do