Changeset 1250

Timestamp:

01/09/08 19:29:44 (9 months ago)

Author:

sethrasmuss..@gmail.com

Message:

tweak BootLoader?.load_inline_helpers for higher maintainability

Files:

• trunk/lib/merb/boot_loader.rb (modified) (2 diffs)

trunk/lib/merb/boot_loader.rb

@@ -121 +121 @@
-      def load_inline_helpers
-        partials = template_paths("_*.{erb,haml}")
-
+  
-        partials.each do |partial|
-          case partial
@@ -128 +128 @@
-            template.def_method(Merb::GlobalHelper, partial.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_"), partial)            
-          when /haml$/
-(Haml::Engine.instance_method(:def_method) rescue nil
+Object.const_defined?(:Haml) and Haml::Engine.instance_methods.include?('def_method'
-              template = Haml::Engine.new(File.read(partial), :filename => partial)
-              template.def_method(Merb::GlobalHelper, partial.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_"))