injectedlogger 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c1110f07cfbbe6a10e93eed0e971351cb165f4b
-  data.tar.gz: f8c373e8b28fc600b561e52c8ebf676a7b3c3471
+  metadata.gz: 7c397eed4509dee6f22849d012f405627ec44d0b
+  data.tar.gz: ffb8aef686ebfb15a7d94586d254b0ebe31ed50e
 SHA512:
-  metadata.gz: 8d7d74723b918d031678ab8ff90194e41b8bddcd72393037877aed3318802b5b2d64aae7ae27cd68259a71af30430c29072283b879f7c1cd98eb417c0dc10985
-  data.tar.gz: 7d9734789ff5eae1f754bdb43466dedbc6ff092beed42ac0571531eccd995f7bfe284fec33f8cc7d21013e1df13ab4b72bd7be8a4ab1d4b7b717b2d6888d8eb7
+  metadata.gz: 9d042ff0938ab25cdec8af039da44d9ef276f2a6b7458f80c573ec5d892adf769cf081d8422d34dd4def747dd9b7aa7c038678d417568e81a654c60abd6e3feb
+  data.tar.gz: 00655caa8274a8713e7adb4de3672da75c90958c435e5ffb119fe8d59e4f2d2507f3f6aba656b63b73457c0bb73d4ec51ac9409505469ba099f5417378f829e0

data/README.md

@@ -17,9 +17,13 @@ or you can set-up a default injection for your logger in case no one else sets i
 ```ruby
 module MyLogger
   InjectedLogger.declare required: [:debug, :info] do
+    # this gets executed if no logger has been injected at use time
     require 'logger'
     { logger: Logger.new(STDERR), prefix: '[mylogger]' }
   end
+  InjectedLogger.after_injection do |logger|
+    logger.info 'ok' # you can also force your prefix with logger.prefix = str
+  end
 end
 
 class WantsLogging
@@ -32,7 +36,10 @@ end
 
 class ThisAlsoWantsIt
   include MyLogger
-  ...
+
+  def some_other_method_with_debug_logging
+    logger.debug 'some_debug_info'
+  end
 end
 ```
 

data/lib/injectedlogger/delegator.rb

@@ -62,8 +62,15 @@ module InjectedLogger
       def add_as_fallback(nonnative, fallback)
         nonnative.each do |lvl|
           remove_level lvl
-          add_level lvl do |msg|
-            public_send fallback, "[#{lvl.upcase}] #{msg}"
+          add_level lvl do |*msg, &blk|
+            if blk
+              public_send fallback, *msg do
+                str = blk.call
+                "[#{lvl.upcase}] #{str}"
+              end
+            else
+              public_send fallback, "[#{lvl.upcase}] #{msg.join ' '}"
+            end
           end
         end
       end
@@ -92,12 +99,19 @@ module InjectedLogger
 
       def add_level_method(lvl)
         if prefix.nil? or prefix.empty?
-          add_level lvl do |msg|
-            logger.send lvl, msg
+          add_level lvl do |*msg, &blk|
+            logger.send lvl, *msg, &blk
           end
         else
-          add_level lvl do |msg|
-            logger.send lvl, "#{prefix} #{msg}"
+          add_level lvl do |*msg, &blk|
+            if blk
+              logger.send lvl, *msg do
+                str = blk.call
+                "#{prefix} #{str}"
+              end
+            else
+              logger.send lvl, "#{prefix} #{msg.join ' '}"
+            end
           end
         end
       end
@@ -112,14 +126,25 @@ module InjectedLogger
           if prefix and not prefix.empty?
             prefix_s += " " + prefix
           end
-          klass.define_singleton_method lvl do |msg|
-            logger.send :log, "#{prefix_s} #{msg}"
+          klass.define_singleton_method lvl do |*msg, &blk|
+            if blk
+              logger.send :log, *msg do
+                str = blk.call
+                "#{prefix_s} #{str}"
+              end
+            else
+              logger.send :log, "#{prefix_s} #{msg.join ' '}"
+            end
           end
         else
           # assume two or more params, best effort with 1st being level
           if lvl_s = ruby_logger_severity(lvl)
-            klass.define_singleton_method lvl do |msg|
-              logger.send :log, lvl_s, msg
+            klass.define_singleton_method lvl do |*msg, &blk|
+              if blk
+                logger.send :log, lvl_s, *msg, &blk
+              else
+                logger.send :log, lvl_s, msg.join(' ')
+              end
             end
           end
         end

data/lib/injectedlogger/version.rb

@@ -1,3 +1,3 @@
 module InjectedLogger
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/injectedlogger.rb

@@ -8,7 +8,8 @@ module InjectedLogger
   # module MyLogger
   #   InjectedLogger.inject do
   #     require 'logger'
-  #     # logger is required, the rest are other inject() params
+  #     # parameters are inject() params, none is required, but if
+  #     # logger is not present, a default one will be used.
   #     { logger: Logger.new(STDERR), prefix: '[mylogger]', ... }
   #   end
   # end
@@ -38,7 +39,6 @@ module InjectedLogger
       on.send :remove_method, method_name
       unless InjectedLogger::Logger.injected?
         args = blk ? blk.call : nil
-        args = InjectedLogger.default_logger if args.nil? or args == :default
         InjectedLogger.inject_logger args, required
       end
       required.uniq!
@@ -47,10 +47,20 @@ module InjectedLogger
       on.send :define_method, method_name do
         InjectedLogger::Logger
       end
+      InjectedLogger.after_hook.call(InjectedLogger::Logger) if InjectedLogger.after_hook
       InjectedLogger::Logger
     end
   end
 
+  def self.after_injection(&blk)
+    self.after_hook = blk
+  end
+
+  class << self
+    attr_accessor :after_hook
+    private :after_hook=
+  end
+
   private
 
   def self.default_logger
@@ -59,10 +69,13 @@ module InjectedLogger
   end
 
   def self.inject_logger(args, required)
+    args ||= {}
+    args = default_logger.merge(args) unless args.has_key? :logger
     logger = args.delete :logger
     unless required.empty?
       args[:levels] ||= []
-      args[:levels].push(required).flatten!.uniq!
+      args[:levels].push(required).flatten!
+      args[:levels].uniq!
     end
     InjectedLogger::Logger.inject(logger, args)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: injectedlogger
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alejandro Martinez Ruiz