0
@@ -15,6 +15,6 @@ if (ENV['RAILS_ENV'] == 'development')
0
   ::MAC_OS_X = (`uname`.chomp == "Darwin") rescue false
0
   require 'textmate_footnotes'
0
   require 'textmate_initialize'
0
-  
0
+
0
   require 'textmate_backtracer' if ::MAC_OS_X
0
 end
0
\ No newline at end of file

0
@@ -1,6 +1,6 @@
0
 class Exception
0
   alias :original_clean_backtrace :clean_backtrace
0
-  
0
+
0
   def add_links_to_backtrace(lines)
0
     lines.collect do |line|
0
       expanded = line.gsub '#{RAILS_ROOT}', RAILS_ROOT
0
@@ -33,11 +33,10 @@ protected
0
   alias backtracer_original_template_path_for_local_rescue template_path_for_local_rescue
0
   def template_path_for_local_rescue(exception)
0
     if ActionView::TemplateError === exception
0
-      File.dirname(__FILE__) + "/../templates/rescues/template_error.rhtml"
0
+      File.dirname(__FILE__) + "/../templates/rescues/template_error.erb"
0
     else
0
       backtracer_original_template_path_for_local_rescue(exception)
0
     end
0
   end
0
-  
0
+
0
 end
0
-  
0
\ No newline at end of file

0
@@ -15,15 +15,15 @@ class FootnoteFilter
0
   cattr_accessor :no_style, :abs_root, :textmate_prefix
0
   self.no_style = false
0
   self.textmate_prefix = "txmt://open?url=file://"
0
-  
0
+
0
   attr_accessor :body, :abs_root
0
-  
0
+
0
   def self.filter(controller)
0
     return if controller.render_without_footnotes
0
     filter = FootnoteFilter.new(controller)
0
     filter.add_footnotes!
0
   end
0
-  
0
+
0
   def initialize(controller)
0
     @controller = controller
0
     @template = controller.instance_variable_get("@template")
0
@@ -31,7 +31,7 @@ class FootnoteFilter
0
     @extra_html = ""
0
     self.abs_root = File.expand_path(RAILS_ROOT)
0
   end
0
-  
0
+
0
   def add_footnotes!
0
     if performed_render? and first_render?
0
       if ["html.erb", "haml", "rhtml", "rxhtml"].include?(template_extension) && (content_type =~ /html/ || content_type.nil?) && !xhr?
0
@@ -44,70 +44,70 @@ class FootnoteFilter
0
     # Discard footnotes if there are any problems
0
     RAILS_DEFAULT_LOGGER.error "Textmate Footnotes Exception: #{e}\n#{e.backtrace.join("\n")}"
0
   end
0
-  
0
+
0
   # Some controller classes come with the Controller:: module and some don't
0
   # (anyone know why? -- Duane)
0
   def controller_filename
0
     File.join(abs_root, "app", "controllers", "#{@controller.class.to_s.underscore}.rb").
0
     sub('/controllers/controllers/', '/controllers/')
0
   end
0
-  
0
+
0
   def controller_text
0
     @controller_text ||= IO.read(controller_filename)
0
   end
0
-  
0
+
0
   def index_of_method
0
     (controller_text =~ /def\s+#{@controller.action_name}[\s\(]/)
0
   end
0
-  
0
+
0
   def controller_line_number
0
     controller_text.line_from_index(index_of_method)
0
   end
0
-  
0
+
0
   def performed_render?
0
     @controller.instance_variable_get("@performed_render")
0
   end
0
-  
0
+
0
   def first_render?
0
     @template.respond_to?(:first_render) and @template.first_render
0
   end
0
-  
0
+
0
   def xhr?
0
     @controller.request.xhr?
0
   end
0
-  
0
+
0
   def template_path
0
     @template.first_render.sub(/\.(html\.erb|rhtml|rxhtml|rxml|rjs)$/, "")
0
   end
0
-  
0
+
0
   def template_extension
0
     @template.first_render.scan(/\.(html\.erb|rhtml|rxhtml|rxml|rjs)$/).flatten.first ||
0
     @template.pick_template_extension(template_path).to_s
0
   end
0
-  
0
+
0
   def template_file_name
0
     File.expand_path(@template.send(:full_template_path, template_path, template_extension))
0
   end
0
-  
0
+
0
   def layout_file_name
0
     ["html.erb", "rhtml"].each do |extension|
0
       path = File.expand_path(@template.send(:full_template_path, @controller.active_layout, extension))
0
       return path if File.exist?(path)
0
     end
0
   end
0
-  
0
+
0
   def content_type
0
     @controller.response.headers['Content-Type']
0
   end
0
-  
0
+
0
   def stylesheet_files
0
     @stylesheet_files ||= @body.scan(/<link[^>]+href\s*=\s*['"]([^>?'"]+)/im).flatten
0
   end
0
-  
0
+
0
   def javascript_files
0
     @javascript_files ||= @body.scan(/<script[^>]+src\s*=\s*['"]([^>?'"]+)/im).flatten
0
   end
0
-  
0
+
0
   def controller_url
0
     escape(
0
       textmate_prefix +
0
@@ -115,15 +115,15 @@ class FootnoteFilter
0
       (index_of_method ? "&line=#{controller_line_number + 1}&column=3" : "")
0
     )
0
   end
0
-  
0
+
0
   def view_url
0
     escape(textmate_prefix + template_file_name)
0
   end
0
-  
0
+
0
   def layout_url
0
     escape(textmate_prefix + layout_file_name)
0
   end
0
-  
0
+
0
   def insert_styles
0
     insert_text :before, /<\/head>/i, <<-HTML
0
     <!-- TextMate Footnotes Style -->
0
@@ -136,13 +136,13 @@ class FootnoteFilter
0
     <!-- End TextMate Footnotes Style -->
0
     HTML
0
   end
0
-  
0
+
0
   def insert_footnotes
0
-    
0
+
0
     def tm_footnotes_toggle(id)
0
       "s = document.getElementById('#{id}').style; if(s.display == 'none') { s.display = '' } else { s.display = 'none' }"
0
     end
0
-    
0
+
0
     footnotes_html = <<-HTML
0
     <!-- TextMate Footnotes -->
0
     <div style="clear:both"></div>
0
@@ -182,7 +182,7 @@ class FootnoteFilter
0
       insert_text :before, /<\/body>/i, footnotes_html
0
     end
0
   end
0
-  
0
+
0
   def textmate_links
0
     html = ""
0
     if ::MAC_OS_X
0
@@ -198,7 +198,7 @@ class FootnoteFilter
0
     end
0
     html
0
   end
0
-  
0
+
0
   def asset_file_links(link_text, files)
0
     return '' if files.size == 0
0
     links = files.map do |filename|
0
@@ -218,7 +218,7 @@ class FootnoteFilter
0
     # Return the link that will open the 'extra html' div
0
     %{ | <a href="#" onclick="#{tm_footnotes_toggle('tm_footnotes_' + link_text.underscore.gsub(' ', '_') )}; return false">#{link_text}</a>}
0
   end
0
-  
0
+
0
   def indent(indentation, text)
0
     lines = text.to_a
0
     initial_indentation = lines.first.scan(/^(\s+)/).flatten.first
0
@@ -250,7 +250,7 @@ class FootnoteFilter
0
       end
0
     @body.insert index, indent(indentation, new_text)
0
   end
0
-  
0
+
0
   def escape(text)
0
     text.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
0
   end

0
@@ -5,7 +5,7 @@ RAILS_ROOT.replace File.dirname(__FILE__)
0
 
0
 class MockController
0
   attr_accessor :template, :session, :params, :cookies
0
-  
0
+
0
   def initialize(body = "")
0
     @body = body
0
     @performed_render = true
0
@@ -14,23 +14,23 @@ class MockController
0
     @cookies = {}
0
     template
0
   end
0
-  
0
+
0
   def template
0
     @template ||= MockTemplate.new(self)
0
   end
0
-  
0
+
0
   def response
0
     @response ||= OpenStruct.new(:body => @body, :headers => {})
0
   end
0
-    
0
+
0
   def first_render
0
     @body
0
   end
0
-  
0
+
0
   def request
0
     @request ||= MockRequest.new(false)
0
   end
0
-  
0
+
0
   def action_name
0
     @params[:action]
0
   end
0
@@ -40,7 +40,7 @@ class MockTemplate
0
   def initialize(controller)
0
     @controller = controller
0
   end
0
-  
0
+
0
   def first_render
0
     "example.rhtml"
0
   end
0
@@ -54,11 +54,11 @@ class FootnoteFilter
0
   def controller_filename
0
     __FILE__
0
   end
0
-  
0
+
0
   def template_file_name
0
     __FILE__
0
   end
0
-  
0
+
0
   def layout_file_name
0
     __FILE__
0
   end

0
@@ -11,52 +11,52 @@ class TextmateFootnotesTest < Test::Unit::TestCase
0
     @controller = MockController.new $html.dup
0
     @footnote = FootnoteFilter.new(@controller)
0
   end
0
-  
0
+
0
   def test_mock_controller
0
     index = @controller.response.body.index(/This is the HTML page/)
0
     assert_equal 334, index
0
   end
0
-  
0
+
0
   def test_footnote_not_included_when_request_is_xhr
0
     @controller.request.xhr = true
0
     @footnote.add_footnotes!
0
     assert_equal $html, @controller.response.body
0
   end
0
-  
0
+
0
   def test_footnote_not_included_when_content_type_is_javascript
0
     @controller.response.headers['Content-Type'] = 'text/javascript'
0
     @footnote.add_footnotes!
0
     assert_equal $html, @controller.response.body
0
   end
0
-  
0
+
0
   def test_footnote_included_when_content_type_is_html
0
     @controller.response.headers['Content-Type'] = 'text/html'
0
     @footnote.add_footnotes!
0
     assert_not_equal $html, @controller.response.body
0
   end
0
-  
0
+
0
   def test_footnote_included_when_content_type_is_nil
0
     @footnote.add_footnotes!
0
     assert_not_equal $html, @controller.response.body
0
   end
0
-  
0
+
0
   def test_indent
0
     before = "text\n  one\n  two"
0
     after  = "  text\n    one\n    two"
0
-    
0
+
0
     assert_equal after, @footnote.indent(2, before)
0
 
0
     before = " text\n  one\n  two"
0
     after  = "  text\n   one\n   two"
0
-    
0
+
0
     assert_equal after, @footnote.indent(2, before)
0
 
0
     before = "  text\none\ntwo"
0
     after  = "  text\n  one\n  two"
0
-    
0
+
0
     assert_equal after, @footnote.indent(2, before)
0
   end
0
-  
0
+
0
   def test_insert_text
0
     @footnote.insert_text :after, /<head>/, "Graffiti", 0
0
     after = "    <head>Graffiti\n"
0
@@ -77,8 +77,8 @@ __END__
0
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
0
     </head>
0
     <body>
0
-        <p>This is the HTML page. It works and is encoded just like any HTML page you    
0
-         have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of 
0
+        <p>This is the HTML page. It works and is encoded just like any HTML page you
0
+         have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
0
          this page to view the difference between HTML and XHTML.</p>
0
         <p>You will be glad to know that no changes need to be made to any of your CSS files.</p>
0
     </body>