rails3-footnotes 4.0.0.pre.6 → 4.0.0.pre.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+== Footnotes v4.0.0.pre.7 (April 5, 2011)
+  * rewrite the log note so it actually works! yay!
+  * fix the view note to work again (oops)
+
 == Footnotes v4.0.0.pre.6 (April 5, 2011)
   * fix another Pathname error in Ruby 1.9
 

data/lib/rails-footnotes.rb

@@ -20,6 +20,12 @@ module Footnotes
         ActionController::Base.after_filter Footnotes::AfterFilter
       end
     end
+
+    # Hook into the logger so we can collect logs
+    initializer "rails3-footnotes.hook_logger" do
+      raise ArgumentError, "We need a logger to get logs" unless Rails.logger
+      Rails.logger.extend Footnotes::LoggingExtensions
+    end
   end
 
 end

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

@@ -3,46 +3,47 @@ require "#{File.dirname(__FILE__)}/abstract_note"
 module Footnotes
   module Notes
     class LogNote < AbstractNote
-      @@log = []
+
+      def self.logs
+        @@logs ||= []
+      end
 
       def self.log(message)
-        @@log << message
+        logs << message unless message =~ /SQL|SELECT/
+      end
+
+      def self.clear_logs
+        @@logs = []
       end
 
       def initialize(controller)
         @controller = controller
       end
 
-      def title
-        "Log (#{log.count("\n")})"
+      def start!
+        self.class.clear_logs
       end
 
-      def content
-        escape(log.gsub(/\e\[.+?m/, '')).gsub("\n", '<br />')
+      def title
+        "Log (#{self.class.logs.size})"
       end
 
-      def log
-        unless @log
-          @log = @@log.join('')
-          @@log = []
-          if rindex = @log.rindex('Processing '+@controller.class.name+'#'+@controller.action_name)
-            @log = @log[rindex..-1]
-          end
-        end
-        @log
+      def content
+        self.class.logs.map do |l|
+          escape(l.gsub(/\e\[.+?m/, ''))
+        end.join('<br />')
       end
 
-      # FIXME (andre 2011-04-04) Fix this to collect Rails 3 logs
-      module LoggingExtensions
-        def add(*args, &block)
-          logged_message = super
-          Footnotes::Notes::LogNote.log(logged_message)
-          logged_message
-        end
-      end
+    end
+  end
 
-      Rails.logger.extend LoggingExtensions
+  module LoggingExtensions
+    def add(*args, &block)
+      message = super
+      Footnotes::Notes::LogNote.log(message)
+      message
     end
   end
+
 end
 

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

@@ -10,11 +10,15 @@ module Footnotes
       end
 
       def link
-        escape(Footnotes::Filter.prefix(Footnotes.view_subscriber.view, 1, 1))
+        escape(Footnotes::Filter.prefix(view, 1, 1))
       end
 
       def valid?
-        prefix? && filename
+        prefix? && view
+      end
+
+      def view
+        @view ||= Footnotes.view_subscriber.view
       end
 
     end

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "4.0.0.pre.6"
+  VERSION = "4.0.0.pre.7"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-footnotes
 version: !ruby/object:Gem::Version 
-  hash: 1923831845
+  hash: 1923831847
   prerelease: true
   segments: 
   - 4
   - 0
   - 0
   - pre
-  - 6
-  version: 4.0.0.pre.6
+  - 7
+  version: 4.0.0.pre.7
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"