mongoid_colored_logger 0.1.5 → 0.2.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'mongoid', '~>2.4'
+gem 'mongoid'
 gem 'mongo', '~>1.6'
 
 group :development do

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     bson (1.7.0)
-    builder (3.0.3)
+    builder (3.0.4)
     git (1.2.5)
     i18n (0.6.1)
     jeweler (1.8.4)
@@ -27,7 +27,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    tzinfo (0.3.33)
+    tzinfo (0.3.34)
 
 PLATFORMS
   ruby
@@ -36,5 +36,5 @@ DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 1.8.0)
   mongo (~> 1.6)
-  mongoid (~> 2.4)
+  mongoid
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/mongoid_colored_logger/logger_decorator.rb

@@ -1,15 +1,5 @@
 module MongoidColoredLogger
   class LoggerDecorator
-    module Severity
-      DEBUG   = 0
-      INFO    = 1
-      WARN    = 2
-      ERROR   = 3
-      FATAL   = 4
-      UNKNOWN = 5
-    end
-    include Severity
-
     WHITE = "\e[37m"
     CYAN = "\e[36m"
     MAGENTA = "\e[35m"
@@ -26,20 +16,15 @@ module MongoidColoredLogger
       @logger = logger
     end
 
-    def add(severity, message = nil, progname = nil, &block)
-      message = block.call if message.nil? and block_given?
-      message = message.to_s.sub('MONGODB', color('MONGODB', odd? ? CYAN : MAGENTA)).
-        sub(%r{(?<=\[')([^']+)}) {|m| color(m, BLUE)}.
-        sub(%r{(?<=\]\.)\w+}) {|m| color(m, YELLOW)}
-      @logger.add(severity, message, progname, &block)
-    end
-
-    %w[debug info warn error fatal unknown].each do |method|
-      class_eval <<-EOT, __FILE__, __LINE__ + 1
-        def #{method}(message = nil, progname = nil, &block)  # def debug(message = nil, progname = nil, &block)
-          add(#{method.upcase}, message, progname, &block)    #   add(DEBUG, message, progname, &block)
-        end                                                   # end
-      EOT
+    colorize_method = Mongoid::VERSION.to_f >= 3.0 ? :colorize_message : :colorize_legacy_message
+    
+    %w[debug info warn error fatal unknown].each.with_index do |method, severity|
+      define_method(method) do |message = nil, progname = nil, &block|
+        message = block.call if message.nil? and block_given?
+        message = self.send(colorize_method, message.to_s)
+        
+        @logger.add(severity, message, progname, &block)
+      end
     end
 
     # Proxy everything else to the logger instance
@@ -47,7 +32,7 @@ module MongoidColoredLogger
       super || @logger.respond_to?(method)
     end
 
-    private
+  private
     def method_missing(method, *args, &block)
       @logger.send(method, *args, &block)
     end
@@ -58,10 +43,26 @@ module MongoidColoredLogger
       "#{bold}#{color}#{text}#{CLEAR}"
     end
 
+    # Used for Mongoid < 3.0
+    def colorize_legacy_message(message)
+      message.sub('MONGODB', color('MONGODB', odd? ? CYAN : MAGENTA)).
+        sub(%r{(?<=\[')([^']+)}) {|m| color(m, BLUE)}.
+        sub(%r{(?<=\]\.)\w+}) {|m| color(m, YELLOW)}
+    end
+
+    # Used for Mongoid >= 3.0
+    def colorize_message(message)
+      message = message.sub('MONGODB', color('MONGODB', odd? ? CYAN : MAGENTA)).
+        sub(%r{(?<=\[')([^']+)}) {|m| color(m, BLUE)}.
+        sub(%r{(?<=\]\.)\w+}) {|m| color(m, YELLOW)}
+      message.sub('MOPED:', color('MOPED:', odd? ? CYAN : MAGENTA)).
+        sub(/\{.+?\}\s/) { |m| color(m, BLUE) }.
+        sub(/COMMAND|QUERY|KILL_CURSORS/) { |m| color(m, YELLOW) }.
+        sub(/[\d\.]+ms/) { |m| color(m, GREEN) }
+    end
+
     def odd?
       @odd_or_even = ! @odd_or_even
     end
-
   end
-
 end

data/lib/mongoid_colored_logger/railtie.rb

@@ -3,14 +3,15 @@ require 'mongoid_colored_logger/logger_decorator'
 module MongoidColoredLogger
 
   class Railtie < Rails::Railtie
+    base = Mongoid::VERSION.to_f >= 3.0 ? Moped : config.mongoid
+
     initializer 'logger_decorator', :after => :initialize_logger do
-      config.mongoid.logger = MongoidColoredLogger::LoggerDecorator.new(Rails.logger)
+      base.logger = MongoidColoredLogger::LoggerDecorator.new(Rails.logger)
     end
 
     # Make it output to STDERR in console
     console do |app|
-      config.mongoid.logger = MongoidColoredLogger::LoggerDecorator.new(Logger.new(STDERR))
+      base.logger = MongoidColoredLogger::LoggerDecorator.new(Logger.new(STDERR))
     end
   end
-
 end

data/mongoid_colored_logger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid_colored_logger"
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Shterenzon"]
-  s.date = "2012-09-10"
+  s.date = "2012-11-01"
   s.description = "Beautiful logging for Mongoid"
   s.email = "romanbsd@yahoo.com"
   s.extra_rdoc_files = [
@@ -40,20 +40,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.4"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
       s.add_runtime_dependency(%q<mongo>, ["~> 1.6"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
     else
-      s.add_dependency(%q<mongoid>, ["~> 2.4"])
+      s.add_dependency(%q<mongoid>, [">= 0"])
       s.add_dependency(%q<mongo>, ["~> 1.6"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["~> 2.4"])
+    s.add_dependency(%q<mongoid>, [">= 0"])
     s.add_dependency(%q<mongo>, ["~> 1.6"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_colored_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 32436982444610564
+      hash: 686914334206650253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: