templates/rescues/template_error.erb
@@ -15,6 +15,6 @@ if (ENV['RAILS_ENV'] == 'development')
::MAC_OS_X = (`uname`.chomp == "Darwin") rescue false
require 'textmate_footnotes'
require 'textmate_initialize'
-
+
require 'textmate_backtracer' if ::MAC_OS_X
end
\ No newline at end of file
init.rb
@@ -1,6 +1,6 @@
class Exception
alias :original_clean_backtrace :clean_backtrace
-
+
def add_links_to_backtrace(lines)
lines.collect do |line|
expanded = line.gsub '#{RAILS_ROOT}', RAILS_ROOT
@@ -33,11 +33,10 @@ protected
alias backtracer_original_template_path_for_local_rescue template_path_for_local_rescue
def template_path_for_local_rescue(exception)
if ActionView::TemplateError === exception
- File.dirname(__FILE__) + "/../templates/rescues/template_error.rhtml"
+ File.dirname(__FILE__) + "/../templates/rescues/template_error.erb"
else
backtracer_original_template_path_for_local_rescue(exception)
end
end
-
+
end
-
\ No newline at end of file
lib/textmate_backtracer.rb
@@ -15,15 +15,15 @@ class FootnoteFilter
cattr_accessor :no_style, :abs_root, :textmate_prefix
self.no_style = false
self.textmate_prefix = "txmt://open?url=file://"
-
+
attr_accessor :body, :abs_root
-
+
def self.filter(controller)
return if controller.render_without_footnotes
filter = FootnoteFilter.new(controller)
filter.add_footnotes!
end
-
+
def initialize(controller)
@controller = controller
@template = controller.instance_variable_get("@template")
@@ -31,7 +31,7 @@ class FootnoteFilter
@extra_html = ""
self.abs_root = File.expand_path(RAILS_ROOT)
end
-
+
def add_footnotes!
if performed_render? and first_render?
if ["html.erb", "haml", "rhtml", "rxhtml"].include?(template_extension) && (content_type =~ /html/ || content_type.nil?) && !xhr?
@@ -44,70 +44,70 @@ class FootnoteFilter
# Discard footnotes if there are any problems
RAILS_DEFAULT_LOGGER.error "Textmate Footnotes Exception: #{e}\n#{e.backtrace.join("\n")}"
end
-
+
# Some controller classes come with the Controller:: module and some don't
# (anyone know why? -- Duane)
def controller_filename
File.join(abs_root, "app", "controllers", "#{@controller.class.to_s.underscore}.rb").
sub('/controllers/controllers/', '/controllers/')
end
-
+
def controller_text
@controller_text ||= IO.read(controller_filename)
end
-
+
def index_of_method
(controller_text =~ /def\s+#{@controller.action_name}[\s\(]/)
end
-
+
def controller_line_number
controller_text.line_from_index(index_of_method)
end
-
+
def performed_render?
@controller.instance_variable_get("@performed_render")
end
-
+
def first_render?
@template.respond_to?(:first_render) and @template.first_render
end
-
+
def xhr?
@controller.request.xhr?
end
-
+
def template_path
@template.first_render.sub(/\.(html\.erb|rhtml|rxhtml|rxml|rjs)$/, "")
end
-
+
def template_extension
@template.first_render.scan(/\.(html\.erb|rhtml|rxhtml|rxml|rjs)$/).flatten.first ||
@template.pick_template_extension(template_path).to_s
end
-
+
def template_file_name
File.expand_path(@template.send(:full_template_path, template_path, template_extension))
end
-
+
def layout_file_name
["html.erb", "rhtml"].each do |extension|
path = File.expand_path(@template.send(:full_template_path, @controller.active_layout, extension))
return path if File.exist?(path)
end
end
-
+
def content_type
@controller.response.headers['Content-Type']
end
-
+
def stylesheet_files
@stylesheet_files ||= @body.scan(/<link[^>]+href\s*=\s*['"]([^>?'"]+)/im).flatten
end
-
+
def javascript_files
@javascript_files ||= @body.scan(/<script[^>]+src\s*=\s*['"]([^>?'"]+)/im).flatten
end
-
+
def controller_url
escape(
textmate_prefix +
@@ -115,15 +115,15 @@ class FootnoteFilter
(index_of_method ? "&line=#{controller_line_number + 1}&column=3" : "")
)
end
-
+
def view_url
escape(textmate_prefix + template_file_name)
end
-
+
def layout_url
escape(textmate_prefix + layout_file_name)
end
-
+
def insert_styles
insert_text :before, /<\/head>/i, <<-HTML
<!-- TextMate Footnotes Style -->
@@ -136,13 +136,13 @@ class FootnoteFilter
<!-- End TextMate Footnotes Style -->
HTML
end
-
+
def insert_footnotes
-
+
def tm_footnotes_toggle(id)
"s = document.getElementById('#{id}').style; if(s.display == 'none') { s.display = '' } else { s.display = 'none' }"
end
-
+
footnotes_html = <<-HTML
<!-- TextMate Footnotes -->
<div style="clear:both"></div>
@@ -182,7 +182,7 @@ class FootnoteFilter
insert_text :before, /<\/body>/i, footnotes_html
end
end
-
+
def textmate_links
html = ""
if ::MAC_OS_X
@@ -198,7 +198,7 @@ class FootnoteFilter
end
html
end
-
+
def asset_file_links(link_text, files)
return '' if files.size == 0
links = files.map do |filename|
@@ -218,7 +218,7 @@ class FootnoteFilter
# Return the link that will open the 'extra html' div
%{ | <a href="#" onclick="#{tm_footnotes_toggle('tm_footnotes_' + link_text.underscore.gsub(' ', '_') )}; return false">#{link_text}</a>}
end
-
+
def indent(indentation, text)
lines = text.to_a
initial_indentation = lines.first.scan(/^(\s+)/).flatten.first
@@ -250,7 +250,7 @@ class FootnoteFilter
end
@body.insert index, indent(indentation, new_text)
end
-
+
def escape(text)
text.gsub("&", "&").gsub("<", "<").gsub(">", ">")
end
lib/textmate_footnotes.rb
@@ -5,7 +5,7 @@ RAILS_ROOT.replace File.dirname(__FILE__)
class MockController
attr_accessor :template, :session, :params, :cookies
-
+
def initialize(body = "")
@body = body
@performed_render = true
@@ -14,23 +14,23 @@ class MockController
@cookies = {}
template
end
-
+
def template
@template ||= MockTemplate.new(self)
end
-
+
def response
@response ||= OpenStruct.new(:body => @body, :headers => {})
end
-
+
def first_render
@body
end
-
+
def request
@request ||= MockRequest.new(false)
end
-
+
def action_name
@params[:action]
end
@@ -40,7 +40,7 @@ class MockTemplate
def initialize(controller)
@controller = controller
end
-
+
def first_render
"example.rhtml"
end
@@ -54,11 +54,11 @@ class FootnoteFilter
def controller_filename
__FILE__
end
-
+
def template_file_name
__FILE__
end
-
+
def layout_file_name
__FILE__
end
test/mock_controller.rb
@@ -11,52 +11,52 @@ class TextmateFootnotesTest < Test::Unit::TestCase
@controller = MockController.new $html.dup
@footnote = FootnoteFilter.new(@controller)
end
-
+
def test_mock_controller
index = @controller.response.body.index(/This is the HTML page/)
assert_equal 334, index
end
-
+
def test_footnote_not_included_when_request_is_xhr
@controller.request.xhr = true
@footnote.add_footnotes!
assert_equal $html, @controller.response.body
end
-
+
def test_footnote_not_included_when_content_type_is_javascript
@controller.response.headers['Content-Type'] = 'text/javascript'
@footnote.add_footnotes!
assert_equal $html, @controller.response.body
end
-
+
def test_footnote_included_when_content_type_is_html
@controller.response.headers['Content-Type'] = 'text/html'
@footnote.add_footnotes!
assert_not_equal $html, @controller.response.body
end
-
+
def test_footnote_included_when_content_type_is_nil
@footnote.add_footnotes!
assert_not_equal $html, @controller.response.body
end
-
+
def test_indent
before = "text\n one\n two"
after = " text\n one\n two"
-
+
assert_equal after, @footnote.indent(2, before)
before = " text\n one\n two"
after = " text\n one\n two"
-
+
assert_equal after, @footnote.indent(2, before)
before = " text\none\ntwo"
after = " text\n one\n two"
-
+
assert_equal after, @footnote.indent(2, before)
end
-
+
def test_insert_text
@footnote.insert_text :after, /<head>/, "Graffiti", 0
after = " <head>Graffiti\n"
@@ -77,8 +77,8 @@ __END__
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
</head>
<body>
- <p>This is the HTML page. It works and is encoded just like any HTML page you
- have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
+ <p>This is the HTML page. It works and is encoded just like any HTML page you
+ have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
this page to view the difference between HTML and XHTML.</p>
<p>You will be glad to know that no changes need to be made to any of your CSS files.</p>
</body>
test/textmate_footnotes_test.rb
templates/rescues/template_error.rhtml
fa01a688cddc3b9b0db2540ad3948c7ae46da5d4
kevin
kevin@dfb7d73b-c2ec-0310-8fea-fb051d288c6d
http://github.com/mhartl/rails-footnotes/commit/34ad6c6ca16a295b14d3a6fb5845767bb96eb479
34ad6c6ca16a295b14d3a6fb5845767bb96eb479
2008-03-08T08:22:13-08:00
2008-03-08T08:22:13-08:00
This is a merge from the git repository hosted by Dr. Nic
http://github.com/drnic/ruby-on-rails-tmbundle/commit/7edadd1
== 1.90.0 2008-03-08
* Major Upgrade to Rails 2.0 - Initial release
* Ruby on Rails bundle maintenance has been taken over by Dr Nic Williams from its initial legendary creator Duane Johnson.
* Added so far:
* Snippets/Commands for:
* Tests
* assert_select (ass)
* assert_difference/assert_no_difference (asd/asnd)
* GET+POST test method stubs (deftg+deftp)
* posts(:) + Alt+Esc allows you to select a posts.yml fixture
* Controllers
* respond_to (rest) and respond_to(html) (Shift+Cmd+H)
* 'Go To View' within a respond_to will use the format/wants type as the default
* REMOVED: render_component snippets
* loggers - pass a block instead of raw string to save time if
logging not used (e.g. production) [Stephen Touset]
* redirect_to for resource paths (rep, repp, renp, renpp)
* render :update (ru) [Simon Jefford]
* Views
* form_for and form_for(with errors) (ff,ffe)
* Various form_for helpers in a drop-down list, e.g. f.text_field (f.)
* Various form_for helpers with own tab completion, e.g. f.text_field (fftf)
* link_to for resource paths (lip, lipp, linp, linpp)
* <% end -%> (end)
* for-loop (for)
* link_to(@model.name, @model) (ltm)
* Layouts
* javascript_include_tag - jit
* stylesheet_link_tag - slt
* Models
* has_many :though (hmt)
* association snippets give better defaults (e.g. bt + hm)
* validates_format_of (vf,vfif) [Dean Strelau]
* validates_numericality_of (vn,vnif) [Tom Morris]
* before/after callbacks (prefix bef/aft + 1st letter of words) [Sam Granieri]
* Migrations
* Sexy Migrations now available as "t." snippets and regular snippets [Lawrence Pit]
* Migration classes have own textmate scope
* Add/Remove Columns - the 'down' statements are in reverse
order [Lawrence Pit, Daniel Kristensen]
* Added 'Redo Last Migration' [Simon Jefford]
* Functional Tests
* assert_redirect_to for resource paths (artp, artpp, artnp, artnpp)
* assert(assigns(:model)) (asg)
* Routes
* named routes, resources snippets (map, mapr, maprs)
* catch_all (mapca) [Sam Granieri]
* Active Support
* cattr_accessor/mattr_accessor (crw/mrw) [Jacob Swanner]
* returning (returning) [Jacob Swanner]
* Language/Syntax
* New keywords: rescue_from, alias_method_chain, alias_attribute, delegate, respond_to [David Lowenfels, Jacob Swanner]
* Added rb as a valid Rails file type [James Deville]
* Commands
* Auto-completion for Foxy Fixtures
* html.erb is the default for new templates (backwards compatibility
is being worked on too)
* 'Go To XXX' - available for wide range of permutations.
Fixtures -> Models; Models -> Controllers, etc
* haml is a valid file extension [Steve Ross]
* specify alternate default file extensions for: [Steve Ross]
* javascript - ENV['RAILS_JS_EXT']
* stylesheet - ENV['RAILS_CSS_EXT']
* view - ENV['RAILS_VIEW_EXT']
* 'Call Generate Script' now accesses all a project's generators
* Plugins
* Footnote
* footnote-edge uses .erb for templates [Stephen Bannasch]
* Internals
* Rakefile - test runner [Steve Ross]
* Added generator_test
* Removed unnecessary misc_test
* script/clean_bundle_file_names - rename non-os-agnostic file names [Charles Roper]
* Haml support [Lawrence Pit]
For thoughts and patches, email drnicwilliams@gmail.com
git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/Ruby%20on%20Rails.tmbundle/Support/plugins/footnotes-edge@9069 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
2b70232d1fd7f40382de51c739b52d71c739ddb2
kevin
kevin@dfb7d73b-c2ec-0310-8fea-fb051d288c6d