opal · May 15, 2015 · May 15, 2015 · May 15, 2015 · May 15, 2015 · May 16, 2015
Showing with 94 additions and 34 deletions.

+17 −0 lib/opal/builder.rb

+8 −5 lib/opal/cli.rb

+3 −0 lib/opal/path_reader.rb

+23 −16 lib/opal/paths.rb

+11 −5 lib/tilt/opal.rb

+12 −6 spec/lib/builder_spec.rb

+2 −2 spec/lib/cli_spec.rb

+18 −0 spec/lib/tilt/opal_spec.rb
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -50,6 +50,17 @@ def build_require(path, options = {})
       process_require(path, options)
     end
 
+    def initialize_copy(other)
+      super
+      @stubs = other.stubs.dup
+      @preload = other.preload.dup
+      @processors = other.processors.dup
+      @path_reader = other.path_reader.dup
+      @prerequired = other.prerequired.dup
+      @compiler_options = other.compiler_options.dup
+      @processed = other.processed.dup
+    end
+
     def to_s
       processed.map(&:to_s).join("\n")
     end
@@ -58,6 +69,12 @@ def source_map
       processed.map(&:source_map).reduce(:+).as_json.to_json
     end
 
+    def append_paths(*paths)
+      path_reader.append_paths(*paths)
+    end
+
+    include UseGem
+
     attr_reader :processed
 
     attr_accessor :processors, :default_processor, :path_reader,

diff --git a/lib/opal/cli.rb b/lib/opal/cli.rb
@@ -87,11 +87,10 @@ def run_code
 
     attr_reader :exit_status
 
-    def compiled_source
-      Opal.paths.concat load_paths
-      gems.each { |gem_name| Opal.use_gem gem_name }
-
+    def build
       builder = Opal::Builder.new stubs: stubs, compiler_options: compiler_options
+      builder.append_paths(*load_paths)
+      gems.each { |gem_name| builder.use_gem gem_name }
 
       builder.build 'opal' unless skip_opal_require?
 
@@ -116,7 +115,11 @@ def compiled_source
 
       builder.build_str 'Kernel.exit', '(exit)' unless no_exit
 
-      builder.to_s
+      builder
+    end
+
+    def compiled_source
+      build.to_s
     end
 
     def show_compiled_source

diff --git a/lib/opal/path_reader.rb b/lib/opal/path_reader.rb
@@ -24,6 +24,9 @@ def paths
       file_finder.paths
     end
 
+    def append_paths(*paths)
+      file_finder.append_paths(*paths)
+    end
 
     private
 

diff --git a/lib/opal/paths.rb b/lib/opal/paths.rb
@@ -16,31 +16,38 @@ def self.std_dir
   # here should only be paths which contain code targeted at being compiled by
   # Opal.
   def self.append_path(path)
-    paths << path
+    append_paths(path)
+  end
+  def self.append_paths(*paths)
+    self.paths.concat(paths)
   end
 
-  def self.use_gem(gem_name, include_dependencies = true)
-    require_paths_for_gem(gem_name, include_dependencies).each do |path|
-      append_path path
+  module UseGem
+    def use_gem(gem_name, include_dependencies = true)
+      append_paths(*require_paths_for_gem(gem_name, include_dependencies))
     end
-  end
+
+    private
 
-  def self.require_paths_for_gem(gem_name, include_dependencies)
-    paths = []
-    spec = Gem::Specification.find_by_name(gem_name)
+    def require_paths_for_gem(gem_name, include_dependencies)
+      paths = []
+      spec = Gem::Specification.find_by_name(gem_name)
 
-    spec.runtime_dependencies.each do |dependency|
-      paths += require_paths_for_gem(dependency.name, include_dependencies)
-    end if include_dependencies
+      spec.runtime_dependencies.each do |dependency|
+        paths += require_paths_for_gem(dependency.name, include_dependencies)
+      end if include_dependencies
 
-    gem_dir = spec.gem_dir
-    spec.require_paths.map do |path|
-      paths << File.join(gem_dir, path)
-    end
+      gem_dir = spec.gem_dir
+      spec.require_paths.map do |path|
+        paths << File.join(gem_dir, path)
+      end
 
-    paths
+      paths
+    end
   end
 
+  extend UseGem
+
   # Private, don't add to these directly (use .append_path instead).
   def self.paths
     @paths ||= [core_dir.untaint, std_dir.untaint, gem_dir.untaint]

diff --git a/lib/tilt/opal.rb b/lib/tilt/opal.rb
@@ -1,5 +1,5 @@
 require 'tilt'
-require 'opal/compiler'
+require 'opal/builder'
 require 'opal/config'
 require 'opal/version'
 
@@ -32,10 +32,16 @@ def initialize_engine
     def prepare
     end
 
-    def evaluate(context, locals, &block)
-      compiler_options = Opal::Config.compiler_options.merge(file: file)
-      compiler = Compiler.new(data, compiler_options)
-      compiler.compile.to_s
+    def evaluate(_, _, &block)
+      if builder = @options[:builder]
+        builder.dup.build(file).to_s
+      elsif @options[:build]
+        Opal::Builder.build(file).to_s
+      else
+        compiler_options = (compiler_options || {}).merge!(file: file)
+        compiler = Compiler.new(data, compiler_options)
+        compiler.compile.to_s
+      end
     end
 
     def compiler_options

diff --git a/spec/lib/builder_spec.rb b/spec/lib/builder_spec.rb
@@ -11,12 +11,8 @@
   end
 
   it 'respect #require_tree calls' do
-    begin
-      Opal.append_path(File.expand_path('..', __FILE__))
-      expect(builder.build('fixtures/require_tree_test').to_s).to include('Opal.modules["fixtures/required_tree_test/required_file1"]')
-    ensure
-      Opal.instance_variable_set('@paths', nil)
-    end
+    builder.append_paths(File.expand_path('..', __FILE__))
+    expect(builder.build('fixtures/require_tree_test').to_s).to include('Opal.modules["fixtures/required_tree_test/required_file1"]')
   end
 
   describe ':stubs' do
@@ -52,6 +48,16 @@
     end
   end
 
+  describe 'dup' do
+    it 'duplicates internal structures' do
+      b2 = builder.dup
+      b2.should_not equal(builder)
+      [:stubs, :preload, :processors, :path_reader, :prerequired, :compiler_options, :processed].each do |m|
+        b2.send(m).should_not equal(builder.send(m))
+      end
+    end
+  end
+
   describe 'requiring a native .js file' do
     it 'can be required without specifying extension' do
       builder.build_str('require "corelib/runtime"', 'foo')

diff --git a/spec/lib/cli_spec.rb b/spec/lib/cli_spec.rb
@@ -82,12 +82,12 @@
       let(:options)  { {:gems => [gem_name], :evals => ['']} }
 
       it "adds the gem's lib paths to Opal.path" do
-        cli.run
+        builder = cli.build
 
         spec = Gem::Specification.find_by_name(gem_name)
         spec.require_paths.each do |require_path|
           require_path = File.join(spec.gem_dir, require_path)
-          expect(Opal.paths).to include(require_path)
+          expect(builder.path_reader.send(:file_finder).paths).to include(require_path)
         end
       end
     end

diff --git a/spec/lib/tilt/opal_spec.rb b/spec/lib/tilt/opal_spec.rb
@@ -16,4 +16,22 @@
       end
     end
   end
+
+  it "support :build option" do
+    template = described_class.new('./spec/lib/fixtures/opal_file.rb', :build=>true)
+    output = template.render
+    expect(output).to include('"hi from opal!"')
+    expect(output).to include('self.$require("corelib/runtime");')
+  end
+
+  it "support :builder option" do
+    builder = Opal::Builder.new(:stubs=>['opal'])
+    template = described_class.new('./spec/lib/fixtures/opal_file.rb', :builder=>builder)
+
+    2.times do
+      output = template.render
+      expect(output.scan(/hi from opal!/).length).to eql(1)
+      expect(output).not_to include('self.$require("corelib/runtime");')
+    end
+  end
 end