pier_logging 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7b8e8a3faa275bd06c3c99bc040674438cad11985026b2eebca94d8d7cceb7
-  data.tar.gz: a543d0ec8e3041658df53bdb74c05c3aae9c859f3117d4dd6d848fb2ed06e249
+  metadata.gz: 5790108eb8d4e852835319b5ab0aa479b0484a4a7c8557b6c3ed71ceaaae704d
+  data.tar.gz: 7c8e4d8772b28bb31ee8cd554635bf5b58394a37f8d8a2bff2f97be79e1d8a04
 SHA512:
-  metadata.gz: e7d627a1ee316a282b4399d1b780aa2b62a1c7aefaa2fbee3380472dd4ef4d21a9ab5084fd228b4625d34508a901d3651d65db485f45d95d7967b5414159a6c8
-  data.tar.gz: dbce9f07acd69a6643ec8de023b1ffb5dc293002a6a2283ead3ebe2ba9153d5dd1d1cfade9d1fcad94019d3686e19354547dab380c4eb26570cacf0bc5e854fc
+  metadata.gz: 8c6c86e0fb40803784e7225db81e331d4b7b3de3372cf0311632b098c017c8e434358365de96b9f5d55da061714d314f8ac5c1926a8cab6b3892f9f6cdb1a1c0
+  data.tar.gz: f95d6ae0abd0756e597cf8333e156a4f9ecf163737ccd418552f12d496fd8b1387c642c9a28a129ada40dbeacdb3db3bc13d022e285a0cb9baddca118292653e

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    pier_logging (0.1.2)
+    pier_logging (0.1.7)
       awesome_print
+      facets
       ougai
       rails
 
@@ -70,6 +71,7 @@ GEM
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     erubi (1.9.0)
+    facets (3.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.8.3)

data/lib/pier_logging.rb

@@ -1,11 +1,15 @@
 require "rails"
 require "ougai"
+require "awesome_print"
+require "facets/hash/traverse"
 require "pier_logging/version"
 require "pier_logging/logger"
 require "pier_logging/request_logger"
 require "pier_logging/formatter/base"
 require "pier_logging/formatter/json"
 require "pier_logging/formatter/readable"
+require "pier_logging/helpers/headers"
+require "pier_logging/helpers/env_config"
 
 module PierLogging
   def self.logger_configuration

data/lib/pier_logging/helpers/env_config.rb

@@ -0,0 +1,48 @@
+module PierLogging
+  module Helpers
+    class EnvConfig
+      def self.for(logger = nil, log_dir: 'log', log_file: PierLogging.logger_configuration.env)
+        {
+          enabled: log_enabled(logger),
+          output: log_output(logger, log_dir, log_file),
+          level: log_level(logger),
+        }
+      end
+
+      private
+
+      def self.log_output(logger, log_dir, log_file)
+        return nil unless log_enabled(logger)
+        log_output_env = ENV.fetch(output_env_var(logger), 'STDOUT').upcase
+        log_output_env == 'STDOUT' ? STDOUT : output_file_name(log_dir, log_file)
+      end
+
+      def self.log_enabled(logger)
+        ENV.fetch(enabled_env_var(logger), 'true') == 'true'
+      end
+
+      def self.log_level(logger)
+        ENV.fetch(level_env_var(logger), 'info').upcase
+      end
+
+      def self.output_env_var(logger)
+        ['LOG', logger ,'OUTPUT'].compact.join('_').upcase
+      end
+
+      def self.enabled_env_var(logger)
+        ['LOG', logger ,'ENABLED'].compact.join('_').upcase
+      end
+
+      def self.level_env_var(logger)
+        ['LOG', logger ,'LEVEL'].compact.join('_').upcase
+      end
+
+      def self.output_file_name(log_dir, log_file)
+        [
+          [ log_dir, log_file ].join('/'),
+          'log'
+        ].join('.')
+      end
+    end
+  end
+end

data/lib/pier_logging/request_logger.rb

@@ -87,16 +87,15 @@ module PierLogging
     end
 
     def parse_body(body)
-      if body.is_a? String # when string
-        Oj.load(body, allow_blank: true)
-      elsif body.is_a? Array # Grape body
-        Oj.load(body.last, allow_blank: true)
-      elsif body.is_a? ActionDispatch::Response::RackBody # Rails body
-        Oj.load(body.body, allow_blank: true)
-      else
-        body
-      end
+      body_object = get_body_object(body)
+      Oj.load(body_object, allow_blank: true)
     rescue
+      body_object || body
+    end
+
+    def get_body_object(body)
+      return body.last if body.is_a? Array # Grape body
+      return body.body if body.is_a? ActionDispatch::Response::RackBody # Rails body
       body
     end
 

data/lib/pier_logging/version.rb

@@ -1,3 +1,3 @@
 module PierLogging
-  VERSION = "0.1.6"
+  VERSION = "0.1.11"
 end

data/pier_logging.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ougai"
   spec.add_dependency "awesome_print"
   spec.add_dependency "rails"
+  spec.add_dependency "facets"
 
   spec.add_development_dependency "bundler", ">= 2.1.4"
   spec.add_development_dependency "rake", ">= 12.3.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pier_logging
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Mauricio Banduk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ougai
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +149,7 @@ files:
 - lib/pier_logging/formatter/base.rb
 - lib/pier_logging/formatter/json.rb
 - lib/pier_logging/formatter/readable.rb
+- lib/pier_logging/helpers/env_config.rb
 - lib/pier_logging/helpers/headers.rb
 - lib/pier_logging/logger.rb
 - lib/pier_logging/request_logger.rb