flexirest 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f360dc2f87aa9c1b0509dd70415e202088643e535159206f350eb9f1ef7814c
-  data.tar.gz: 7c68d576f0719bfbe522b216d9e17ee7e72fa76aa03317e0937b5c69488bb845
+  metadata.gz: 392084cff2b3134307881a8e998b561ff49c8f5f3db22f5e6af4df495a8f8790
+  data.tar.gz: cd6928e4802e733483ea04de70765f2d069181b1f445ccb1ba188a3d247d8908
 SHA512:
-  metadata.gz: c8c2e739b3be3d1088985704fb1e629d55f92117273ef47e631eebac7f1f28ea844bcdc703351aeb1189f907653d34534c3c8839258e5236593a2c501e4ae362
-  data.tar.gz: edf8def024e7364381180d117e62c1b7f0c4adc9f34329bc16a4032c0e13df0a41554ed2b0bfe8e924ff3772237288be5992cc4f432eb9a8cf7393d51e36c67e
+  metadata.gz: 65c520be2d605b87e665599e9bcc0d5d59752c86aa5cf68d17273ec894832296b37058fa13c700a57214c3a8255edd306f789c679a203c2daad35c375bf9b55a
+  data.tar.gz: f2dfcf7aa20f178d9dff64232577dc4a3810f77877d089ef85222ae78aa4c17df7ddc213691f8d104c8f8ff91a6f9e63e63097217ac56bc8e3f63da8b1ab9c82

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.8
+
+Fix:
+
+- plain requests to URLs that are just the domain e.g. "https://www.example.com" should also work (i.e. without any trailing path, even a '/')
+
 ## 1.7.7
 
 Change:

data/docs/faraday-configuration.md

@@ -18,6 +18,7 @@ For available configuration variables look into the [Faraday documentation](http
 Flexirest::Base.faraday_config do |faraday|
   faraday.adapter(:net_http)
   faraday.options.timeout       = 10
+  faraday.ssl.verify            = false
   faraday.headers['User-Agent'] = "Flexirest/#{Flexirest::VERSION}"
 end
 ```

data/lib/flexirest/request.rb

@@ -459,7 +459,7 @@ module Flexirest
           connection = Flexirest::ConnectionManager.get_connection(base_url)
         end
       else
-        parts = @url.match(%r{^(https?://[a-z\d\.:-]+?)(/.*)}).to_a
+        parts = @url.match(%r{^(https?://[a-z\d\.:-]+?)(/.*)?$}).to_a
         if (parts.empty?) # Not a full URL, so use hostname/protocol from existing base_url
           uri = URI.parse(base_url)
           @base_url = "#{uri.scheme}://#{uri.host}#{":#{uri.port}" if uri.port != 80 && uri.port != 443}"

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.7.7"
+  VERSION = "1.7.8"
 end

data/spec/lib/base_without_validation_spec.rb

@@ -330,14 +330,14 @@ describe Flexirest::BaseWithoutValidation do
 
     it "passes headers" do
       stub_request(:get, "http://api.example.com/v1").
-        with(headers: {'Accept'=>'application/hal+json, application/json;q=0.5', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Connection'=>'Keep-Alive', 'Content-Type'=>'application/x-www-form-urlencoded', 'X-Something'=>'foo/bar', 'User-Agent'=>/Flexirest\//}).
+        with(headers: {'Accept'=>'application/hal+json, application/json;q=0.5', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Connection'=>'Keep-Alive', 'Content-Type'=>'application/x-www-form-urlencoded; charset=utf-8', 'X-Something'=>'foo/bar', 'User-Agent'=>/Flexirest\//}).
         to_return(status: 200, body: "", headers: {})
       EmptyExample._request("http://api.example.com/v1", :get, {}, {headers: {"X-Something" => "foo/bar"}})
     end
 
     it "passes headers if the response is unparsed" do
       stub_request(:get, "http://api.example.com/v1").
-        with(headers: {'Accept'=>'application/hal+json, application/json;q=0.5', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Connection'=>'Keep-Alive', 'Content-Type'=>'application/x-www-form-urlencoded', 'X-Something'=>'foo/bar', 'User-Agent'=>/Flexirest\//}).
+        with(headers: {'Accept'=>'application/hal+json, application/json;q=0.5', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Connection'=>'Keep-Alive', 'Content-Type'=>'application/x-www-form-urlencoded; charset=utf-8', 'X-Something'=>'foo/bar', 'User-Agent'=>/Flexirest\//}).
         to_return(status: 200, body: "", headers: {})
       EmptyExample._plain_request("http://api.example.com/v1", :get, {}, {headers: {"X-Something" => "foo/bar"}})
     end
@@ -367,7 +367,13 @@ describe Flexirest::BaseWithoutValidation do
     it "should be able to pass the plain response from the directly called URL bypassing JSON loading" do
       response_body = "This is another non-JSON string"
       expect_any_instance_of(Flexirest::Connection).to receive(:post).with(any_args).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:response_body)))
-      expect(EmptyExample._plain_request("http://api.example.com/", :post, {id:1234})).to eq(response_body)
+      expect(EmptyExample._plain_request("http://api.example.com/v1/something", :post, {id:1234})).to eq(response_body)
+    end
+
+    it "should be able to pass the plain response from the directly called URL bypassing JSON loading" do
+      response_body = "This is another non-JSON string"
+      expect_any_instance_of(Flexirest::Connection).to receive(:post).with(any_args).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:response_body)))
+      expect(EmptyExample._plain_request("http://api.example.com", :post, {id:1234})).to eq(response_body)
     end
 
     it "should return a PlainResponse from the directly called URL bypassing JSON loading" do

data/spec/lib/request_spec.rb

@@ -794,7 +794,7 @@ describe Flexirest::Request do
     rescue Flexirest::HTTPServerException => e
       e
     end
-    expect(e.message).to eq(%q{Sending POST to '/create' returned a 500 with the body of - {"first_name":"John", "id":1234}})
+    expect(e.message).to eq(%q{The POST to '/create' returned a 500 status, which raised a Flexirest::HTTPServerException with a body of: \{"first_name":"John", "id":1234\}})
   end
 
   it "should raise a parse exception for invalid JSON returns" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler