grizzled-rails-logger 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+Version 0.1.5
+
+- Changed to work with Rails 3.2.6, while retaining backward compatibility
+  with prior versions. Addresses [Issue #5][].
+- Added a `dont_flatten_patterns` configuration item. See the
+  [documentation](http://software.clapper.org/grizzled-rails-logger/) for
+  details.
+
+[Issue #5]: https://github.com/bmc/grizzled-rails-logger/issues/5
+
+---
+
 Version 0.1.4
 
 Before attempting to use (and `gsub` against) the passed-in message, the

data/grizzled-rails-logger.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
 
   s.name             = 'grizzled-rails-logger'
-  s.version          = '0.1.4'
-  s.date             = '2012-05-09'
+  s.version          = '0.1.5'
+  s.date             = '2012-06-16'
   s.summary          = 'A custom Rails 3 logger'
   s.authors          = ['Brian M. Clapper']
   s.license          = 'BSD'

data/lib/grizzled/rails/logger.rb

@@ -17,13 +17,15 @@ module Grizzled # :nodoc:
 
       # Configuration constants
       Configuration = OpenStruct.new(
-          :format           => '[%T] (%S) %P %M',
-          :timeformat       => '%Y/%m/%d %H:%M:%S',
-          :colorize         => true,
-          :flatten          => true,
-          :flatten_patterns => [
+          :format                => '[%T] (%S) %P %M',
+          :timeformat            => '%Y/%m/%d %H:%M:%S',
+          :colorize              => true,
+          :flatten               => true,
+          :flatten_patterns      => [
             /.*/
           ],
+          :dont_flatten_patterns => [
+          ],
           :colors => {
             :debug => Term::ANSIColor.cyan,
             :warn  => Term::ANSIColor.yellow + Term::ANSIColor.bold,
@@ -92,11 +94,19 @@ Backtrace:
       private
 
         def do_add(severity, message, progname, options = {}, &block)
-          return if @level > severity
+          if self.respond_to? :level
+            lvl = level
+          elsif defined? @level
+            lvl = @level
+          else
+            raise "Can't determine logging level."
+          end
+
+          return if lvl > severity
 
           if message.nil?
             if block_given?
-              if severity < @level
+              if severity < lvl
                 return true
               end
               message = yield
@@ -105,17 +115,35 @@ Backtrace:
 
           flatten = options.fetch(:flatten, Configuration.flatten)
           if flatten
-            patterns = options.fetch(
+            flatten_patterns = options.fetch(
               :flatten_patterns, Configuration.flatten_patterns
             )
-            patterns = ['.*'] if patterns.nil? || (patterns.length == 0)
+            dont_flatten_patterns = options.fetch(
+              :dont_flatten_patterns, Configuration.dont_flatten_patterns
+            )
+            if flatten_patterns.nil? || (flatten_patterns.length == 0)
+              flatten_patterns = ['.*']
+            end
+            flatten = false
             flattened_message = message.to_s.gsub("\n", '')
-            patterns.each do |pattern|
+
+            # Flatten the message if it matches the specified pattern...
+            flatten_patterns.each do |pattern|
               if pattern =~ flattened_message
-                message = flattened_message
+                flatten = true
                 break
               end
             end
+
+            # ... unless it's also matches a "don't flatten" pattern.
+            dont_flatten_patterns.each do |pattern|
+              if pattern =~ flattened_message
+                flatten = false
+                break
+              end
+            end
+
+            message = flattened_message if flatten
           end
 
           time = Time.now.strftime(Configuration.timeformat)

data/rdoc/Grizzled/Rails/Logger.html

@@ -175,7 +175,7 @@ end</pre>
             
             <div class="method-source-code" id="configure-source">
 <pre>
-<span class="ruby-comment"># File lib/grizzled/rails/logger.rb, line 41</span>
+<span class="ruby-comment"># File lib/grizzled/rails/logger.rb, line 43</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">configure</span>(&amp;<span class="ruby-identifier">block</span>)
   <span class="ruby-identifier">block</span>.<span class="ruby-identifier">call</span> <span class="ruby-constant">Configuration</span>
 <span class="ruby-keyword">end</span></pre>

data/rdoc/created.rid

@@ -1,4 +1,4 @@
-Sat, 05 May 2012 17:18:43 -0400
+Sat, 16 Jun 2012 13:38:51 -0400
 lib/grizzled/rails.rb	Thu, 12 Apr 2012 11:47:09 -0400
-lib/grizzled/rails/logger.rb	Sat, 05 May 2012 17:10:00 -0400
+lib/grizzled/rails/logger.rb	Sat, 16 Jun 2012 13:38:37 -0400
 lib/grizzled.rb	Thu, 12 Apr 2012 11:46:52 -0400

data/rdoc/lib/grizzled/rails/logger_rb.html

@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">2012-05-05 17:10:00 -0400</dd>
+      <dd class="modified-date">2012-06-16 13:38:37 -0400</dd>
 
       
       <dt class="requires">Requires</dt>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grizzled-rails-logger
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &17574520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *17574520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
 description: ! 'A custom Rails 3 logger
 
 '
@@ -94,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A custom Rails 3 logger