esi 0.4.12 → 0.4.13.pre.alpa2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68e387404646d212d17d199025c513524eddd55bddf55e78105974b7245c0080
-  data.tar.gz: 092ee6893b9613c381be0475e75e9b8611f567450e709ecc83403e80d65c9011
+  metadata.gz: bcaffc70bd2847f7ae948e5b7ff8115e317c5a9b0730cd08851241cfcaf209b2
+  data.tar.gz: f4532b5f6e8e56d6989f69314ca0ec76b7b0ae662a85cfc70a7cae5072bfdf77
 SHA512:
-  metadata.gz: 12fffec327434b1238085b155ac499156883f2d1378ac1dd40156a7f517e50fabf95bea835f1c18b062313201bd205658182ca39cac9061e2b78ae8df7eee39b
-  data.tar.gz: 6acc3aeaca298f0b226a1b132d6b0e8834fcd5acd60f663aedec57baa434ca363cf633205f7cdf45fb95415fdadc9dca631ff27125da375df048f4b019f767ae
+  metadata.gz: 6ac2860625402b608aeb7e0de0740a0e2a4337215d421d53ced0269fb88e723c7c152a24262b0595801aa4842df4c803b8c0cb7832f353478e3592b457b19f67
+  data.tar.gz: 60cfe7052b01428894d71b94d68470225679dc067173b6a2e7bec3eab2135576a43b4c3917e1084265fb4d9864dbed225e2be9bb2f8e942b7120c0805d206945

data/lib/esi/client.rb

@@ -25,11 +25,13 @@ module Esi
     # @param token [String] token the esi access_token
     # @param refresh_token [String] refresh_token the esi refresh_token
     # @param expires_at [Time] expires_at the time stamp the esi token expires_at
-    def initialize(token: nil, refresh_token: nil, expires_at: nil)
+    # @param oauth_client [OAuth2::Client] Custom instance of OAuth2::Client
+    def initialize(token: nil, refresh_token: nil, expires_at: nil, oauth_client: nil)
       @logger = Esi.logger
       @access_token = token
       @refresh_token = refresh_token
       @expires_at = expires_at
+      @oauth_client = oauth_client
       @oauth = init_oauth
     end
 
@@ -152,11 +154,13 @@ module Esi
       name.dup.to_s.split('_').map(&:capitalize).join
     end
 
+    # rubocop:disable Metrics/MethodLength
     def init_oauth
       @oauth ||= OAuth.new(
         access_token: @access_token,
         refresh_token: @refresh_token,
         expires_at: @expires_at,
+        client: @oauth_client,
         callback: lambda { |token, expires_at|
           @access_token = token
           @expires_at = expires_at
@@ -164,6 +168,7 @@ module Esi
         }
       )
     end
+    # rubocop:enable Metrics/MethodLength
 
     def request_paginated(call, &block)
       call.page = 1

data/lib/esi/o_auth.rb

@@ -20,26 +20,36 @@ module Esi
       end
 
       def client
-        @client ||= OAuth2::Client.new(
-          Esi.config.client_id, Esi.config.client_secret,
-          site: Esi.config.oauth_host
-        )
+        @client ||= create_client
+      end
+
+      # @return [OAuth2::Client] new oAuth2 client instance with specified options
+      def create_client(client_id: nil, client_secret: nil)
+        client_id ||= Esi.config.client_id
+        client_secret ||= Esi.config.client_secret
+
+        OAuth2::Client.new(client_id, client_secret, site: Esi.config.oauth_host)
       end
     end
 
-    def initialize(access_token:, refresh_token:, expires_at:, callback: nil)
+    def initialize(access_token:, refresh_token:, expires_at:, callback: nil, client: nil)
       raise Esi::Error, 'Callback should be a callable Proc' if callback && !callback.respond_to?(:call)
 
       @access_token = access_token
       @refresh_token = refresh_token
       @expires_at = expires_at
       @callback = callback if callback
+      @client = client if client
     end
 
     private
 
+    def client
+      @client || OAuth.client
+    end
+
     def token
-      @token = Esi::AccessToken.new(OAuth.client, @access_token,
+      @token = Esi::AccessToken.new(client, @access_token,
                                     refresh_token: @refresh_token, expires_at: @expires_at)
       refresh_access_token if @token.expired?
       @token

data/lib/esi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Esi
-  VERSION = '0.4.12'
+  VERSION = '0.4.13-alpa2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13.pre.alpa2
 platform: ruby
 authors:
 - Danny Hiemstra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -188,9 +188,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6