prefab-cloud-ruby 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f56ee15a73bef27dbb37cfbc4df7b1004543664ea7b5defc5ae6afbb738a4c23
-  data.tar.gz: 151d525aca5d58ee1098fed1f6e87037ee6b2cc8570985f2a922ec028cc3d394
+  metadata.gz: d1d4612e27cae5a4e66065a16d8d70cb0b1c7120770eac8c7e09ce3ca0e48e82
+  data.tar.gz: 1d1f50b6b4605729b93d62194b17ed9a1fca739f435ec2a4e682482a293bffe6
 SHA512:
-  metadata.gz: 9d48de76dc679c635a9530625aa0feedd6ddb9193023b98e5c24247f6eded562e9ffcca770116dc5a1bc7dc60a0e7fad2f828f31b791c771c7d3aa587daf77bd
-  data.tar.gz: da2371a89c4886ac22d2ce5ef0b7b2e8b732aa8ac2600a699b1598cc1c9138c9a99e075df944d911f790f385ffea81c2b186aaf29d6b40ed7c5f05247d41d22b
+  metadata.gz: ed5a04b2a16a79b0963d9af2dd71955141fdd06e7d73a4897adf74245435cf33239f78b08bbde797b7420b7e988fbb76e5e4333e6da5350f1037502949c469e7
+  data.tar.gz: 1b6f556bb94a31c272d5cd3c585860cacb4698be61830379c1a1a7e2d2fdcb461c02777e0c6fdb6a2cc939dcb070a27237506bd3c21d69ccd723ec50dccfbf2a

data/VERSION

@@ -1 +1 @@
-0.19.0
+0.20.0

data/lib/prefab/logger_client.rb

@@ -43,15 +43,13 @@ module Prefab
     end
 
     def log(message, path, progname, severity, &block)
-      level = level_of(path)
-      progname = "#{path}: #{progname}"
       severity ||= Logger::UNKNOWN
-      if @logdev.nil? || severity < level || @silences[local_log_id]
+      if @logdev.nil? || severity < level_of(path) || @silences[local_log_id]
         return true
       end
-      if progname.nil?
-        progname = @progname
-      end
+
+      progname = "#{path}: #{progname || @progname}"
+
       if message.nil?
         if block_given?
           message = yield
@@ -60,6 +58,7 @@ module Prefab
           progname = @progname
         end
       end
+
       @logdev.write(
         format_message(format_severity(severity), Time.now, progname, message))
       true

data/lib/prefab/options.rb

@@ -19,7 +19,7 @@ module Prefab
     attr_reader :prefab_envs
 
     DEFAULT_LOG_FORMATTER = proc { |severity, datetime, progname, msg|
-      "#{severity.ljust(5)} #{datetime}: #{progname} #{msg}\n"
+      "#{severity.ljust(5)} #{datetime}:#{" " if progname}#{progname} #{msg}\n"
     }
 
     module ON_INITIALIZATION_FAILURE

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.19.0 ruby lib
+# stub: prefab-cloud-ruby 0.20.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.19.0"
+  s.version = "0.20.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2022-11-19"
+  s.date = "2022-12-02"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/test_logger.rb

@@ -115,18 +115,54 @@ class TestCLogger < Minitest::Test
     prefix = 'my.own.prefix'
     message = 'this is a test'
 
-    io = StringIO.new
-    options = Prefab::Options.new(logdev: io, log_prefix: prefix, prefab_datasources: Prefab::Options::DATASOURCES::LOCAL_ONLY)
-    prefab = Prefab::Client.new(options)
+    prefab, io = captured_logger(log_prefix: prefix)
 
     prefixed_logger = prefab.log
     prefixed_logger.error message
 
-    assert_logged io.string, 'ERROR', "#{prefix}.test.test_logger.test_logging_with_prefix", message
+    assert_logged io, 'ERROR', "#{prefix}.test.test_logger.test_logging_with_prefix", message
+  end
+
+  def test_logging_without_a_progname
+    prefab, io = captured_logger
+    message = "MY MESSAGE"
+
+    prefab.log.error message
+
+    assert_logged io, 'ERROR', "test.test_logger.test_logging_without_a_progname", message
+  end
+
+  def test_logging_without_a_progname_or_message
+    prefab, io = captured_logger
+
+    prefab.log.error
+
+    assert_logged io, 'ERROR', "test.test_logger.test_logging_without_a_progname_or_message", ""
+  end
+
+  def test_logging_with_a_progname
+    prefab, io = captured_logger
+    message = "MY MESSAGE"
+
+    prefab.log.progname = "MY_PROGNAME"
+    prefab.log.error message
+
+    assert_logged io, 'ERROR', "MY_PROGNAME test.test_logger.test_logging_with_a_progname", message
+  end
+
+  def test_logging_with_a_progname_and_no_message
+    prefab, io = captured_logger
+
+    prefab.log.progname = "MY_PROGNAME"
+    prefab.log.error
+
+    assert_logged io, 'ERROR', "MY_PROGNAME test.test_logger.test_logging_with_a_progname_and_no_message", "MY_PROGNAME"
   end
 
-  def assert_logged(log_line, level, path, message)
-    assert_match(/#{level} \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]?\d+:  #{path}: #{message}\n/, log_line)
+  private
+
+  def assert_logged(logged_io, level, path, message)
+    assert_match(/#{level} \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]?\d+: #{path}: #{message}\n/, logged_io.string)
   end
 
   def mock_logger_expecting pattern, configs = {}, calls: 1
@@ -144,4 +180,15 @@ class TestCLogger < Minitest::Test
     logger.set_config_client(MockConfigClient.new(configs))
     [logger, mock_logdev]
   end
+
+  def captured_logger(options = {})
+    io = StringIO.new
+    options = Prefab::Options.new(**options.merge(
+      logdev: io,
+      prefab_datasources: Prefab::Options::DATASOURCES::LOCAL_ONLY
+    ))
+    prefab = Prefab::Client.new(options)
+
+    return [prefab, io]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-19 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby