ree_lib 1.0.27 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a595f2a5ec4f7c044a86ecfdfd0e631fee7b3b4f000ca29673189f0660936b18
-  data.tar.gz: 9b179fdb9527e329d1c784c6fbb04f168e5b95e070fda44f1044d90776486063
+  metadata.gz: 84e4aade5b4eaae42f95c7664db6dd35ea318caf734d2890482d8e6d8fec060a
+  data.tar.gz: 65969441395458b1520c85e1f71dc610e8d2787a1c2cdcc493477eff93c0fa9a
 SHA512:
-  metadata.gz: 3ba5209c69d69b970340659a20fe07b2382e7aa7f84615c696da2925010fe19dff31eec1707a7436898b749ce09aa6e8240ce400cab5911044e324ac1ca168f9
-  data.tar.gz: 18fc8a1eeb6684d426349ec9f97f4f537c505e20f02bfd6175611b1f25b6ca206e9a2306b0a955527eb54aebd2bf17e326f152f4c45112c7251f957c8588d289
+  metadata.gz: a486a292e460edfd1ffb3304d7168ae8f5c9c615c6ae2b32dce08fa661f76f081b9082faa35b5077b43dc28fa0aa39dfb9eb7917fada4736e94cf7c0bbbc2260
+  data.tar.gz: 6582341e1519c1e06261d1c1e8faa85106e26c12ea4afe7f2a6788fcbf5d19f2c14c39e32b3f29e4ffa7c1bceba052608cbc5d9fdd39245ca09dbcf031dcd12b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.27)
+    ree_lib (1.0.29)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -22,7 +22,7 @@ GEM
       msgpack (~> 1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -36,9 +36,9 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
-    nokogiri (1.13.10-x86_64-darwin)
+    nokogiri (1.14.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.5)
@@ -46,7 +46,7 @@ GEM
     racc (1.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    ree (1.0.14)
+    ree (1.0.18)
       commander (~> 4.6.0)
     rexml (3.2.5)
     rollbar (3.3.3)
@@ -66,7 +66,7 @@ GEM
     sequel (5.58.0)
     sqlite3 (1.4.4)
     timecop (0.9.6)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_pg_connection.rb

@@ -25,6 +25,7 @@ class ReeDao::BuildPgConnection
       sslrootcert?: String,
       search_path?: String,
       use_iso_date_format?: Bool,
+      max_connections?: Integer,
     },
     Ksplat[
       RestKeys => Any # inherited from `build_connection` opts

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_sqlite_connection.rb

@@ -13,6 +13,7 @@ class ReeDao::BuildSqliteConnection
       database: String,
       readonly?: Bool,
       timeout?: Integer,
+      max_connections?: Integer,
     },
     Ksplat[
       RestKeys => Any # inherited from `build_connection` opts

data/lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_pg_connection.schema.json

@@ -16,7 +16,7 @@
       "args": [
         {
           "arg": "conn_opts",
-          "type": "{:conn_str? => String, :adapter => String, :database? => String, :encoding? => String, :user? => String, :password? => String, :host? => String, :port? => String, :convert_infinite_timestamps? => Or[string, nil, float], :connect_timeout? => Integer, :driver_options? => Hash, :notice_receiver? => Proc, :sslmode? => Or[disable, allow, prefer, require, verify-ca, verify-full...], :sslrootcert? => String, :search_path? => String, :use_iso_date_format? => Bool}"
+          "type": "{:conn_str? => String, :adapter => String, :database? => String, :encoding? => String, :user? => String, :password? => String, :host? => String, :port? => String, :convert_infinite_timestamps? => Or[string, nil, float], :connect_timeout? => Integer, :driver_options? => Hash, :notice_receiver? => Proc, :sslmode? => Or[disable, allow, prefer, require, verify-ca, verify-full...], :sslrootcert? => String, :search_path? => String, :use_iso_date_format? => Bool, :max_connections? => Integer}"
         },
         {
           "arg": "opts",

data/lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_sqlite_connection.schema.json

@@ -16,7 +16,7 @@
       "args": [
         {
           "arg": "conn_opts",
-          "type": "{:database => String, :readonly? => Bool, :timeout? => Integer}"
+          "type": "{:database => String, :readonly? => Bool, :timeout? => Integer, :max_connections? => Integer}"
         },
         {
           "arg": "opts",

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection/max_connections_spec.rb

@@ -0,0 +1,10 @@
+package_require('ree_dao')
+
+RSpec.describe :build_sqlite_connection do
+  link :build_sqlite_connection, from: :ree_dao
+
+  it {
+    db = build_sqlite_connection({database: 'sqlite_db', max_connections: 2})
+    expect(db.pool.max_size).to eq 2
+  }
+end

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.29"
 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.29
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -260,6 +260,7 @@ files:
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/one_to_one.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/persist_assoc.schema.json
 - lib/ree_lib/packages/ree_dao/spec/package_schema_spec.rb
+- lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection/max_connections_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/one_to_many_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/one_to_one_spec.rb