auto_logger 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd86c3c5cbb2c61ece0ecdcfee09a2f661e1d198d09d5c04f865148ca2ecd335
-  data.tar.gz: b626f9731dd67d2ae21caa5f7870eafa423c090fe54d76c95d068718e9202181
+  metadata.gz: 0f11f1f0a46aa7904f73ef2bdcf084469426331d06f2555ed622e7007aafa32b
+  data.tar.gz: d9be3d2f7c7eaa750f13a0e840632f7f5109ad7aac35df9176612e12851086f8
 SHA512:
-  metadata.gz: 86f85d96bc739a0f5cdb09d42e3fdf4e1b0350444c88a4a25230271eabcbb35c8148cdece1d2928c9e0e7f00d8cf45fdc4025af6c4db0058bd52febb46bc16d5
-  data.tar.gz: 920b696f4da460ecb3687fdb6216198dd3928fb05e45fafde4311e600970bee0a21caacad3cf35649b6411d122869ecfed3f1826cae80dbd17d1a8fb1752807b
+  metadata.gz: 87ad0c3b8cea74dfab805284b9db36f1d37e1a2edb967036c35db27808cf6755b03601c1a995f8540bafb4385df26e669e5a58a1ed23dfdb93a5d61eebea910d
+  data.tar.gz: cdcc3a79b885747d58e9d618185439ba5cedaabbbb55ea230893e1c5bc9de6d4e19f46464a1b984ef349973d60098830eed25ee793dffaf71c2b185dc5e4bc24

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 /log/*
+*.gem

data/Gemfile.lock

@@ -1,33 +1,44 @@
 PATH
   remote: .
   specs:
-    auto_logger (0.1.0)
+    auto_logger (0.1.7)
       activesupport
       beautiful-log
-      logger
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     awesome_print (1.8.0)
     beautiful-log (0.2.2)
       awesome_print (~> 1.8.0)
       colorize (~> 0.8.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.0.5)
-    i18n (1.1.0)
+    concurrent-ruby (1.1.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    logger (1.2.8)
+    logstash-event (1.2.02)
+    logstash-logger (0.26.1)
+      logstash-event (~> 1.2)
+    method_source (1.0.0)
     minitest (5.11.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     rake (10.5.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -35,8 +46,10 @@ PLATFORMS
 DEPENDENCIES
   auto_logger!
   bundler (~> 1.16)
+  logstash-logger
   minitest (~> 5.0)
+  pry-byebug
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

data/README.md

@@ -25,8 +25,10 @@ Or install it yourself as:
 
 ## Usage
 
+### Instance usage
+
 ```
-module SomeService
+class SomeService
   include AutoLogger
 
   def perform
@@ -35,6 +37,9 @@ module SomeService
 end
 ```
 
+
+### Grape example
+
 Иногда необходимо насильно указать имя файла для лога. Например при подключении
 в модули/класс без имени, в частности в grape-контролерах:
 
@@ -46,6 +51,30 @@ class PublicAPI::OrdersAPI < Grape::API
 end
 ```
 
+## Usage in module context
+
+```
+module Custom
+  extend AutoLogger
+
+  def self.perform
+     logger.info "Do..."
+  end
+end
+
+Custom.logger.info "Do.."
+```
+
+## Setup custom logger
+
+```
+AutoLogger.logger_builder = -> (tag, default_formatter) {
+  ActiveSupport::TaggedLogging
+    .new(LogStashLogger.new(type: :stdout))
+    .tagged(tag)
+}
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/auto_logger.gemspec

@@ -34,9 +34,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'beautiful-log'
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'logger'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'logstash-logger'
 end

data/lib/auto_logger.rb

@@ -28,14 +28,14 @@ require "auto_logger/named"
 module AutoLogger
   DEFAULT_LOG_DIR = './log'
 
-  mattr_accessor :log_dir
-
-  private
+  mattr_accessor :log_dir, :log_formatter, :logger_builder, :_cached_logger
 
   def logger
-    @logger ||= _build_auto_logger
+    _cached_logger ||= _build_auto_logger
   end
 
+  private
+
   # Логируем вместе с временем выполнения
   #
   def bm_log(message)
@@ -45,18 +45,18 @@ module AutoLogger
     res
   end
 
-  def _auto_logger_file_name
-    self.class.to_s.underscore.gsub('/','_')
+  def _auto_logger_tag
+    ([Class, Module].include?(self.class) ? self.name : self.class.name).underscore.gsub('/','_')
   end
 
   def _auto_logger_file
-    file = "#{_auto_logger_file_name}.log"
+    file = "#{_auto_logger_tag}.log"
 
     if log_dir.present?
       File.join(log_dir, file)
 
     elsif defined? Rails
-      Rails.root.join file
+      Rails.root.join 'log', file
 
     else
       File.join(DEFAULT_LOG_DIR, file)
@@ -64,11 +64,15 @@ module AutoLogger
   end
 
   def _log_formatter
-    !defined?(Rails) || Rails.env.test? ? Logger::Formatter.new : Formatter.new
+    @log_formatter || !defined?(Rails) || Rails.env.test? ? Logger::Formatter.new : Formatter.new
   end
 
   def _build_auto_logger
-    ActiveSupport::Logger.new(_auto_logger_file).
-      tap { |logger| logger.formatter = _log_formatter }
+    if logger_builder.nil?
+      ActiveSupport::Logger.new(_auto_logger_file).
+        tap { |logger| logger.formatter = _log_formatter }
+    else
+      logger_builder.call(_auto_logger_tag, _log_formatter)
+    end
   end
 end

data/lib/auto_logger/named.rb

@@ -3,7 +3,7 @@ module AutoLogger
     def self.new(name: nil)
       Module.new do
         include AutoLogger
-        define_method(:_auto_logger_file_name) { name }
+        define_method(:_auto_logger_tag) { name }
       end
     end
   end

data/lib/auto_logger/version.rb

@@ -1,3 +1,3 @@
 module AutoLogger
-  VERSION = "0.1.2"
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auto_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Danil Pismenny
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beautiful-log
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: logger
-  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
@@ -94,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mixin that adds `logger` method authomatically configured to use log
   name from module/class
 email:
@@ -137,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: "'logger' method configured with class/module name"