Initial (recommit) of template local variable support

adambeynon · adambeynon · commit ced9f369a38b · 2015-03-12T17:48:40.000Z
diff --git a/lib/opal/builder_processors.rb b/lib/opal/builder_processors.rb
@@ -132,6 +132,14 @@ def prepare(source, path)
         erb_compiler = erb_compiler_class.new(source, path)
         erb_compiler.prepared_source
       end
+
+      def compiled
+        @compiled ||= begin
+          compiler = compiler_for(@source, file: @filename, template: true)
+          compiler.compile
+          compiler
+        end
+      end
     end
 
     class ERBProcessor < Processor
diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -86,6 +86,11 @@ def self.compiler_option(name, default_value, options = {})
     # compile top level local vars with support for irb style vars
     compiler_option :irb, false, :as => :irb?
 
+    #@!method template?
+    #
+    # compile file with support for local variables (used by Template)
+    compiler_option :template, false, :as => :template?
+
     # @!method dynamic_require_severity
     #
     # how to handle dynamic requires (:error, :warning, :ignore)
diff --git a/lib/opal/erb.rb b/lib/opal/erb.rb
@@ -46,7 +46,7 @@ def prepared_source
       end
 
       def compile
-        Opal.compile prepared_source
+        Opal.compile prepared_source, :template => true
       end
 
       def fix_quotes(result)
@@ -77,7 +77,7 @@ def find_code(result)
 
       def wrap_compiled(result)
         path = @file_name.sub(/\.opalerb$/, '')
-        result = "Template.new('#{path}') do |output_buffer|\noutput_buffer.append(\"#{result}\")\noutput_buffer.join\nend\n"
+        result = "Template.new('#{path}') do |output_buffer, __locals = {}|\noutput_buffer.append(\"#{result}\")\noutput_buffer.join\nend\n"
       end
     end
   end
diff --git a/lib/opal/nodes/call.rb b/lib/opal/nodes/call.rb
@@ -33,6 +33,9 @@ def compile
         # if trying to access an lvar in irb mode
         return compile_irb_var if using_irb?
 
+        # if compiling a template, support local variables
+        return compile_template_var if using_template?
+
         default_compile
       end
 
@@ -121,6 +124,19 @@ def using_irb?
         @compiler.irb? and scope.top? and arglist == s(:arglist) and recvr.nil? and iter.nil?
       end
 
+      def using_template?
+        @compiler.template? and scope.iter? and arglist == s(:arglist) and recvr.nil? and iter.nil?
+      end
+
+      def compile_template_var
+        with_temp do |tmp|
+          lvar = variable(meth)
+          call = s(:call, s(:self), meth.intern, s(:arglist))
+          push "((#{tmp} = __locals.smap.#{lvar}) == null ? ", expr(call),
+            " : #{tmp})"
+        end
+      end
+
       # Handle "special" method calls, e.g. require(). Subclasses can override
       # this method. If this method returns nil, then the method will continue
       # to be generated by CallNode.
diff --git a/spec/opal/stdlib/erb/erb_spec.rb b/spec/opal/stdlib/erb/erb_spec.rb
@@ -2,12 +2,14 @@
 require File.expand_path('../simple', __FILE__)
 require File.expand_path('../quoted', __FILE__)
 require File.expand_path('../inline_block', __FILE__)
+require File.expand_path('../with_locals', __FILE__)
 
 describe "ERB files" do
   before :each do
     @simple = Template['opal/stdlib/erb/simple']
     @quoted = Template['opal/stdlib/erb/quoted']
     @inline_block = Template['opal/stdlib/erb/inline_block']
+    @with_locals = Template['opal/stdlib/erb/with_locals']
   end
 
   it "should be defined by their filename on Template namespace" do
@@ -27,4 +29,11 @@
   it "should be able to handle inline blocks" do
     @inline_block.should be_kind_of(Template)
   end
+
+  describe 'template locals' do
+    it 'can pass local variables to a template' do
+      def self.non_local; 'Ford'; end
+      @with_locals.render(self, :is_local => 'Perfect').should =~ /Ford\ Perfect/
+    end
+  end
 end
diff --git a/spec/opal/stdlib/erb/with_locals.opalerb b/spec/opal/stdlib/erb/with_locals.opalerb
@@ -0,0 +1 @@
+<%= non_local %> <%= is_local %>
diff --git a/stdlib/template.rb b/stdlib/template.rb
@@ -23,8 +23,8 @@ def inspect
     "#<Template: '#@name'>"
   end
 
-  def render(ctx = self)
-    ctx.instance_exec(OutputBuffer.new, &@body)
+  def render(ctx = self, locals = {})
+    ctx.instance_exec(OutputBuffer.new, locals, &@body)
   end
 
   class OutputBuffer
