@@ -3,8 +3,7 @@ if defined?(Merb) require "haml" require "merb-haml/template" Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks")) - - Merb::Plugins.config[:haml] ||= {} + Merb::Plugins.config[:sass] ||= {} Merb::BootLoader.after_app_loads do merb-haml/lib/merb-haml.rb @@ -11,8 +11,11 @@ module Merb::Template # mod<Class, Module>:: # The class or module wherein this method should be defined. def self.compile_template(io, name, locals, mod) - path = File.expand_path(io.path) - config = Mash.new(Merb::Plugins.config[:haml].merge(:filename => path)) + path = File.expand_path(io.path) + config = (Merb::Plugins.config[:haml] || {}).inject({}) do |c, (k, v)| + c[k.to_sym] = v + c + end.merge :filename => path template = ::Haml::Engine.new(io.read, config) template.def_method(mod, name, *locals) name merb-haml/lib/merb-haml/template.rb a86c711fa54c4c433efac83a3eee622605ceb9d8 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/5d54aa9da31466dacb39961f9ef818244aa14515 5d54aa9da31466dacb39961f9ef818244aa14515 2009-01-29T11:35:25-08:00 2009-01-29T11:33:46-08:00 Revert "[merb-haml] Use Mash instead of overly clever code with inject" This reverts commit 033ded037567d7c7bde0e28bc201c80768c37c13. This change caused template engine options be never passed to HAML engine. 93501b360acd7b0cf4dbe43ea0884d3c889edbba Michael S. Klishin michael@novemberain.com