esi 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743d23033a52204c6dccb56822c1afb7f7d7ae03
-  data.tar.gz: d76820f57e9b7b843f2ba633649716157bd513e9
+  metadata.gz: e8f83e980f923caa2cc0f9b5bf31acfb9c7abadc
+  data.tar.gz: 44bcbebf9363236aef4ff71f40fa799a077b620f
 SHA512:
-  metadata.gz: a91a6e6c288cebcdb40d5c75fcee0d1fd637f2ec02d6fa46b4ae94de804711542d34e44eb0b0eb0cbc92194ab40d2404add8ce9b719e4f26207edc5afe31e688
-  data.tar.gz: f64d4fd200f727f411d7564b27637dbf60ee52663894c41548cd1c452d670f79c59d676e7246b47616fd9ee76b3bbbfde753ba19290428251f5e9e636be79f45
+  metadata.gz: '0019d599abad8664a7f6061ddbfe2d94d92d5a3be758bc020a73b6a200b6736250a9a5fd93e9b5ee0ed2f82b3b4519d42ab1d167778c8e588018aa8507281fe4'
+  data.tar.gz: 31927f969d9509558722496c08c67360f5408deac60a51d2c9697156e7615445a567ae63fcb8e9c77f7b057abe4d02a55bb07f5cbda3a47078ccdcc92a0b0b29

data/lib/esi/client.rb

@@ -112,11 +112,11 @@ module Esi
             when 403 # Forbidden
               logger.error "ApiForbiddenError: #{e.response.status}: #{e.response.body}"
               logger.error url
-              raise Esi::ApiForbiddenError.new(Response.new(e.response))
+              raise Esi::ApiForbiddenError.new(Response.new(e.response, call))
             when 404 # Not Found
-              raise Esi::ApiNotFoundError.new(Response.new(e.response))
+              raise Esi::ApiNotFoundError.new(Response.new(e.response, call))
             else
-              response = Response.new(e.response)
+              response = Response.new(e.response, call)
               logger.error "ApiUnknownError (#{response.status}): #{url}"
 
               case response.error
@@ -139,18 +139,11 @@ module Esi
 
       debug "Request successful"
 
-      ActiveSupport::Notifications.instrument('esi.client.response.initialize') do
-        response = Response.new(response)
+      ActiveSupport::Notifications.instrument('esi.client.response.render') do
+        response = Response.new(response, call)
+        response.save
       end
-      ActiveSupport::Notifications.instrument('esi.client.response.save') do
-        if Esi.config.response_log_path && Dir.exists?(Esi.config.response_log_path)
-          call_name = call.class.to_s.downcase.split('::').last
-          folder = Pathname.new(Esi.config.response_log_path).join(call_name)
-          FileUtils.mkdir_p(folder)
-          File.write(folder.join("#{Time.now.to_i.to_s}.json"), response.to_s)
-        end
-      end
-      ActiveSupport::Notifications.instrument('esi.client.response.classify') do
+      ActiveSupport::Notifications.instrument('esi.client.response.callback') do
         response.data.each { |item| block.call(item) } if block
       end
       response

data/lib/esi/response.rb

@@ -4,12 +4,13 @@ module Esi
   class Response
     extend Forwardable
 
-    attr_reader :original_response, :data
+    attr_reader :original_response, :call, :data
     def_delegators :original_response, :status, :body, :headers
     def_delegators :data, :each
 
-    def initialize(response)
+    def initialize(response, call=nil)
       @original_response = response
+      @call = call
       @data = normalize_results
     end
 
@@ -34,6 +35,16 @@ module Esi
       @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)
+
+      call_name = call.class.to_s.split('::').last.underscore
+      folder = Pathname.new(Esi.config.response_log_path).join(call_name)
+      FileUtils.mkdir_p(folder)
+      File.write(folder.join("#{Time.now.to_i.to_s}.json"), to_json)
+    end
+
     def method_missing(method, *args, &block)
       begin
         data.send(method, *args, &block)

data/lib/esi/version.rb

@@ -1,3 +1,3 @@
 module Esi
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Danny Hiemstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2