intake 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b845805181f81717bfc41734b8f35905d0adff760ba182e95c9ece95285d7a4e
-  data.tar.gz: 19e290811468e20994441c4ea2f2747b81cfbc36d257ae1d9eadd1a18713c705
+  metadata.gz: 0da496aeddc3a2af915242e66b0dde99077f9db6fad39b1aa608db88c4b3c7d7
+  data.tar.gz: 3e6f74f74938ca1ac38c4c6ffef7f6518a159ce208b26cd6fc442e1063e7d2b6
 SHA512:
-  metadata.gz: df4713a410191c85e398f66bea3aea0c97bcfaf5274472689c2889cf7a185cd9c36bee2ee6a9196d7fc27e7c2d5efeafb61045972302eaf4f5f199c62878594e
-  data.tar.gz: bc7a9a6e520c8de2d2c043ba999327e1f604bd8310f425ad5ce096c020b9b51d85ca6e8d3f69b4a96bb32002cda26a1cf7f3f2597b5217584ee619ec3c3eb1a8
+  metadata.gz: 7b79c556355cd93395449943a59e1fda06af7081357fd94581a5ae8e192b10b3e5e113e8848b66c56cc9ab1b7e0242bbdbc1217c65c845dedf2e88f931e252c0
+  data.tar.gz: ed1959f3d7d111bd7acfb62412eec03c76767ef2cdf57ceab35ac5c0640dbc516cf5cf5e0f15c69367dab5a6f1ff7781264bcdd0f43f86c9a4aec95ba1f62929

data/lib/intake/logger.rb

@@ -11,31 +11,38 @@ require_relative 'repository'
 module Intake
   # Logger is a object that captures log event and forward that to event sinks.
   class Logger
+    DEFAULT_LEVEL = ::Intake::Level[:info]
     class << self
       def [](name)
-        ::Intake::Repository.instance.get_or_add(name) do |logger_name|
-          Logger.new(logger_name)
+        ::Intake::Repository.instance.get_or_add(name) do |logger_name, parent|
+          Logger.new(logger_name, parent: parent)
         end
       end
     end
 
     attr_reader :name
 
-    def initialize(name)
+    def initialize(name, parent: nil)
       validate_name(name)
 
       @name = name
-      @level = ::Intake::Level[:info]
+      @level = nil
+      @parent = parent
     end
 
     def level?(level)
-      @level.val <= level.val
+      self.level.val <= level.val
+    end
+
+    def level
+      @level || @parent&.level || DEFAULT_LEVEL
     end
 
     def level=(level)
       @level = case level
                when String, Symbol then ::Intake::Level[level.to_sym]
                when ::Intake::Level then level
+               when nil then nil
                end
     end
 

data/lib/intake/repository.rb

@@ -19,17 +19,16 @@ module Intake
       @store.key? canonize_name(name)
     end
 
-    def get_or_add(name)
-      name = canonize_name(name)
-      logger = @store[name]
+    def get_or_add(name, &block)
+      return nil if name.nil?
 
-      if logger.nil?
-        logger = @mutex.synchronize do
-          @store[name] = yield(name) unless @store.key?(name)
-          @store[name]
+      name = canonize_name(name)
+      unless @store.key? name
+        @mutex.synchronize do
+          create_logger_unsafe(name, &block) unless @store.key? name
         end
       end
-      logger
+      @store[name]
     end
 
     private
@@ -44,8 +43,22 @@ module Intake
       end
     end
 
+    def parent_name(name)
+      separator_rindex = name.rindex('::')
+      separator_rindex.nil? ? 'root' : name[0, separator_rindex]
+    end
+
     def module_name(mod)
       mod.name
     end
+
+    def create_logger_unsafe(name, &block)
+      unless name == 'root'
+        parent_logger_name = parent_name(name)
+        parent_logger = @store[parent_logger_name] || create_logger_unsafe(parent_logger_name, &block)
+      end
+      @store[name] = block.call(name, parent_logger) unless @store.key?(name)
+      @store[name]
+    end
   end
 end

data/lib/intake/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Intake
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intake
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrey Maraev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby