opal · Apr 7, 2014 · Apr 7, 2014
Showing with 38 additions and 8 deletions.

+9 −3 lib/opal/new_builder.rb

+6 −4 lib/opal/sprockets/processor.rb

+19 −0 spec/cli/new_builder_spec.rb

+4 −1 stdlib/file.rb
diff --git a/lib/opal/new_builder.rb b/lib/opal/new_builder.rb
@@ -6,6 +6,7 @@ class NewBuilder
     def initialize(options = {}, path_reader = PathReader.new, compiler_class = CompilerWrapper)
       @options          = options
       @compiler_options = options[:compiler_options] || {}
+      @stubbed_files    = options[:stubbed_files] || []
       @path_reader      = path_reader
       @compiler_class   = compiler_class
     end
@@ -20,7 +21,9 @@ def build_str(source, path = '(file)', prerequired = [])
       sources = []
       compiled_requires = {}
       prerequired.each {|pr| compiled_requires[pr] = true}
+
       compiler.requires.uniq.each { |r| compile_require(r, sources, compiled_requires) }
+
       sources << compiler.compiled
       prerequired.concat(compiled_requires.keys)
       sources.join("\n")
@@ -36,8 +39,7 @@ def javascript? path
     def compile_require r, sources, compiled_requires
       return if compiled_requires.has_key?(r)
       compiled_requires[r] = true
-
-      require_source = path_reader.read(r)
+      require_source = stubbed?(r) ? '' : path_reader.read(r)
       if javascript?(r)
         sources << require_source
       else
@@ -47,11 +49,15 @@ def compile_require r, sources, compiled_requires
       end
     end
 
+    def stubbed? file
+      stubbed_files.include? file
+    end
+
     def compiler_for(source, options = {})
       compiler_class.new(source, compiler_options.merge(options))
     end
 
-    attr_reader :compiler_class, :path_reader, :compiler_options
+    attr_reader :compiler_class, :path_reader, :compiler_options, :stubbed_files
 
     class CompilerWrapper
       def initialize(source, options)

diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -78,10 +78,12 @@ def evaluate(context, locals, &block)
       }
 
       path = context.logical_path
-      requires = stubbed_files.dup.to_a
-      builder = NewBuilder.new({compiler_options: options})
-      result = builder.build_str(data, path, requires)
-      (requires - stubbed_files.to_a).uniq.each { |r| context.depend_on path }
+      prerequired = []
+      builder = NewBuilder.new(:compiler_options => options, :stubbed_files => stubbed_files)
+      result = builder.build_str(data, path, prerequired)
+
+      # prerequired is mutated by the builder
+      prerequired.uniq.each { |r| context.depend_on path }
 
       if self.class.source_map_enabled
         $OPAL_SOURCE_MAPS[context.pathname] = '' #compiler.source_map(source_file_url(context)).to_s

diff --git a/spec/cli/new_builder_spec.rb b/spec/cli/new_builder_spec.rb
@@ -74,6 +74,25 @@
       end
     end
 
+    context 'with a stubbed file' do
+      let(:foo_stubbed) { 'foo stubbed' }
+
+      before do
+        options.merge! stubbed_files: [foo_path]
+        foo_compiler = double(:compile, :compiled => foo_stubbed, :requires => [])
+        compiler_class.stub(:new).with('', :file => foo_path, :requirable => true) { foo_compiler }
+      end
+
+      it 'returns an empty source' do
+        expect(builder.build(filepath)).to eq([
+          foo_stubbed,
+          required_bar,
+          compiled_source,
+        ].join("\n"))
+      end
+    end
+
+
     include_examples :path_reader do
       let(:path) {'foo'}
       let(:contents) { foo_contents }

diff --git a/stdlib/file.rb b/stdlib/file.rb
@@ -2,6 +2,9 @@ class File
   SEPARATOR = '/'
 
   def self.expand_path(path, basedir = nil)
-    [basedir || '.', path].join(SEPARATOR).gsub(%r{/[^/]+/\.\./}, '/')
+    expand_regexp = %r{(/|^)[^/]+/\.\./}
+    full_path = [basedir || '.', path].join(SEPARATOR)
+    full_path = full_path.gsub(expand_regexp, '\1') while full_path =~ expand_regexp
+    full_path
   end
 end