Implicitly require 'opal-haml' when a haml template is required

adambeynon · adambeynon · commit 39632b8c8d10 · 2014-01-08T12:42:26.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
+## edge
+
+*   Implicitly require `opal-haml` when any haml template is required
+
 ## 0.2.0 2013-12-17
 
-* Remove opal-sprockets dependency
+*   Remove opal-sprockets dependency
 
 ## 0.1.0 2013-12-17
 
-* Initial release
+*   Initial release
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'opal', '~> 0.5.0'
+gem 'opal',       :github => 'opal/opal'
+gem 'opal-rspec', '0.3.0.beta2'
diff --git a/lib/opal/haml/processor.rb b/lib/opal/haml/processor.rb
@@ -17,8 +17,9 @@ def initialize_engine
       def prepare
       end
 
-      def evaluate(scope, locals, &block)
-        Opal::Haml.compile data, scope.logical_path.sub(/^templates\//, '')
+      def evaluate(context, locals, &block)
+        context.require_asset 'opal-haml'
+        Opal::Haml.compile data, context.logical_path.sub(/^templates\//, '')
       end
     end
   end
diff --git a/spec/haml_spec.rb b/spec/haml_spec.rb
@@ -1,5 +1,3 @@
-require 'opal-haml'
-
 require File.expand_path('../simple', __FILE__)
 require File.expand_path('../advanced', __FILE__)
 require File.expand_path('../html_content', __FILE__)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'opal-haml'`
`2`		`-`
`3`	`1`	`require File.expand_path('../simple', __FILE__)`
`4`	`2`	`require File.expand_path('../advanced', __FILE__)`
`5`	`3`	`require File.expand_path('../html_content', __FILE__)`