esi 0.4.13.pre.alpa2 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcaffc70bd2847f7ae948e5b7ff8115e317c5a9b0730cd08851241cfcaf209b2
-  data.tar.gz: f4532b5f6e8e56d6989f69314ca0ec76b7b0ae662a85cfc70a7cae5072bfdf77
+  metadata.gz: 5318ada47a8456e3ec80feb871a3998c8e760dc3ec12c2b8d975252292a04f45
+  data.tar.gz: b0adbff86424651b6c12f19f3dc1e5d0564ea20e2b46e7c3a76170a0140c5cc6
 SHA512:
-  metadata.gz: 6ac2860625402b608aeb7e0de0740a0e2a4337215d421d53ced0269fb88e723c7c152a24262b0595801aa4842df4c803b8c0cb7832f353478e3592b457b19f67
-  data.tar.gz: 60cfe7052b01428894d71b94d68470225679dc067173b6a2e7bec3eab2135576a43b4c3917e1084265fb4d9864dbed225e2be9bb2f8e942b7120c0805d206945
+  metadata.gz: 20c417ed1f54121112a39cb8a7c1e4bc8087f88e167a75a8f06314a7ed67a418040e01f6c1583dc26f6da5cc7abb664839ab3fc74a386f0b85c68fbb47b562b5
+  data.tar.gz: e15bcb5f258699f1d3721d5f5936b0ae30c4540275369f4dd95fba537f7eddc4cd605d1881b0b35afe1b5dadc1cd294320d7f9ae446e8720e03110cdf271294c

data/lib/esi/calls/corporations.rb

@@ -98,5 +98,14 @@ module Esi
       self.scope = 'esi-wallet.read_corporation_wallets.v1'
       self.cache_duration = 300
     end
+
+    class CorporationWalletJournal < Base
+      self.scope = 'esi-wallet.read_corporation_wallets.v1'
+      self.cache_duration = 3600
+
+      def initialize(corporation_id, division)
+        @path = "/corporations/#{corporation_id}/wallet/#{division}/journal"
+      end
+    end
   end
 end

data/lib/esi/client.rb

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

data/lib/esi/o_auth.rb

@@ -20,36 +20,26 @@ module Esi
       end
 
       def client
-        @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)
+        @client ||= OAuth2::Client.new(
+          Esi.config.client_id, Esi.config.client_secret,
+          site: Esi.config.oauth_host
+        )
       end
     end
 
-    def initialize(access_token:, refresh_token:, expires_at:, callback: nil, client: nil)
+    def initialize(access_token:, refresh_token:, expires_at:, callback: 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(client, @access_token,
+      @token = Esi::AccessToken.new(OAuth.client, @access_token,
                                     refresh_token: @refresh_token, expires_at: @expires_at)
       refresh_access_token if @token.expired?
       @token

data/lib/esi/response.rb

@@ -31,14 +31,6 @@ module Esi
       @cached_until ||= headers[:expires] ? Time.parse(headers[:expires]) : nil
     end
 
-    def response_json
-      @response_json ||= begin
-                           MultiJson.load(body, symbolize_keys: true)
-                         rescue StandardError
-                           {}
-                         end
-    end
-
     def save
       return unless should_log_response?
       File.write(log_directroy.join("#{Time.now.to_i}.json"), to_json)

data/lib/esi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.4.13.pre.alpa2
+  version: 0.4.14
 platform: ruby
 authors:
 - Danny Hiemstra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-03 00:00:00.000000000 Z
+date: 2018-03-25 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6