ree_lib 1.0.27 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a595f2a5ec4f7c044a86ecfdfd0e631fee7b3b4f000ca29673189f0660936b18
-  data.tar.gz: 9b179fdb9527e329d1c784c6fbb04f168e5b95e070fda44f1044d90776486063
+  metadata.gz: 1dee10604487127cc63af20d01924626af8cdd4e5559a1b8716d2065f2ef0c95
+  data.tar.gz: 742e3d4ec4990eb9989cf904e7fb3eb5ed4eb6d06e5c3791a3188f1ec22cc7b5
 SHA512:
-  metadata.gz: 3ba5209c69d69b970340659a20fe07b2382e7aa7f84615c696da2925010fe19dff31eec1707a7436898b749ce09aa6e8240ce400cab5911044e324ac1ca168f9
-  data.tar.gz: 18fc8a1eeb6684d426349ec9f97f4f537c505e20f02bfd6175611b1f25b6ca206e9a2306b0a955527eb54aebd2bf17e326f152f4c45112c7251f957c8588d289
+  metadata.gz: 54aa51badb91b3b3dba8ff6429d3f219bb17e099fb22b0202b6a8a72a65ab0425c56d5237df5fb7a27b8622db2a3f7b453162a6a7d2fc4681acb5c4bda2f840b
+  data.tar.gz: 75729a0e3b80a7e57e18ba4a3c45a41a96d31dab16868e168e4a31e564166f32b2783ee16c0f4e27412c4edb56d01795875ca5e4d153159d68d71fa961aa3c2e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.27)
+    ree_lib (1.0.28)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)

data/lib/ree_lib/packages/ree_logger/package/ree_logger/multi_logger.rb

@@ -1,10 +1,10 @@
 class ReeLogger::MultiLogger < Logger
   include Ree::LinkDSL
 
-  link 'ree_logger/rate_limiter', -> { RateLimiter }
-  link 'ree_logger/log_event', -> { LogEvent }
-  link :transform_values, from: :ree_hash
   link :as_json, from: :ree_object
+  link :transform_values, from: :ree_hash
+  link 'ree_logger/log_event', -> { LogEvent }
+  link 'ree_logger/rate_limiter', -> { RateLimiter }
 
   undef level=
   undef datetime_format
@@ -26,7 +26,7 @@ class ReeLogger::MultiLogger < Logger
     Nilor[String],
     Nilor[RateLimiter],
     Nilor[ArrayOf[String]] => Any
-  )
+  ).throws(ArgumentError)
   def initialize(progname, rate_limiter, filter_words)
     @progname = progname
     @rate_limiter = rate_limiter
@@ -57,34 +57,64 @@ class ReeLogger::MultiLogger < Logger
     @silenced = false
   end
 
-  contract(String, Hash, Nilor[Exception], Bool => nil)
-  def debug(message, parameters = {}, exception = nil, log_args = false)
-    log(:debug, message, parameters, nil, false)
+  contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
+  def debug(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil, &block)
+    if block_given?
+      log(:debug, yield, parameters, nil, log_args)
+    else
+      msg = get_message(message)
+      log(:debug, msg, parameters, nil, log_args)
+    end
   end
 
-  contract(String, Hash, Nilor[Exception], Bool => nil)
-  def info(message, parameters = {}, exception = nil, log_args = false)
-    log(:info, message, parameters, nil)
+  contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
+  def info(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil,  &block)
+    if block_given?
+      log(:info, yield, parameters, nil, log_args)
+    else
+      msg = get_message(message)
+      log(:info, msg, parameters, nil)
+    end
   end
 
-  contract(String, Hash, Nilor[Exception], Bool => nil)
-  def warn(message, parameters = {}, exception = nil, log_args = false)
-    log(:warn, message, parameters, nil)
+  contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
+  def warn(message = nil, parameters = {}, exception = nil, log_args = false, progname = nil,  &block)
+    if block_given?
+      log(:warn, yield, parameters, nil, log_args)
+    else
+      msg = get_message(message)
+      log(:warn, msg, parameters, nil)
+    end
   end
 
-  contract(String, Hash, Nilor[Exception], Bool => nil)
-  def error(message, parameters = {}, exception = nil, log_args = true)
-    log(:error, message, parameters, exception, log_args)
+  contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
+  def error(message = nil, parameters = {}, exception = nil, log_args = true, progname = nil,  &block)
+    if block_given?
+      log(:error, yield, parameters, exception, log_args)
+    else
+      msg = get_message(message)
+      log(:error, msg, parameters, exception, log_args)
+    end
   end
 
-  contract(String, Hash, Nilor[Exception], Bool => nil)
-  def fatal(message, parameters = {}, exception = nil, log_args = true)
-    log(:error, message, parameters, exception, true)
+  contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
+  def fatal(message = nil, parameters = {}, exception = nil, log_args = true, progname = nil,  &block)
+    if block_given?
+      log(:error, yield, parameters, exception, log_args)
+    else
+      msg = get_message(message)
+      log(:error, msg, parameters, exception, log_args)
+    end
   end
 
-  contract(String, Hash, Nilor[Exception], Bool => nil)
-  def unknown(message, parameters = {}, exception = nil, log_args = true)
-    log(:unknown, message, parameters, exception, true)
+  contract(Nilor[String], Hash, Nilor[Exception], Bool, Nilor[String], Optblock => nil)
+  def unknown(message = nil, parameters = {}, exception = nil, log_args = true, progname = nil,  &block)
+    if block_given?
+      log(:unknown, yield, parameters, exception, log_args)
+    else
+      msg = get_message(message)
+      log(:unknown, msg, parameters, exception, log_args)
+    end
   end
 
   contract(Symbol, String, Hash, Nilor[Exception], Bool => nil)
@@ -158,4 +188,8 @@ class ReeLogger::MultiLogger < Logger
   def higher_or_equal_level?(message_level, appender_level)
     LEVEL_MAPPING[message_level] >= LEVEL_MAPPING[appender_level]
   end
+
+  def get_message(message)
+    message || (raise ArgumentError.new("message should be given"))
+  end
 end

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/multi_logger_spec.rb

@@ -81,6 +81,12 @@ RSpec.describe ReeLogger::MultiLogger do
     expect(File.read(log_file_path)).to match("hello world")
   }
 
+  it {
+    expect { logger_with_appenders.info {'block message'} }.to output(/block message/).to_stdout
+    expect(Rollbar).to have_received(:log)
+    expect(File.read(log_file_path)).to match("block message")
+  }
+
   it {
     expect { logger_with_appenders.info('hello world', { param: 1, another_param: { name: 'John'}, password: 'password01' }) }.to output(/John/).to_stdout
     expect(Rollbar).to have_received(:log)
@@ -136,6 +142,4 @@ RSpec.describe ReeLogger::MultiLogger do
       end
     }.to_not output.to_stdout
   }
-
-
 end

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.27"
+  VERSION = "1.0.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.28
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree