Merge pull request #2 from jcoene/jcoene/no-encode-uri

Replace use of URI.encode

.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.3.4
   - 2.4.1
+  - 2.5.9
+  - 2.7.3
+  - 3.0.1

frenchy.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "json"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

lib/frenchy/client.rb

@@ -47,16 +47,13 @@ def get(path, params)
     private
 
     def perform(method, path, params)
-      uri = URI(@host)
+      uri = URI(@host + path)
       body = nil
       headers = {
         "User-Agent" => "Frenchy/#{Frenchy::VERSION}",
         "Accept"     => Frenchy.accept_header,
       }.merge(@headers)
 
-      # Set the URI path
-      uri.path = URI.encode(path)
-
       # Set request parameters
       if params.any?
         case method

lib/frenchy/request.rb

@@ -19,7 +19,7 @@ def initialize(service, method, path, params={}, extras={})
         end
 
         params.delete(k)
-        path.sub!(pat, v)
+        path.sub!(pat, CGI.escape(v))
       end
 
       @service = service

spec/lib/frenchy/request_spec.rb

@@ -7,6 +7,12 @@
       expect(request.path).to eql("/v1/users/1234/md5something")
     end
 
+    it "escapes path parameters but not query params" do
+      request = Frenchy::Request.new("service", "get", "/v1/users/:slug/:fullname", {"slug" => "big dog 20", "fullname" => "How Big Is He?", "division" => "How Big Is He, Really?"}, {})
+      expect(request.path).to eql("/v1/users/big+dog+20/How+Big+Is+He%3F")
+      expect(request.params).to eql({"division" => "How Big Is He, Really?"})
+    end
+
     it "retains remaining parameters as query parameters" do
       request = Frenchy::Request.new("service", "get", "/v1/users/:id", {"id" => 1234, "token" => "md5something"}, {})
       expect(request.path).to eql("/v1/users/1234")