salestation 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2f1a0952d479679a0e165cab5e87f2d5a6d49b7
-  data.tar.gz: 2b4a7e851aad8310f98c001fb8a0452fe757a244
+SHA256:
+  metadata.gz: dc82a6d835313f9a3dc307f08087dde23916dabccc6805aee7d4e2c8e1f7b9b2
+  data.tar.gz: a0088243adf9f2dae6c119b86c836138627475cc1a11a9b07a7171ff9adcecc2
 SHA512:
-  metadata.gz: f993f4a6ee270c184337a32098346693ccc2eaaa8a2dc7ccfa195a2a4350f958f3542986330db96e82cb069f872b764623f28d0a8d8c9536110ebdeed9e5b619
-  data.tar.gz: ec9f62fceec3395c27d0ed8fd719ae3b5454ca0dc5e22bd6703ebbc25c7118b1d9747ad3a95acca423973f0f33aefc9f8d8bdf764a92c005a642d0ca86d784a8
+  metadata.gz: 82e2007245ee0fc1c1f0170f063c658d837af57df50f126bcaae10eb3b245f5c895699010f8013ccbbd3d8333f1ec187beceb6f994061d7385b488f1ac33a890
+  data.tar.gz: 2c4510ad5f22ab4e548197dca991b68bf238d166572a5b63eb0d579139a9c47feb31ad43638670bcf79617bd8fc3c021f9d2c48a86afa3af1b8d3a5d915768a8

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.4
-before_install: gem install bundler -v 1.13.6
+  - 2.4
+  - 2.5
+before_install: gem install bundler -v 1.17.3

data/lib/salestation/app/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class App
     module Errors

data/lib/salestation/app/input_verification.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class App
     module InputVerification

data/lib/salestation/app/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class App
     class Request

data/lib/salestation/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'deterministic'
 require 'dry-struct'
 require 'dry-types'

data/lib/salestation/result_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   module ResultHelper
     def observe(&block)

data/lib/salestation/web/active_record_connection_management.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class Web < Module
     class ActiveRecordConnectionManagement

data/lib/salestation/web/error_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class Web < Module
     class ErrorMapper

data/lib/salestation/web/extractors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class Web < Module
     module Extractors

data/lib/salestation/web/request_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 require 'json'
 
@@ -5,15 +7,15 @@ module Salestation
   class Web < Module
     class RequestLogger
 
-      REMOTE_ADDR = 'REMOTE_ADDR'.freeze
-      REQUEST_URI = 'REQUEST_URI'.freeze
-      REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-      QUERY_STRING   = 'QUERY_STRING'.freeze
-      CONTENT_TYPE = 'CONTENT_TYPE'.freeze
-      HTTP_USER_AGENT = 'HTTP_USER_AGENT'.freeze
-      HTTP_ACCEPT = 'HTTP_ACCEPT'.freeze
-      SERVER_NAME = 'SERVER_NAME'.freeze
-      JSON_CONTENT_TYPE = 'application/json'.freeze
+      REMOTE_ADDR = 'REMOTE_ADDR'
+      REQUEST_URI = 'REQUEST_URI'
+      REQUEST_METHOD = 'REQUEST_METHOD'
+      QUERY_STRING = 'QUERY_STRING'
+      CONTENT_TYPE = 'CONTENT_TYPE'
+      HTTP_USER_AGENT = 'HTTP_USER_AGENT'
+      HTTP_ACCEPT = 'HTTP_ACCEPT'
+      SERVER_NAME = 'SERVER_NAME'
+      JSON_CONTENT_TYPE = 'application/json'
 
       def initialize(app, logger, log_response_body: true)
         @app = app
@@ -22,23 +24,18 @@ module Salestation
       end
 
       def call(env)
-        request_id = SecureRandom.hex(4)
-        request_logger = Logger.new(@logger, request_id)
-
-        env['request_logger'] = request_logger
         began_at = Time.now
 
-        request_logger.info('Received request', request_log(env))
         @app.call(env).tap do |status, headers, body|
           type = status >= 500 ? :error : :info
-          request_logger.public_send(type, 'Processed request', response_log(env, status, headers, body, began_at))
+          @logger.public_send(type, 'Processed request', response_log(env, status, headers, body, began_at))
         end
       end
 
       private
 
-      def request_log(env)
-        {
+      def response_log(env, status, headers, body, began_at)
+        log = {
           remote_addr:  env[REMOTE_ADDR],
           method:       env[REQUEST_METHOD],
           path:         env[REQUEST_URI],
@@ -46,50 +43,32 @@ module Salestation
           content_type: env[CONTENT_TYPE],
           http_agent:   env[HTTP_USER_AGENT],
           http_accept:  env[HTTP_ACCEPT],
-          server_name:  env[SERVER_NAME]
+          server_name:  env[SERVER_NAME],
+          status:       status,
+          duration:     Time.now - began_at,
+          headers:      headers
         }
-      end
-
-      def response_log(env, status, headers, body, began_at)
-        response_payload =
-          if status >= 400
-            { error: parse_body(body, env) }
-          elsif @log_response_body
-            { body: parse_body(body, env) }
-          else
-            {}
-          end
 
-        {
-          path: env[REQUEST_URI],
-          method: env[REQUEST_METHOD],
-          status: status,
-          duration: Time.now - began_at,
-          headers: headers
-        }.merge(response_payload)
-      end
-
-      def parse_body(body, env)
-        begin
-          # Rack body is an array
-          return {} if body.empty?
-          JSON.parse(body.join)
-        rescue Exception
-          {error: 'Failed to parse response body'}
+        if status >= 400
+          log[:error] = parse_body(body)
+        elsif @log_response_body
+          log[:body] = parse_body(body)
         end
+
+        log
       end
 
-      class Logger
-        def initialize(logger, request_id)
-          @logger = logger
-          @request_id = request_id
-        end
+      def parse_body(body)
+        # Rack body is an array
+        return {} if body.empty?
 
-        [:debug, :info, :warn, :error].each do |name|
-          define_method(name) do |msg, metadata = {}|
-            @logger.public_send(name, msg, metadata.merge(request_id: @request_id))
-          end
+        if defined?(Oj)
+          Oj.load(body.join)
+        else
+          JSON.parse(body.join)
         end
+      rescue Exception
+        {error: 'Failed to parse response body'}
       end
     end
   end

data/lib/salestation/web/responses.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class Web < Module
     module Responses

data/lib/salestation/web/statsd_middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Salestation
   class Web < Module
     class StatsdMiddleware

data/lib/salestation/web.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'deterministic'
 require 'dry-struct'
 require 'dry-types'

data/lib/salestation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './salestation/app'
 require_relative './salestation/web'
 

data/salestation.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "salestation"
-  spec.version       = "1.0.2"
+  spec.version       = "2.0.0"
   spec.authors       = ["SaleMove TechMovers"]
   spec.email         = ["techmovers@salemove.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salestation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''