omghax-rails-footnotes 3.6.1 → 3.6.2

data/README

@@ -1,6 +1,6 @@
 Rails Footnotes
 License: MIT
-Version: 3.6
+Version: 3.6.2
 
 You can also read this README in pretty html at the GitHub project Wiki page
 
@@ -38,7 +38,7 @@ If you want it as plugin, just do:
 If you are running on Rails 2.2 or Rails 2.1 you should do:
 
     cd myapp
-    git clone git://github.com/josevalim/rails-footnotes.git
+    git clone git://github.com/josevalim/rails-footnotes.git vendor/plugins/rails-footnotes
     cd vendor/plugins/rails-footnotes
     git checkout VERSION_NUMBER
     rm -rf ./.git

data/lib/rails-footnotes.rb

@@ -5,7 +5,7 @@ require File.join(dir, 'rails-footnotes', 'backtracer')
 # Load all notes
 #
 Dir[File.join(dir, 'rails-footnotes', 'notes', '*.rb')].each do |note|
-  require note
+  require note unless note ~= /queries/ && !defined?(ActiveRecord)
 end
 
 # The footnotes are applied by default to all actions. You can change this

data/lib/rails-footnotes/footnotes.rb

@@ -13,10 +13,10 @@ module Footnotes
     @@notes += [ :assigns, :session, :cookies, :params, :filters, :routes, :env, :queries, :log, :general ]
 
     # Change queries for rpm note when available
-    if defined?(NewRelic)
-      @@notes.delete(:queries)
-      @@notes << :rpm
-    end
+    # if defined?(NewRelic)
+    #  @@notes.delete(:queries)
+    #  @@notes << :rpm
+    # end
 
     # :no_style       => If you don't want the style to be appended to your pages
     # :notes          => Class variable that holds the notes to be processed

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

@@ -25,7 +25,15 @@ module Footnotes
         def controller_filename
           controller_name=@controller.class.to_s.underscore
           controller_name='application' if controller_name=='application_controller'
-          File.join(File.expand_path(RAILS_ROOT), 'app', 'controllers', "#{controller_name}.rb").sub('/controllers/controllers/', '/controllers/')
+          if ActionController::Routing.respond_to? :controller_paths
+            ActionController::Routing.controller_paths.each do |controller_path|
+              full_controller_path = File.join(File.expand_path(controller_path), "#{controller_name}.rb")
+              return full_controller_path if File.exists?(full_controller_path)
+            end
+            raise "File not found"
+          else
+            File.join(File.expand_path(RAILS_ROOT), 'app', 'controllers', "#{controller_name}.rb").sub('/controllers/controllers/', '/controllers/')
+          end
         end
 
         def controller_text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: omghax-rails-footnotes
 version: !ruby/object:Gem::Version 
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-07-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -49,6 +49,7 @@ files:
 - lib/rails-footnotes/notes/view_note.rb
 has_rdoc: true
 homepage: http://github.com/josevalim/rails-footnotes
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Every Rails page has footnotes that gives information about your application and links back to your editor.