rails-footnotes 3.6.7 → 3.7.0

data/.gitignore

@@ -0,0 +1 @@
+tags

data/CHANGELOG

@@ -1,3 +1,7 @@
+== Footnotes v3.7.0
+  * Migrate to Bundler
+  * Support only Rails3
+
 == Footnotes v3.6.7
   * fixed log_note error - long overdue (thanks to many including Moritz Heidkamp)
   * 1.9: ignore more assigns (thanks to justin case)
@@ -14,7 +18,7 @@
   * pre rails 2.3 support fixes (thanks to tobias)
   * better disabling of query notes (thanks to tobias)
   * fixed variable assignment escaping (thanks to gdelvino)
-  * fixed cookie value escaping (thanks to indirect) 
+  * fixed cookie value escaping (thanks to indirect)
   * Turn off footnotes with a parameter footnotes=false (thanks to indirect)
 
 == Footnotes v3.6
@@ -50,7 +54,7 @@
 == Footnotes v3.2.1
   * Added some tests;
   * Redefined Footnotes CSS and Javascripts to use concise names.
-  
+
 == Footnotes v3.2
   * Now you can easily add your own notes;
   * Added numbers to tabs;

data/Gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in mcutter.gemspec
+gemspec
+
+# gem "rails", ">= 3.0.5"
+#
+if RUBY_PLATFORM =~ /darwin/
+  group :test do
+    gem "autotest-growl"
+  end
+end

data/Gemfile.lock

@@ -0,0 +1,83 @@
+PATH
+  remote: .
+  specs:
+    rails-footnotes (3.6.7)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
+    autotest-growl (0.2.9)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.12)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    redgreen (1.2.2)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.25)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  autotest-growl
+  mocha
+  rails (>= 3.0.5)
+  rails-footnotes!
+  redgreen

data/README

@@ -1,12 +1,11 @@
 Rails Footnotes
 License: MIT
-Version: 3.6.7
+Version: 3.7.0
 
 You can also read this README in pretty html at the GitHub project Wiki page
 
   http://wiki.github.com/josevalim/rails-footnotes
 
-
 Description
 -----------
 
@@ -21,28 +20,42 @@ your backtrace lines.
 Installation
 ------------
 
-Install Rails Footnotes is very easy. If you are running on Rails 2.3 just run
-the following:
+Since this branch aims Rails 3 support, if you want to use it with Rails 2.3 you should check this branch:
+
+  https://github.com/josevalim/rails-footnotes/tree/rails2
 
-   sudo gem install rails-footnotes
+Install Rails Footnotes is very easy.
+
+Rails 2.x
 
 In RAILS_ROOT/config/environments/development.rb (yes, you want it only in development):
 
-  config.gem "rails-footnotes"
+  gem "rails-footnotes", '< 3.7.0', :group => :development
 
-If you want it as plugin, just do:
+Rails 3.x
 
-   script/plugin install git://github.com/josevalim/rails-footnotes.git
+   gem 'rails-footnotes', '>= 3.7', :group => :development
 
 Configuration
 -------------
 
+For version greater then 3.7.0
+
+If you want to add alternate logic to enable or disable footnotes,
+add something like this to config/initializers/footnotes.rb:
+
+  if defined?(Footnotes) & Rails.env.development?
+    Footnotes.run! # first of all
+
+    # ... other init code
+  end
+
 If you are not using Textmate as text editor, in your environment.rb or
 in an initializer do:
 
-  if defined?(Footnotes)
-    Footnotes::Filter.prefix = 'txmt://open?url=file://%s&amp;line=%d&amp;column=%d'
-  end
+  Footnotes::Filter.prefix = 'mvim://open?url=file://%s&amp;line=%d&amp;column=%d'
+
+for MacVim
 
 Where you are going to choose a prefix compatible with your text editor. The %s is
 replaced by the name of the file, the first %d is replaced by the line number and
@@ -63,11 +76,6 @@ If you have New Relic RPM installed, you may want to turn off query explains
 
   Footnotes::Notes::QueriesNote.sql_explain = false
 
-If you want to add alternate logic to enable or disable footnotes,
-add something like this to environment.rb:
-
-  ENABLE_RAILS_FOOTNOTES=(Rails.env.production? == false)
-
 Finally, you can control which notes you want to show. The default are:
 
   Footnotes::Filter.notes = [:session, :cookies, :params, :filters, :routes, :env, :queries, :log, :general]
@@ -95,9 +103,9 @@ For example, to create a note that shows info about the user logged in your appl
           @current_user = controller.instance_variable_get("@current_user")
         end
 
-        # The name that will appear as legend in fieldsets
+        # Returns the title that represents this note.
         #
-        def legend
+        def title
           "Current user: #{@current_user.name}"
         end
 

data/Rakefile

@@ -1,28 +1,14 @@
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "rails-footnotes"
-    s.version = "3.6.7"
-    s.rubyforge_project = "rails-footnotes"
-    s.summary = "Every Rails page has footnotes that gives information about your application and links back to your editor."
-    s.email = "keenan@thebrocks.net"
-    s.homepage = "http://github.com/josevalim/rails-footnotes"
-    s.description = "Every Rails page has footnotes that gives information about your application and links back to your editor."
-    s.authors = ['Keenan Brock']
-    s.files =  FileList["[A-Z]*", "{lib}/**/*"]
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
-end
+desc 'Default: run tests'
+task :default => :test
 
 desc 'Run tests for Footnotes.'
 Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
@@ -36,14 +22,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('MIT-LICENSE')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'metric_fu'
-  MetricFu::Configuration.run do |config|
-      #skipping: churn, :stats
-      config.metrics  = [:saikuro, :flog, :flay, :reek, :roodi, :rcov]
-      # config.graphs   = [:flog, :flay, :reek, :roodi, :rcov]
-      config.rcov[:rcov_opts] << "-Itest"
-  end
-rescue LoadError
-end

data/lib/rails-footnotes.rb

@@ -1,23 +1,22 @@
-unless defined?(ENABLE_RAILS_FOOTNOTES)
-  ENABLE_RAILS_FOOTNOTES=(RAILS_ENV == 'development')
-end
-if ENABLE_RAILS_FOOTNOTES
-  dir = File.dirname(__FILE__)
-  require File.join(dir, 'rails-footnotes', 'footnotes')
-  require File.join(dir, 'rails-footnotes', 'backtracer')
-
-  # Load all notes
-  #
-  Dir[File.join(dir, 'rails-footnotes', 'notes', '*.rb')].sort.each do |note|
-    require note
-  end
-
+module Footnotes
+  
   # The footnotes are applied by default to all actions. You can change this
   # behavior commenting the after_filter line below and putting it in Your
   # application. Then you can cherrypick in which actions it will appear.
   #
-  class ActionController::Base
-    prepend_before_filter Footnotes::Filter
-    after_filter Footnotes::Filter
+  module RailsFootnotesExtension
+    def self.included(base)
+      base.prepend_before_filter Footnotes::BeforeFilter
+      base.after_filter Footnotes::AfterFilter
+    end
+  end
+  
+  def self.run!
+    require 'rails-footnotes/footnotes'
+    require 'rails-footnotes/backtracer'
+     
+    Dir[File.join(File.dirname(__FILE__), 'rails-footnotes', 'notes', '*.rb')].each { |note| require note }
+    
+    ActionController::Base.send(:include, RailsFootnotesExtension)    
   end
 end

data/lib/rails-footnotes/backtracer.rb

@@ -9,7 +9,7 @@ module Footnotes
 
       def add_links_to_backtrace(lines)
         lines.collect do |line|
-          expanded = line.gsub('#{RAILS_ROOT}', RAILS_ROOT)
+          expanded = line.gsub('#{RAILS_ROOT}', Rails.root)
           if match = expanded.match(/^(.+):(\d+):in/) || match = expanded.match(/^(.+):(\d+)\s*$/)
             file = File.expand_path(match[1])
             line_number = match[2]
@@ -31,4 +31,6 @@ module Footnotes
   end
 end
 
-Exception.send :include, Footnotes::Extensions::Exception
+if Rails.version < '3.0'
+  Exception.send :include, Footnotes::Extensions::Exception
+end

data/lib/rails-footnotes/footnotes.rb

@@ -1,4 +1,21 @@
 module Footnotes
+  class BeforeFilter
+    # Method called to start the notes
+    # It's a before filter prepend in the controller
+    def self.filter(controller)
+      Footnotes::Filter.start!(controller)
+    end
+  end
+
+  class AfterFilter
+    # Method that calls Footnotes to attach its contents
+    def self.filter(controller)
+      filter = Footnotes::Filter.new(controller)
+      filter.add_footnotes!
+      filter.close!(controller)
+    end
+  end
+
   class Filter
     @@no_style = false
     @@multiple_notes = false
@@ -25,20 +42,6 @@ module Footnotes
     cattr_accessor :no_style, :notes, :prefix, :multiple_notes
 
     class << self
-      # Method called to start the notes
-      # It's a before filter prepend in the controller
-      #
-      def before(controller)
-        Footnotes::Filter.start!(controller)
-      end
-
-      # Method that calls Footnotes to attach its contents
-      #
-      def after(controller)
-        filter = Footnotes::Filter.new(controller)
-        filter.add_footnotes!
-        filter.close!(controller)
-      end
 
       # Calls the class method start! in each note
       # Sometimes notes need to set variables or clean the environment to work properly
@@ -77,7 +80,7 @@ module Footnotes
       # Logs the error using specified title and format
       #
       def log_error(title, exception)
-        RAILS_DEFAULT_LOGGER.error "#{title}: #{exception}\n#{exception.backtrace.join("\n")}"
+        Rails.logger.error "#{title}: #{exception}\n#{exception.backtrace.join("\n")}"
       end
 
       # If none argument is sent, simply return the prefix.
@@ -138,11 +141,24 @@ module Footnotes
       end
 
       def performed_render?
-        @controller.instance_variable_get(:@performed_render)
+        @controller.instance_variable_get(:@performed_render) || # rails 2.x
+          (@controller.respond_to?(:performed?) && @controller.performed?) # rails3, will break on redirect??
       end
 
       def valid_format?
-        [:html,:rhtml,:xhtml,:rxhtml].include?(@template.template_format.to_sym)
+        if @template # Rails 2.x
+          [:html,:rhtml,:xhtml,:rxhtml].include?(@template.send(template_format_method.to_sym).to_sym)
+        else # Rails 3
+          @controller.response.content_type == 'text/html'
+        end
+      end
+
+      def template_format_method
+        if @template.respond_to?(:template_format)
+          return 'template_format'
+        else
+          return 'format'
+        end
       end
 
       def valid_content_type?
@@ -167,17 +183,18 @@ module Footnotes
       #
 
       def insert_styles
+        #TODO More customizable(reset.css, from file etc.)
         insert_text :before, /<\/head>/i, <<-HTML
         <!-- Footnotes Style -->
         <style type="text/css">
-          #footnotes_debug {margin: 2em 0 1em 0; text-align: center; color: #444; line-height: 16px;}
+          #footnotes_debug {font-size: 11px; font-weight: normal; margin: 2em 0 1em 0; text-align: center; color: #444; line-height: 16px;}
           #footnotes_debug th, #footnotes_debug td {color: #444; line-height: 18px;}
-          #footnotes_debug a {text-decoration: none; color: #444; line-height: 18px;}
+          #footnotes_debug a {color: #9b1b1b; font-weight: inherit; text-decoration: none; line-height: 18px;}
           #footnotes_debug table {text-align: center;}
           #footnotes_debug table td {padding: 0 5px;}
           #footnotes_debug tbody {text-align: left;}
           #footnotes_debug .name_values td {vertical-align: top;}
-          #footnotes_debug legend {background-color: #FFF;}
+          #footnotes_debug legend {background-color: #fff;}
           #footnotes_debug fieldset {text-align: left; border: 1px dashed #aaa; padding: 0.5em 1em 1em 1em; margin: 1em 2em; color: #444; background-color: #FFF;}
           /* Aditional Stylesheets */
           #{@notes.map(&:stylesheet).compact.join("\n")}
@@ -242,7 +259,7 @@ module Footnotes
         HTML
 
         placeholder = /<div[^>]+id=['"]footnotes_holder['"][^>]*>/i
-        if @body =~ placeholder
+        if @controller.response.body =~ placeholder
           insert_text :after, placeholder, footnotes_html
         else
           insert_text :before, /<\/body>/i, footnotes_html
@@ -325,15 +342,17 @@ module Footnotes
       def insert_text(position, pattern, new_text)
         index = case pattern
           when Regexp
-            if match = @body.match(pattern)
+            if match = @controller.response.body.match(pattern)
               match.offset(0)[position == :before ? 0 : 1]
             else
-              @body.size
+              @controller.response.body.size
             end
           else
             pattern
           end
-        @body.insert index, new_text
+        newbody = @controller.response.body
+        newbody.insert index, new_text
+        @controller.response.body = newbody
       end
 
       # Instance each_with_rescue method

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

@@ -36,7 +36,7 @@ module Footnotes
             end
             #raise "File not found"
           else
-            @controller_filename=File.join(File.expand_path(RAILS_ROOT), 'app', 'controllers', "#{controller_name}.rb").sub('/controllers/controllers/', '/controllers/')
+            @controller_filename=File.join(File.expand_path(Rails.root), 'app', 'controllers', "#{controller_name}.rb").sub('/controllers/controllers/', '/controllers/')
           end
           @controller_filename
         end

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

@@ -32,7 +32,7 @@ module Footnotes
         def parse_files!
           @files.collect! do |filename|
             if filename =~ %r{^/}
-              full_filename = File.join(File.expand_path(RAILS_ROOT), 'public', filename)
+              full_filename = File.join(File.expand_path(Rails.root), 'public', filename)
               %[<a href="#{Footnotes::Filter.prefix(full_filename, 1, 1)}">#{filename}</a>]
             else
               %[<a href="#{filename}">#{filename}</a>]

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

@@ -20,9 +20,9 @@ module Footnotes
         # Get controller filter chain
         #
         def parse_filters
-          return @controller.class.filter_chain.collect do |filter|
-            [parse_method(filter.method), filter.type.inspect, controller_filtered_actions(filter).inspect]
-          end
+          return [] # TODO @controller.class.filter_chain.collect do |filter|
+#            [parse_method(filter.method), filter.type.inspect, controller_filtered_actions(filter).inspect]
+#          end
         end
 
         # This receives a filter, creates a mock controller and check in which

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

@@ -16,12 +16,12 @@ module Footnotes
       end
 
       def valid?
-        prefix? && @controller.active_layout
+        prefix? && nil#@controller.active_layout TODO doesn't work with Rails 3
       end
 
       protected
         def filename
-          File.join(File.expand_path(RAILS_ROOT), 'app', 'layouts', "#{@controller.active_layout.to_s.underscore}").sub('/layouts/layouts/', '/views/layouts/')
+          File.join(File.expand_path(Rails.root), 'app', 'layouts', "#{@controller.active_layout.to_s.underscore}").sub('/layouts/layouts/', '/views/layouts/')
         end
     end
   end

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

@@ -25,7 +25,7 @@ module Footnotes
         unless @log
           @log = @@log.join('')
           @@log = []
-          if rindex = @log.rindex('Processing '+@controller.controller_class_name+'#'+@controller.action_name)
+          if rindex = @log.rindex('Processing '+@controller.class.name+'#'+@controller.action_name)
             @log = @log[rindex..-1]
           end
         end

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

@@ -16,7 +16,7 @@ module Footnotes
       def content
         rows = partials.map do |filename|
           href = Footnotes::Filter.prefix(filename,1,1)
-          shortened_name=filename.gsub(File.join(RAILS_ROOT,"app/views/"),"")
+          shortened_name=filename.gsub(File.join(Rails.root,"app/views/"),"")
           [%{<a href="#{href}">#{shortened_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

@@ -71,7 +71,7 @@ module Footnotes
           ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Footnotes::Extensions::AbstractAdapter
           ActiveRecord::ConnectionAdapters.local_constants.each do |adapter|
             next unless adapter =~ /.*[^Abstract]Adapter$/
-            next if adapter =~ /SQLiteAdapter$/
+            next if adapter =~ /(SQLite|Salesforce)Adapter$/
             eval("ActiveRecord::ConnectionAdapters::#{adapter}").send :include, Footnotes::Extensions::QueryAnalyzer
             self.loaded = true
           end
@@ -91,7 +91,7 @@ module Footnotes
         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 />]
+            %[<a href="#{escape(Footnotes::Filter.prefix("#{Rails.root.to_s}/#{s[0]}", s[1].to_i, 1))}">#{escape(t)}</a><br />]
           end.join
         end
 
@@ -136,7 +136,7 @@ module Footnotes
 
         # 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]
+        @trace = Kernel.caller.collect(&:strip).select{|i| i.gsub!(/^#{Rails.root}\//im, '') }[2..-1]
       end
     end
 

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

@@ -18,21 +18,25 @@ module Footnotes
 
       protected
         def parse_routes
-          routes_with_name = ActionController::Routing::Routes.named_routes.to_a.flatten
+          routes_with_name = Rails.application.routes.named_routes.to_a.flatten
 
-          return ActionController::Routing::Routes.filtered_routes(:controller => @controller.controller_path).collect do |route|
+          return Rails.application.routes.filtered_routes(:controller => @controller.controller_path).collect do |route|
             # Catch routes name if exists
             i = routes_with_name.index(route)
             name = i ? routes_with_name[i-1].to_s : ''
 
             # Catch segments requirements
             req = {}
-            route.segments.each do |segment|
-              next unless segment.is_a?(ActionController::Routing::DynamicSegment) && segment.regexp
-              req[segment.key.to_sym] = segment.regexp
+            if Rails.version < '3.0'
+              route.segments.each do |segment|
+                next unless segment.is_a?(ActionController::Routing::DynamicSegment) && segment.regexp
+                req[segment.key.to_sym] = segment.regexp
+              end
+              [escape(name), route.segments.join, route.requirements.reject{|key,value| key == :controller}.inspect, req.inspect]
+            else
+              req = route.conditions
+              [escape(name), route.conditions.keys.join, route.requirements.reject{|key,value| key == :controller}.inspect, req.inspect]
             end
-
-            [escape(name), route.segments.join, route.requirements.reject{|key,value| key == :controller}.inspect, req.inspect]
           end
         end
     end

data/lib/rails-footnotes/version.rb

@@ -0,0 +1,3 @@
+module Footnotes
+  VERSION = "3.7.0"
+end

data/rails-footnotes.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rails-footnotes/version"
+
+Gem::Specification.new do |s|
+  s.name        = "rails-footnotes"
+  s.version     = Footnotes::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Keenan Brock"]
+  s.email       = ["keenan@thebrocks.net"]
+  s.homepage    = "http://github.com/josevalim/rails-footnotes"
+  s.summary     = %q{Every Rails page has footnotes that gives information about your application and links back to your editor.}
+  s.description = %q{Every Rails page has footnotes that gives information about your application and links back to your editor.}
+
+  s.rubyforge_project = "rails-footnotes"
+
+  s.add_dependency "rails", ">= 3.0.0"
+
+  s.add_development_dependency "autotest"
+  s.add_development_dependency "redgreen"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "rails", ">= 3.0.0"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end
+

data/test/footnotes_test.rb

@@ -1,8 +1,7 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 require 'action_controller'
 require 'action_controller/test_case'
-require 'action_controller/test_process'
 
 class FootnotesController < ActionController::Base; attr_accessor :template, :performed_render; end
 
@@ -20,6 +19,7 @@ class FootnotesTest < Test::Unit::TestCase
     @controller.request = ActionController::TestRequest.new
     @controller.response = ActionController::TestResponse.new
     @controller.response.body = $html.dup
+    @controller.params = {}
 
     Footnotes::Filter.notes = [ :test ]
     Footnotes::Filter.multiple_notes = false
@@ -81,8 +81,8 @@ class FootnotesTest < Test::Unit::TestCase
   def test_notes_are_initialized
     footnotes_perform!
     test_note = @footnotes.instance_variable_get('@notes').first
-    assert 'Footnotes::Notes::TestNote', test_note.class
-    assert :test, test_note.to_sym
+    assert_equal 'Footnotes::Notes::TestNote', test_note.class.name
+    assert_equal :test, test_note.to_sym
   end
 
   def test_notes_links
@@ -173,12 +173,20 @@ class FootnotesTest < Test::Unit::TestCase
     # Then we call add_footnotes!
     #
     def footnotes_perform!
-      @controller.template.expects(:template_format).returns('html')
+      template_expects('html')
       @controller.performed_render = true
 
       Footnotes::Filter.start!(@controller)
       @footnotes.add_footnotes!
     end
+
+    def template_expects(format)
+      if @controller.template.respond_to?(:template_format)
+        @controller.template.expects(:template_format).returns(format)
+      else
+        @controller.template.expects(:format).returns(format)
+      end
+    end
 end
 
 $html = <<HTML

data/test/notes/abstract_note_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class AbstractNoteTest < Test::Unit::TestCase
   def setup
@@ -78,7 +78,7 @@ class AbstractNoteTest < Test::Unit::TestCase
     assert_equal '', @note.send(:mount_table,[['h1','h2','h3']], :class => 'table')
 
     tab = <<-TABLE
-          <table class="table">
+          <table class="table" >
             <thead><tr><th>H1</th></tr></thead>
             <tbody><tr><td>r1c1</td></tr></tbody>
           </table>

data/test/test_helper.rb

@@ -5,5 +5,6 @@ require 'mocha'
 ENV['RAILS_ENV'] = 'test'
 
 require 'active_support'
-require File.dirname(__FILE__) + '/../lib/rails-footnotes/footnotes'
-require File.dirname(__FILE__) + '/../lib/rails-footnotes/notes/abstract_note'
+require 'active_support/all' unless Class.respond_to?(:cattr_accessor)
+require 'rails-footnotes/footnotes'
+require 'rails-footnotes/notes/abstract_note'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rails-footnotes
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 3
-  - 6
-  - 7
-  version: 3.6.7
+  prerelease: 
+  version: 3.7.0
 platform: ruby
 authors: 
 - Keenan Brock
@@ -15,20 +10,78 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -04:00
+date: 2011-03-19 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: redgreen
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :development
+  version_requirements: *id005
 description: Every Rails page has footnotes that gives information about your application and links back to your editor.
-email: keenan@thebrocks.net
+email: 
+- keenan@thebrocks.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README
 - Rakefile
@@ -54,6 +107,8 @@ files:
 - 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
+- rails-footnotes.gemspec
 - test/footnotes_test.rb
 - test/notes/abstract_note_test.rb
 - test/test_helper.rb
@@ -62,8 +117,8 @@ homepage: http://github.com/josevalim/rails-footnotes
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,23 +126,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rails-footnotes
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Every Rails page has footnotes that gives information about your application and links back to your editor.