rails-footnotes 3.6.3 → 3.6.4

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

@@ -1,19 +1,19 @@
-require "#{File.dirname(__FILE__)}/abstract_note"
-
-module Footnotes
-  module Notes
-    class GeneralNote < AbstractNote
-      def title
-        'General Debug'
-      end
-
-      def legend
-        'General (id="general_debug_info")'
-      end
-
-      def content
-        'You can use this tab to debug other parts of your application, for example Javascript.'
-      end
-    end
-  end
+require "#{File.dirname(__FILE__)}/abstract_note"
+
+module Footnotes
+  module Notes
+    class GeneralNote < AbstractNote
+      def title
+        'General Debug'
+      end
+
+      def legend
+        'General (id="general_debug_info")'
+      end
+
+      def content
+        'You can use this tab to debug other parts of your application, for example Javascript.'
+      end
+    end
+  end
 end

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

@@ -1,16 +1,16 @@
-require "#{File.dirname(__FILE__)}/files_note"
-
-module Footnotes
-  module Notes
-    class JavascriptsNote < FilesNote
-      def title
-        "Javascripts (#{@files.length})"
-      end
-
-      protected
-        def scan_text(text)
-          text.scan(/<script[^>]+src\s*=\s*['"]([^>?'"]+\.js)/im).flatten
-        end
-    end
-  end
+require "#{File.dirname(__FILE__)}/files_note"
+
+module Footnotes
+  module Notes
+    class JavascriptsNote < FilesNote
+      def title
+        "Javascripts (#{@files.length})"
+      end
+
+      protected
+        def scan_text(text)
+          text.scan(/<script[^>]+src\s*=\s*['"]([^>?'"]+\.js)/im).flatten
+        end
+    end
+  end
 end

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

@@ -1,28 +1,28 @@
-require "#{File.dirname(__FILE__)}/abstract_note"
-
-module Footnotes
-  module Notes
-    class LayoutNote < AbstractNote
-      def initialize(controller)
-        @controller = controller
-      end
-
-      def row
-        :edit
-      end
-
-      def link
-        escape(Footnotes::Filter.prefix(filename, 1, 1))
-      end
-
-      def valid?
-        prefix? && @controller.active_layout
-      end
-
-      protected
-        def filename
-          File.join(File.expand_path(RAILS_ROOT), 'app', 'layouts', "#{@controller.active_layout.to_s.underscore}").sub('/layouts/layouts/', '/views/layouts/')
-        end
-    end
-  end
-end
+require "#{File.dirname(__FILE__)}/abstract_note"
+
+module Footnotes
+  module Notes
+    class LayoutNote < AbstractNote
+      def initialize(controller)
+        @controller = controller
+      end
+
+      def row
+        :edit
+      end
+
+      def link
+        escape(Footnotes::Filter.prefix(filename, 1, 1))
+      end
+
+      def valid?
+        prefix? && @controller.active_layout
+      end
+
+      protected
+        def filename
+          File.join(File.expand_path(RAILS_ROOT), 'app', 'layouts', "#{@controller.active_layout.to_s.underscore}").sub('/layouts/layouts/', '/views/layouts/')
+        end
+    end
+  end
+end

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

@@ -1,36 +1,47 @@
-require "#{File.dirname(__FILE__)}/abstract_note"
-
-module Footnotes
-  module Notes
-    class LogNote < AbstractNote
-      def initialize(controller)
-        @controller = controller
-      end
-
-      def content
-        escape(log_tail).gsub("\n","<br />")
-      end
-
-      protected
-        def log_tail
-          filename = if RAILS_DEFAULT_LOGGER.instance_variable_get('@log')
-            RAILS_DEFAULT_LOGGER.instance_variable_get('@log').path
-          else 
-            RAILS_DEFAULT_LOGGER.instance_variable_get('@logdev').filename
-          end
-          file_string = File.open(filename).read.to_s
-
-          # We try to select the specified action from the log
-          # If we can't find it, we get the last 100 lines
-          #
-          if rindex = file_string.rindex('Processing '+@controller.controller_class_name+'#'+@controller.action_name)
-            file_string[rindex..-1].gsub(/\e\[.+?m/, '')
-          else
-            lines = file_string.split("\n")
-            index = [lines.size-100,0].max
-            lines[index..-1].join("\n")
-          end
-        end
-    end
-  end
-end
+require "#{File.dirname(__FILE__)}/abstract_note"
+
+module Footnotes
+  module Notes
+    class LogNote < AbstractNote
+      @@log = []
+      
+      def self.log(message)
+        @@log << message
+      end
+      
+      def initialize(controller)
+        @controller = controller
+      end
+
+      def title
+        "Log (#{log.count("\n")})"
+      end
+
+      def content
+        escape(log.gsub(/\e\[.+?m/, '')).gsub("\n", '<br />')
+      end
+      
+      def log
+        unless @log
+          @log = @@log.join('')
+          @@log = []
+          if rindex = @log.rindex('Processing '+@controller.controller_class_name+'#'+@controller.action_name)
+            @log = @log[rindex..-1]
+          end
+        end
+        @log
+      end
+
+      module LoggingExtensions
+        def add(*args, &block)
+          logged_message = super
+          Footnotes::Notes::LogNote.log(logged_message)
+          logged_message
+        end
+      end
+      
+      Rails.logger.extend LoggingExtensions
+    end
+  end
+end
+

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

@@ -1,19 +1,19 @@
-require "#{File.dirname(__FILE__)}/abstract_note"
-
-module Footnotes
-  module Notes
-    class ParamsNote < AbstractNote
-      def initialize(controller)
-        @params = controller.params.symbolize_keys
-      end
-
-      def title
-        "Params (#{@params.length})"
-      end
+require "#{File.dirname(__FILE__)}/abstract_note"
+
+module Footnotes
+  module Notes
+    class ParamsNote < AbstractNote
+      def initialize(controller)
+        @params = controller.params.symbolize_keys
+      end
+
+      def title
+        "Params (#{@params.length})"
+      end
 
       def content
-        mount_table_for_hash(@params)
-      end
-    end
-  end
+        mount_table_for_hash(@params)
+      end
+    end
+  end
 end

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

@@ -1,61 +1,61 @@
-require "#{File.dirname(__FILE__)}/abstract_note"
-
-module Footnotes
-  module Notes
-    class QueriesNote < AbstractNote
-      @@alert_db_time = 0.16
-      @@alert_sql_number = 8
-      @@sql = []
-      cattr_accessor :sql, :alert_db_time, :alert_sql_number, :alert_explain, :instance_writter => false
-
-      def self.start!(controller)
-        @@sql = []
-      end
-
-      def self.to_sym
-        :queries
-      end
-
-      def title
-        db_time = @@sql.inject(0){|sum, item| sum += item.time }
-        query_color = generate_red_color(@@sql.length, alert_sql_number)
+require "#{File.dirname(__FILE__)}/abstract_note"
+
+module Footnotes
+  module Notes
+    class QueriesNote < AbstractNote
+      @@alert_db_time = 0.16
+      @@alert_sql_number = 8
+      @@sql = []
+      cattr_accessor :sql, :alert_db_time, :alert_sql_number, :alert_explain, :instance_writter => false
+
+      def self.start!(controller)
+        @@sql = []
+      end
+
+      def self.to_sym
+        :queries
+      end
+
+      def title
+        db_time = @@sql.inject(0){|sum, item| sum += item.time }
+        query_color = generate_red_color(@@sql.length, alert_sql_number)
         db_color    = generate_red_color(db_time, alert_db_time)
-
-        <<-TITLE
-  <span style="background-color:#{query_color}">Queries (#{@@sql.length})</span> 
-  <span style="background-color:#{db_color}">DB (#{"%.6f" % db_time}s)</span>
-        TITLE
-      end
-
-      def stylesheet
-        <<-STYLESHEET
-  #queries_debug_info table td, #queries_debug_info table th{border:1px solid #A00; padding:0 3px; text-align:center;}
-  #queries_debug_info table thead, #queries_debug_info table tbody {color:#A00;}
-  #queries_debug_info p {background-color:#F3F3FF; border:1px solid #CCC; margin:12px; padding:4px 6px;}
-  #queries_debug_info a:hover {text-decoration:underline;}
-        STYLESHEET
-      end
-
-      def content
-        html = ''
-
-        @@sql.each_with_index do |item, i|
-          sql_links = []
-          sql_links << "<a href=\"javascript:Footnotes.toggle('qtable_#{i}')\" style=\"color:#A00;\">explain</a>" if item.explain
-          sql_links << "<a href=\"javascript:Footnotes.toggle('qtrace_#{i}')\" style=\"color:#00A;\">trace</a>" if item.trace
-
-          html << <<-HTML
-  <b id="qtitle_#{i}">#{escape(item.type.to_s.upcase)}</b> (#{sql_links.join(' | ')})<br />
-  #{print_name_and_time(item.name, item.time)}<br />
-  <span id="explain_#{i}">#{print_query(item.query)}</span><br />
-  #{print_explain(i, item.explain) if item.explain}
-  <p id="qtrace_#{i}" style="display:none;">#{parse_trace(item.trace) if item.trace}</p><br />
-          HTML
-        end
-
-        return html
-      end
-
+
+        <<-TITLE
+  <span style="background-color:#{query_color}">Queries (#{@@sql.length})</span> 
+  <span style="background-color:#{db_color}">DB (#{"%.6f" % db_time}s)</span>
+        TITLE
+      end
+
+      def stylesheet
+        <<-STYLESHEET
+  #queries_debug_info table td, #queries_debug_info table th{border:1px solid #A00; padding:0 3px; text-align:center;}
+  #queries_debug_info table thead, #queries_debug_info table tbody {color:#A00;}
+  #queries_debug_info p {background-color:#F3F3FF; border:1px solid #CCC; margin:12px; padding:4px 6px;}
+  #queries_debug_info a:hover {text-decoration:underline;}
+        STYLESHEET
+      end
+
+      def content
+        html = ''
+
+        @@sql.each_with_index do |item, i|
+          sql_links = []
+          sql_links << "<a href=\"javascript:Footnotes.toggle('qtable_#{i}')\" style=\"color:#A00;\">explain</a>" if item.explain
+          sql_links << "<a href=\"javascript:Footnotes.toggle('qtrace_#{i}')\" style=\"color:#00A;\">trace</a>" if item.trace
+
+          html << <<-HTML
+  <b id="qtitle_#{i}">#{escape(item.type.to_s.upcase)}</b> (#{sql_links.join(' | ')})<br />
+  #{print_name_and_time(item.name, item.time)}<br />
+  <span id="explain_#{i}">#{print_query(item.query)}</span><br />
+  #{print_explain(i, item.explain) if item.explain}
+  <p id="qtrace_#{i}" style="display:none;">#{parse_trace(item.trace) if item.trace}</p><br />
+          HTML
+        end
+
+        return html
+      end
+
       protected
         def parse_explain(results)
           table = []
@@ -65,108 +65,108 @@ module Footnotes
           end
           table
         end
-
-        def parse_trace(trace)
-          trace.map do |t|
-            s = t.split(':')
-            %[<a href="#{escape(Footnotes::Filter.prefix("#{RAILS_ROOT}/#{s[0]}", s[1].to_i, 1))}">#{escape(t)}</a><br />]
-          end.join
-        end
-
-        def print_name_and_time(name, time)
-          "<span style='background-color:#{generate_red_color(time, alert_ratio)}'>#{escape(name || 'SQL')} (#{sprintf('%f', time)}s)</span>"
-        end
-
-        def print_query(query)
-          escape(query.to_s.gsub(/(\s)+/, ' ').gsub('`', ''))
-        end
-
+
+        def parse_trace(trace)
+          trace.map do |t|
+            s = t.split(':')
+            %[<a href="#{escape(Footnotes::Filter.prefix("#{RAILS_ROOT}/#{s[0]}", s[1].to_i, 1))}">#{escape(t)}</a><br />]
+          end.join
+        end
+
+        def print_name_and_time(name, time)
+          "<span style='background-color:#{generate_red_color(time, alert_ratio)}'>#{escape(name || 'SQL')} (#{sprintf('%f', time)}s)</span>"
+        end
+
+        def print_query(query)
+          escape(query.to_s.gsub(/(\s)+/, ' ').gsub('`', ''))
+        end
+
         def print_explain(i, explain)
           mount_table(parse_explain(explain), :id => "qtable_#{i}", :style => 'margin:10px;display:none;')
-        end
-
+        end
+
         def generate_red_color(value, alert)
           c = ((value.to_f/alert).to_i - 1) * 16
           c = 0  if c < 0
           c = 15 if c > 15
-
-          c = (15-c).to_s(16)
-          "#ff#{c*4}"
+
+          c = (15-c).to_s(16)
+          "#ff#{c*4}"
         end
 
         def alert_ratio
           alert_db_time / alert_sql_number
-        end
-
-    end
-  end
-
-  module Extensions
-    class Sql
-      attr_accessor :type, :name, :time, :query, :explain, :trace
-
-      def initialize(type, name, time, query, explain)
-        @type = type
-        @name = name
-        @time = time
-        @query = query
-        @explain = explain
-
-        # Strip, select those ones from app and reject first two, because they
-        # are from the plugin
-        @trace = Kernel.caller.collect(&:strip).select{|i| i.gsub!(/^#{RAILS_ROOT}\//im, '') }[2..-1]
-      end
-    end
-
-    module QueryAnalyzer
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :execute, :analyzer
-        end
-      end
-
-      def execute_with_analyzer(query, name = nil)
-        query_results = nil
-        time = Benchmark.realtime { query_results = execute_without_analyzer(query, name) }
-
-        if query =~ /^(select|create|update|delete)\b/i
-          type = $&.downcase.to_sym
-          explain = nil
-
-          if adapter_name == 'MySQL' && type == :select
-            log_silence do
-              explain = execute_without_analyzer("EXPLAIN #{query}", name)
-            end
-          end
-          Footnotes::Notes::QueriesNote.sql << Footnotes::Extensions::Sql.new(type, name, time, query, explain)
-        end
-
-        query_results
-      end
-    end
-
-    module AbstractAdapter
-      def log_silence
-        result = nil
-        if @logger
-          @logger.silence do
-            result = yield
-          end
-        else
-          result = yield
-        end
-        result
-      end
-    end
-
-  end
-end
-
-if Footnotes::Notes::QueriesNote.included?
-  ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Footnotes::Extensions::AbstractAdapter
-  ActiveRecord::ConnectionAdapters.local_constants.each do |adapter|
-    next unless adapter =~ /.*[^Abstract]Adapter$/
-    next if adapter =~ /SQLiteAdapter$/
-    eval("ActiveRecord::ConnectionAdapters::#{adapter}").send :include, Footnotes::Extensions::QueryAnalyzer
-  end
-end
+        end
+
+    end
+  end
+
+  module Extensions
+    class Sql
+      attr_accessor :type, :name, :time, :query, :explain, :trace
+
+      def initialize(type, name, time, query, explain)
+        @type = type
+        @name = name
+        @time = time
+        @query = query
+        @explain = explain
+
+        # Strip, select those ones from app and reject first two, because they
+        # are from the plugin
+        @trace = Kernel.caller.collect(&:strip).select{|i| i.gsub!(/^#{RAILS_ROOT}\//im, '') }[2..-1]
+      end
+    end
+
+    module QueryAnalyzer
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :execute, :analyzer if respond_to?(:execute)
+        end
+      end
+
+      def execute_with_analyzer(query, name = nil)
+        query_results = nil
+        time = Benchmark.realtime { query_results = execute_without_analyzer(query, name) }
+
+        if query =~ /^(select|create|update|delete)\b/i
+          type = $&.downcase.to_sym
+          explain = nil
+
+          if adapter_name == 'MySQL' && type == :select
+            log_silence do
+              explain = execute_without_analyzer("EXPLAIN #{query}", name)
+            end
+          end
+          Footnotes::Notes::QueriesNote.sql << Footnotes::Extensions::Sql.new(type, name, time, query, explain)
+        end
+
+        query_results
+      end
+    end
+
+    module AbstractAdapter
+      def log_silence
+        result = nil
+        if @logger
+          @logger.silence do
+            result = yield
+          end
+        else
+          result = yield
+        end
+        result
+      end
+    end
+
+  end
+end
+
+if Footnotes::Notes::QueriesNote.included?
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Footnotes::Extensions::AbstractAdapter
+  ActiveRecord::ConnectionAdapters.local_constants.each do |adapter|
+    next unless adapter =~ /.*[^Abstract]Adapter$/
+    next if adapter =~ /SQLiteAdapter$/
+    eval("ActiveRecord::ConnectionAdapters::#{adapter}").send :include, Footnotes::Extensions::QueryAnalyzer
+  end
+end