resurfaceio-logger 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6325802c6b0b9f45a243d514552865acafe0cf8a
-  data.tar.gz: 549e12382335f21c169d8657313cf2f60c241bda
+  metadata.gz: a583801501358c56e7f049b70bb41f3695612f7a
+  data.tar.gz: a3db5f5fad430ecadbcef92b75011ec62e478d54
 SHA512:
-  metadata.gz: 99ec978f7215220b3d35ac7148aa436ddf1e4981983f884836338760a5e6cf6b55b16fd27f6b930bf16b1a85b8b801e3d05a425ec07c0dfb9804a81765726502
-  data.tar.gz: 1b126b84b901f850adf3e701a5d97242305f33b844fb72de1c5c2ffcaf04a5006bba7a9a0ff48825884767e55d5b71fd674f2dc9aed8cf2cc9221ef9dc41e9af
+  metadata.gz: a65d4f79c84c6c8b3768184c205e527e67704d963e154db0f4d1b1ff3d7ab9a8c3f8f09623a19d55f5eaae194830a3e1cfb0ceffd481cbe581f76050c82ce3ab
+  data.tar.gz: 47a2f99ed81a16fbddd0248f743a63a124a67da57f8f2ba02363cf954f563bc3039b34f06f926685ad5fb3db527fa79eb901c5af13adbe1c405e5306c1ef73f3

data/lib/resurfaceio/all.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 require 'resurfaceio/base_logger'
 require 'resurfaceio/http_logger'
 require 'resurfaceio/http_logger_for_rack'
 require 'resurfaceio/http_logger_for_rails'
+require 'resurfaceio/http_message_impl'
 require 'resurfaceio/http_request_impl'
 require 'resurfaceio/http_response_impl'
 require 'resurfaceio/usage_loggers'
@@ -23,6 +24,9 @@ module Resurfaceio
   class HttpLoggerForRails < HttpLoggerForRails
   end
 
+  class HttpMessageImpl < HttpMessageImpl
+  end
+
   class HttpRequestImpl < HttpRequestImpl
   end
 

data/lib/resurfaceio/base_logger.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 require 'uri'
 require 'net/http'
@@ -48,6 +48,8 @@ class BaseLogger
         @enabled = false
       end
     end
+
+    @enableable = !@queue.nil? || !@url.nil?
   end
 
   def agent
@@ -60,10 +62,14 @@ class BaseLogger
   end
 
   def enable
-    @enabled = true unless @queue.nil? && @url.nil?
+    @enabled = true if @enableable
     self
   end
 
+  def enableable?
+    @enableable
+  end
+
   def enabled?
     @enabled && UsageLoggers.enabled?
   end

data/lib/resurfaceio/http_logger.rb

@@ -1,107 +1,32 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 require 'json'
 require 'resurfaceio/base_logger'
+require 'resurfaceio/http_message_impl'
 
 class HttpLogger < BaseLogger
 
   AGENT = 'http_logger.rb'.freeze
 
-  def initialize(options={})
+  def self.string_content_type?(s)
+    !s.nil? && !(s =~ /^(text\/(html|plain|xml))|(application\/(json|soap|xml|x-www-form-urlencoded))/i).nil?
+  end
+
+  def initialize(options = {})
     super(AGENT, options)
   end
 
-  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 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 == ''
+  def format(request, response, response_body = nil, request_body = nil, now = nil)
+    message = HttpMessageImpl.build(request, response, response_body, request_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, response, response_body=nil, request_body=nil)
+  def log(request, response, response_body = nil, request_body = nil)
     !enabled? || submit(format(request, response, response_body, request_body))
   end
 
-  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
-
-  def append_request_headers(message, request)
-    respond_to_env = request.respond_to?(:env)
-    if respond_to_env || request.respond_to?(:headers)
-      headers = respond_to_env ? request.env : request.headers
-      headers.each do |name, value|
-        unless value.nil?
-          if name =~ /^CONTENT_TYPE/
-            message << ['request_header:content-type', value]
-          end
-          if name =~ /^HTTP_/
-            message << ["request_header:#{name[5..-1].downcase.tr('_', '-')}", value]
-          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
-
-  def append_response_headers(message, response)
-    found_content_type = false
-    if response.respond_to?(:headers)
-      response.headers.each do |name, value|
-        unless value.nil?
-          name = name.downcase
-          found_content_type = true if name =~ /^content-type/
-          message << ["response_header:#{name}", value]
-        end
-      end unless response.headers.nil?
-    end
-    unless found_content_type || response.content_type.nil?
-      message << ['response_header:content-type', response.content_type]
-    end
-  end
-
-  def append_value(message, key, value=nil)
-    unless key.nil?
-      unless value.nil?
-        case value
-          when Array
-            message << [key, value.join]
-          when String
-            message << [key, value]
-          else
-            message << [key, value.to_s]
-        end
-      end
-    end
-    message
-  end
-
 end

data/lib/resurfaceio/http_logger_for_rack.rb

@@ -1,12 +1,12 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 require 'rack'
 require 'resurfaceio/http_logger'
 
 class HttpLoggerForRack # http://rack.rubyforge.org/doc/SPEC.html
 
-  def initialize(app, options={})
+  def initialize(app, options = {})
     @app = app
     @logger = HttpLogger.new(options)
   end
@@ -21,7 +21,8 @@ class HttpLoggerForRack # http://rack.rubyforge.org/doc/SPEC.html
       response = Rack::Response.new(body, status, headers)
       if HttpLogger::string_content_type?(response.content_type)
         request = Rack::Request.new(env)
-        @logger.log(request, response)
+        message = @logger.format(request, response)
+        @logger.submit(message)
       end
     end
     [status, headers, body]

data/lib/resurfaceio/http_logger_for_rails.rb

@@ -1,11 +1,11 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 require 'resurfaceio/http_logger'
 
 class HttpLoggerForRails
 
-  def initialize(options={})
+  def initialize(options = {})
     @logger = HttpLogger.new(options)
   end
 
@@ -15,11 +15,14 @@ class HttpLoggerForRails
 
   def around(controller)
     yield
-    request = controller.request
-    response = controller.response
-    status = response.status
-    if (status < 300 || status == 302) && HttpLogger::string_content_type?(response.content_type)
-      @logger.log(request, response)
+    if @logger.enabled?
+      request = controller.request
+      response = controller.response
+      status = response.status
+      if (status < 300 || status == 302) && HttpLogger::string_content_type?(response.content_type)
+        message = @logger.format(request, response)
+        @logger.submit(message)
+      end
     end
   end
 

data/lib/resurfaceio/http_message_impl.rb

@@ -0,0 +1,89 @@
+# coding: utf-8
+# © 2016-2018 Resurface Labs LLC
+
+require 'json'
+
+class HttpMessageImpl
+
+  def self.build(request, response, response_body = nil, request_body = 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 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 == ''
+    return message
+  end
+
+  protected
+
+  def self.append_request_headers(message, request)
+    respond_to_env = request.respond_to?(:env)
+    if respond_to_env || request.respond_to?(:headers)
+      headers = respond_to_env ? request.env : request.headers
+      headers.each do |name, value|
+        unless value.nil?
+          if name =~ /^CONTENT_TYPE/
+            message << ['request_header:content-type', value]
+          end
+          if name =~ /^HTTP_/
+            message << ["request_header:#{name[5..-1].downcase.tr('_', '-')}", value]
+          end
+        end
+      end unless headers.nil?
+    end
+  end
+
+  def self.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
+
+  def self.append_response_headers(message, response)
+    found_content_type = false
+    if response.respond_to?(:headers)
+      response.headers.each do |name, value|
+        unless value.nil?
+          name = name.downcase
+          found_content_type = true if name =~ /^content-type/
+          message << ["response_header:#{name}", value]
+        end
+      end unless response.headers.nil?
+    end
+    unless found_content_type || response.content_type.nil?
+      message << ['response_header:content-type', response.content_type]
+    end
+  end
+
+  def self.append_value(message, key, value = nil)
+    unless key.nil?
+      unless value.nil?
+        case value
+          when Array
+            message << [key, value.join]
+          when String
+            message << [key, value]
+          else
+            message << [key, value.to_s]
+        end
+      end
+    end
+    message
+  end
+
+end

data/lib/resurfaceio/http_request_impl.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 class HttpRequestImpl
 

data/lib/resurfaceio/http_response_impl.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 class HttpResponseImpl
 

data/lib/resurfaceio/usage_loggers.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2017 Resurface Labs LLC
+# © 2016-2018 Resurface Labs LLC
 
 class UsageLoggers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resurfaceio-logger
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - RobDickinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - lib/resurfaceio/http_logger.rb
 - lib/resurfaceio/http_logger_for_rack.rb
 - lib/resurfaceio/http_logger_for_rails.rb
+- lib/resurfaceio/http_message_impl.rb
 - lib/resurfaceio/http_request_impl.rb
 - lib/resurfaceio/http_response_impl.rb
 - lib/resurfaceio/usage_loggers.rb