sinatra 0.3.0 → 0.3.1

data/ChangeLog

@@ -1,3 +1,7 @@
+= 0.3.1
+
+ * Unbreak optional path parameters [jeremyevans]
+
 = 0.3.0
 
   * Add sinatra.gemspec w/ support for github gem builds. Forks can now

data/lib/sinatra.rb

@@ -163,7 +163,7 @@ module Sinatra
         return unless host === request.host
       end
       return unless pattern =~ request.path_info.squeeze('/')
-      path_params = param_keys.zip($~.captures.map{|s| unescape(s)}).to_hash
+      path_params = param_keys.zip($~.captures.map{|s| unescape(s) if s}).to_hash
       params.merge!(path_params)
       splats = params.select { |k, v| k =~ /^_splat_\d+$/ }.sort.map(&:last)
       unless splats.empty?

data/sinatra.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '0.3.0'
-  s.date = "2008-08-31"
+  s.version = '0.3.1'
+  s.date = "2008-09-08"
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"

data/test/events_test.rb

@@ -33,6 +33,24 @@ context "Simple Events" do
     result.params.should.equal "foo" => 'a', "bar" => 'blake mizerany'
   end
 
+  specify "takes optional params in path" do
+    result = invoke_simple('/?:foo?/?:bar?', '/a/b')
+    result.should.not.be.nil
+    result.params.should.equal "foo" => 'a', "bar" => 'b'
+
+    result = invoke_simple('/?:foo?/?:bar?', '/a/')
+    result.should.not.be.nil
+    result.params.should.equal "foo" => 'a', "bar" => nil
+
+    result = invoke_simple('/?:foo?/?:bar?', '/a')
+    result.should.not.be.nil
+    result.params.should.equal "foo" => 'a', "bar" => nil
+
+    result = invoke_simple('/:foo?/?:bar?', '/')
+    result.should.not.be.nil
+    result.params.should.equal "foo" => nil, "bar" => nil
+  end
+
   specify "ignores to many /'s" do
     result = invoke_simple('/x/y', '/x//y')
     result.should.not.be.nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-31 00:00:00 -07:00
+date: 2008-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency