strelka 0.0.1.pre.290 → 0.0.1.pre.291

data/lib/strelka/httprequest.rb

@@ -94,13 +94,13 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	###   # => #<URI::HTTP:0x007fe34d16b2e0 URL:http://localhost:8080/user>
 	def base_uri
 		rval = self.uri
-		rval.path = self.route
+		rval.path = self.headers.pattern
 		rval.query = nil
 		return rval
 	end
 
 
-	### Return the portion of the Request's path that was routed by Mongrel2. This and the
+	### Return the unescaped portion of the Request's path that was routed by Mongrel2. This and the
 	### #app_path make up the #path.
 	###
 	###   # For a handler with a route of '/user', for the request:
@@ -108,20 +108,20 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 	###   request.route
 	###   # => "/user"
 	def route
-		return self.headers.pattern
+		return URI.unescape( self.headers.pattern )
 	end
 	alias_method :pattern, :route
 
 
-	### Return the portion of the Request's path relative to the request's #route.
+	### Return the unescaped portion of the Request's path relative to the request's #route.
 	###
 	###   # For a handler with a route of '/user', for the request:
 	###   # "GET /user/1/profile HTTP/1.1"
 	###   request.app_path
 	###   # => "/1/profile"
 	def app_path
-		rval = self.uri.path.dup
-		rval.slice!( 0, self.route.length )
+		rval = URI.unescape( self.uri.path )
+		rval.slice!( 0, self.route.bytesize )
 		return rval
 	end
 

data/spec/strelka/httprequest_spec.rb

@@ -78,6 +78,33 @@ describe Strelka::HTTPRequest do
 	end
 
 
+	context "instance with URI-escaped characters in its path" do
+
+		before( :each ) do
+			@req = @request_factory.get( '/directory/user%20info/ged%00' )
+		end
+
+		it "knows what the request's parsed URI is" do
+			@req.uri.should be_a( URI )
+			@req.uri.to_s.should == 'http://localhost:8080/directory/user%20info/ged%00'
+		end
+
+		it "knows what Mongrel2 route it followed" do
+			@req.pattern.should == "/directory"
+		end
+
+		it "knows what the URI of the route handling the request is" do
+			@req.base_uri.should be_a( URI )
+			@req.base_uri.to_s.should == 'http://localhost:8080/directory'
+		end
+
+		it "knows what the path of the request past its route is" do
+			@req.app_path.should == "/user info/ged\0"
+		end
+
+	end
+
+
 	context "instance with a query string" do
 
 		before( :each ) do

data/spec/strelka/router/default_spec.rb

@@ -258,6 +258,11 @@ describe Strelka::Router::Default do
 			@router.route_request( req ).should match_route( :as_pdf )
 		end
 
+		it "doesn't route /foo%1B.pdf to the regexp action" do
+			req = @request_factory.get( "/user/foo%1B.pdf" )
+			@router.route_request( req ).should_not match_route( :as_pdf )
+		end
+
 		it "routes /zanzibar.pdf to the regexp action" do
 			req = @request_factory.get( '/user/zanzibar.pdf' )
 			@router.route_request( req ).should match_route( :as_pdf )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.290
+  version: 0.0.1.pre.291
   prerelease: 
 platform: ruby
 authors:

metadata.gz.sig

@@ -1 +1,2 @@
-��L�5i
:��ռ݃�'��l���As�1�,ҳ� &M��d4��;2�]	SbZϮ���`���-��j���� x��o"諈Ž'�H`Ǯz��~A��a�	�5�&L.�^3<c��߀�]5`k댩�H���p���U'����.4X�'�u����A��]�#�\��J�&���q�&�ׯ�(?}�2��K��F>G�pV��B������L� ��u�J�)r������l��weO��?
+�-�)E9�c"�މx�	(���"�Jh���~�y�'c+���u�38�`�f���Q6��yV����c�K��0��0R�b�Hk#��M����aޟ˗�6�!}��a��9I�P�����U<���Y����a�ʑcf�ӱV�6��g�	��!�zؖ��o����7�Q޲��匋�>���N_Db��"�V bەD=�;�
+�F
*���\��f;�OeQK�?����l�g�ǔ;�
@��+�Z}��e�;lM�