faux_rails_root/app/views/templates/haml_template.html.haml @@ -1,3 +1,5 @@ +07/16/08 - patched template query to handle HAML extensions [Matthew Bass] + 06/23/08 - added Sandro's patch for help text below edit fields [Matthew Bass] 06/16/08 - fixed partial rendering calls that had been missed during RC3 refactoring [Matthew Bass] CHANGELOG @@ -45,11 +45,15 @@ module Streamlined::RenderMethods # Returns true if the given template exists under <tt>app/views</tt>. # The template name can optionally include an extension. If an extension - # is not provided, <tt>rhtml</tt> will be used by default. + # is not provided, <tt>rhtml</tt> and <tt>.html.haml</tt> will be used by default. def specific_template_exists?(template) template, extension = template.split('.') path = File.join(RAILS_ROOT, "app/views", template) - File.exist?("#{path}.#{extension || 'rhtml'}") + if extension.blank? + File.exist?("#{path}.rhtml") || File.exist?("#{path}.html.haml") + else + File.exist?("#{path}.#{extension}") + end end def convert_default_options(options) lib/streamlined/render_methods.rb @@ -6,6 +6,7 @@ describe "Streamlined::RenderMethods#specific_template_exists" do it "specific template exists?" do assert specific_template_exists?("templates/template") + assert specific_template_exists?("templates/haml_template") assert specific_template_exists?("templates/template.rhtml") assert specific_template_exists?("templates/template.rxml") assert !specific_template_exists?("templates/template.rpdf") test/unit/streamlined/render_methods_test.rb 7ae37c7f0a0e5783b893b981109f9eca1391fa55 matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab http://github.com/relevance/streamlined/commit/a540467639c55f2f8069a0d39ba36850879fe412 a540467639c55f2f8069a0d39ba36850879fe412 2008-07-16T06:37:15-07:00 2008-07-16T06:37:15-07:00 patched template query to handle HAML extensions 7af15e23e27e86a2f5444157888aed2b05ea72d3 matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab