opal · Sep 30, 2014 · Sep 30, 2014 · Sep 30, 2014 · Sep 30, 2014 · Sep 30, 2014
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -32,8 +32,9 @@ def build(path, options = {})
     end
 
     def build_str source, filename, options = {}
-      asset = processor_for(source, filename, options)
-      requires = preload + asset.requires
+      path = path_reader.expand(filename).to_s unless stub?(filename)
+      asset = processor_for(source, filename, path, options)
+      requires = preload + asset.requires + tree_requires(asset, path)
       requires.map { |r| process_require(r, options) }
       processed << asset
       self
@@ -61,11 +62,18 @@ def source_map
 
     private
 
-    def processor_for(source, filename, options)
-      unless stub?(filename)
-        full_filename = path_reader.expand(filename).to_s
-        processor = processors.find { |p| p.match? full_filename }
+    def tree_requires(asset, path)
+      asset.required_trees.flat_map do |tree|
+        base = File.expand_path(File.dirname(path))
+        expanded = File.expand_path File.join(base, tree, '*.rb')
+        Dir[expanded].map do |file|
+          file.gsub(/(\.js)?(\.(?:rb|opal))/, '')[(base.size+1)..-1]
+        end
       end
+    end
+
+    def processor_for(source, filename, path, options)
+      processor   = processors.find { |p| p.match? path }
       processor ||= default_processor
       return processor.new(source, filename, compiler_options.merge(options))
     end
@@ -77,7 +85,9 @@ def process_require(filename, options)
 
       source = stub?(filename) ? '' : path_reader.read(filename)
       raise ArgumentError, "can't find file: #{filename.inspect}" if source.nil?
-      asset = processor_for(source, filename, options.merge(requirable: true))
+
+      path = path_reader.expand(filename).to_s unless stub?(filename)
+      asset = processor_for(source, filename, path, options.merge(requirable: true))
       process_requires(asset, options)
       processed << asset
     end

diff --git a/lib/opal/builder_processors.rb b/lib/opal/builder_processors.rb
@@ -13,8 +13,9 @@ def self.inherited(processor)
       def initialize(source, filename, options = {})
         @source, @filename, @options = source, filename, options
         @requires = []
+        @required_trees = []
       end
-      attr_reader :source, :filename, :options, :requires
+      attr_reader :source, :filename, :options, :requires, :required_trees
 
       def to_s
         source.to_s
@@ -68,6 +69,10 @@ def requires
         compiled.requires
       end
 
+      def required_trees
+        compiled.required_trees
+      end
+
       def compiler_class
         ::Opal::Compiler
       end

diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -211,6 +211,12 @@ def requires
       @requires ||= []
     end
 
+    # An array of trees required in this file
+    # (typically by calling #require_tree)
+    def required_trees
+      @required_trees ||= []
+    end
+
     # The last sexps in method bodies, for example, need to be returned
     # in the compiled javascript. Due to syntax differences between
     # javascript any ruby, some sexps need to be handled specially. For

diff --git a/lib/opal/nodes/call.rb b/lib/opal/nodes/call.rb
@@ -186,6 +186,16 @@ def compile_default?
         end
       end
 
+      add_special :require_tree do
+        compile_default!
+        arg = arglist[1]
+        if arg[0] == :str
+          dir = File.dirname(compiler.file)
+          compiler.required_trees << arg[1]
+        end
+        push fragment('')
+      end
+
       add_special :block_given? do
         push compiler.handle_block_given_call @sexp
       end

diff --git a/spec/lib/builder_processors_spec.rb b/spec/lib/builder_processors_spec.rb
@@ -18,5 +18,10 @@
       expect(processor.to_s).not_to include('Opal.modules[')
     end
   end
+
+  it 'fills required_trees' do
+    processor = described_class.new('require_tree "./pippo"', '-e')
+    expect(processor.required_trees).to eq(['./pippo'])
+  end
 end
 
diff --git a/spec/lib/builder_spec.rb b/spec/lib/builder_spec.rb
@@ -10,6 +10,15 @@
     expect(builder.build('opal').to_s).to match('(Opal);')
   end
 
+  it 'respect #require_tree calls' do
+    begin
+      Opal.append_path(File.expand_path('../fixtures/', __FILE__))
+      expect(builder.build('require_tree_test').to_s).to match('required_file1')
+    ensure
+      Opal.instance_variable_set('@paths', nil)
+    end
+  end
+
   describe ':stubs' do
     let(:options) { {stubs: ['foo']} }
 

diff --git a/spec/lib/compiler_spec.rb b/spec/lib/compiler_spec.rb
@@ -175,6 +175,16 @@
         expect(compiler.requires).to eq([__FILE__])
       end
     end
+
+    describe '#require_tree' do
+      require 'pathname'
+      let(:file) { Pathname(__FILE__).join('../fixtures/require_tree_test.rb') }
+
+      it 'parses and resolve #require argument' do
+        compiler = compiler_for(file.read)
+        expect(compiler.required_trees).to eq(['./required_tree_test'])
+      end
+    end
   end
 
   def expect_compiled(*args)

diff --git a/spec/lib/fixtures/require_tree_test.rb b/spec/lib/fixtures/require_tree_test.rb
@@ -1,3 +1,3 @@
-#=require_tree ./required_tree_test
+require_tree './required_tree_test'
 
 puts 5
diff --git a/spec/lib/fixtures/sprockets_require_tree_test.rb b/spec/lib/fixtures/sprockets_require_tree_test.rb
@@ -0,0 +1,3 @@
+#=require_tree ./required_tree_test
+
+puts 5
diff --git a/spec/lib/sprockets/environment_spec.rb b/spec/lib/sprockets/environment_spec.rb
@@ -12,8 +12,16 @@
     expect(env[logical_path+'.js'].source).to include('$puts(')
   end
 
+  describe 'require_tree sprockets directive' do
+    it 'is still supported' do
+      source = env['sprockets_require_tree_test'].source
+      expect(source).to include('required_file1')
+      expect(source).to include('required_file2')
+    end
+  end
+
   describe 'require_tree helper' do
-    it 'does something' do
+    it 'is handled by the processor' do
       source = env['require_tree_test'].source
       expect(source).to include('required_file1')
       expect(source).to include('required_file2')