campact_user_service 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a757abe1d7920da576a75ce549919398e63e7cbe7992eec550ea858c99f5df6b
-  data.tar.gz: 1630b643c70172e7b9b46e499cbda48a3bc5a78f257f45ad1cfd70f756feb1dd
+  metadata.gz: 6e9cb5aee16e6996f096b2a784d87d425fca96e5bcb04af1c6bb226bc7f6e3a6
+  data.tar.gz: 9a245ab3f8ba1f0ba86f3b7c630f1f4df86714bb58f553bc045685edec6e3081
 SHA512:
-  metadata.gz: 2b0bd9826a3cd73a03c22de64243f78261704fabc09bc581540614dfb45bd3fb37c77aa020d5f07ee490027a27d669175da6d94165feb9e22210551129ec9a17
-  data.tar.gz: 49b9d38cb242dd0ed249bf88493dea4f23d0fe0b1ba4b651d568db6d53725439e9ec9bc5fd7e3f98bbd86afaa1c3fcf1b3829c657c1bd350c827c52b07d9ba40
+  metadata.gz: 4e1b4f9916af9c8142811589bd3683de92d4189b32de5968f3df42bd85930bb1d6d857e392d1c669c8cda0cdceb280676f162c0d20f69db33961d50249a6e1af
+  data.tar.gz: bdb5d97db34b872a4d50e8dee355a53f5e2700766c524dc280c26e9b1ed6d5a322654207ae38f0a9e7cb940ffa8dcec97d7bd466423c4c58ac5a61760d8525a0

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/campact_user_service.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: campact_user_service 3.0.1 ruby lib
+# stub: campact_user_service 3.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "campact_user_service".freeze
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["ControlShift".freeze]
-  s.date = "2020-08-24"
+  s.date = "2020-10-14"
   s.description = "Ruby wrapper for Campact User Service".freeze
   s.email = "hello@controlshiftlabs.com".freeze
   s.extra_rdoc_files = [
@@ -43,27 +43,41 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/controlshift/campact_user_service".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.2".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "Ruby wrapper for Campact User Service".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<rotp>.freeze, ["~> 6"])
-    s.add_runtime_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
-    s.add_runtime_dependency(%q<json>.freeze, ["~> 2.1"])
-    s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
-    s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-    s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
-    s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
-    s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.0", ">= 6.0.4"])
-    s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
-    s.add_development_dependency(%q<simplecov>.freeze, ["= 0.16.1"])
-    s.add_development_dependency(%q<pry-byebug>.freeze, ["~> 3.6"])
-    s.add_development_dependency(%q<faraday-detailed_logger>.freeze, ["~> 2.1", ">= 2.1.2"])
-    s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rotp>.freeze, ["~> 6"])
+      s.add_runtime_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
+      s.add_runtime_dependency(%q<json>.freeze, ["~> 2.1"])
+      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.0", ">= 6.0.4"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, ["= 0.16.1"])
+      s.add_development_dependency(%q<pry-byebug>.freeze, ["~> 3.6"])
+      s.add_development_dependency(%q<faraday-detailed_logger>.freeze, ["~> 2.1", ">= 2.1.2"])
+      s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
+    else
+      s.add_dependency(%q<rotp>.freeze, ["~> 6"])
+      s.add_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
+      s.add_dependency(%q<json>.freeze, ["~> 2.1"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<webmock>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 6.0", ">= 6.0.4"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, ["= 0.16.1"])
+      s.add_dependency(%q<pry-byebug>.freeze, ["~> 3.6"])
+      s.add_dependency(%q<faraday-detailed_logger>.freeze, ["~> 2.1", ">= 2.1.2"])
+      s.add_dependency(%q<rubocop>.freeze, [">= 0"])
+    end
   else
     s.add_dependency(%q<rotp>.freeze, ["~> 6"])
     s.add_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])

data/lib/campact_user_service/client.rb

@@ -5,7 +5,8 @@ require 'campact_user_service/response_error'
 
 module CampactUserService
   class Client
-    TIMEOUT = 5.freeze
+    TIMEOUT = 60.freeze
+    OPEN_TIMEOUT = 20.freeze
 
     attr_reader :connection, :host, :port, :topt_authorization
 
@@ -33,7 +34,7 @@ module CampactUserService
       response = connection.send(verb.to_sym) do |req|
         req.url path
         req.options.timeout = TIMEOUT
-        req.options.open_timeout = TIMEOUT
+        req.options.open_timeout = OPEN_TIMEOUT
         if options.key?(:cookies)
           req.headers['Cookie'] = format_cookies(options[:cookies])
         end

data/spec/client_spec.rb

@@ -53,7 +53,7 @@ describe CampactUserService::Client do
       it 'should raise error if status code is 3xx, 4xx or 5xx' do
         expect(request_builder).to receive(:url).with('/foo/bar')
         expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-        expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+        expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
         allow(response).to receive(:status).and_return(unexpected_status_code)
         allow(response).to receive(:body).and_return('An error occurred')
 
@@ -68,7 +68,7 @@ describe CampactUserService::Client do
     it 'should return nil if status code is 404' do
       expect(request_builder).to receive(:url).with('/foo/bar')
       expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
       allow(response).to receive(:status).and_return(404)
 
       response = subject.send(method_under_test, '/foo/bar')
@@ -97,7 +97,7 @@ describe CampactUserService::Client do
     it 'should perform get request on provided path and return true if response is 204' do
       expect(request_builder).to receive(:url).with('/foo/bar')
       expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
       allow(response).to receive(:status).and_return(204)
 
       expect(subject.get_request('/foo/bar')).to be_truthy
@@ -109,7 +109,7 @@ describe CampactUserService::Client do
       before :each do
         allow(request_builder).to receive(:url).with('/foo/bar')
         allow(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-        allow(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+        allow(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
         allow(request_builder).to receive(:headers).and_return(headers_builder)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: campact_user_service
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - ControlShift
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp
@@ -243,7 +243,7 @@ homepage: http://github.com/controlshift/campact_user_service
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for Campact User Service
 test_files: []