Cleanup generated code to reuse erb runtime

opal · Feb 7, 2014 · 0bdd3eb · 0bdd3eb
1 parent 5e6453c
commit 0bdd3eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 *   Implicitly require `opal-haml` when any haml template is required
 
+*   Cleanup generated code to be use Opal ERB runtime directly
+
 ## 0.2.0 2013-12-17
 
 *   Remove opal-sprockets dependency

diff --git a/lib/opal/haml.rb b/lib/opal/haml.rb
@@ -6,11 +6,17 @@ module Opal
   module Haml
     def self.compile(source, file = '(haml)')
       haml = ::Haml::Engine.new(source, :ugly => true).precompiled
+      haml = haml.gsub('_hamlout.buffer', '_hamlout')
       Opal.compile(wrap(haml, file))
     end
 
     def self.wrap(haml, file)
-      "Template.new('#{file}') do |_hamlout|\n#{haml}\n_hamlout.join\nend\n"
+      <<-EOS
+        Template.new('#{file}') do |_hamlout|
+          #{haml}
+          _hamlout.join
+        end
+      EOS
     end
   end
 end

diff --git a/opal/opal-haml.rb b/opal/opal-haml.rb
@@ -2,10 +2,6 @@
 
 class Template
   class OutputBuffer
-    def buffer
-      self
-    end
-
     alias << append
 
     # allow tags in haml to have dynamic attributes