siebel_donations 1.0.7 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8018ecedc8b9f2dd959cb8ebdd50a75c566c1b7e
-  data.tar.gz: 845ac1d0aa34bcf884b6c02e9772e320ded985f5
+SHA256:
+  metadata.gz: 77f82f06f4eb40588971c8ea5d34666fd1b83501235135ccaab67899e11b720e
+  data.tar.gz: 8070f048653445280b1e11ec3db354969452a3c015e29bf955ad2a429bd83172
 SHA512:
-  metadata.gz: 82c56c49a331d0d445020ad7b473b1998ab0703b98c4aa6166b5af4feb832225a827871fbc02082995fd5e9b153aed7d8d9b34ec4ae16e645515030ade6ed894
-  data.tar.gz: 13a45dc08ab2e0785333b577087772cf4d32b5a844f52b250f8ab6414053cd888cbf071d87888ae3c593b1ae67116cca4820d1ef09d6d78fcfd97d9dbef423d9
+  metadata.gz: cf3f338d0c939d203f7d10f99a152052cc871095c201d1b4b66072c35752777e1c56bc2bf0248edfa63467a838a1bf9c239278d6087db66bd53a5866e2aa0c8c
+  data.tar.gz: 245c82c5d36b96cc1396b88dab184b4131d396371c762a798394e979f58e7a8c1713e0efde12b4abcdef4417376fc6516818abfdaa646008cf562a58907d6bfb

data/lib/siebel_donations.rb

@@ -7,7 +7,7 @@ end
 
 module SiebelDonations
   class << self
-    attr_accessor :base_url, :oauth_token, :default_timeout
+    attr_accessor :base_url, :oauth_token, :default_timeout, :default_retry_count
 
     def configure
       yield self
@@ -20,6 +20,10 @@ module SiebelDonations
     def default_timeout
       @default_timeout || 6000
     end
+
+    def default_retry_count
+      @default_retry_count || 20
+    end
   end
 end
 

data/lib/siebel_donations/base.rb

@@ -14,24 +14,31 @@ module SiebelDonations
     def self.get(path, params)
       raise 'You need to configure SiebelDonations with your oauth_token.' unless SiebelDonations.oauth_token
 
-      params[:response_timeout] ||= SiebelDonations.default_timeout
+      request_timeout = params[:timeout] || SiebelDonations.default_timeout
+      params[:response_timeout] ||= request_timeout
+      retry_count = params.delete(:retry_count) || SiebelDonations.default_retry_count
 
       url = SiebelDonations.base_url + path
-      Retryable.retryable :on => [RestClient::InternalServerError, Timeout::Error, Errno::ECONNRESET], :times => 20, :sleep => 20 do
-        RestClient::Request.execute(:method => :get, :url => url, :headers => {params: params, authorization: "Bearer #{SiebelDonations.oauth_token}"}, :timeout => nil) { |response, request, result, &block|
+      headers = { params: params, authorization: "Bearer #{SiebelDonations.oauth_token}" }
+
+      retryable_errors = [RestClient::InternalServerError, Timeout::Error, Errno::ECONNRESET]
+
+      Retryable.retryable on: retryable_errors, times: retry_count, sleep: 20 do
+        request_params = { method: :get, url: url, headers: headers, timeout: request_timeout }
+        RestClient::Request.execute(request_params) do |response, request, result, &block|
           case response.code
           when 200
             Oj.load(response.unpack("C*").pack("U*").force_encoding("UTF-8").encode!)
           when 400
-            raise RestClient::BadRequest, response.to_s
+            raise RestClient::BadRequest, response
           when 500
-            raise RestClient::InternalServerError, response.to_s
+            raise RestClient::InternalServerError, response
           else
             puts response.inspect
             puts request.inspect
             raise result.inspect
           end
-        }
+        end
       end
     end
 

data/lib/siebel_donations/version.rb

@@ -1,3 +1,3 @@
 module SiebelDonations
-  VERSION = "1.0.7"
+  VERSION = "1.0.12"
 end

data/siebel_donations.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('rest-client', '~> 2.0.2')
-  gem.add_dependency('oj', '~> 2.18.5')
+  gem.add_dependency('oj', '>= 2.18')
   gem.add_dependency('activesupport', '>= 3.0.0')
   gem.add_dependency('retryable-rb', '~> 1.1.0')
 

data/spec/base_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe SiebelDonations::Base do
+  context '.get' do
+    context 'with timeout param set' do
+      it 'passes param to RestClient' do
+        expect(RestClient::Request).to receive(:execute)
+          .with(hash_including(url: SiebelDonations.base_url, timeout: 123))
+          .and_return(nil)
+
+        described_class.get('', timeout: 123)
+      end
+    end
+
+    context 'without timeout param set' do
+      it 'passes default to RestClient' do
+        expect(RestClient::Request).to receive(:execute)
+          .with(hash_including(timeout: 6000))
+          .and_return(nil)
+
+        described_class.get('', {})
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siebel_donations
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.12
 platform: ruby
 authors:
 - Josh Starcher
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,16 +28,16 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.5
+        version: '2.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.5
+        version: '2.18'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -92,12 +92,13 @@ files:
 - lib/siebel_donations/profile.rb
 - lib/siebel_donations/version.rb
 - siebel_donations.gemspec
+- spec/base_spec.rb
 - spec/donation_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,11 +113,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Get donation information from Siebel Donor
 test_files:
+- spec/base_spec.rb
 - spec/donation_spec.rb
 - spec/spec_helper.rb