rails3-footnotes 4.0.0.pre.4 → 4.0.0.pre.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+== Footnotes v4.0.0.pre.5 (April 4, 2011)
+  * fix Pathname error in Ruby 1.9
+  * add view note that links to edit the view
+  * fix assigns note to work again
+  * add FIXMEs for remaining broken notes
+
 == Footnotes v4.0.0.pre.4 (April 2, 2011)
   * fix event[:duration] to event.duration in query note
   * fix layout note to work again

data/README.md

@@ -4,22 +4,21 @@
 
 ## Rails 3
 
-Rails 3 compatibility was started by mperham, but was dropped when he discovered rack-bug. I happen to have a
-soft spot for rails-footnotes, so I'm keeping this around for myself.
+Rails 3 compatibility was started by mperham, but dropped when he discovered rack-bug. I haven't been able to get rack-bug to do what I want with Rails 3, and I happen to have a soft spot for rails-footnotes, so I'm keeping this around for myself.
 
 ## Description
 
-If you are developing in Rails you should know the plugin! It displays footnotes in your application for easy
-debugging, such as sessions, request parameters, cookies, filter chain, routes, queries, etc.
-
-Even more, it contains links to open files directly in your editor including your backtrace lines.
-
+This gem plugin for Rails 3 displays footnotes for easy debugging, such as sessions, request parameters, cookies, filter chain, routes, queries, etc. It also contains links to open files directly in your editor.
 
 ## Installation
 
 In your Gemfile:
 
-    gem 'rails-footnotes', :git => 'git://github.com/indirect/rails-footnotes.git'
+    gem 'rails3-footnotes', '~>4.0.0.pre'
+
+or if you prefer the absolute cutting edge:
+
+    gem 'rails3-footnotes', :git => 'git://github.com/indirect/rails-footnotes.git'
 
 ## Configuration
 

data/lib/rails-footnotes/footnotes.rb

@@ -25,7 +25,7 @@ module Footnotes
     @@prefix = 'txmt://open?url=file://%s&line=%d&column=%d'.html_safe
 
     # Edit notes
-    @@notes = [ :controller, :layout, :partials, :stylesheets, :javascripts ]
+    @@notes = [ :view, :controller, :layout, :partials, :stylesheets, :javascripts ]
     # Show notes
     @@notes += [ :render, :assigns, :session, :cookies, :params, :filters, :routes, :env, :queries, :log ]
 

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

@@ -3,68 +3,39 @@ require "#{File.dirname(__FILE__)}/abstract_note"
 module Footnotes
   module Notes
     class AssignsNote < AbstractNote
-      @@ignored_assigns = [
-                            :@action_has_layout,
-                            :@before_filter_chain_aborted,
-                            :@db_rt_after_render,
-                            :@db_rt_before_render,
-                            :@devise_mapping,
-                            :@lookup_context,
-                            :@performed_redirect,
-                            :@performed_render,
-                            :@real_format,
-                            :@template,
-                            :@url,
-                            :@view_context_class,
-                            :@_action_name,
-                            :@_config,
-                            :@_db_runtime,
-                            :@_env,
-                            :@_params,
-                            :@_request,
-                            :@_response,
-                            :@_response_body,
-                            :@_status,
-                            :@_view_runtime,
-                          ]
-      cattr_accessor :ignored_assigns, :instance_writter => false
 
       def initialize(controller)
-        @controller = controller
+        @assigns = controller.send(:view_assigns)
       end
 
       def title
-        "Assigns (#{assigns.size})"
+        "Assigns (#{assign_keys.size})"
       end
 
       def valid?
-        assigns
+        assign_keys.any?
       end
 
       def content
         rows = []
-        assigns.each do |key|
-          rows << [ key, escape(assigned_value(key)) ]
+        assign_keys.each do |key|
+          rows << [ key, escape(@assigns[key].inspect) ]
         end
         mount_table(rows.unshift(['Name', 'Value']), :class => 'name_values', :summary => "Debug information for #{title}")
       end
 
-      protected
+    protected
 
-        def assigns
-          assign = []
-          ignored = @@ignored_assigns
-
-          @controller.instance_variables.each {|x| assign << x.intern }
-          @controller.protected_instance_variables.each {|x| ignored << x.intern } if @controller.respond_to? :protected_instance_variables
+      def assign_keys
+        @assign_keys ||= (@assigns.keys.reject{|k| k[0] == ?_ } - ignored_assigns)
+      end
 
-          assign -= ignored
-          return assign
-        end
+      def ignored_assigns
+        [ "action_has_layout",
+          "lookup_context",
+          "view_context_class" ]
+      end
 
-        def assigned_value(key)
-          @controller.instance_variable_get(key).inspect
-        end
     end
   end
 end

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

@@ -20,7 +20,7 @@ module Footnotes
         # Get controller filter chain
         #
         def parse_filters
-          return [] # TODO @controller.class.filter_chain.collect do |filter|
+          return [] # FIXME @controller.class.filter_chain.collect do |filter|
 #            [parse_method(filter.method), filter.type.inspect, controller_filtered_actions(filter).inspect]
 #          end
         end
@@ -35,12 +35,12 @@ module Footnotes
             mock_controller.action_name = action
 
             #remove conditions (this would call a Proc on the mock_controller)
-            filter.options.merge!(:if => nil, :unless => nil) 
+            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
-        
+
         def parse_method(method = '')
           escape(method.inspect.gsub(RAILS_ROOT, ''))
         end

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

@@ -4,11 +4,11 @@ module Footnotes
   module Notes
     class LogNote < AbstractNote
       @@log = []
-      
+
       def self.log(message)
         @@log << message
       end
-      
+
       def initialize(controller)
         @controller = controller
       end
@@ -20,7 +20,7 @@ module Footnotes
       def content
         escape(log.gsub(/\e\[.+?m/, '')).gsub("\n", '<br />')
       end
-      
+
       def log
         unless @log
           @log = @@log.join('')
@@ -32,6 +32,7 @@ module Footnotes
         @log
       end
 
+      # FIXME (andre 2011-04-04) Fix this to collect Rails 3 logs
       module LoggingExtensions
         def add(*args, &block)
           logged_message = super
@@ -39,7 +40,7 @@ module Footnotes
           logged_message
         end
       end
-      
+
       Rails.logger.extend LoggingExtensions
     end
   end

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

@@ -20,7 +20,7 @@ module Footnotes
       def content
         rows = partials.map do |filename|
           href = Footnotes::Filter.prefix(filename,1,1)
-          name = filename.gsub(Rails.root.join("app/views/"),"")
+          name = filename.gsub(Rails.root.join("app/views/").to_s, '')
           [%{<a href="#{href}">#{name}</a>},"#{@partial_times[filename].sum}ms", @partial_counts[filename]]
         end
         mount_table(rows.unshift(%w(Partial Time Count)), :summary => "Partials for #{title}")

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

@@ -50,6 +50,7 @@ module Footnotes
         STYLESHEET
       end
 
+      # FIXME (andre 2011-04-04) This should look like the old query log, preferably with links to trace the queries.
       def content
         html = ''
 

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

@@ -12,7 +12,7 @@ module Footnotes
       end
 
       def title
-        "<span style=\"background-color:#{color(@page.duration)}\">Rendered (#{"%.3f" % @page.duration}ms)</span>"
+        "<span style=\"background-color:#{color(@page.duration)}\">Render (#{"%.3f" % @page.duration}ms)</span>"
       end
 
       def content

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

@@ -0,0 +1,27 @@
+require "#{File.dirname(__FILE__)}/abstract_note"
+require "#{File.dirname(__FILE__)}/../view_subscriber"
+
+module Footnotes
+  module Notes
+    class ViewNote < AbstractNote
+
+      def row
+        :edit
+      end
+
+      def link
+        escape(Footnotes::Filter.prefix(filename, 1, 1))
+      end
+
+      def valid?
+        prefix? && filename
+      end
+
+    protected
+      def filename
+        Footnotes.view_subscriber.view
+      end
+
+    end
+  end
+end

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "4.0.0.pre.4"
+  VERSION = "4.0.0.pre.5"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-footnotes
 version: !ruby/object:Gem::Version 
-  hash: 1923831841
+  hash: 1923831843
   prerelease: true
   segments: 
   - 4
   - 0
   - 0
   - pre
-  - 4
-  version: 4.0.0.pre.4
+  - 5
+  version: 4.0.0.pre.5
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -83,6 +83,7 @@ files:
 - lib/rails-footnotes/notes/rpm_note.rb
 - lib/rails-footnotes/notes/session_note.rb
 - lib/rails-footnotes/notes/stylesheets_note.rb
+- lib/rails-footnotes/notes/view_note.rb
 - lib/rails-footnotes/version.rb
 - lib/rails-footnotes/view_subscriber.rb
 - lib/rails-footnotes.rb