resurfaceio-logger 1.7.14 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43259eb0b70a63bd2d27ff40915e5046a0296784
-  data.tar.gz: 011033a042cdc4642b50edfc29148d55ffca0926
+  metadata.gz: 336dc8fe112fbe418b7636554503c58d4697eefc
+  data.tar.gz: a60960ad10d9d6e05d6d5184d4f664afe656d769
 SHA512:
-  metadata.gz: ec22698b4ca603ab73fc1d68d73ccb958a207679f147755a517bdc20f330c1266d719d3807c00696eba4823a858fe97de19c3aeb77808238720832ef7fe4e508
-  data.tar.gz: 0ffd311454eca86d67b465316116c067b9aa811d2f02bd01b4ee8cdb142f4bd880a9566f98a64b7b7b3adc3fd35d5bfa13c599bcd21bf4196bc6735be56a8f58
+  metadata.gz: 9c41e4094105e62d2498274a40d0b0896594b0f359255c4079a5cb01974475c2b1104dcaff6faf1f344315904d72c117f6c9f5aac46dac4690973ae878111fd2
+  data.tar.gz: b4a8a43683d44f406b39f090100b43533872eab643666b017e79f58a84c60a9e3bb95b65924baa0c6525efdadb7213799e9d793b6eaec4607c12a865cb1e0e03

data/lib/resurfaceio/http_logger.rb

@@ -12,27 +12,29 @@ class HttpLogger < BaseLogger
     super(AGENT, options)
   end
 
-  def format(request, request_body, response, response_body, now=nil)
+  def format(request, response, response_body=nil, request_body=nil, now=nil)
     message = []
     append_value message, 'request_method', request.request_method
     append_value message, 'request_url', request.url
     append_value message, 'response_code', response.status
     append_request_headers message, request
+    append_request_params message, request
     append_response_headers message, response
-    append_value message, 'request_body', request_body.nil? ? request.body : request_body
-    append_value message, 'response_body', response_body.nil? ? response.body : response_body
+    append_value message, 'request_body', request_body unless request_body == ''
+    final_response_body = response_body.nil? ? response.body : response_body
+    append_value message, 'response_body', final_response_body unless final_response_body == ''
     message << ['agent', @agent]
     message << ['version', @version]
     message << ['now', now.nil? ? (Time.now.to_f * 1000).floor.to_s : now]
     JSON.generate message
   end
 
-  def log(request, request_body, response, response_body)
-    !enabled? || submit(format(request, request_body, response, response_body))
+  def log(request, response, response_body=nil, request_body=nil)
+    !enabled? || submit(format(request, response, response_body, request_body))
   end
 
-  def string_content_type?(s)
-    !s.nil? && s =~ /^(text\/(html|plain|xml))|(application\/(json|soap|xml|x-www-form-urlencoded))/i
+  def self.string_content_type?(s)
+    !s.nil? && !(s =~ /^(text\/(html|plain|xml))|(application\/(json|soap|xml|x-www-form-urlencoded))/i).nil?
   end
 
   protected
@@ -50,7 +52,23 @@ class HttpLogger < BaseLogger
             message << ["request_header.#{name[5..-1].downcase.tr('_', '-')}", value]
           end
         end
-      end
+      end unless headers.nil?
+    end
+  end
+
+  def append_request_params(message, request)
+    respond_to_env = request.respond_to?(:env)
+    if respond_to_env || request.respond_to?(:form_hash)
+      hash = respond_to_env ? request.env['rack.request.form_hash'] : request.form_hash
+      hash.each do |name, value|
+        append_value message, "request_param.#{name.downcase}", value
+      end unless hash.nil?
+    end
+    if respond_to_env || request.respond_to?(:query_hash)
+      hash = respond_to_env ? request.env['rack.request.query_hash'] : request.query_hash
+      hash.each do |name, value|
+        append_value message, "request_param.#{name.downcase}", value
+      end unless hash.nil?
     end
   end
 
@@ -63,7 +81,7 @@ class HttpLogger < BaseLogger
           found_content_type = true if name =~ /^content-type/
           message << ["response_header.#{name}", value]
         end
-      end
+      end unless response.headers.nil?
     end
     unless found_content_type || response.content_type.nil?
       message << ['response_header.content-type', response.content_type]
@@ -79,11 +97,7 @@ class HttpLogger < BaseLogger
           when String
             message << [key, value]
           else
-            if value.respond_to?(:read)
-              message << [key, value.read]
-            else
-              message << [key, value.to_s]
-            end
+            message << [key, value.to_s]
         end
       end
     end

data/lib/resurfaceio/http_logger_for_rack.rb

@@ -13,11 +13,11 @@ class HttpLoggerForRack # http://rack.rubyforge.org/doc/SPEC.html
 
   def call(env)
     status, headers, body = @app.call(env)
-    if @logger.enabled? && status < 300
+    if @logger.enabled? && (status < 300 || status == 302)
       response = Rack::Response.new(body, status, headers)
-      if @logger.string_content_type?(response.content_type)
+      if HttpLogger::string_content_type?(response.content_type)
         request = Rack::Request.new(env)
-        @logger.log(request, nil, response, nil)
+        @logger.log(request, response)
       end
     end
     [status, headers, body]

data/lib/resurfaceio/http_logger_for_rails.rb

@@ -11,9 +11,11 @@ class HttpLoggerForRails
 
   def around(controller)
     yield
+    request = controller.request
     response = controller.response
-    if response.status < 300 && @logger.string_content_type?(response.content_type)
-      @logger.log(controller.request, nil, response, nil)
+    status = response.status
+    if (status < 300 || status == 302) && HttpLogger::string_content_type?(response.content_type)
+      @logger.log(request, response)
     end
   end
 

data/lib/resurfaceio/http_request_impl.rb

@@ -4,8 +4,9 @@
 class HttpRequestImpl
 
   def initialize
+    @form_hash = Hash.new
     @headers = Hash.new
-    @raw_body = nil
+    @query_hash = Hash.new
   end
 
   def add_header(key, value)
@@ -19,10 +20,6 @@ class HttpRequestImpl
     end
   end
 
-  def body
-    @raw_body ? StringIO.new(@raw_body) : nil
-  end
-
   def content_type
     @headers['CONTENT_TYPE']
   end
@@ -31,11 +28,18 @@ class HttpRequestImpl
     @headers['CONTENT_TYPE'] = content_type
   end
 
+  def form_hash
+    @form_hash
+  end
+
   def headers
     @headers
   end
 
-  attr_accessor :raw_body
+  def query_hash
+    @query_hash
+  end
+
   attr_accessor :request_method
   attr_accessor :url
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resurfaceio-logger
 version: !ruby/object:Gem::Version
-  version: 1.7.14
+  version: 1.8.0
 platform: ruby
 authors:
 - RobDickinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler