@@ -1,9 +1,15 @@ TODO: * Create ProfilerNote + * Javascript injection for partials -== Footnotes v3.2.2 +== Footnotes v3.3 Author: José Valim (jose.valim@gmail.com) Site: http://www.pagestacker.com/ + http://josevalim.blogspot.com/ + * Rails Edge (aka 2.2) compatibility; + * Initial Ruby 1.9 compatibility. + +== Footnotes v3.2.2 * Added trace to QueriesNote; * Fixed incompatibility with Ultrasphinx (thanks to mhartl); * Added W3C compatibility (thanks to tapajos); CHANGELOG @@ -1,4 +1,4 @@ -Footnotes plugin for Rails (v3.2.2) +Footnotes plugin for Rails (v3.3) ----------------------------------- If you are developing in Rails you should know the plugin! @@ -23,6 +23,14 @@ If you are using Git for your own app, then you could use Git sub-modules or the Early versions ============== +The current version is only Rails Edge (aka Rails 2.2) compatible. If you are running on Rails 2.1.x, you should use Footnotes v3.2.2: + + cd myapp + git clone git://github.com/drnic/rails-footnotes.git vendor/plugins/footnotes + cd vendor/plugins/footnotes + git checkout v3.2.2 + rm -rf ./.git + If you are running on Rails 2.0.x or Rails 1.x, you should use Footnotes v3.0: cd myapp README.markdown @@ -50,6 +50,6 @@ module Footnotes end end -Exception.send :include, Footnotes::Extensions::Exception -ActionView::TemplateError.send :include, Footnotes::Extensions::ActionView -ActionController::Base.send :include, Footnotes::Extensions::ActionController \ No newline at end of file +Exception.__send__ :include, Footnotes::Extensions::Exception +ActionView::TemplateError.__send__ :include, Footnotes::Extensions::ActionView +ActionController::Base.__send__ :include, Footnotes::Extensions::ActionController \ No newline at end of file lib/backtracer.rb @@ -114,7 +114,7 @@ module Footnotes end def first_render? - @template.first_render + @template.__send__(:_first_render) end def valid_format? @@ -122,7 +122,7 @@ module Footnotes end def valid_content_type? - c = @controller.response.headers['Content-Type'] + c = @controller.response.headers['Content-Type'].to_s (c.nil? || c =~ /html/) end lib/footnotes.rb @@ -66,4 +66,4 @@ module Footnotes end end -Footnotes::Filter.send :include, Footnotes::Components if Footnotes::Filter.notes.include?(:components) \ No newline at end of file +Footnotes::Filter.__send__ :include, Footnotes::Components if Footnotes::Filter.notes.include?(:components) \ No newline at end of file lib/notes/components_note.rb @@ -4,7 +4,7 @@ module Footnotes module Notes class CookiesNote < AbstractNote def initialize(controller) - @cookies = (controller.send(:cookies) || {}).symbolize_keys + @cookies = (controller.__send__(:cookies) || {}).symbolize_keys end def self.to_sym lib/notes/cookies_note.rb @@ -45,7 +45,7 @@ module Footnotes #remove conditions (this would call a Proc on the mock_controller) filter.options.merge!(:if => nil, :unless => nil) - filter.send!(:should_run_callback?, mock_controller) + filter.__send__(:should_run_callback?, mock_controller) }.map(&:to_sym) end lib/notes/filters_note.rb @@ -2,26 +2,39 @@ require "#{File.dirname(__FILE__)}/view_note" module Footnotes module Notes - class LayoutNote < ViewNote + class LayoutNote < AbstractNote + def initialize(controller) + @controller = controller + @template = controller.instance_variable_get('@template') + end + def self.to_sym :layout end + def row + :edit + end + def title 'Layout' end def link - escape(Footnotes::Filter.prefix + layout_file_name) + escape(Footnotes::Filter.prefix + layout_filename) end def valid? - @controller.active_layout && prefix? + prefix? && @controller.active_layout && layout_template end protected - def layout_file_name - File.expand_path(template_base_path(@controller.active_layout)) + def layout_template + @layout_template ||= @template.__send__(:_pick_template, @controller.active_layout) + end + + def layout_filename + layout_template.filename end end end lib/notes/layout_note.rb @@ -45,11 +45,15 @@ JAVASCRIPT html = '' @@sql.each_with_index do |item, i| + sql_links = [] + sql_links << "<a href=\"#\" style=\"color:#A00;\" onclick=\"queries_toogle('table',#{i});return false\">explain</a>" if item.explain + sql_links << "<a href=\"#\" style=\"color:#00A;\" onclick=\"queries_toogle('trace',#{i});return false\">trace</a>" if item.trace + html << <<-HTML - <b id="qtitle_#{i}">#{escape(item.type.to_s.upcase)}</b> (<a href="#" style="color:#A00;" onclick="queries_toogle('table',#{i});return false">explain</a> | <a href="#" style="color:#00A;" onclick="queries_toogle('trace',#{i});return false">trace</a>)<br /> - #{escape(item.name || 'SQL')} (#{sprintf('%f', item.time)}s)<br /> - #{escape(item.query.gsub(/(\s)+/, ' ').gsub('`', ''))}<br /> - #{mount_table(parse_explain(item.explain), :id => "qtable_#{i}", :style => 'margin:10px;display:none;') if item.explain} + <b id="qtitle_#{i}">#{escape(item.type.to_s.upcase)}</b> (#{sql_links.join(' | ')})<br /> + #{print_name_and_time(item.name, item.time)}<br /> + #{print_query(item.query)}<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 @@ -71,6 +75,18 @@ HTML "<a href=\"#{escape("#{Footnotes::Filter.prefix}#{RAILS_ROOT}/#{s[0]}&line=#{s[1].to_i}")}\">#{escape(t)}</a><br />" end.join end + + def print_name_and_time(name, time) + "#{escape(name || 'SQL')} (#{sprintf('%f', time)}s)" + 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 end @@ -135,10 +151,10 @@ HTML end if Footnotes::Notes::QueriesNote.included? - ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Footnotes::Extensions::AbstractAdapter + ActiveRecord::ConnectionAdapters::AbstractAdapter.__send__ :include, Footnotes::Extensions::AbstractAdapter ActiveRecord::ConnectionAdapters.local_constants.each do |adapter| next unless adapter =~ /.*[^Abstract]Adapter$/ next if adapter =~ /SQLite.Adapter$/ - eval("ActiveRecord::ConnectionAdapters::#{adapter}").send :include, Footnotes::Extensions::QueryAnalyzer + eval("ActiveRecord::ConnectionAdapters::#{adapter}").__send__ :include, Footnotes::Extensions::QueryAnalyzer end end \ No newline at end of file lib/notes/queries_note.rb @@ -63,5 +63,5 @@ module Footnotes end if Footnotes::Notes::RoutesNote.included? - ActionController::Routing::RouteSet.send :include, Footnotes::Extensions::Routes + ActionController::Routing::RouteSet.__send__ :include, Footnotes::Extensions::Routes end \ No newline at end of file lib/notes/routes_note.rb @@ -21,28 +21,20 @@ module Footnotes end def link - escape(Footnotes::Filter.prefix + template_file_name) + escape(Footnotes::Filter.prefix + filename) end def valid? - template_path && prefix? && @template.respond_to?(:finder) + prefix? && first_render? end protected - def template_extension(path) - @template.finder.pick_template_extension(path) + def first_render? + @template.__send__(:_first_render) end - - def template_base_path(path) - @template.finder.pick_template(path, template_extension(path)) - end - - def template_path - @template.first_render - end - - def template_file_name - File.expand_path(template_base_path(template_path)) + + def filename + @filename ||= @template.__send__(:_first_render).filename end end end lib/notes/view_note.rb @@ -164,7 +164,7 @@ class FootnotesTest < Test::Unit::TestCase # Then we call add_footnotes! # def footnotes_perform! - @controller.template.expects(:first_render).returns(true) + @controller.template.expects(:_first_render).returns(true) @controller.performed_render = true @controller.template.expects(:template_format).returns('html') test/footnotes_test.rb 68fddf407ba2f2abf493d6c43be481cd0a9a01b9 Jose' Valim jose.valim@gmail.com http://github.com/drnic/rails-footnotes/commit/d42fef4fab0f40f81c86bdaa6ed2a6d193b226b2 d42fef4fab0f40f81c86bdaa6ed2a6d193b226b2 2008-09-09T17:18:40-07:00 2008-09-09T17:18:40-07:00 Added Rails Edge (aka 2.2) support! 72b06970d30d76859f19c94ddbeb1c036c23f96c Jose' Valim jose.valim@gmail.com