flexirest 1.3.25 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47cf1c23a48bd2918fe49fd5470a9a3b0342e877
-  data.tar.gz: 5e217cfef265cbe32682ae8a6d1749b4be843428
+  metadata.gz: 7e5d860a92f3a3ce66635458548eeffa50fa9bde
+  data.tar.gz: 1992115ebc006ee19ad9650e61641ca01ed60a47
 SHA512:
-  metadata.gz: fc90cf108ae54f5ee86d6f884e35eecf4fe46e5f7f0b835f2fe5dd77759392f62e3a7cbf1582a749068332e757ddaa672a77894e1858eef88cedcfb621013584
-  data.tar.gz: 9245bc5bc022f899fb8db5a71339fac3d5ad33d19abb0d13d1dd60d97640f1d751757fd55f1395c24fe32be81dbeac372f2c745a2e75ab817879a6037fdbd9be
+  metadata.gz: f3d01faf990a544d09f734d123842a456c2dfdad898549a88b4555f2042b82d24962fc155a26ef24a952e946d4e09731a36625fd2fd9c1f175b8f5cea8920bd1
+  data.tar.gz: 76382e77ae23a93feddb2317ecb9b515a9e65e7cfb05cf43dfa8ac0b35b4856c840f527c068fc12937ba914f76c4cbb6dcbea6e8c78bbfb4a10607df3d384d14

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.26
+
+Bugfix:
+
+- Parameters sent within the URL (e.g. /foo/:bar) should be URI escaped or Flexirest raises an error about unparseable URLs
+
 ## 1.3.25
 
 Feature:

data/lib/flexirest/request.rb

@@ -271,7 +271,7 @@ module Flexirest
         matches.each do |token|
           token = token.first[1,999]
           target = @get_params.delete(token.to_sym) || @post_params.delete(token.to_sym) || @get_params.delete(token.to_s) || @post_params.delete(token.to_s) || ""
-          @url.gsub!(":#{token}", target.to_s)
+          @url.gsub!(":#{token}", URI.escape(target.to_s))
         end
       end
     end
@@ -570,7 +570,12 @@ module Flexirest
       if @response.body.is_a?(Array) || @response.body.is_a?(Hash)
         body = @response.body
       elsif is_json_response?
-        body = @response.body.blank? ? {} : MultiJson.load(@response.body)
+        begin
+          body = @response.body.blank? ? {} : MultiJson.load(@response.body)
+        rescue MultiJson::ParseError => exception
+          raise ResponseParseException.new(status:@response.status, body:@response.body, headers:@response.headers)
+        end
+
         if options[:ignore_root]
           body = body[options[:ignore_root].to_s]
         end

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.3.25"
+  VERSION = "1.3.26"
 end

data/spec/lib/request_spec.rb

@@ -192,6 +192,11 @@ describe Flexirest::Request do
     ExampleClient.find id:1234
   end
 
+  it "should pass URL-encode URL parameters" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/foo%20bar", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
+    ExampleClient.find id:"foo bar"
+  end
+
   it "should accept an integer as the only parameter and use it as id" do
     expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/1234", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
     ExampleClient.find(1234)
@@ -612,6 +617,23 @@ describe Flexirest::Request do
     expect(e.result).to eq(error_content)
   end
 
+  it "should raise response parse exception for invalid JSON content" do
+    message_content = "Success"
+    expect_any_instance_of(Flexirest::Connection).
+      to receive(:post).
+      with("/create", "first_name=John&should_disappear=true", an_instance_of(Hash)).
+      and_return(::FaradayResponseMock.new(OpenStruct.new(body:message_content, response_headers:{'Content-Type' => 'application/json'}, status:200)))
+    object = ExampleClient.new(first_name:"John", should_disappear:true)
+    begin
+      object.create
+    rescue => e
+      e
+    end
+    expect(e).to be_instance_of(Flexirest::ResponseParseException)
+    expect(e.status).to eq(200)
+    expect(e.body).to eq(message_content)
+  end
+
   it "should raise response parse exception for 200 response status and non json content type" do
     error_content = "<h1>malformed json</h1>"
     expect_any_instance_of(Flexirest::Connection).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.3.25
+  version: 1.3.26
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler