reasonable_log4r 0.9.0 → 1.0.0

data/.gitignore

@@ -15,4 +15,10 @@
 /tmp
 .idea/*
 database.yml
-/log/*.pid
+/log/*.pid
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/
+spec/dummy/.sass-cache
+spec/dummy/config/database.yml
+spec/dummy/db/schema.rb

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -5,8 +5,6 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'log4r', '1.1.10'
-
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
@@ -14,3 +12,4 @@ gem 'log4r', '1.1.10'
 
 # To use debugger
 # gem 'ruby-debug'
+gem 'log4r', '1.1.10'

data/Gemfile.lock

@@ -1,13 +1,107 @@
 PATH
   remote: .
   specs:
-    reasonable_log4r (0.9.0)
+    reasonable_log4r (1.0.0)
       log4r (= 1.1.10)
+      pg
+      rails (>= 3.0.0)
+      rspec-rails
 
 GEM
   remote: http://rubygems.org/
   specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.3)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
     log4r (1.1.10)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    pg (0.14.1)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby

data/lib/reasonable_log4r.rb

@@ -1,2 +1,4 @@
 require 'reasonable_log4r/monkey_patch_log4r'
+require 'reasonable_log4r/monkey_patch_logger_factory'
+require 'reasonable_log4r/monkey_patch_yaml_configurator'
 require 'reasonable_log4r/version'

data/lib/reasonable_log4r/monkey_patch_log4r.rb

@@ -64,125 +64,4 @@ module Log4r
     # Does nothing
     def remove(*foo); end
   end
-
-  class Logger
-    # Returns the root logger. Identical to Logger.global
-    def self.root; return RootLogger.instance end
-    # Returns the root logger. Identical to Logger.root
-    def self.global; return GlobalLogger.instance end
-    
-    # Get a logger with a fullname from the repository or nil if logger
-    # wasn't found.
-
-    def self.[](_fullname)
-      # forces creation of RootLogger if it doesn't exist yet.
-      if _fullname=='root'
-        return RootLogger.instance
-      end
-      if _fullname=='global'
-        return GlobalLogger.instance
-      end
-      Repository[_fullname]
-    end
-
-    class LoggerFactory #:nodoc:
-      # we want to log iff root.lev <= lev && logger.lev <= lev
-      # BTW, root is guaranteed to be defined by this point
-      def self.define_methods(logger)
-        undefine_methods(logger)
-        globlev = Log4r::Logger['global'].level
-        return if logger.level == OFF or globlev == OFF
-        toggle_methods(globlev, logger)
-      end
-
-      # Logger logging methods are defined here.
-      def self.set_log(logger, lname) 
-        # invoke caller iff the logger invoked is tracing
-        tracercall = (logger.trace ? "caller" : "nil")
-        # maybe pass parent a logevent. second arg is the switch
-        if logger.additive && !logger.is_root?
-          parentcall = "@parent.#{lname.downcase}(event, true)"
-        end
-        mstr = %-
-          def logger.#{lname.downcase}(data=nil, propagated=false)
-            if propagated then event = data
-            else
-              data = yield if block_given?
-              event = LogEvent.new(#{lname}, self, #{tracercall}, data)
-            end
-            @outputters.each {|o| o.#{lname.downcase}(event) }
-            #{parentcall}
-          end
-        -
-        module_eval mstr
-      end
-    end
-  end
-
-  class YamlConfigurator
-    # Given a filename, loads the YAML configuration for Log4r.
-    def self.load_yaml_files(filenames, yaml_sections = ['log4r_config'])
-      cfgs = []
-      yaml_sections.each do |yaml_section|
-        filenames.each do |filename|
-          log4r_config = nil
-          docs = File.open(filename)
-          begin
-            YAML.load_documents(docs) do |doc|
-              doc.has_key?(yaml_section) and log4r_config = doc[yaml_section] and break
-            end
-          rescue Exception => e
-            raise "YAML error, file: #{filename}, error=#{e.message}"
-          end
-          if log4r_config
-            cfgs << log4r_config
-          end
-        end
-      end
-
-      cfgs.each do |cfg|
-        decode_pre_config(cfg['pre_config']) unless cfg['pre_config'].nil?
-      end
-
-      cfgs.each do |cfg|
-        cfg['outputters'].each{ |op| decode_outputter(op)} unless cfg['outputters'].nil?
-      end
-
-      cfgs.each do |cfg|
-        cfg['loggers'].each{ |lo| decode_logger(lo)} unless cfg['loggers'].nil?
-      end
-
-      cfgs.each do |cfg|
-        cfg['logserver'].each{ |lo| decode_logserver(lo)} unless cfg['logserver'].nil?
-      end
-    end
-
-    def self.decode_pre_config(pre)
-      return Logger.root if pre.nil?
-      decode_custom_levels( pre['custom_levels'])
-      global_config( pre['global'])
-      root_config( pre['root'])
-      decode_parameters( pre['parameters'])
-    end
-
-    def self.root_config(e)
-      return if e.nil?
-      globlev = e['level']
-      return if globlev.nil?
-      lev = LNAMES.index(globlev)     # find value in LNAMES
-      Log4rTools.validate_level(lev, 4)  # choke on bad level
-      Logger.root.level = lev
-    end
-
-    def self.decode_logger(lo)
-      if lo['name'] == 'root'
-        l = Logger.root
-      elsif lo['name'] == 'global'
-        l = Logger.global
-      else
-        l = Logger.new lo['name']
-      end
-      decode_logger_common(l, lo)
-    end
-  end
 end

data/lib/reasonable_log4r/monkey_patch_logger_factory.rb

@@ -0,0 +1,55 @@
+module Log4r
+  class Logger
+    # Returns the root logger. Identical to Logger.global
+    def self.root; return RootLogger.instance end
+    # Returns the root logger. Identical to Logger.root
+    def self.global; return GlobalLogger.instance end
+
+    # Get a logger with a fullname from the repository or nil if logger
+    # wasn't found.
+
+    def self.[](_fullname)
+      # forces creation of RootLogger if it doesn't exist yet.
+      if _fullname=='root'
+        return RootLogger.instance
+      end
+      if _fullname=='global'
+        return GlobalLogger.instance
+      end
+      Repository[_fullname]
+    end
+
+    class LoggerFactory #:nodoc:
+      # we want to log if root.lev <= lev && logger.lev <= lev
+      # BTW, root is guaranteed to be defined by this point
+      def self.define_methods(logger)
+        undefine_methods(logger)
+        globlev = Log4r::Logger['global'].level
+        return if logger.level == OFF or globlev == OFF
+        toggle_methods(globlev, logger)
+      end
+
+      # Logger logging methods are defined here.
+      def self.set_log(logger, lname)
+        # invoke caller iff the logger invoked is tracing
+        tracercall = (logger.trace ? "caller" : "nil")
+        # maybe pass parent a logevent. second arg is the switch
+        if logger.additive && !logger.is_root?
+          parentcall = "@parent.#{lname.downcase}(event, true)"
+        end
+        mstr = %-
+          def logger.#{lname.downcase}(data=nil, propagated=false)
+            if propagated then event = data
+            else
+              data = yield if block_given?
+              event = LogEvent.new(#{lname}, self, #{tracercall}, data)
+            end
+            @outputters.each {|o| o.#{lname.downcase}(event) }
+            #{parentcall}
+          end
+        -
+        module_eval mstr
+      end
+    end
+  end
+end

data/lib/reasonable_log4r/monkey_patch_yaml_configurator.rb

@@ -0,0 +1,68 @@
+module Log4r
+  class YamlConfigurator
+    # Given a filename, loads the YAML configuration for Log4r.
+    def self.load_yaml_files(filenames, yaml_sections = ['log4r_config'])
+      cfgs = []
+      yaml_sections.each do |yaml_section|
+        filenames.each do |filename|
+          log4r_config = nil
+          docs = File.open(filename)
+          begin
+            YAML.load_documents(docs) do |doc|
+              doc.has_key?(yaml_section) and log4r_config = doc[yaml_section] and break
+            end
+          rescue Exception => e
+            raise "YAML error, file: #{filename}, error=#{e.message}"
+          end
+          if log4r_config
+            cfgs << log4r_config
+          end
+        end
+      end
+
+      cfgs.each do |cfg|
+        decode_pre_config(cfg['pre_config']) unless cfg['pre_config'].nil?
+      end
+
+      cfgs.each do |cfg|
+        cfg['outputters'].each{ |op| decode_outputter(op)} unless cfg['outputters'].nil?
+      end
+
+      cfgs.each do |cfg|
+        cfg['loggers'].each{ |lo| decode_logger(lo)} unless cfg['loggers'].nil?
+      end
+
+      cfgs.each do |cfg|
+        cfg['logserver'].each{ |lo| decode_logserver(lo)} unless cfg['logserver'].nil?
+      end
+    end
+
+    def self.decode_pre_config(pre)
+      return Logger.root if pre.nil?
+      decode_custom_levels( pre['custom_levels'])
+      global_config( pre['global'])
+      root_config( pre['root'])
+      decode_parameters( pre['parameters'])
+    end
+
+    def self.root_config(e)
+      return if e.nil?
+      globlev = e['level']
+      return if globlev.nil?
+      lev = LNAMES.index(globlev)     # find value in LNAMES
+      Log4rTools.validate_level(lev, 4)  # choke on bad level
+      Logger.root.level = lev
+    end
+
+    def self.decode_logger(lo)
+      if lo['name'] == 'root'
+        l = Logger.root
+      elsif lo['name'] == 'global'
+        l = Logger.global
+      else
+        l = Logger.new lo['name']
+      end
+      decode_logger_common(l, lo)
+    end
+  end
+end

data/lib/reasonable_log4r/version.rb

@@ -1,4 +1,4 @@
 module ReasonableLog4r
   # the current version of this gem
-  VERSION = "0.9.0"
+  VERSION = "1.0.0"
 end

data/reasonable_log4r.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
  s.name        = 'reasonable_log4r'
  s.version     = ReasonableLog4r::VERSION
  s.license     = 'New BSD License'
- s.date        = '2012-09-16'
+ s.date        = '2012-09-26'
  s.summary     = "Patches log4r gem to make it work in a reasonable way(Tm)."
  s.description = "Reasonable patches to log4r gem including root loggers having outputters and yaml configurator supporting many files and yaml sections."
  s.authors     = ["Keith Gabryelski"]
@@ -17,4 +17,7 @@ Gem::Specification.new do |s|
  s.require_path = 'lib'
  s.homepage    = 'http://github.com/fiksu/reasonable_log4r'
  s.add_dependency 'log4r', '1.1.10'
+ s.add_dependency "pg"
+ s.add_dependency "rails", '>= 3.0.0'
+ s.add_dependency 'rspec-rails'
 end

data/spec/dummy/.rspec

@@ -0,0 +1 @@
+--color

data/spec/dummy/README

@@ -0,0 +1 @@
+== dummy project

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .