sinatra-named_routes 0.1.0 → 0.1.1

data/lib/sinatra/named_routes/router.rb

@@ -1,4 +1,5 @@
 require 'tree'
+require 'cgi'
 
 module Sinatra
   module NamedRoutes
@@ -41,9 +42,9 @@ module Sinatra
         options.each do |k, v|
           regex = /(:#{k})/
             if path =~ regex
-              path.gsub!(regex, v.to_s)
+              path.gsub!(regex, CGI.escape(v.to_s))
             else
-              query << "#{k}=#{v}"
+              query << "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
             end
         end
 

data/lib/sinatra/named_routes/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module NamedRoutes
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/sinatra/named_routes/router_spec.rb

@@ -30,4 +30,10 @@ describe Sinatra::NamedRoutes::Router do
       subject.set('/two', :name)
     }.must_raise Sinatra::NamedRoutes::Exceptions::RouteNameTaken
   end
+
+  it 'should escape route parameters' do
+    subject.set('/admin/:id', :admin)
+    subject.get(:admin, {:id => 'a/b'}).must_equal '/admin/a%2Fb'
+  end
+
 end

data/spec/sinatra/named_routes_spec.rb

@@ -79,6 +79,14 @@ describe 'NamedRoutes' do
 
     end
 
+    it 'should escape unsafe characters correctly' do
+      mock_app{ get(named(:some_name, '/some_path/:id')) { url_for(:some_name, {:id => '/', 'k!ey' => 'v&lue'}) }}
+      get "/some_path/foo"
+
+      last_response.status.must_equal 200
+      last_response.body.must_equal "/some_path/%2F?k%21ey=v%26lue"
+    end
+
   end
 
   describe 'with namespaces' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-named_routes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70130137083180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70130137083180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tree
-  requirement: &70130137082600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70130137082600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70130137082020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130137082020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70130137081460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +69,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130137081460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70130137080800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *70130137080800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: Sinatra extension that allows you to use name your routes
 email:
 - federomero@gmail.com
@@ -96,24 +121,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3106058868979547746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3106058868979547746
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sinatra named routes
 test_files:
 - spec/sinatra/named_routes/router_spec.rb
 - spec/sinatra/named_routes_spec.rb
+has_rdoc: