rails-footnotes 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb24d7d697c09db406447acfedef8f683044736
-  data.tar.gz: f23154a732d475110df4b607d8168e0818f531d7
+  metadata.gz: 30f78c7266a4f4e1ec31ead76bdfa0df95f83759
+  data.tar.gz: 87c90a35321e12cb18fcc551450038d2e2c83de2
 SHA512:
-  metadata.gz: 04383c31311d242b02852f00d9640cd31b79baac0696e5dbafdcd6e335069feaeb49b675bbcbfa1535b3a1ddc0cef493dfba91bb1d2d6849192055bd1651b5e6
-  data.tar.gz: f4515392b32c4af3995400edaf6802115db1658f06eae7df587a262974c1e6d642d8befe26181481a50083e16a033d16880ef292e3a6c7451159867aa8c52a39
+  metadata.gz: 676ba9d1a928b9abc18a5eba12d3fd58aba70793120659944b39e3fc10db6cb88749a8b0e2eb85d10c736c5b8ccdb646ebae26d844b1e9c77627d35d39ae377c
+  data.tar.gz: 8d88e8d16638d10a8610adcd5e40d3e647664be877cbc0745da8f9b752a330d1ef1e39b62453d175a452e346d355fb765f316accb074948c04d45e898e3ab268

data/CHANGELOG

@@ -1,3 +1,5 @@
+== Footnotes v4.1.3 ==
+  * Improve fix done in 4.1.2 that broke support with rails 3 (thanks kirikiriyamama)
 == Footnotes v4.1.2 ==
   * Fix errors when some log formatters return nil
 == Footnotes v4.1.1 ==

data/README.rdoc

@@ -18,8 +18,7 @@ Installing Rails Footnotes is very easy.
 
 === Rails 3.2.x/4.x
 
-    gem 'rails-footnotes', '>= 4.0.0', '<5'
-
+    gem 'rails-footnotes', '~> 4.0'
 
 After you install RailsFootnotes and add it to your Gemfile, you need to run the generator:
 

data/lib/rails-footnotes/notes/log_note.rb

@@ -12,7 +12,12 @@ module Footnotes
         self.original_logger = Rails.logger
         note_logger = NoteLogger.new(self.logs)
         note_logger.level = self.original_logger.level
-        note_logger.formatter = self.original_logger.kind_of?(Logger) ? self.original_logger.formatter : ActiveSupport::Logger::SimpleFormatter.new
+        note_logger.formatter =
+          if self.original_logger.kind_of?(Logger)
+            self.original_logger.formatter
+          else
+            defined?(ActiveSupport::Logger) ? ActiveSupport::Logger::SimpleFormatter.new : Logger::SimpleFormatter.new
+          end
         # Rails 3 don't have ActiveSupport::Logger#broadcast so we backported it
         extend_module = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger.broadcast(note_logger) : NoteLogger.broadcast(note_logger)
         Rails.logger = self.original_logger.dup.extend(extend_module)

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "4.1.2"
+  VERSION = "4.1.3"
 end

data/spec/controllers/log_note_controller_spec.rb

@@ -26,15 +26,6 @@ describe 'log note' do
     Footnotes.enabled = false
   end
 
-  before do
-    @original_logger = Rails.logger
-    Rails.logger = Logger.new(StringIO.new)
-  end
-
-  after do
-    Rails.logger = @original_logger
-  end
-
   it 'Includes the log in the response' do
     get :index
     log_debug = first('fieldset#log_debug_info div', :visible => false)

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ rescue LoadError
 end
 ENV["RAILS_ENV"] ||= 'test'
 require "rails-footnotes"
-Rails.logger = Logger.new(STDOUT)
 
 module FooBar
   class Application < Rails::Application
@@ -20,6 +19,8 @@ end
 
 RSpec.configure do |config|
 
+  Rails.application.initialize!
+
   Rails.application.routes.draw do
     get 'footnotes/foo'
     get 'footnotes/foo_holder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-footnotes
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Roman V. Babenko
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails