bima-shark-sdk 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ab74483354f85310c09fe0f53a00143fbd8042e81b0ed8d7226d77909ff2e24
-  data.tar.gz: 4c2d6b001cd4dfbd451c59c2e27368b55ecca753fd0a63f4a4350216b790be91
+  metadata.gz: 5c3d5438f91e3e0715d520cae493446b62571f4f63baa1dcf4b4ff1ce9a97380
+  data.tar.gz: 7d321474ad227eabb72a5c9f64806e2219a606ce9b804b1c36bf78b8e6176b48
 SHA512:
-  metadata.gz: 26060a07b63c8f2c37a5fe505a5e4aee3bb907ebe1a75340ae4676b05dbdc3377d2e6175ef12fe62e019d98f77680df720527b947f8ffd4e1e0ccb4066ce44fa
-  data.tar.gz: 13f5e6dd6a7b1b83c98f8e40232349e6d8eaa30f60058363d838491596eb06ee2f8a37cf08868ea71316bd77b5d08c90d5bbd7c151db5120fce8fcf2edb91e24
+  metadata.gz: '078265caf5dd06022b0ae91356fd4bd9f8093a879c1191a55297280786be708950652563cf1d5ccb9df8a51c5b9bec7a66f7f8b534eb865ad6142b757310a216'
+  data.tar.gz: ae7031d4aee957a60d2791122b650a713c77b75fa0c661b84444830cc463c5f40ac69dda0f19ed296cf22d7acee21f76346973e523ccb8316bf16ce4ed178ab6

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-# cache: bundler
+cache: bundler
 rvm:
   - 2.7.6
   - 3.0.2

data/CHANGELOG.md

@@ -1,12 +1,12 @@
 ## Changelog
 
-#### 2.5.0
-- Extend `with_service_token` with `with_auth_token` which allows to send custom `Authorization` header, not only `Bearer`
+#### 3.0.0
+- new minimum requirements are `Ruby 3.0` and `faraday 2.0`
 - remove `Shark::Subscription`
 
 #### 2.4.4
-* lowest supported Ruby version is 2.7
-* add `recipient` to `Shark::DoubleOptIn::Execution`
+- lowest supported Ruby version is 2.7
+- add `recipient` to `Shark::DoubleOptIn::Execution`
 
 #### 2.4.3
 - allow `Shark::MailingService::Mailer#mail` to use separate layouts

data/README.md

@@ -42,21 +42,6 @@ Shark::MailingService.use_shark_mailer do |mailer|
 end
 ```
 
-To sign your requests with custom tokens, for instance with JWT:
-```ruby
-  def deliver
-    access_id = 'access_id'
-    secret_key = 'secret_key'
-
-    signature = JWT.encode({ exp: Time.now.to_i + (1 * 60) }, secret_key, 'HS256')
-
-    Shark.with_auth_token("JWT #{access_id}:#{signature}") do
-      super
-    end
-  end
-
-```
-
 ## Testing
 
 ```

data/bima-shark-sdk.gemspec

@@ -21,10 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 4.1.0'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'json_api_client', '>= 1.10.0'
-  spec.add_dependency 'net-http-persistent'
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'faraday', '~> 2.0'
+  spec.add_dependency 'json_api_client', '>= 1.23.0'
   spec.add_dependency 'rack'
 
   spec.add_development_dependency 'bundler'

data/lib/shark/client/connection.rb

@@ -12,11 +12,11 @@ module Shark
           params: options[:params] || {}
         }
 
-        @connection = Faraday.new do |faraday|
-          faraday.use Shark::Middleware::ComposeRequest
-          faraday.use Shark::Middleware::Status
-          faraday.use JsonApiClient::Middleware::ParseJson
-          faraday.adapter :net_http_persistent
+        @connection = Faraday.new do |conn|
+          conn.use Shark::Middleware::ComposeRequest
+          conn.use Shark::Middleware::Status
+          conn.response :json, content_type: /\bjson$/
+          conn.adapter Faraday.default_adapter
         end
       end
 
@@ -38,7 +38,9 @@ module Shark
         request_headers = connection_options_headers.merge(headers || {})
         request_params = connection_options_params.merge(params || {})
 
-        request_headers['Authorization'] = Shark.auth_token if Shark.auth_token.present?
+        if Shark.service_token.present?
+          request_headers['Authorization'] = "Bearer #{Shark.service_token}"
+        end
 
         @connection.send(request_action) do |request|
           request.url(url)

data/lib/shark/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shark
-  VERSION = '2.5.0'
+  VERSION = '3.0.0'
 end

data/lib/shark.rb

@@ -32,41 +32,28 @@ module Shark
   # @param token [String] The service token for the authorization header
   # @param block [Block] The block where service token authorization will be set for
   # @api public
-  def self.with_service_token(token, &block)
+  def self.with_service_token(token)
     if token.is_a?(String)
-      auth_token = "Bearer #{token}"
+      self.service_token = token
     elsif token.respond_to?(:jwt)
-      auth_token = "Bearer #{token.jwt}"
+      self.service_token = token.jwt
     else
       raise ArgumentError, 'Parameter :token must be kind of String.'
     end
 
-    with_auth_token(auth_token, &block)
-  end
-
-  # Within the given block, add the authorization header token to all api requests.
-  #
-  # @param token [String] The token for the authorization header
-  # @param block [Block] The block where authorization token will be set for
-  # @api public
-  def self.with_auth_token(token)
-    raise ArgumentError, 'Parameter :token must be kind of String.' unless token.is_a?(String)
-
-    self.auth_token = token
-
     yield
   ensure
-    self.auth_token = nil
+    self.service_token = nil
   end
 
   # @api public
-  def self.auth_token
-    Thread.current['shark-auth-token']
+  def self.service_token
+    Thread.current['shark-service-token']
   end
 
   # @api private
-  def self.auth_token=(value)
-    Thread.current['shark-auth-token'] = value
+  def self.service_token=(value)
+    Thread.current['shark-service-token'] = value
   end
 
   #

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: bima-shark-sdk
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - bima-team@justrelate.com
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_api_client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: json_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: ''