flexirest 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0ba7e77c7149e1a5691a9df1f6fd811060c075d15c01b531b7240c6b5b8f94
-  data.tar.gz: 23c1f0c72c2eb048da0729099f8ca76819fcb01740d1fa424784f3a322b9b538
+  metadata.gz: 6fa38d8d7f9ee0f19744e46cfa7a3d0b22eb9d149dce1f5b025beb0f1bbbc6f1
+  data.tar.gz: b2ae4157a3f0fdb754d0a5e1599051be5658a6b342fd9b3d588b4d79b7ed312a
 SHA512:
-  metadata.gz: 6e36124f12607b062a53bcf7ef424b3aa501bfced4a62c2606ba8a045cef11ed97bbffe49acb6ccd99317f82f5fa2cd2984affcd5c17a0d3277fc6ea979a2101
-  data.tar.gz: d2be92fdb5aff31371e4851adf9557da3355b042a277b3d10a06b1494a8ff79e0dd72f446a1d00fcb6478c45573b4ae0a8c7fecb46ba18523515e0477cbfcd89
+  metadata.gz: 2ada072dd254ce8818178de8dab0f72a676e47c0c39e3bc2419b33c3c81ba64e2e9a428bedc42ddcd95d785a2ae3fcafdcecd52fe4f6935e4dd6e0fdc31d7c83
+  data.tar.gz: eb67f39a6697f1e0e48ae8a11037c275f631334d59df36b243e2d5ae2a20e798c8fd614d4a1bb69a561f84db2452af2b6bae417df903b0c0a99b264d9a0555df

data/CHANGELOG.md

@@ -1,10 +1,16 @@
 # Changelog
 
+## 1.8.7
+
+Fix:
+
+- URL parameters should be automatically required or you end up requesting incorrect URLs (thanks to Marko Kind, @m-kind for the issue).
+
 ## 1.8.6
 
 Fix:
 
-- Correct HTTP status code for too many requests (thanks to Tomohiko Mimura, @mito5525) for spotting this.
+- Correct HTTP status code for too many requests (thanks to Tomohiko Mimura, @mito5525 for spotting this).
 
 ## 1.8.5
 

data/docs/faraday-configuration.md

@@ -10,7 +10,7 @@ Flexirest::Base.adapter = :patron
 
 In versions before 1.2.0 the adapter was hardcoded to `:patron`, so if you want to ensure it still uses Patron, you should set this setting.
 
-If you want more control you can pass a **complete** configuration block ("complete" means that the block does not _override_ [the default configuration](https://github.com/flexirest/flexirest/blob/5b1953d89e26c02ca74f74464ccb7cd4c9439dcc/lib/flexirest/configuration.rb#L184-L201), but rather _replaces_ it).
+If you want more control you can pass a **complete** configuration block ("complete" means that the block does not _override_ [the default configuration](https://github.com/flexirest/flexirest/blob/master/lib/flexirest/configuration.rb#L292), but rather _replaces_ it).
 
 For available configuration variables look into the [Faraday documentation](https://github.com/lostisland/faraday).
 

data/lib/flexirest/connection.rb

@@ -26,14 +26,14 @@ module Flexirest
       block.call
     rescue Faraday::Error::TimeoutError
       raise Flexirest::TimeoutException.new("Timed out getting #{full_url(path)}")
-    rescue Faraday::Error::ConnectionFailed => e1
+    rescue Faraday::ConnectionFailed => e1
       if e1.respond_to?(:cause) && e1.cause.is_a?(Net::OpenTimeout)
         raise Flexirest::TimeoutException.new("Timed out getting #{full_url(path)}")
       end
       begin
         reconnect
         block.call
-      rescue Faraday::Error::ConnectionFailed => e2
+      rescue Faraday::ConnectionFailed => e2
         if e2.respond_to?(:cause) && e2.cause.is_a?(Net::OpenTimeout)
           raise Flexirest::TimeoutException.new("Timed out getting #{full_url(path)}")
         end

data/lib/flexirest/request.rb

@@ -353,6 +353,7 @@ module Flexirest
     end
 
     def prepare_url
+      missing = []
       if @forced_url && @forced_url.present?
         @url = @forced_url
       else
@@ -368,9 +369,16 @@ module Flexirest
             # it's possible the URL path variable may not be part of the request, in that case, try to resolve it from the object attributes
             target = @object._attributes[token.to_sym] || "" if target == ""
           end
+          if target.to_s.blank?
+            missing << token
+          end
           @url.gsub!(":#{token}", URI.escape(target.to_s).gsub("/", "%2F").gsub("+", "%2B"))
         end
       end
+
+      if missing.present?
+        raise Flexirest::MissingParametersException.new("The following parameters weren't specifed: #{missing.join(", ")}")
+      end
     end
 
     def append_get_parameters

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.8.6"
+  VERSION = "1.8.7"
 end

data/spec/lib/request_spec.rb

@@ -37,6 +37,7 @@ describe Flexirest::Request do
       put :headers_default, "/headers_default"
       put :headers_json, "/headers_json", request_body_type: :json
       get :find, "/:id", required: [:id]
+      get :find_cat, "/:id/cat"
       get :change, "/change"
       get :plain, "/plain/:id", plain: true
       post :create, "/create", rubify_names: true
@@ -288,6 +289,16 @@ describe Flexirest::Request do
     expect{ExampleClient.requires name: nil, age: nil}.to raise_error(Flexirest::MissingParametersException)
   end
 
+  it "should ensure any URL parameters are implicitly required and error if not specified" do
+    expect_any_instance_of(Flexirest::Connection).to_not receive(:get)
+    expect{ExampleClient.find_cat}.to raise_error(Flexirest::MissingParametersException)
+  end
+
+  it "should ensure any URL parameters are implicitly required and make the request if specified" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
+    expect{ExampleClient.find_cat(1)}.to_not raise_error
+  end
+
   it "should makes the request if all required parameters are specified" do
     expect_any_instance_of(Flexirest::Connection).to receive(:get).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
     expect{ExampleClient.requires name: "John", age: 21}.not_to raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler