mediashelf-loggable 0.4.3 → 0.4.5

data/Gemfile

@@ -1,6 +1,5 @@
 source "http://rubygems.org"
 
-
 group :development, :test do
   gem "jeweler"
   gem "mocha"
@@ -12,3 +11,4 @@ group :development, :test do
   gem "ruby-debug"
 end
 
+gemspec

data/Gemfile.lock

@@ -13,6 +13,7 @@ GEM
     json_pure (1.4.6)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
+    logger (1.2.8)
     mocha (0.9.9)
       rake
     rake (0.8.7)
@@ -35,6 +36,7 @@ DEPENDENCIES
   RedCloth
   jeweler
   jnunemaker-matchy
+  logger
   mocha
   rcov
   ruby-debug

data/History.txt

@@ -1,3 +1,7 @@
+0.4.3
+
+Don't use this version.  It will raise "stack trace too deep" errors in some cases
+
 0.4.2
 
 Fixed bug in the line that checks for ::Rails.logger

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.5

data/lib/loggable/log_methods.rb

@@ -18,11 +18,18 @@ module Loggable
     # If ::Rails.logger is defined, that will be returned.
     # If no logger has been defined, a new STDOUT Logger will be created.
     def logger
-      if (defined?(::Rails) && !::Rails.logger.nil?)
-        @@logger = ::Rails.logger
-      else
-        @@logger ||= ::Logger.new(STDOUT)
+      
+      if defined?(::Rails) && Rails.respond_to?(:version)
+        if Rails.version >= "3.0" && defined?(::Rails::Application) && !::Rails.logger.nil?
+          @@logger = ::Rails.logger
+        elsif defined?(RAILS_DEFAULT_LOGGER)
+          @@logger = RAILS_DEFAULT_LOGGER
+        end
       end
+      
+      # If none of the above was able to set @@logger, create a new default logger
+      @@logger ||= ::Logger.new(STDOUT)
+      
       return @@logger
     end
     

data/mediashelf-loggable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mediashelf-loggable}
-  s.version = "0.4.3"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Patrick Reagan", "Matt Zumwalt"]
-  s.date = %q{2011-07-25}
+  s.authors = [%q{Patrick Reagan}, %q{Matt Zumwalt}]
+  s.date = %q{2011-07-28}
   s.description = %q{A gem that provides logging capabilities to any class.  Relies on Rails logger if it's available.  Extended from loggable gem by viget}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
      "lib/loggable.rb",
      "lib/loggable/log_methods.rb",
      "lib/loggable/logger_stub.rb",
-     "lib/loggable/version.rb",
      "lib/tasks/loggable.rake",
      "loggable.gemspec",
      "mediashelf-loggable.gemspec",
@@ -36,9 +35,9 @@ Gem::Specification.new do |s|
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/mediashelf/mediashelf-loggable}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rdoc_options = [%q{--charset=UTF-8}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{A gem that provides logging capabilities to any class}
   s.test_files = [
     "test/examples/log_methods_test.rb",

data/test/examples/log_methods_test.rb

@@ -52,9 +52,63 @@ class LogMethodsTest < Test::Unit::TestCase
 
   end
   
-  context "MyModule in Rails3" do
+  context "MyModule with Rails defined but not initialized" do
     setup do
       class ::Rails
+      end 
+    end
+    
+    teardown do
+      Object.send(:remove_const, :Rails)
+    end
+    
+    should "use the default logger" do
+      MyModule.logger = nil
+      MyModule.logger.should be_kind_of(Logger)
+    end
+  end
+    
+  
+  context "MyModule in Rails2" do
+    setup do
+      class ::Rails
+        def self.version
+          return "2.8.5"
+        end
+      end 
+      module ::ActiveSupport 
+        class BufferedLogger
+          def initialize(arg)
+          end
+        end
+      end
+      Object.const_set(:RAILS_DEFAULT_LOGGER, ActiveSupport::BufferedLogger.new(STDOUT))
+      # ::RAILS_DEFAULT_LOGGER = 
+    end
+    
+    teardown do
+      Object.send(:remove_const, :Rails)
+      Object.send(:remove_const, :ActiveSupport)
+      Object.send(:remove_const, :RAILS_DEFAULT_LOGGER)
+    end
+    
+    should "use Rails2 logger" do
+      MyModule.logger = nil
+      MyModule.logger.should == ::RAILS_DEFAULT_LOGGER
+    end
+    should "switch to using Rails2 logger even if a default logger was already defined" do
+      MyModule.logger = Logger.new(STDOUT)
+      MyModule.logger.should == ::RAILS_DEFAULT_LOGGER
+    end
+  end
+  
+  context "MyModule in Rails3" do
+    setup do
+      module ::Rails
+        class Application;end
+        def self.version
+          return "3.0.0"
+        end
         def self.logger
           return "I'm a Rails Logger."
         end
@@ -65,11 +119,11 @@ class LogMethodsTest < Test::Unit::TestCase
       Object.send(:remove_const, :Rails)
     end
     
-    should "use Rails logger" do
+    should "use Rails3 logger" do
       MyModule.logger = nil
       MyModule.logger.should == Rails.logger
     end
-    should "switch to using Rails logger even if a default logger was already defined" do
+    should "switch to using Rails3 logger even if a default logger was already defined" do
       MyModule.logger = Logger.new(STDOUT)
       MyModule.logger.should == Rails.logger
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mediashelf-loggable
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 -05:00
-default_executable: 
+date: 2011-07-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -53,14 +52,12 @@ files:
 - lib/loggable.rb
 - lib/loggable/log_methods.rb
 - lib/loggable/logger_stub.rb
-- lib/loggable/version.rb
 - lib/tasks/loggable.rake
 - loggable.gemspec
 - mediashelf-loggable.gemspec
 - test/examples/log_methods_test.rb
 - test/examples/logger_stub_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/mediashelf/mediashelf-loggable
 licenses: []
 
@@ -90,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A gem that provides logging capabilities to any class

data/lib/loggable/version.rb

@@ -1,13 +0,0 @@
-module Loggable
-  module Version
-    
-    MAJOR = 0
-    MINOR = 3
-    TINY  = 0
-    
-    def self.to_s # :nodoc:
-      [MAJOR, MINOR, TINY].join('.')
-    end
-    
-  end
-end