gin 1.1.0 → 1.1.1

data/History.rdoc

@@ -1,4 +1,9 @@
-=== 1.1.0 / 2013-07-10
+=== 1.1.1 / 2013-07-11
+
+* Bugfixes
+  * CGI encode and decode embedded path params
+
+=== 1.1.0 / 2013-07-11
 
 * Major Enhancements
   * Test helper methods and assertions

data/lib/gin.rb

@@ -2,7 +2,7 @@ require 'rack'
 require 'tilt'
 
 class Gin
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   LIB_DIR    = File.expand_path("..", __FILE__)            #:nodoc:
   PUBLIC_DIR = File.expand_path("../../public/", __FILE__) #:nodoc:

data/lib/gin/router.rb

@@ -152,8 +152,9 @@ class Gin::Router
     def to_path params={}
       rendered_path = @path.dup
       rendered_path = rendered_path % @param_keys.map do |k|
-        params.delete(k) || params.delete(k.to_sym) ||
-          raise(PathArgumentError, "Missing param #{k}")
+        val = params.delete(k) || params.delete(k.to_sym)
+        raise(PathArgumentError, "Missing param #{k}") unless val
+        CGI.escape(val.to_s)
       end unless @param_keys.empty?
 
       rendered_path << "?#{Gin.build_query(params)}" unless params.empty?
@@ -326,10 +327,10 @@ class Gin::Router
         curr_node = curr_node[key]
 
       elsif curr_node["%s"]
-        param_vals << key
+        param_vals << CGI.unescape(key)
         curr_node = curr_node["%s"]
 
-      elsif child_and_matches = curr_node.match(key)
+      elsif child_and_matches = curr_node.match(CGI.unescape(key))
         param_vals.concat child_and_matches[1]
         curr_node = child_and_matches[0]
 

data/test/test_router.rb

@@ -38,6 +38,26 @@ class RouterTest < Test::Unit::TestCase
   end
 
 
+  def test_add_and_retrieve_cgi_escaped
+    @router.add MyCtrl, '/my_ctrl' do
+      get  :bar, "/bar/:id"
+    end
+
+    assert_equal [MyCtrl, :bar, {'id' => '123 456'}],
+      @router.resources_for("GET", "/my_ctrl/bar/123+456")
+  end
+
+
+  def test_add_and_retrieve_complex_cgi_escaped
+    @router.add MyCtrl, '/my_ctrl' do
+      get  :bar, "/bar/:type/:id.:format"
+    end
+
+    assert_equal [MyCtrl, :bar, {"type"=>"[I]", "id"=>"123 456", "format"=>"json"}],
+      @router.resources_for("GET", "/my_ctrl/bar/%5BI%5D/123+456.json")
+  end
+
+
   def test_add_and_retrieve_named_route
     @router.add FooController, "/foo" do
       get  :index, "/", :all_foo
@@ -240,4 +260,15 @@ class RouterTest < Test::Unit::TestCase
       @router.path_to(MyCtrl, :bar, params)
     end
   end
+
+
+  def test_path_to_complex_param_cgi_escaped
+    @router.add MyCtrl, "/" do
+      get :bar, "/bar/:type/:id.:format"
+    end
+
+    params = {'type' => 'sub/thing', 'id' => '123&4', 'more' => 'hi there', 'format' => 'json'}
+    assert_equal "/bar/sub%2Fthing/123%264.json?more=hi+there",
+      @router.path_to(MyCtrl, :bar, params)
+  end
 end

data/test/test_test.rb

@@ -76,9 +76,9 @@ class TestTest < Test::Unit::TestCase
 
   def test_make_request
     resp = @tests.make_request :get, :show_bar,
-              {id: 123, foo: "BAR", bar: "BAZ"},'REMOTE_ADDR' => '127.0.0.1'
+              {id: 123, foo: "BAR", bar: "BAZ Foo"},'REMOTE_ADDR' => '127.0.0.1'
 
-    assert_equal "foo=BAR&bar=BAZ", @tests.req_env['QUERY_STRING']
+    assert_equal "foo=BAR&bar=BAZ+Foo", @tests.req_env['QUERY_STRING']
     assert_equal "/bar/123", @tests.req_env['PATH_INFO']
     assert_equal "127.0.0.1", @tests.req_env['REMOTE_ADDR']
     assert_equal "127.0.0.1", @tests.request.ip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1165683181263996333
+      hash: 3379788584365895606
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: