extended_logger 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829c2ba09350eb621bb0694a0c099c7b392edf20
-  data.tar.gz: 43f5a2da899103fd2d42147909723229571a8d8c
+  metadata.gz: 4eb522f68f7697e65cffd4539df8219879be9973
+  data.tar.gz: 0eda1536929c52214abe517846b7913adfe372da
 SHA512:
-  metadata.gz: 5c1b55af38672df94b92523b188bf26c36d97e333a225aed93d33c2901a043a0fab5e291749ecfdd91f3fca86e36fec9fd90cbe650e6039ab65cfb181026bd53
-  data.tar.gz: ee6f7448f2866dc7a4f5f23e6c92bec98cdbbd9ca34dc96efc93336961a68d2731fc29d7826481b5d092206f1e42c31fe4c5af67f6671232a7ecaf6ea8658d22
+  metadata.gz: 8150607148ff582e2e8f959f67d614a05551bbc87bc227a272950a201a7639a2f12a70d7e118e5dfb4de215bfe2a18e5f6175e14987502edac6442ce0f508109
+  data.tar.gz: 95d3dae30748c24e11ddfc5813e4c818514535a8318268c813d09a1b4bfec3016a1192a9e102ffe1e8dcd88c0e81f60f8cacec2cb0b1554e23146281c7f7d727

data/lib/extended_logger.rb

@@ -7,7 +7,9 @@ require_relative './extended_logger/define'
 require_relative './extended_logger/extended_logger'
 require_relative './extended_logger/level'
 require_relative './extended_logger/level/set'
+require_relative './extended_logger/logger'
 require_relative './extended_logger/message'
+require_relative './extended_logger/registry'
 require_relative './extended_logger/rule'
 require_relative './extended_logger/serializer'
 require_relative './extended_logger/serializer/text_formatter'

data/lib/extended_logger/controls.rb

@@ -11,7 +11,7 @@ class ExtendedLogger
       end
 
       module None
-        def self.value
+        def self.example
           ColorScheme::None
         end
       end
@@ -19,7 +19,7 @@ class ExtendedLogger
 
     module Formatters
       module Plain
-        def self.value
+        def self.example
           -> message do
             "#{message.level} -- #{message.prose}"
           end
@@ -28,7 +28,7 @@ class ExtendedLogger
     end
 
     module Label
-      def self.value
+      def self.example
         'SomeClass'
       end
     end
@@ -38,7 +38,7 @@ class ExtendedLogger
         Set.ruby_logger.get :info
       end
 
-      def self.value label=nil
+      def self.example label=nil
         label ||= :normal
         Set.get label
       end
@@ -48,7 +48,7 @@ class ExtendedLogger
           %i(debug info warn error fatal)
         end
 
-        def self.value
+        def self.example
           %i(verbose normal)
         end
       end
@@ -64,26 +64,36 @@ class ExtendedLogger
         end
 
         def self.example
-          names = Names.value
+          names = Names.example
           Level::Set.build names, :default => :normal
         end
       end
     end
 
-    class Logger < ExtendedLogger.define
-      def self.example device=nil
-        device ||= StringIO.new
+    class Logger < ExtendedLogger.define Levels::Set.example, :format => Formatters::Plain.example
+      def self.example
+        device = StringIO.new
 
         instance = build device
         instance.clock = Time::Clock
         instance
       end
+
+      class Ruby < ExtendedLogger.define
+        def self.example
+          device = StringIO.new
+
+          instance = build device
+          instance.clock = Time::Clock
+          instance
+        end
+      end
     end
 
     module Messages
       def self.example prose: nil, level: nil, label: nil, time: nil
         prose ||= Prose.example
-        level ||= Levels.value
+        level ||= Levels.example
         time ||= Time.reference
 
         if prose.is_a? Proc
@@ -96,15 +106,15 @@ class ExtendedLogger
       end
 
       module Label
-        def self.value label=nil
-          label ||= Control::Label.value
+        def self.example label=nil
+          label ||= Control::Label.example
 
           Messages.example label: label
         end
       end
 
       module RubyLogger
-        def self.value label=nil
+        def self.example label=nil
           level = Level.new :info
 
           Messages.example level: level, label: label
@@ -113,22 +123,22 @@ class ExtendedLogger
     end
 
     module Output
-      def self.value prose=nil
+      def self.example prose=nil
         prose ||= Prose.example
         "NORMAL -- #{prose}\n"
       end
 
       module Colorized
-        def self.value prose=nil
+        def self.example prose=nil
           prose ||= Prose.example
           colorized_prose = "\e[1;37;40m#{prose}\e[0m"
 
-          Output.value colorized_prose
+          Output.example colorized_prose
         end
       end
 
       module MultipleLines
-        def self.value
+        def self.example
           "NORMAL -- Multiple\nNORMAL -- line\nNORMAL -- message\n"
         end
       end
@@ -138,7 +148,7 @@ class ExtendedLogger
           @log_format ||= ::Logger::Formatter.new
         end
 
-        def self.value progname=nil
+        def self.example progname=nil
           severity = 'INFO'
           time = Time::Clock.now
           message = Prose.example
@@ -148,34 +158,34 @@ class ExtendedLogger
       end
 
       module RuleApplied
-        def self.value
+        def self.example
           prose = Prose.example
           prose = prose.upcase
 
-          Output.value prose
+          Output.example prose
         end
       end
     end
 
     module Prose
       def self.example
-        SingleLine.value
+        SingleLine.example
       end
 
       module EscapeCodes
-        def self.value
+        def self.example
           "\t\r"
         end
       end
 
       module MultipleLines
-        def self.value
+        def self.example
           "Multiple\nline\nmessage"
         end
       end
 
       module SingleLine
-        def self.value
+        def self.example
           "Some log message"
         end
       end
@@ -194,7 +204,7 @@ class ExtendedLogger
 
     module Sink
       def self.example device=nil, format: nil, rules: nil
-        format ||= Controls::Formatters::Plain.value
+        format ||= Controls::Formatters::Plain.example
         device ||= StringIO.new
         levels = Controls::Levels::Set.example
 

data/lib/extended_logger/define.rb

@@ -1,18 +1,20 @@
 class ExtendedLogger
-  def self.define levels=nil, **defaults
+  def self.define levels=nil, **sink_defaults
     levels ||= Defaults.levels
 
     subclass = Class.new self
-    Define.(subclass, levels)
+    Define.(subclass, levels, sink_defaults)
     subclass
   end
 
   class Define
     attr_reader :levels
+    attr_reader :sink_defaults
     attr_reader :subclass
 
-    def initialize subclass, levels, **defaults
+    def initialize subclass, levels, sink_defaults
       @levels = levels
+      @sink_defaults = sink_defaults
       @subclass = subclass
     end
 
@@ -22,8 +24,16 @@ class ExtendedLogger
     end
 
     def call
-      levels = self.levels
-      subclass.send :define_method, :levels do levels end
+      levels = self.level_set
+
+      subclass.define_singleton_method :levels do levels end
+      subclass.send :define_method, :levels do self.class.levels end
+
+      if sink_defaults = self.sink_defaults
+        subclass.define_singleton_method :sink_defaults do
+          sink_defaults
+        end
+      end
 
       levels.each do |level|
         method_name = level.name
@@ -33,5 +43,13 @@ class ExtendedLogger
         end
       end
     end
+
+    def level_set
+      if levels.is_a? Level::Set
+        levels
+      else
+        Level::Set.build levels
+      end
+    end
   end
 end

data/lib/extended_logger/extended_logger.rb

@@ -8,13 +8,36 @@ class ExtendedLogger
     @sink = sink
   end
 
-  def self.build *arguments
-    sink = Sink.build *arguments
+  def self.build device=nil, **sink_arguments
+    sink = self.sink device: device, **sink_arguments
 
     instance = new sink
     instance
   end
 
+  def self.empty_message
+    '<empty message>'
+  end
+
+  def self.levels
+  end
+
+  def self.sink device: nil, **sink_arguments
+    sink_arguments = sink_defaults.merge sink_arguments
+
+    sink_arguments[:levels] ||= levels if levels
+
+    Sink.build device, **sink_arguments
+  end
+
+  def self.sink_defaults
+    {}
+  end
+
+  def << message
+    sink << message
+  end
+
   def add level, prose=nil, label: nil, &block
     block ||= ->{ prose }
     label ||= self.label
@@ -23,7 +46,7 @@ class ExtendedLogger
 
     message = Message.new block, level, time, label
 
-    sink << message
+    self << message
   end
 
   def clock

data/lib/extended_logger/level/set.rb

@@ -53,10 +53,10 @@ class ExtendedLogger
       end
 
       def resolve reference
-        if reference.is_a? Symbol
-          get reference
-        else
-          get reference.name
+        case reference
+        when Symbol then get reference
+        when String then get reference.to_sym
+        else get reference.name
         end
       end
     end

data/lib/extended_logger/logger.rb

@@ -0,0 +1,3 @@
+class ExtendedLogger
+  Logger = self.define
+end

data/lib/extended_logger/registry.rb

@@ -0,0 +1,107 @@
+class ExtendedLogger
+  class Registry < Module
+    attr_reader :attr_name
+    attr_reader :logger_class
+    attr_reader :sink
+
+    def initialize logger_class, sink, attr_name
+      @attr_name = attr_name
+      @logger_class = logger_class
+      @sink = sink
+    end
+
+    def self.build logger_class, attr_name: nil, **sink_arguments
+      attr_name ||= :logger
+
+      sink = logger_class.sink **sink_arguments
+
+      instance = new logger_class, sink, attr_name
+      instance.send :const_set, :Logger, logger_class
+      instance
+    end
+
+    def build_logger key
+      logger = logger_class.new sink
+      logger.label = key.name
+      logger
+    end
+
+    def cache
+      @cache ||= Hash.new do |cache, key|
+        cache[key] = build_logger key
+      end
+    end
+
+    def clear
+      cache.clear
+    end
+
+    def included cls
+      cls.class_exec self do |registry|
+        ivar_name = "@#{registry.attr_name}"
+        cvar_name = "@@#{registry.attr_name}"
+
+        attr_writer registry.attr_name
+
+        define_method registry.attr_name do
+          if instance_variable_defined? ivar_name
+            return instance_variable_get ivar_name
+          end
+
+          if self.is_a? Module
+            target = self
+          else
+            target = self.class
+          end
+
+          if target.class_variable_defined? cvar_name
+            return target.class_variable_get cvar_name
+          end
+
+          logger = registry.get self
+          self.class.class_variable_set cvar_name, logger
+        end
+      end
+    end
+
+    def extended object
+      included object.singleton_class
+    end
+
+    def get receiver=nil
+      receiver ||= Object
+
+      key = self.key receiver
+
+      cache[key]
+    end
+
+    def key receiver
+      if receiver.is_a? Module
+        receiver
+      else
+        receiver.class
+      end
+    end
+
+    def level
+      sink.level
+    end
+
+    def level= reference
+      sink.level = levels.resolve reference
+    end
+
+    def levels
+      sink.levels
+    end
+
+    def lower_verbosity
+      sink.lower_verbosity
+    end
+
+    def raise_verbosity
+      sink.raise_verbosity
+    end
+  end
+end

data/lib/extended_logger/serializer/text_formatter.rb

@@ -13,7 +13,7 @@ class ExtendedLogger
       end
 
       def call
-        return %w(<empty message>) if prose.nil? or prose.empty?
+        return [ExtendedLogger.empty_message] if prose.nil? or prose.empty?
 
         lines.map do |line|
           line.chomp! if line.match %r{(?<!\r)\n}
@@ -24,6 +24,7 @@ class ExtendedLogger
             line = line.inspect
             line.slice! 0, 1
             line.slice! -1, 1
+            line.gsub! '\\"', '"'
             line
           end
         end

data/lib/extended_logger/sink.rb

@@ -1,6 +1,6 @@
 class ExtendedLogger
   class Sink
-    attr_reader :device
+    attr_accessor :device
     attr_reader :levels
     attr_writer :rules
     attr_reader :serializer
@@ -11,10 +11,15 @@ class ExtendedLogger
       @serializer = serializer
     end
 
-    def self.build device=nil, format: nil, levels: nil, rules: nil, serializer: nil
+    def self.build device=nil, color_scheme: nil, format: nil, levels: nil, rules: nil
       device ||= $stderr
       levels ||= Defaults.levels
-      serializer ||= Serializer.build log_format: format
+
+      device = File.open device, 'a+' if device.is_a? String
+      device.sync = true
+
+      color_scheme = nil unless device.is_a? StringIO or device.tty?
+      serializer = Serializer.build log_format: format, color_scheme: color_scheme
 
       instance = new device, levels, serializer
       instance.rules = rules if rules
@@ -37,6 +42,22 @@ class ExtendedLogger
       end
     end
 
+    def level
+      verbosity_threshold.level
+    end
+
+    def level= reference
+      verbosity_threshold.level = levels.resolve reference
+    end
+
+    def lower_verbosity
+      verbosity_threshold.lower
+    end
+
+    def raise_verbosity
+      verbosity_threshold.raise
+    end
+
     def rules
       @rules ||= []
     end

data/lib/extended_logger/verbosity_threshold.rb

@@ -15,14 +15,14 @@ class ExtendedLogger
     end
 
     def lower
-      if level.prev
-        self.level = level.prev
+      if level.next
+        self.level = level.next
       end
     end
 
     def raise
-      if level.next
-        self.level = level.next
+      if level.prev
+        self.level = level.prev
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extended_logger
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nathan Ladd
@@ -41,7 +41,9 @@ files:
 - lib/extended_logger/extended_logger.rb
 - lib/extended_logger/level.rb
 - lib/extended_logger/level/set.rb
+- lib/extended_logger/logger.rb
 - lib/extended_logger/message.rb
+- lib/extended_logger/registry.rb
 - lib/extended_logger/rule.rb
 - lib/extended_logger/serializer.rb
 - lib/extended_logger/serializer/text_formatter.rb