campact_user_service 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd0c2841ffadf7445944b27cd650a6655159f0fb0ac9081929270709cc48028
-  data.tar.gz: 7717cd9eb790c374226fc69468dc369cea48f5b890bb75f2be6dce115114cec7
+  metadata.gz: 558b63f52138a71633f121ad7418b8903c7c781bea38c6f17cee3eb3ff168573
+  data.tar.gz: f031af26c529fadfa0b2a8c0223154fa66624d2630e82c0bf7dd3d9f261ac671
 SHA512:
-  metadata.gz: 3b9faf2ed1c4e4a613dbf6535442531079bf682cd783dd6d837bf51fa8b491f473c32bcc147e47815eef1ebf0dec6f2eacd2e14f30bc150f56dd309de60f760a
-  data.tar.gz: 7d55743e0bc670e97423376fa151c1dae7e8a604a8cd66757bb2b05ae3ab9ac4e93d393eaf52cf86fc4743556f170b8b26dc811acf9690924630646e2fed4f2f
+  metadata.gz: 40e314a23b014f000e2b2039c82e8bb669f640b32dd05731ec0cca583b94867d306da6d7f2e3d3cc97f05a38c84cb39ee7a189a57aca187389c5c4ca30f1f7a2
+  data.tar.gz: 8b01531c1d7507181cb23fc5518f40f1b7528f1e0d8e9b8a983442806e7e2c608e3d6712706499c4697cb2c0aa678843de6392860a7c59ef3e8c31c56331e84a

data/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: CI
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rspec
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rubocop

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+2.7.5

data/Gemfile

@@ -1,8 +1,7 @@
 source "https://rubygems.org"
 
-gem 'base32', '~> 0.3.2'
 gem 'rotp', '~> 6'
-gem 'faraday', '>= 0.12.2', '< 1.0'
+gem 'faraday', '~> 1.0'
 gem 'json', '~> 2.1'
 
 group :development do

data/README.md

@@ -1,5 +1,5 @@
 # campact-user-service
-[![Build Status](https://travis-ci.org/controlshift/campact-user-service.svg?branch=master)](https://travis-ci.org/controlshift/campact-user-service)
+[![CI Status](https://github.com/controlshift/campact-user-service/actions/workflows/ci.yml/badge.svg)](https://github.com/controlshift/campact-user-service/actions/workflows/ci.yml)
 
 a ruby gem that wraps the Campact user service API
 

data/VERSION

@@ -1 +1 @@
-3.0.0
+4.0.0

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.0 ruby lib
+# stub: campact_user_service 4.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "campact_user_service".freeze
-  s.version = "3.0.0"
+  s.version = "4.0.0"
 
   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-06-25"
+  s.date = "2021-12-16"
   s.description = "Ruby wrapper for Campact User Service".freeze
   s.email = "hello@controlshiftlabs.com".freeze
   s.extra_rdoc_files = [
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".github/workflows/ci.yml",
     ".rubocop.yml",
     ".ruby-gemset",
     ".ruby-version",
-    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.md",
@@ -43,7 +43,7 @@ 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.1.6".freeze
   s.summary = "Ruby wrapper for Campact User Service".freeze
 
   if s.respond_to? :specification_version then
@@ -51,9 +51,8 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<base32>.freeze, ["~> 0.3.2"])
-    s.add_runtime_dependency(%q<rotp>.freeze, ["~> 3.3", ">= 3.3.1"])
-    s.add_runtime_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
+    s.add_runtime_dependency(%q<rotp>.freeze, ["~> 6"])
+    s.add_runtime_dependency(%q<faraday>.freeze, ["~> 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"])
@@ -66,9 +65,8 @@ Gem::Specification.new do |s|
     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<base32>.freeze, ["~> 0.3.2"])
-    s.add_dependency(%q<rotp>.freeze, ["~> 3.3", ">= 3.3.1"])
-    s.add_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
+    s.add_dependency(%q<rotp>.freeze, ["~> 6"])
+    s.add_dependency(%q<faraday>.freeze, ["~> 1.0"])
     s.add_dependency(%q<json>.freeze, ["~> 2.1"])
     s.add_dependency(%q<byebug>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])

data/lib/campact_user_service/account.rb

@@ -8,7 +8,7 @@ module CampactUserService
     end
 
     def exists?
-      account && !account["id"].nil?
+      account && !account['external_id'].nil?
     end
 
     def subscribed_to_newsletter?

data/lib/campact_user_service/client.rb

@@ -1,12 +1,12 @@
 require 'faraday'
 require 'json'
-require 'base32'
 require 'rotp'
 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
 
@@ -34,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/account_spec.rb

@@ -18,7 +18,7 @@ describe CampactUserService::Account do
     it 'should return true where a valid user object is returned' do
       stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
-          "id": "id-123"
+          "external_id": "id-123"
         }.to_json)
 
       expect(subject.exists?).to be_truthy

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
 
@@ -131,7 +131,7 @@ describe CampactUserService::Client do
         allow(response).to receive(:status).and_return(200)
         allow(response).to receive(:body).and_return(nil)
 
-        totp_secret = Base32.encode('shh! a secret!').gsub('=', '')
+        totp_secret = ROTP::Base32.encode('shh! a secret!')
 
         totp = double
         expect(totp).to receive(:now).and_return('totp_token')

metadata

@@ -1,67 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: campact_user_service
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - ControlShift
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: base32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -238,10 +212,10 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".github/workflows/ci.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -278,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for Campact User Service

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-cache: bundler
-before_install:
-  - gem install bundler
-script:
-  - bundle exec rspec
-  - bundle exec rubocop