rails-footnotes 3.7.6 → 3.7.7

data/Gemfile

@@ -1,14 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-
-# gem "rails", ">= 3.0.5"
-
-group :test do
-  if RUBY_VERSION > "1.9.0"
-    # gem 'simplecov', '>= 0.4.0', :require => false
-  else
-    # gem "rcov"
-    gem "ruby-debug"
-  end
-end

data/lib/rails-footnotes/after_filter.rb

@@ -0,0 +1,10 @@
+module Footnotes
+  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
+end

data/lib/rails-footnotes/before_filter.rb

@@ -0,0 +1,9 @@
+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
+end

data/lib/rails-footnotes/each_with_rescue.rb

@@ -0,0 +1,35 @@
+module Footnotes
+  module EachWithRescue
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+      # Process notes, discarding only the note if any problem occurs
+      #
+      def each_with_rescue(collection)
+        delete_me = []
+
+        collection.each do |item|
+          begin
+            yield item
+          rescue Exception => e
+            # Discard item if it has a problem
+            log_error("Footnotes #{item.to_s.camelize} Exception", e)
+            delete_me << item
+            next
+          end
+        end
+
+        delete_me.each { |item| collection.delete(item) }
+        return collection
+      end
+
+      # Logs the error using specified title and format
+      #
+      def log_error(title, exception)
+        Rails.logger.error "#{title}: #{exception}\n#{exception.backtrace.join("\n")}"
+      end
+    end
+  end
+end

data/lib/rails-footnotes/filter.rb

@@ -0,0 +1,315 @@
+module Footnotes
+  class Filter
+    @@no_style = false
+    @@multiple_notes = false
+    @@klasses = []
+
+    # Default link prefix is textmate
+    @@prefix = 'txmt://open?url=file://%s&line=%d&column=%d'
+
+    # Edit notes
+    @@notes = [ :controller, :view, :layout, :partials, :stylesheets, :javascripts ]
+    # Show notes
+    @@notes += [ :assigns, :session, :cookies, :params, :filters, :routes, :env, :queries, :log, :general ]
+
+    # :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
+    # :prefix         => Prefix appended to FootnotesLinks
+    # :multiple_notes => Set to true if you want to open several notes at the same time
+    cattr_accessor :no_style, :notes, :prefix, :multiple_notes
+
+    class << self
+      include Footnotes::EachWithRescue
+
+      # Calls the class method start! in each note
+      # Sometimes notes need to set variables or clean the environment to work properly
+      # This method allows this kind of setup
+      #
+      def start!(controller)
+        self.each_with_rescue(Footnotes.before_hooks) {|hook| hook.call(controller, self)}
+
+        @@klasses = []
+        self.each_with_rescue(@@notes.flatten) do |note|
+          klass = "Footnotes::Notes::#{note.to_s.camelize}Note".constantize
+          klass.start!(controller) if klass.respond_to?(:start!)
+          @@klasses << klass
+        end
+      end
+
+      # If none argument is sent, simply return the prefix.
+      # Otherwise, replace the args in the prefix.
+      #
+      def prefix(*args)
+        if args.empty?
+          @@prefix
+        else
+          format(@@prefix, *args)
+        end
+      end
+
+    end
+
+    def initialize(controller)
+      @controller = controller
+      @template = controller.instance_variable_get(:@template)
+      @body = controller.response.body
+      @notes = []
+    end
+
+    def add_footnotes!
+      add_footnotes_without_validation! if valid?
+    rescue Exception => e
+      # Discard footnotes if there are any problems
+      self.class.log_error("Footnotes Exception", e)
+    end
+
+    # Calls the class method close! in each note
+    # Sometimes notes need to finish their work even after being read
+    # This method allows this kind of work
+    #
+    def close!(controller)
+      self.each_with_rescue(@@klasses) {|klass| klass.close!(controller)}
+      self.each_with_rescue(Footnotes.after_hooks) {|hook| hook.call(controller, self)}
+    end
+
+    protected
+      def valid?
+        @body.is_a?(String) && performed_render? && valid_format? && valid_content_type? &&
+          !component_request? && !xhr? && !footnotes_disabled?
+      end
+
+      def add_footnotes_without_validation!
+        initialize_notes!
+        insert_styles unless @@no_style
+        insert_footnotes
+      end
+
+      def initialize_notes!
+        each_with_rescue(@@klasses) do |klass|
+          note = klass.new(@controller)
+          @notes << note if note.respond_to?(:valid?) && note.valid?
+        end
+      end
+
+      def 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?
+        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?
+        c = @controller.response.headers['Content-Type'].to_s
+        (c.empty? || c =~ /html/)
+      end
+
+      def component_request?
+        @controller.instance_variable_get(:@parent_controller)
+      end
+
+      def xhr?
+        @controller.request.xhr?
+      end
+
+      def footnotes_disabled?
+        @controller.params[:footnotes] == "false"
+      end
+
+      #
+      # Insertion methods
+      #
+
+      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 {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 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 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")}
+        </style>
+        <!-- End Footnotes Style -->
+        HTML
+      end
+
+      def insert_footnotes
+        # Fieldsets method should be called first
+        content = fieldsets
+
+        footnotes_html = <<-HTML
+        <!-- Footnotes -->
+        <div style="clear:both"></div>
+        <div id="footnotes_debug">
+          #{links}
+          #{content}
+          <script type="text/javascript">
+            var Footnotes = function() {
+
+              function hideAll(){
+                #{close unless @@multiple_notes}
+              }
+
+              function hideAllAndToggle(id) {
+                hideAll();
+                toggle(id)
+
+                location.href = '#footnotes_debug';
+              }
+
+              function toggle(id){
+                var el = document.getElementById(id);
+                if (el.style.display == 'none') {
+                  Footnotes.show(el);
+                } else {
+                  Footnotes.hide(el);
+                }
+              }
+
+              function show(element) {
+                element.style.display = 'block'
+              }
+
+              function hide(element) {
+                element.style.display = 'none'
+              }
+
+              return {
+                show: show,
+                hide: hide,
+                toggle: toggle,
+                hideAllAndToggle: hideAllAndToggle
+              }
+            }();
+            /* Additional Javascript */
+            #{@notes.map(&:javascript).compact.join("\n")}
+          </script>
+        </div>
+        <!-- End Footnotes -->
+        HTML
+
+        placeholder = /<div[^>]+id=['"]footnotes_holder['"][^>]*>/i
+        if @controller.response.body =~ placeholder
+          insert_text :after, placeholder, footnotes_html
+        else
+          insert_text :before, /<\/body>/i, footnotes_html
+        end
+      end
+
+      # Process notes to gets their links in their equivalent row
+      #
+      def links
+        links = Hash.new([])
+        order = []
+        each_with_rescue(@notes) do |note|
+          order << note.row
+          links[note.row] += [link_helper(note)]
+        end
+
+        html = ''
+        order.uniq!
+        order.each do |row|
+          html << "#{row.is_a?(String) ? row : row.to_s.camelize}: #{links[row].join(" | \n")}<br />"
+        end
+        html
+      end
+
+      # Process notes to get their content
+      #
+      def fieldsets
+        content = ''
+        each_with_rescue(@notes) do |note|
+          next unless note.has_fieldset?
+          content << <<-HTML
+            <fieldset id="#{note.to_sym}_debug_info" style="display: none">
+              <legend>#{note.legend}</legend>
+              <div>#{note.content}</div>
+            </fieldset>
+          HTML
+        end
+        content
+      end
+
+      # Process notes to get javascript code to close them.
+      # This method is only used when multiple_notes is false.
+      #
+      def close
+        javascript = ''
+        each_with_rescue(@notes) do |note|
+          next unless note.has_fieldset?
+          javascript << close_helper(note)
+        end
+        javascript
+      end
+
+      #
+      # Helpers
+      #
+
+      # Helper that creates the javascript code to close the note
+      #
+      def close_helper(note)
+        "Footnotes.hide(document.getElementById('#{note.to_sym}_debug_info'));\n"
+      end
+
+      # Helper that creates the link and javascript code when note is clicked
+      #
+      def link_helper(note)
+        onclick = note.onclick
+        unless href = note.link
+          href = '#'
+          onclick ||= "Footnotes.hideAllAndToggle('#{note.to_sym}_debug_info');return false;" if note.has_fieldset?
+        end
+
+        "<a href=\"#{href}\" onclick=\"#{onclick}\">#{note.title}</a>"
+      end
+
+      # Inserts text in to the body of the document
+      # +pattern+ is a Regular expression which, when matched, will cause +new_text+
+      # to be inserted before or after the match.  If no match is found, +new_text+ is appended
+      # to the body instead. +position+ may be either :before or :after
+      #
+      def insert_text(position, pattern, new_text)
+        index = case pattern
+          when Regexp
+            if match = @controller.response.body.match(pattern)
+              match.offset(0)[position == :before ? 0 : 1]
+            else
+              @controller.response.body.size
+            end
+          else
+            pattern
+          end
+        newbody = @controller.response.body
+        newbody.insert index, new_text
+        @controller.response.body = newbody
+      end
+
+      # Instance each_with_rescue method
+      #
+      def each_with_rescue(*args, &block)
+        self.class.each_with_rescue(*args, &block)
+      end
+  end
+end

data/lib/rails-footnotes/footnotes.rb

@@ -1,359 +1,7 @@
 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
+  autoload :EachWithRescue, 'rails-footnotes/each_with_rescue'
 
-  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
-    @@klasses = []
-
-    # Default link prefix is textmate
-    @@prefix = 'txmt://open?url=file://%s&line=%d&column=%d'
-
-    # Edit notes
-    @@notes = [ :controller, :view, :layout, :partials, :stylesheets, :javascripts ]
-    # Show notes
-    @@notes += [ :assigns, :session, :cookies, :params, :filters, :routes, :env, :queries, :log, :general ]
-
-    # :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
-    # :prefix         => Prefix appended to FootnotesLinks
-    # :multiple_notes => Set to true if you want to open several notes at the same time
-    cattr_accessor :no_style, :notes, :prefix, :multiple_notes
-
-    class << self
-
-      # Calls the class method start! in each note
-      # Sometimes notes need to set variables or clean the environment to work properly
-      # This method allows this kind of setup
-      #
-      def start!(controller)
-        self.each_with_rescue(Footnotes.before_hooks) {|hook| hook.call(controller, self)}
-
-        @@klasses = []
-        self.each_with_rescue(@@notes.flatten) do |note|
-          klass = "Footnotes::Notes::#{note.to_s.camelize}Note".constantize
-          klass.start!(controller) if klass.respond_to?(:start!)
-          @@klasses << klass
-        end
-      end
-
-      # Process notes, discarding only the note if any problem occurs
-      #
-      def each_with_rescue(collection)
-        delete_me = []
-
-        collection.each do |item|
-          begin
-            yield item
-          rescue Exception => e
-            # Discard item if it has a problem
-            log_error("Footnotes #{item.to_s.camelize} Exception", e)
-            delete_me << item
-            next
-          end
-        end
-
-        delete_me.each { |item| collection.delete(item) }
-        return collection
-      end
-
-      # Logs the error using specified title and format
-      #
-      def log_error(title, exception)
-        Rails.logger.error "#{title}: #{exception}\n#{exception.backtrace.join("\n")}"
-      end
-
-      # If none argument is sent, simply return the prefix.
-      # Otherwise, replace the args in the prefix.
-      #
-      def prefix(*args)
-        if args.empty?
-          @@prefix
-        else
-          format(@@prefix, *args)
-        end
-      end
-
-    end
-
-    def initialize(controller)
-      @controller = controller
-      @template = controller.instance_variable_get(:@template)
-      @body = controller.response.body
-      @notes = []
-    end
-
-    def add_footnotes!
-      add_footnotes_without_validation! if valid?
-    rescue Exception => e
-      # Discard footnotes if there are any problems
-      self.class.log_error("Footnotes Exception", e)
-    end
-
-    # Calls the class method close! in each note
-    # Sometimes notes need to finish their work even after being read
-    # This method allows this kind of work
-    #
-    def close!(controller)
-      self.each_with_rescue(@@klasses) {|klass| klass.close!(controller)}
-      self.each_with_rescue(Footnotes.after_hooks) {|hook| hook.call(controller, self)}
-    end
-
-    protected
-      def valid?
-        performed_render? && valid_format? && valid_content_type? &&
-          @body.is_a?(String) && !component_request? && !xhr? &&
-          !footnotes_disabled?
-      end
-
-      def add_footnotes_without_validation!
-        initialize_notes!
-        insert_styles unless @@no_style
-        insert_footnotes
-      end
-
-      def initialize_notes!
-        each_with_rescue(@@klasses) do |klass|
-          note = klass.new(@controller)
-          @notes << note if note.respond_to?(:valid?) && note.valid?
-        end
-      end
-
-      def 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?
-        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?
-        c = @controller.response.headers['Content-Type'].to_s
-        (c.empty? || c =~ /html/)
-      end
-
-      def component_request?
-        @controller.instance_variable_get(:@parent_controller)
-      end
-
-      def xhr?
-        @controller.request.xhr?
-      end
-
-      def footnotes_disabled?
-        @controller.params[:footnotes] == "false"
-      end
-
-      #
-      # Insertion methods
-      #
-
-      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 {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 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 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")}
-        </style>
-        <!-- End Footnotes Style -->
-        HTML
-      end
-
-      def insert_footnotes
-        # Fieldsets method should be called first
-        content = fieldsets
-
-        footnotes_html = <<-HTML
-        <!-- Footnotes -->
-        <div style="clear:both"></div>
-        <div id="footnotes_debug">
-          #{links}
-          #{content}
-          <script type="text/javascript">
-            var Footnotes = function() {
-
-              function hideAll(){
-                #{close unless @@multiple_notes}
-              }
-
-              function hideAllAndToggle(id) {
-                hideAll();
-                toggle(id)
-
-                location.href = '#footnotes_debug';
-              }
-
-              function toggle(id){
-                var el = document.getElementById(id);
-                if (el.style.display == 'none') {
-                  Footnotes.show(el);
-                } else {
-                  Footnotes.hide(el);
-                }
-              }
-
-              function show(element) {
-                element.style.display = 'block'
-              }
-
-              function hide(element) {
-                element.style.display = 'none'
-              }
-
-              return {
-                show: show,
-                hide: hide,
-                toggle: toggle,
-                hideAllAndToggle: hideAllAndToggle
-              }
-            }();
-            /* Additional Javascript */
-            #{@notes.map(&:javascript).compact.join("\n")}
-          </script>
-        </div>
-        <!-- End Footnotes -->
-        HTML
-
-        placeholder = /<div[^>]+id=['"]footnotes_holder['"][^>]*>/i
-        if @controller.response.body =~ placeholder
-          insert_text :after, placeholder, footnotes_html
-        else
-          insert_text :before, /<\/body>/i, footnotes_html
-        end
-      end
-
-      # Process notes to gets their links in their equivalent row
-      #
-      def links
-        links = Hash.new([])
-        order = []
-        each_with_rescue(@notes) do |note|
-          order << note.row
-          links[note.row] += [link_helper(note)]
-        end
-
-        html = ''
-        order.uniq!
-        order.each do |row|
-          html << "#{row.is_a?(String) ? row : row.to_s.camelize}: #{links[row].join(" | \n")}<br />"
-        end
-        html
-      end
-
-      # Process notes to get their content
-      #
-      def fieldsets
-        content = ''
-        each_with_rescue(@notes) do |note|
-          next unless note.has_fieldset?
-          content << <<-HTML
-            <fieldset id="#{note.to_sym}_debug_info" style="display: none">
-              <legend>#{note.legend}</legend>
-              <div>#{note.content}</div>
-            </fieldset>
-          HTML
-        end
-        content
-      end
-
-      # Process notes to get javascript code to close them.
-      # This method is only used when multiple_notes is false.
-      #
-      def close
-        javascript = ''
-        each_with_rescue(@notes) do |note|
-          next unless note.has_fieldset?
-          javascript << close_helper(note)
-        end
-        javascript
-      end
-
-      #
-      # Helpers
-      #
-
-      # Helper that creates the javascript code to close the note
-      #
-      def close_helper(note)
-        "Footnotes.hide(document.getElementById('#{note.to_sym}_debug_info'));\n"
-      end
-
-      # Helper that creates the link and javascript code when note is clicked
-      #
-      def link_helper(note)
-        onclick = note.onclick
-        unless href = note.link
-          href = '#'
-          onclick ||= "Footnotes.hideAllAndToggle('#{note.to_sym}_debug_info');return false;" if note.has_fieldset?
-        end
-
-        "<a href=\"#{href}\" onclick=\"#{onclick}\">#{note.title}</a>"
-      end
-
-      # Inserts text in to the body of the document
-      # +pattern+ is a Regular expression which, when matched, will cause +new_text+
-      # to be inserted before or after the match.  If no match is found, +new_text+ is appended
-      # to the body instead. +position+ may be either :before or :after
-      #
-      def insert_text(position, pattern, new_text)
-        index = case pattern
-          when Regexp
-            if match = @controller.response.body.match(pattern)
-              match.offset(0)[position == :before ? 0 : 1]
-            else
-              @controller.response.body.size
-            end
-          else
-            pattern
-          end
-        newbody = @controller.response.body
-        newbody.insert index, new_text
-        @controller.response.body = newbody
-      end
-
-      # Instance each_with_rescue method
-      #
-      def each_with_rescue(*args, &block)
-        self.class.each_with_rescue(*args, &block)
-      end
-
-  end
+  autoload :BeforeFilter,   'rails-footnotes/before_filter'
+  autoload :AfterFilter,    'rails-footnotes/after_filter'
+  autoload :Filter,         'rails-footnotes/filter'
 end

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

@@ -22,7 +22,7 @@ module Footnotes
 
       def title
         queries = self.events.count
-        total_time = self.events.map(&:duration).sum / 1000.0
+        total_time = self.events.map(&:duration).sum
         query_color = generate_red_color(self.events.count, alert_sql_number)
         db_color    = generate_red_color(total_time, alert_db_time)
 

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "3.7.6"
+  VERSION = "3.7.7"
 end

data/rails-footnotes.gemspec

@@ -6,8 +6,8 @@ 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.authors     = ["Roman V. Babenko", "José Valim", "Keenan Brock", "Duane Johnson"]
+  s.email       = ["romanvbabenko@gmail.com"]
   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.}
@@ -17,8 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 3.0.0"
 
   s.add_development_dependency "rails", ">= 3.0.0"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "watchr"
+  s.add_development_dependency "rspec", "~> 2.9.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/footnotes_spec.rb

@@ -23,7 +23,7 @@ describe "Footnotes" do
     @controller.template = Object.new
     @controller.request = ActionController::TestRequest.new
     @controller.response = ActionController::TestResponse.new
-    @controller.response_body = HTML.dup
+    @controller.response_body = HTML_DOCUMENT.dup
     @controller.params = {}
 
     Footnotes::Filter.notes = [ :test ]
@@ -40,7 +40,7 @@ describe "Footnotes" do
   if RUBY_VERSION >= '1.9.0'
     it "foonotes_included" do
       footnotes_perform!
-      @controller.response_body.should_not == HTML
+      @controller.response_body.should_not == HTML_DOCUMENT
     end
   end
 
@@ -48,29 +48,30 @@ describe "Footnotes" do
     @controller.request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
     @controller.request.env['HTTP_ACCEPT'] = 'text/javascript, text/html, application/xml, text/xml, */*'
     footnotes_perform!
-    @controller.response.body.should eql HTML
+    @controller.response.body.should eql HTML_DOCUMENT
   end
 
   specify "footnotes_not_included_when_content_type_is_javascript" do
     @controller.response.headers['Content-Type'] = 'text/javascript'
     footnotes_perform!
-    @controller.response.body.should eql HTML
+    @controller.response.body.should eql HTML_DOCUMENT
   end
 
   specify "footnotes_included_when_content_type_is_html" do
     @controller.response.headers['Content-Type'] = 'text/html'
     footnotes_perform!
-    @controller.response.body.should_not eql HTML
+    @controller.response.body.should_not eql HTML_DOCUMENT
   end
 
   specify "footnotes_included_when_content_type_is_nil" do
     footnotes_perform!
-    @controller.response.body.should_not eql HTML
+    @controller.response.body.should_not eql HTML_DOCUMENT
   end
 
   specify "not_included_when_body_is_not_a_string" do
-    @controller.response.body = Proc.new { Time.now }
-    expect { footnotes_perform! }.should_not raise_exception
+    @controller.response.stub(:body).and_return(Time.now)# = Proc.new { Time.now }
+    Footnotes::Filter.new(@controller).send(:valid?).should_not be
+    @controller.response.body.should_not =~ /<!-- Footnotes/
   end
 
   specify "notes_are_initialized" do
@@ -198,7 +199,7 @@ describe "Footnotes" do
     end
   end
 
-HTML = <<EOF
+HTML_DOCUMENT = <<EOF
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: rails-footnotes
 version: !ruby/object:Gem::Version
-  version: 3.7.6
+  version: 3.7.7
   prerelease: 
 platform: ruby
 authors:
+- Roman V. Babenko
+- José Valim
 - Keenan Brock
+- Duane Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70324691484480 !ruby/object:Gem::Requirement
+  requirement: &70198531287580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +24,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324691484480
+  version_requirements: *70198531287580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70324691483740 !ruby/object:Gem::Requirement
+  requirement: &70198531286580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,33 +35,22 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70324691483740
+  version_requirements: *70198531286580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70324691483080 !ruby/object:Gem::Requirement
+  requirement: &70198531285700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70324691483080
-- !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: &70324691482220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70324691482220
+  version_requirements: *70198531285700
 description: Every Rails page has footnotes that gives information about your application
   and links back to your editor.
 email:
-- keenan@thebrocks.net
+- romanvbabenko@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -78,7 +70,11 @@ files:
 - lib/generators/templates/rails_footnotes.rb
 - lib/rails-footnotes.rb
 - lib/rails-footnotes/abstract_note.rb
+- lib/rails-footnotes/after_filter.rb
 - lib/rails-footnotes/backtracer.rb
+- lib/rails-footnotes/before_filter.rb
+- lib/rails-footnotes/each_with_rescue.rb
+- lib/rails-footnotes/filter.rb
 - lib/rails-footnotes/footnotes.rb
 - lib/rails-footnotes/notes/all.rb
 - lib/rails-footnotes/notes/assigns_note.rb