flexirest 1.9.17 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50fe9393bbb548c2052ca5f971b7c406a9daf742d398fcd0681a917e03dd6247
-  data.tar.gz: b1dc3e1b1c97626ed7956f7a7ba31f4bd424d9a1a539645de8bbd456348eb814
+  metadata.gz: 9f713d7d9f8f37de42e54bd20623b4477b9893b6cd40f0d2d5e8c5a06079a821
+  data.tar.gz: b5fc1fe7bffbe57a6adf9443aab86d91313fddd90b2fcc2ef35f50f2b41ec942
 SHA512:
-  metadata.gz: 23ca59d17ad6df1bf15f8dc40bf4fd826132016d82de50a40824ac9d7d98858e92ab621bc8d0681bb61db950ae50853b3017bae86b8ae96ecccc1270a757c018
-  data.tar.gz: 60bae684f60df01e8419f97d870bb3412192c6e7c85ecff1abf578d6210bc8d336781e1f1bd1d4f05753b1cccd3a44923049dd43a76f55f5b3ee233807b75fbb
+  metadata.gz: eedfb75a0ecacbb1114d62fad201cf5e478242dd74126b87b29f1081e9c56b4194b600c6d729ac8afa70a7dd4ee8d66a03057974a2e52ee76f575e848027bfca
+  data.tar.gz: 955f229836e2e6fbc6273b1505294619ab0a614af05e79d0e5113b956959dbf22bb76ed23b2a169a9dafe207b6ab48b3559f7adeb84f22e3fcff01fbc223b28f

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.10.0
+
+Enhancement:
+
+- Add specific exceptions for the most common 5xx server-side errors
+
+## 1.9.18
+
+Security:
+
+- Upgrade rest-client development dependency to a CVE-fixed version.
+
 ## 1.9.17
 
 Feature:

data/flexirest.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "api-auth", ">= 1.3.1", "< 2.4"
   spec.add_development_dependency 'typhoeus'
   spec.add_development_dependency 'activemodel'
+  spec.add_development_dependency 'rest-client', ">= 1.8.0"
 
   spec.add_runtime_dependency "mime-types"
   spec.add_runtime_dependency "multi_json"
@@ -52,12 +53,4 @@ Gem::Specification.new do |spec|
   else
     spec.add_runtime_dependency "activesupport", "< 5.0.0"
   end
-  # JSON is an implicit dependency of something, but JSON v2+ requires Ruby 2+
-  # Same with "tins" which is a dependency of coveralls
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-    spec.add_runtime_dependency "json", "< 2.0.0"
-    spec.add_runtime_dependency "tins", "~> 1.6.0"
-    spec.add_runtime_dependency "term-ansicolor", "~> 1.3.2"
-    spec.add_runtime_dependency "public_suffix", "~> 1.4.6"
-  end
 end

data/lib/flexirest/request.rb

@@ -630,6 +630,16 @@ module Flexirest
           raise HTTPConflictClientException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
         elsif status == 429
           raise HTTPTooManyRequestsClientException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
+        elsif status == 500
+          raise HTTPInternalServerException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
+        elsif status == 501
+          raise HTTPNotImplementedServerException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
+        elsif status == 502
+          raise HTTPBadGatewayServerException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
+        elsif status == 503
+          raise HTTPServiceUnavailableServerException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
+        elsif status == 504
+          raise HTTPGatewayTimeoutServerException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
         elsif (400..499).include? status
           raise HTTPClientException.new(status:status, result:error_response, raw_response: @response.body, url:@url, method: http_method)
         elsif (500..599).include? status
@@ -901,5 +911,9 @@ module Flexirest
   class HTTPNotFoundClientException < HTTPClientException ; end
   class HTTPTooManyRequestsClientException < HTTPClientException ; end
   class HTTPServerException < HTTPException ; end
-
+  class HTTPInternalServerException < HTTPServerException ; end
+  class HTTPNotImplementedServerException < HTTPServerException ; end
+  class HTTPBadGatewayServerException < HTTPServerException ; end
+  class HTTPServiceUnavailableServerException < HTTPServerException ; end
+  class HTTPGatewayTimeoutServerException < HTTPServerException ; end
 end

data/lib/flexirest/result_iterator.rb

@@ -66,8 +66,8 @@ module Flexirest
       self
     end
 
-    def delete_if
-      @items = @items.delete_if &Proc.new
+    def delete_if(&block)
+      @items = @items.delete_if &block
       self
     end
 

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.9.17"
+  VERSION = "1.10.0"
 end

data/spec/lib/request_spec.rb

@@ -1005,7 +1005,7 @@ describe Flexirest::Request do
     rescue Flexirest::HTTPServerException => e
       e
     end
-    expect(e).to be_instance_of(Flexirest::HTTPServerException)
+    expect(e).to be_instance_of(Flexirest::HTTPInternalServerException)
     expect(e.status).to eq(500)
     expect(e.result.first_name).to eq("John")
   end
@@ -1021,7 +1021,7 @@ describe Flexirest::Request do
     rescue Flexirest::HTTPServerException => e
       e
     end
-    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\}})
+    expect(e.message).to eq(%q{The POST to '/create' returned a 500 status, which raised a Flexirest::HTTPInternalServerException with a body of: \{"first_name":"John", "id":1234\}})
   end
 
   it "should raise a parse exception for invalid JSON returns" do
@@ -1036,7 +1036,7 @@ describe Flexirest::Request do
     rescue => e
       e
     end
-    expect(e).to be_instance_of(Flexirest::HTTPServerException)
+    expect(e).to be_instance_of(Flexirest::HTTPInternalServerException)
     expect(e.status).to eq(500)
     expect(e.result).to eq(error_content)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.9.17
+  version: 1.10.0
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement