injectedlogger 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed2823f82e7cba6cf36cf6a49fc25a9653ce00b
-  data.tar.gz: 260c054c7c2d305ab0704f957ce48abbf3cf004b
+  metadata.gz: 6c1110f07cfbbe6a10e93eed0e971351cb165f4b
+  data.tar.gz: f8c373e8b28fc600b561e52c8ebf676a7b3c3471
 SHA512:
-  metadata.gz: b2ca8524827fbff3ff2f53dec3c9a192e236aee3e8de1c4c18ade2f75d0c3728ce5e2f053f431dd8b5a2d4556c73e21cf82d500004b69e3f1d39cf5dc797af0a
-  data.tar.gz: 208518022caff1c31ffa758717fcf08e38c21d0bb7a6a81c7f92807af260489b660f30c07096d906f31f574d43aba5469fbfc6121dcab75afea2d7200b14f928
+  metadata.gz: 8d7d74723b918d031678ab8ff90194e41b8bddcd72393037877aed3318802b5b2d64aae7ae27cd68259a71af30430c29072283b879f7c1cd98eb417c0dc10985
+  data.tar.gz: 7d9734789ff5eae1f754bdb43466dedbc6ff092beed42ac0571531eccd995f7bfe284fec33f8cc7d21013e1df13ab4b72bd7be8a4ab1d4b7b717b2d6888d8eb7

data/README.md

@@ -7,7 +7,7 @@ It will try to support as many methods and levels as the underlying object suppo
 ## Usage
 
 ```ruby
-logger = InjectedLogger::Logger.use somelogger
+logger = InjectedLogger::Logger.inject somelogger
 raise 'No info :(' unless logger.level_info[:supported].include? :info
 logger.info 'You now have a logger!'
 ```
@@ -16,7 +16,7 @@ or you can set-up a default injection for your logger in case no one else sets i
 
 ```ruby
 module MyLogger
-  InjectedLogger.inject required: [:debug, :info] do
+  InjectedLogger.declare required: [:debug, :info] do
     require 'logger'
     { logger: Logger.new(STDERR), prefix: '[mylogger]' }
   end

data/lib/injectedlogger.rb

@@ -8,7 +8,7 @@ module InjectedLogger
   # module MyLogger
   #   InjectedLogger.inject do
   #     require 'logger'
-  #     # logger is required, the rest are other use() params
+  #     # logger is required, the rest are other inject() params
   #     { logger: Logger.new(STDERR), prefix: '[mylogger]', ... }
   #   end
   # end
@@ -26,18 +26,20 @@ module InjectedLogger
   # logger method is called, so that it does not 'require' anything if it is not
   # needed. :)
 
-  def self.inject(on: nil, required: [], method_name: :logger, &blk)
-    on = blk.binding.eval 'self' unless on
-    on = on.singleton_class unless on.is_a? Module
+  def self.declare(on: nil, required: [], method_name: :logger, &blk)
+    if on.nil?
+      raise InjectedLogger::DefaultInjectionBlockMissing if blk.nil?
+      on = blk.binding.eval 'self'
+    else
+      on = on.singleton_class unless on.is_a? Module
+    end
     on.send :define_method, method_name do
-      unless InjectedLogger::Logger.in_use?
-        args = blk.call
-        logger = args.delete :logger
-        unless required.empty?
-          args[:levels] ||= []
-          args[:levels].push(required).flatten!.uniq!
-        end
-        InjectedLogger::Logger.use(logger, args)
+      # avoid recursion if someone calls logger in the block
+      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!
       required -= InjectedLogger::Logger.level_info[:supported]
@@ -48,4 +50,20 @@ module InjectedLogger
       InjectedLogger::Logger
     end
   end
+
+  private
+
+  def self.default_logger
+    require 'logger'
+    { logger: ::Logger.new(STDERR) }
+  end
+
+  def self.inject_logger(args, required)
+    logger = args.delete :logger
+    unless required.empty?
+      args[:levels] ||= []
+      args[:levels].push(required).flatten!.uniq!
+    end
+    InjectedLogger::Logger.inject(logger, args)
+  end
 end

data/lib/injectedlogger/errors.rb

@@ -1,6 +1,7 @@
 module InjectedLogger
   Error = Class.new StandardError
   InUse = Class.new Error
+  DefaultInjectionBlockMissing = Class.new Error
   UnsupportedLevels = Class.new Error do
     def initalize(levels)
       super("logger does not support required levels #{levels.join ', '}")

data/lib/injectedlogger/logger.rb

@@ -9,18 +9,18 @@ module InjectedLogger
     class << self
       attr_reader :prefix, :levels, :level_info, :fallback
 
-      def in_use?
+      def injected?
         not logger.nil?
       end
 
-      def use(logger_obj, levels: LOGLEVELS, fallback: UNKNOWN, prefix: nil)
+      def inject(logger_obj, levels: LOGLEVELS, fallback: UNKNOWN, prefix: nil)
         if logger and logger != logger_obj
           raise InUse, "#{self} was already using logger #{logger}"
         end
-        use! logger_obj, levels: levels, fallback: fallback
+        inject! logger_obj, levels: levels, fallback: fallback
       end
 
-      def use!(logger_obj, levels: LOGLEVELS, fallback: UNKNOWN, prefix: nil)
+      def inject!(logger_obj, levels: LOGLEVELS, fallback: UNKNOWN, prefix: nil)
         self.logger = logger_obj
         set_prefix prefix
         set_levels levels

data/lib/injectedlogger/version.rb

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

data/spec/logger_spec.rb

@@ -66,7 +66,7 @@ module InjectedLogger
       let(:logger_object) { Helpers::RubyLikeLogger.new [] }
 
       before do
-        InjectedLogger::Logger.use! logger_object
+        InjectedLogger::Logger.inject! logger_object
         #l = InjectedLogger::Logger
         #STDERR.puts "Native: #{l.level_info[:native]} Non-native: #{l.level_info[:nonnative]} Fallback: #{l.level_info[:fallback]} Info: #{l.level_info[:info]}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: injectedlogger
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alejandro Martinez Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler