merb-haml 1.0.8.1 → 1.0.9

data/lib/merb-haml/template.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

data/lib/merb-haml.rb

@@ -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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-haml
 version: !ruby/object:Gem::Version 
-  version: 1.0.8.1
+  version: 1.0.9
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -07:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.8.1
+        version: 1.0.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml