esi 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d47a1c60590cea3b27c56f4024cc40def5fe7c00
-  data.tar.gz: eaee95bd3df0a5899d39fffb81c78d805f803bfe
+  metadata.gz: 738a00d0fccf472e015bd9cad297fa740de68a62
+  data.tar.gz: c7f73001c9801fbe5243d7711b6fa3eb01a717ad
 SHA512:
-  metadata.gz: c91589ff35b7c1779d97f181967dbd8b5becb0176862674086f134cf647581946b5a6e33c34830c030e3c827c876d7a74e681d0c9721617c9337d8045ff1061c
-  data.tar.gz: fc1779a7ac22b08b19789075f5d6029d60c29cc3468d19b5c01206e6d487d5aafe0a0966351a417dd91f1c23db3f836d0a0fcbce75f25a5fbd876d54e099696e
+  metadata.gz: 42fe74fd00136355d620f20f12c86ad3882b5dde5ca4a942b4d186a94b3933eb75c2f2dfd5cd2273c84a54c2b231ce3d26a987934b5a5576391938a5047d0b6c
+  data.tar.gz: 5998db7cccfbf0dd3435caaae037668cd50830bfabe57a2a1ed69b486e8fe2f91550c9afe2644281eb1fa41fa50021186c77ae75f160e824a884654a8aa77230

data/esi.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "oauth2", "~> 1.4"
   spec.add_dependency "addressable", "~> 2.3"
-  spec.add_dependency "recursive-open-struct", "~> 1"
   spec.add_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/esi/access_token.rb

@@ -1,5 +1,7 @@
 module Esi
   class AccessToken < OAuth2::AccessToken
+    EXPIRES_MARGIN = 30.seconds
+
     def initialize(*args)
       if args[0].is_a?(OAuth2::AccessToken)
         token = args[0]
@@ -13,5 +15,9 @@ module Esi
     def verify
       Esi::Response.new(get("/oauth/verify"))
     end
+
+    def expired?
+      expires? && (expires_at < EXPIRES_MARGIN.ago.to_i)
+    end
   end
 end

data/lib/esi/o_auth.rb

@@ -3,7 +3,7 @@ module Esi
     extend Forwardable
 
     attr_reader :access_token, :refresh_token, :expires_at
-    def_delegators :token, :request, :get, :post, :delete, :patch, :put
+    def_delegators :token, :get, :post, :delete, :patch, :put
 
     class << self
       def authorize_url(redirect_uri:, scopes: nil)
@@ -36,6 +36,10 @@ module Esi
       @callback = callback if callback
     end
 
+    def request(*args)
+      token.request(*args)
+    end
+
     private
 
     def token
@@ -47,6 +51,8 @@ module Esi
     end
 
     def refresh_access_token
+      Esi.logger.debug "Refreshing access token"
+
       ActiveSupport::Notifications.instrument('esi.oauth.refresh_token') do
         @token = @token.refresh!
         @access_token = @token.token

data/lib/esi/response.rb

@@ -1,5 +1,3 @@
-require 'recursive-open-struct'
-
 module Esi
   class Response
     extend Forwardable
@@ -11,7 +9,7 @@ module Esi
     def initialize(response, call=nil)
       @original_response = response
       @call = call
-      @data = normalize_results
+      @data = MultiJson.load(body, symbolize_keys: true, object_class: OpenStruct) rescue {}
     end
 
     def merge(other_response)
@@ -31,10 +29,6 @@ module Esi
       @cached_until ||= headers[:expires] ? Time.parse(headers[:expires]) : nil
     end
 
-    def response_json
-      @response_json ||= MultiJson.load(body, symbolize_keys: true) rescue {}
-    end
-
     def save
       return if call.nil?
       return if Esi.config.response_log_path.blank? || !Dir.exists?(Esi.config.response_log_path)
@@ -48,23 +42,5 @@ module Esi
     def method_missing(method, *args, &block)
       data.send(method, *args, &block)
     end
-
-    private
-
-    def normalize_results
-      case response_json.class.to_s
-      when 'Hash'  then normalize_entry(response_json)
-      when 'Array' then response_json.map { |e| normalize_entry(e) }
-      else response_json
-      end
-    end
-
-    def normalize_entry(entry)
-      entry.is_a?(Hash) ? RecursiveOpenStruct.new(entry.transform_keys { |k| underscore(k).to_sym }, recurse_over_arrays: true) : entry
-    end
-
-    def underscore(str)
-      str.to_s.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
-    end
   end
 end

data/lib/esi/version.rb

@@ -1,3 +1,3 @@
 module Esi
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Danny Hiemstra
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: recursive-open-struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement