prefab-cloud-ruby 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a092713ab6a3e93c9597c9457144769d954679877d35cfa21550880fb30251
-  data.tar.gz: 43aaa1cadb70983991ea7f2908d5986c47579e9057574a8cd623f4a12d2e4e3e
+  metadata.gz: d9225ebaadf8be997d152b66cb58ff342d126bc5cfbe489511af4791d89dd5f7
+  data.tar.gz: cbaf511c7aeaf0ef743b33c2ad00c40bd4d6c8ddba0a17ddff541afeb8e055d9
 SHA512:
-  metadata.gz: 8392d08f8bdd0b6bfd89e1b1ad32fb3e1161e60f8b2ad54984d0cc1795b91476061c7b38a770263a48d217072d8562e6d4dd1b348c975f22cab092e25d017806
-  data.tar.gz: c6fc0b30a9f52d850b1e6422932691b47004a29738cf8adeafada21d734392630df00d081b4dc230a8a0ba2148ebf4d12610a4d17d3791eb02104097fce86b96
+  metadata.gz: f00e343e6f3f7a7f11351409708979c4e02420eae8bf8d9520cdc58de464b682158b863bcab88b4583c469709c621f066bd8995e482963386b931c877bfd2b1f
+  data.tar.gz: 5e51d64d2d5adc738e5f8438cd222ae3e4d9fc1f183a789d25486da7197b25c3263fff9a0fac9b33a9acffc169e035630e7a8cb8b3d3770e9e8b669d34b96f68

data/VERSION

@@ -1 +1 @@
-0.17.0
+0.18.0

data/lib/prefab/logger_client.rb

@@ -4,7 +4,7 @@ module Prefab
 
     SEP = "."
     BASE_KEY = "log-level"
-    UNKNOWN = "unknown"
+    UNKNOWN_PATH = "unknown."
 
     LOG_LEVEL_LOOKUPS = {
       Prefab::LogLevel::NOT_SET_LOG_LEVEL => Logger::DEBUG,
@@ -36,7 +36,7 @@ module Prefab
     def log_internal(message, path, progname, severity, &block)
       level = level_of(path)
       progname = "#{path}: #{progname}"
-      severity ||= UNKNOWN
+      severity ||= Logger::UNKNOWN
       if @logdev.nil? || severity < level || @silences[local_log_id]
         return true
       end
@@ -119,7 +119,7 @@ module Prefab
 
     # Find the closest match to 'log_level.path' in config
     def level_of(path)
-      closest_log_level_match = @config_client.get(BASE_KEY, Prefab::LogLevel::WARN)
+      closest_log_level_match = @config_client.get(BASE_KEY, :WARN)
       path.split(SEP).inject([BASE_KEY]) do |memo, n|
         memo << n
         val = @config_client.get(memo.join(SEP), nil)
@@ -128,7 +128,8 @@ module Prefab
         end
         memo
       end
-      LOG_LEVEL_LOOKUPS[closest_log_level_match]
+      closest_log_level_match_int = Prefab::LogLevel.resolve(closest_log_level_match)
+      LOG_LEVEL_LOOKUPS[closest_log_level_match_int]
     end
 
     def get_loc_path(loc)
@@ -139,7 +140,7 @@ module Prefab
     # sanitize & clean the path of the caller so the key
     # looks like log_level.app.models.user
     def get_path(absolute_path, base_label)
-      path = (absolute_path || UNKNOWN).dup
+      path = (absolute_path || UNKNOWN_PATH).dup
       path.slice! Dir.pwd
       path.gsub!(/(.*)?(?=\/lib)/im, "") # replace everything before first lib
 
@@ -154,7 +155,7 @@ module Prefab
   # since it may log
   class BootstrappingConfigClient
     def get(key, default = nil)
-      ENV["PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL"] ? Prefab::LogLevel.resolve(ENV["PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL"].upcase.to_sym) : default
+      ENV["PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL"] ? ENV["PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL"].upcase.to_sym : default
     end
   end
 end

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.17.0 ruby lib
+# stub: prefab-cloud-ruby 0.18.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.17.0"
+  s.version = "0.18.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-10-11"
+  s.date = "2022-10-14"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/test_logger.rb

@@ -20,6 +20,9 @@ class TestCLogger < Minitest::Test
     assert_equal "active_support.log_subscriber.info",
                  @logger.get_path("/Users/jeffdwyer/.asdf/installs/ruby/3.1.2/lib/ruby/gems/3.1.0/gems/activesupport-7.0.2.4/lib/active_support/log_subscriber.rb:130:in `info'",
                                   "info")
+    assert_equal "unknown.info",
+                 @logger.get_path(nil,
+                                  "info")
   end
 
   def test_loc_resolution
@@ -44,24 +47,61 @@ class TestCLogger < Minitest::Test
     with_env("PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL", "info") do
       # env var overrides the default level
       assert_equal Logger::INFO,
-        @logger.level_of("app.models.user"), "PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL is info"
+                   @logger.level_of("app.models.user"), "PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL is info"
 
       @logger.set_config_client(MockConfigClient.new({}))
       assert_equal Logger::WARN,
-                  @logger.level_of("app.models.user"), "default is warn"
+                   @logger.level_of("app.models.user"), "default is warn"
 
-      @logger.set_config_client(MockConfigClient.new("log-level.app" => Prefab::LogLevel::INFO))
+      @logger.set_config_client(MockConfigClient.new("log-level.app" => :INFO))
       assert_equal Logger::INFO,
-                  @logger.level_of("app.models.user")
+                   @logger.level_of("app.models.user")
 
-      @logger.set_config_client(MockConfigClient.new("log-level.app" => Prefab::LogLevel::DEBUG))
+      @logger.set_config_client(MockConfigClient.new("log-level.app" => :DEBUG))
       assert_equal Logger::DEBUG,
-                  @logger.level_of("app.models.user")
+                   @logger.level_of("app.models.user")
 
-      @logger.set_config_client(MockConfigClient.new("log-level.app" => Prefab::LogLevel::DEBUG,
-                                                    "log-level.app.models" => Prefab::LogLevel::ERROR))
+      @logger.set_config_client(MockConfigClient.new("log-level.app" => :DEBUG,
+                                                     "log-level.app.models" => :ERROR))
       assert_equal Logger::ERROR,
-                  @logger.level_of("app.models.user"), "test leveling"
+                   @logger.level_of("app.models.user"), "test leveling"
+    end
+  end
+
+  def test_log_internal
+    logger, mock_logdev = mock_logger_expecting /W, \[.*\]  WARN -- test.path: : test message/
+    logger.log_internal("test message", "test.path", "", Logger::WARN)
+    mock_logdev.verify
+  end
+
+  def test_log_internal_unknown
+    logger, mock_logdev = mock_logger_expecting /A, \[.*\]   ANY -- test.path: : test message/
+    logger.log_internal("test message", "test.path", "", Logger::UNKNOWN)
+    mock_logdev.verify
+  end
+
+  def test_log_internal_silencing
+    logger, mock_logdev = mock_logger_expecting /W, \[.*\]  WARN -- test.path: : should log/, calls: 2
+    logger.silence do
+      logger.log_internal("should not log", "test.path", "", Logger::WARN)
+    end
+    logger.log_internal("should log", "test.path", "", Logger::WARN)
+    mock_logdev.verify
+  end
+
+  def mock_logger_expecting pattern, configs = {}, calls: 1
+    mock_logdev = Minitest::Mock.new
+    mock_logdev.expect :write, nil do |arg|
+      pattern.match(arg)
     end
+
+    calls.times.each do
+      mock_logdev.expect(:nil?, false)
+    end
+
+    logger = Prefab::LoggerClient.new($stdout)
+    logger.instance_variable_set('@logdev', mock_logdev)
+    logger.set_config_client(MockConfigClient.new(configs))
+    [logger, mock_logdev]
   end
 end

metadata

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