rails3-footnotes 4.0.0.pre.1 → 4.0.0.pre.2

data/CHANGELOG

@@ -1,7 +1,12 @@
-== Footnotes v4.0.0.pre.1
+== Footnotes v4.0.0.pre.2 (February 21, 2011)
+  * add a Railtie so the plugin will load in Rails 3 apps
+  * remove some internal rails3 ivars from the assigns note
+  * convert CSS to ems, px are sooo 2000's
+
+== Footnotes v4.0.0.pre.1 (February 14, 2011)
   * escapes TextMate links correctly (thanks reedlaw)
 
-== Footnotes v4.0.0.pre
+== Footnotes v4.0.0.pre (February 14, 2011)
   * works with Rails 3 (mostly thanks to mperham)
 
 == Footnotes v3.6.7

data/lib/rails-footnotes.rb

@@ -1,22 +1,21 @@
 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.
-  #
-  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'
+  class Railtie < ::Rails::Railtie
+    config.before_configuration do
+      if ::Rails.env.development?
+        require 'rails-footnotes/footnotes'
+        require 'rails-footnotes/backtracer'
 
-    Dir[File.join(File.dirname(__FILE__), 'rails-footnotes', 'notes', '*.rb')].each { |note| require note }
+        # Require each individual note
+        notes_glob = File.expand_path("../rails-footnotes/notes/*.rb", __FILE__)
+        Dir[notes_glob].each{|note| require note }
 
-    ActionController::Base.send(:include, RailsFootnotesExtension)
+        # The footnotes are applied by default to all actions. To remove the
+        # footnotes from an action, use skip_filter in your controller.
+        ActionController::Base.prepend_before_filter Footnotes::BeforeFilter
+        ActionController::Base.after_filter Footnotes::AfterFilter
+      end
+    end
   end
+
 end

data/lib/rails-footnotes/footnotes.rb

@@ -80,7 +80,7 @@ module Footnotes
       # Logs the error using specified title and format
       #
       def log_error(title, exception)
-        Rails.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.
@@ -187,9 +187,9 @@ module Footnotes
         insert_text :before, /<\/head>/i, <<-HTML
         <!-- Footnotes Style -->
         <style type="text/css">
-          #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 {color: #9b1b1b; font-weight: inherit; text-decoration: none; line-height: 18px;}
+          #footnotes_debug {font-size: 1em; 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: 1.5em;}
+          #footnotes_debug a {color: #9b1b1b; font-weight: inherit; text-decoration: none; line-height: 1.5em;}
           #footnotes_debug table {text-align: center;}
           #footnotes_debug table td {padding: 0 5px;}
           #footnotes_debug tbody {text-align: left;}

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

@@ -4,18 +4,28 @@ module Footnotes
   module Notes
     class AssignsNote < AbstractNote
       @@ignored_assigns = [
-                            :@real_format,
+                            :@action_has_layout,
                             :@before_filter_chain_aborted,
+                            :@db_rt_after_render,
+                            :@db_rt_before_render,
+                            :@devise_mapping,
+                            :@lookup_context,
                             :@performed_redirect,
                             :@performed_render,
-                            :@_params,
-                            :@_response,
-                            :@url,
+                            :@real_format,
                             :@template,
+                            :@url,
+                            :@view_context_class,
+                            :@_action_name,
+                            :@_config,
+                            :@_db_runtime,
+                            :@_env,
+                            :@_params,
                             :@_request,
-                            :@db_rt_before_render,
-                            :@db_rt_after_render,
-                            :@view_runtime
+                            :@_response,
+                            :@_response_body,
+                            :@_status,
+                            :@_view_runtime,
                           ]
       cattr_accessor :ignored_assigns, :instance_writter => false
 
@@ -44,11 +54,11 @@ module Footnotes
         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
-           
-          assign -= ignored            
+
+          assign -= ignored
           return assign
         end
 

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

@@ -20,15 +20,15 @@ module Footnotes
         prefix? && first_render?
       end
 
-      protected
+    protected
 
-        def first_render?
-          @template.instance_variable_get(:@_first_render)
-        end
+      def first_render?
+        @template.instance_variable_get(:@_first_render)
+      end
 
-        def filename
-          @filename ||= @template.instance_variable_get(:@_first_render).filename
-        end
+      def filename
+        @filename ||= @template.instance_variable_get(:@_first_render).filename
+      end
 
     end
   end

data/lib/rails-footnotes/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-footnotes
 version: !ruby/object:Gem::Version 
-  hash: 1923831851
+  hash: 1923831853
   prerelease: true
   segments: 
   - 4
   - 0
   - 0
   - pre
-  - 1
-  version: 4.0.0.pre.1
+  - 2
+  version: 4.0.0.pre.2
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"