RubyGems - opal - Versions diffs - 0.6.3 → 0.7.0.beta1 - Mend

opal 0.6.3 → 0.7.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (221) hide show

checksums.yaml +4 -4
data/.gitignore +0 -1
data/.spectator +2 -0
data/.spectator-mspec +3 -0
data/.travis.yml +8 -11
data/CHANGELOG.md +33 -0
data/CONTRIBUTING.md +8 -43
data/Gemfile +15 -4
data/Guardfile +77 -0
data/README.md +15 -9
data/Rakefile +36 -12
data/benchmarks/operators.rb +11 -0
data/bin/opal +10 -13
data/bin/opal-build +4 -4
data/bin/opal-mspec +10 -0
data/bin/opal-repl +4 -3
data/examples/sinatra/Gemfile +1 -1
data/examples/sinatra/config.ru +3 -3
data/lib/mspec/opal/main.rb.erb +2 -2
data/lib/mspec/opal/rake_task.rb +31 -24
data/lib/mspec/opal/runner.rb +18 -1
data/lib/mspec/opal/sprockets.js +17 -0
data/lib/opal.rb +1 -34
data/lib/opal/builder.rb +92 -58
data/lib/opal/builder_processors.rb +165 -0
data/lib/opal/cli.rb +85 -144
data/lib/opal/cli_options.rb +136 -90
data/lib/opal/cli_runners.rb +10 -0
data/lib/opal/cli_runners/nodejs.rb +56 -0
data/lib/opal/cli_runners/phantom.js +35 -0
data/lib/opal/cli_runners/phantomjs.rb +28 -0
data/lib/opal/cli_runners/server.rb +54 -0
data/lib/opal/compiler.rb +35 -16
data/lib/opal/erb.rb +29 -15
data/lib/opal/hike_path_finder.rb +18 -0
data/lib/opal/nodes.rb +1 -0
data/lib/opal/nodes/call.rb +107 -26
data/lib/opal/nodes/call_special.rb +31 -6
data/lib/opal/nodes/class.rb +2 -2
data/lib/opal/nodes/constants.rb +5 -20
data/lib/opal/nodes/def.rb +4 -4
data/lib/opal/nodes/defined.rb +3 -3
data/lib/opal/nodes/definitions.rb +1 -1
data/lib/opal/nodes/for.rb +35 -0
data/lib/opal/nodes/helpers.rb +2 -2
data/lib/opal/nodes/iter.rb +3 -3
data/lib/opal/nodes/literal.rb +10 -2
data/lib/opal/nodes/masgn.rb +2 -2
data/lib/opal/nodes/module.rb +2 -2
data/lib/opal/nodes/scope.rb +1 -0
data/lib/opal/nodes/singleton_class.rb +2 -2
data/lib/opal/nodes/super.rb +2 -2
data/lib/opal/nodes/top.rb +30 -3
data/lib/opal/parser.rb +15 -1
data/lib/opal/parser/grammar.rb +2571 -2452
data/lib/opal/parser/grammar.y +37 -5
data/lib/opal/parser/keywords.rb +2 -0
data/lib/opal/parser/lexer.rb +21 -11
data/lib/opal/path_reader.rb +28 -0
data/lib/opal/paths.rb +38 -0
data/lib/opal/source_map.rb +32 -15
data/lib/opal/sprockets/environment.rb +9 -2
data/lib/opal/sprockets/erb.rb +1 -2
data/lib/opal/sprockets/path_reader.rb +34 -0
data/lib/opal/sprockets/processor.rb +40 -39
data/lib/opal/sprockets/server.rb +47 -33
data/lib/opal/version.rb +1 -1
data/opal.gemspec +10 -5
data/opal/README.md +6 -0
data/opal/corelib/array.rb +36 -4
data/opal/corelib/array/inheritance.rb +6 -6
data/opal/corelib/basic_object.rb +9 -9
data/opal/corelib/boolean.rb +1 -1
data/opal/corelib/class.rb +12 -12
data/opal/corelib/dir.rb +20 -0
data/opal/corelib/enumerable.rb +42 -42
data/opal/corelib/enumerator.rb +1 -1
data/opal/corelib/error.rb +2 -2
data/opal/corelib/file.rb +56 -0
data/opal/corelib/hash.rb +5 -5
data/opal/corelib/helpers.rb +3 -3
data/opal/corelib/io.rb +13 -10
data/opal/corelib/kernel.rb +44 -68
data/opal/corelib/method.rb +1 -1
data/opal/corelib/module.rb +89 -114
data/opal/corelib/nil_class.rb +1 -1
data/opal/corelib/numeric.rb +27 -23
data/opal/corelib/proc.rb +5 -5
data/opal/corelib/range.rb +8 -4
data/opal/corelib/regexp.rb +5 -5
data/opal/corelib/runtime.js +589 -272
data/opal/corelib/string.rb +52 -37
data/opal/corelib/string/inheritance.rb +5 -5
data/opal/corelib/time.rb +102 -52
data/opal/corelib/variables.rb +3 -3
data/opal/opal.rb +2 -0
data/package.json +9 -0
data/spec/filters/bugs/array.rb +0 -6
data/spec/filters/bugs/language.rb +4 -0
data/spec/filters/bugs/numeric.rb +7 -6
data/spec/filters/bugs/opal.rb +2 -0
data/spec/filters/bugs/regexp.rb +4 -0
data/spec/filters/bugs/string.rb +0 -7
data/spec/filters/bugs/stringscanner.rb +4 -1
data/spec/filters/unsupported/private_methods.rb +2 -0
data/spec/lib/builder_processors_spec.rb +27 -0
data/spec/lib/builder_spec.rb +66 -0
data/spec/{cli → lib}/cli_spec.rb +60 -5
data/spec/{cli → lib}/compiler_spec.rb +66 -5
data/spec/{cli → lib}/dependency_resolver_spec.rb +1 -1
data/spec/lib/fixtures/no_requires.rb +1 -0
data/spec/{cli → lib}/fixtures/opal_file.rb +0 -0
data/spec/lib/fixtures/require_tree_test.rb +3 -0
data/spec/lib/fixtures/required_tree_test/required_file1.rb +1 -0
data/spec/lib/fixtures/required_tree_test/required_file2.rb +1 -0
data/spec/lib/fixtures/requires.rb +7 -0
data/spec/{cli → lib}/fixtures/sprockets_file.js.rb +0 -0
data/spec/lib/fixtures/sprockets_require_tree_test.rb +3 -0
data/spec/lib/hike_path_finder_spec.rb +23 -0
data/spec/{cli → lib}/lexer_spec.rb +1 -1
data/spec/{cli → lib}/parser/alias_spec.rb +1 -1
data/spec/{cli → lib}/parser/and_spec.rb +1 -1
data/spec/{cli → lib}/parser/attrasgn_spec.rb +1 -1
data/spec/{cli → lib}/parser/begin_spec.rb +1 -1
data/spec/{cli → lib}/parser/block_spec.rb +1 -1
data/spec/{cli → lib}/parser/break_spec.rb +1 -1
data/spec/{cli → lib}/parser/call_spec.rb +1 -1
data/spec/{cli → lib}/parser/class_spec.rb +1 -1
data/spec/{cli → lib}/parser/comments_spec.rb +1 -1
data/spec/{cli → lib}/parser/def_spec.rb +1 -1
data/spec/{cli → lib}/parser/if_spec.rb +1 -1
data/spec/{cli → lib}/parser/iter_spec.rb +1 -1
data/spec/{cli → lib}/parser/lambda_spec.rb +1 -1
data/spec/{cli → lib}/parser/literal_spec.rb +1 -1
data/spec/{cli → lib}/parser/masgn_spec.rb +1 -1
data/spec/{cli → lib}/parser/module_spec.rb +1 -1
data/spec/{cli → lib}/parser/not_spec.rb +1 -1
data/spec/{cli → lib}/parser/op_asgn1_spec.rb +1 -1
data/spec/{cli → lib}/parser/op_asgn2_spec.rb +1 -1
data/spec/{cli → lib}/parser/or_spec.rb +1 -1
data/spec/{cli → lib}/parser/return_spec.rb +1 -1
data/spec/{cli → lib}/parser/sclass_spec.rb +1 -1
data/spec/{cli → lib}/parser/string_spec.rb +8 -1
data/spec/{cli → lib}/parser/super_spec.rb +1 -1
data/spec/lib/parser/unary_spec.rb +48 -0
data/spec/{cli → lib}/parser/undef_spec.rb +1 -1
data/spec/{cli → lib}/parser/unless_spec.rb +1 -1
data/spec/{cli → lib}/parser/variables_spec.rb +1 -1
data/spec/{cli → lib}/parser/while_spec.rb +1 -1
data/spec/{cli → lib}/parser/yield_spec.rb +1 -1
data/spec/lib/path_reader_spec.rb +24 -0
data/spec/lib/shared/path_finder_shared.rb +19 -0
data/spec/lib/shared/path_reader_shared.rb +31 -0
data/spec/lib/spec_helper.rb +9 -0
data/spec/lib/sprockets/environment_spec.rb +30 -0
data/spec/{cli → lib}/sprockets/erb_spec.rb +1 -1
data/spec/lib/sprockets/path_reader_spec.rb +25 -0
data/spec/{cli → lib}/sprockets/processor_spec.rb +9 -2
data/spec/lib/sprockets/server_spec.rb +20 -0
data/spec/opal/compiler/irb_spec.rb +11 -11
data/spec/opal/core/fixtures/require_tree_files/file 1.rb +1 -0
data/spec/opal/core/fixtures/require_tree_files/file 2.rb +1 -0
data/spec/opal/core/fixtures/require_tree_files/file 3.rb +1 -0
data/spec/opal/core/fixtures/require_tree_files/file 4.rb +1 -0
data/spec/opal/core/fixtures/require_tree_files/file 5.rb +1 -0
data/spec/opal/core/kernel/require_tree_spec.rb +7 -0
data/spec/opal/core/kernel/respond_to_spec.rb +2 -2
data/spec/opal/core/runtime/method_missing_spec.rb +19 -0
data/spec/opal/core/source_map_spec.rb +2 -2
data/spec/opal/core/string_spec.rb +11 -0
data/spec/opal/stdlib/erb/erb_spec.rb +0 -1
data/spec/opal/stdlib/thread/mutex_spec.rb +40 -0
data/spec/opal/stdlib/thread/thread_queue_spec.rb +32 -0
data/spec/opal/stdlib/thread/thread_spec.rb +60 -0
data/spec/rubyspecs +54 -11
data/spec/spec_helper.rb +18 -3
data/spec/support/mspec_rspec_adapter.rb +33 -0
data/spec/{cli/spec_helper.rb → support/parser_helpers.rb} +10 -10
data/stdlib/README.md +3 -0
data/stdlib/benchmark.rb +10 -0
data/stdlib/date.rb +2 -2
data/stdlib/dir.rb +1 -5
data/stdlib/file.rb +1 -7
data/stdlib/json.rb +10 -1
data/stdlib/native.rb +5 -5
data/stdlib/nodejs.rb +5 -0
data/stdlib/nodejs/dir.rb +13 -0
data/stdlib/nodejs/file.rb +98 -0
data/stdlib/nodejs/fileutils.rb +26 -0
data/stdlib/nodejs/io.rb +2 -0
data/stdlib/nodejs/irb.rb +45 -0
data/stdlib/nodejs/process.rb +16 -0
data/stdlib/nodejs/require.rb +32 -0
data/stdlib/nodejs/rubygems.rb +68 -0
data/stdlib/nodejs/runtime.rb +25 -0
data/stdlib/nodejs/yaml.rb +11 -0
data/stdlib/opal-parser.rb +1 -2
data/stdlib/opal-source-maps.rb +2 -0
data/stdlib/phantomjs.rb +8 -0
data/stdlib/process.rb +10 -0
data/stdlib/promise.rb +12 -4
data/stdlib/set.rb +27 -0
data/stdlib/source_map.rb +5 -63
data/stdlib/source_map/map.rb +220 -0
data/stdlib/source_map/mapping.rb +26 -0
data/stdlib/source_map/offset.rb +88 -0
data/stdlib/source_map/version.rb +3 -0
data/stdlib/source_map/vlq.rb +77 -101
data/stdlib/sourcemap.rb +1 -0
data/stdlib/strscan.rb +7 -1
data/stdlib/template.rb +1 -1
data/stdlib/thread.rb +147 -7
metadata +238 -104
data/lib/mspec/opal/mspec_fixes.rb +0 -87
data/spec/cli/sprockets/environment_spec.rb +0 -14
data/spec/filters/bugs/symbol.rb +0 -5
data/spec/opal/core/kernel/warn_spec.rb +0 -83
data/spec/opal/core/language/numbers_spec.rb +0 -60
data/stdlib/opal-source-maps.js.erb +0 -2
data/stdlib/source_map/generator.rb +0 -251
data/stdlib/source_map/parser.rb +0 -102

data/bin/opal-build CHANGED Viewed

@@ -19,9 +19,9 @@ module Opal
         end
         opts.on('-g', '--gem GEM_NAME', String,
-                'Adds the specified GEM_NAME to Opal\'s load path.',
-                'E.g.: opal-build --require opal-browser browser`',
-                'Will build browser.rb from the Opal gem opal-browser') do |g|
+                'Adds the specified GEM_NAME lib dir to Opal\'s load path.',
+                'E.g.: opal-build --gem erubis -- erubis`',
+                'Will build erubis.rb from the regular "erubis" gem') do |g|
           options[:gems] ||= []
           options[:gems] << g
         end
@@ -54,7 +54,7 @@ option_parser = Opal::BuilderOptions.new
 option_parser.parse!
 if ARGV.empty?
-  puts options
+  puts option_parser
 else
   require 'opal'
   options = option_parser.options

data/bin/opal-mspec ADDED Viewed

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+specs = ARGV.map do |s|
+  s.end_with?('.rb') ? s : "#{s}/**/*_spec.rb"
+end
+pattern = %Q{MSPEC_PATTERN="{#{specs.join(',')}}"} if specs.any?
+command = [pattern, 'rake mspec'].compact.join(' ')
+exec command
+# bundle exec mspec run -t opal -pspec/corelib/spec_helper spec/corelib/core/true/*

data/bin/opal-repl CHANGED Viewed

@@ -19,7 +19,7 @@ module Opal
       @v8 = V8::Context.new
       @v8['console'] = self
-      @v8.eval @builder.build 'opal'
+      @v8.eval Opal::Builder.new.build('opal').to_s
       if filename
         if File.exist? filename
@@ -56,8 +56,9 @@ module Opal
     end
     def eval_ruby(str)
-      code = @builder.build_str str, :irb => true, :const_missing => true
-      @v8.eval "var $_result = #{code} ($_result == null ? 'nil' : $_result.$inspect());"
+      code = Opal::Builder.new.build_str(str, '(irb)', :irb => true, :const_missing => true)
+      code.processed[0...-1].each{ |c| @v8.eval(c.to_s) }
+      @v8.eval "var $_result = #{code.processed.last.to_s} ($_result == null ? 'nil' : $_result.$inspect());"
     rescue => e
       puts "#{e.message}\n\t#{e.backtrace.join("\n\t")}"
     end

data/examples/sinatra/Gemfile CHANGED Viewed

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gem 'opal', :path => '../../opal'
+gem 'opal', :path => '../..'
 gem 'sinatra'

data/examples/sinatra/config.ru CHANGED Viewed

@@ -6,7 +6,7 @@ opal = Opal::Server.new {|s|
   s.main = 'application'
 }
-map '/__opal_source_maps__' do
+map opal.source_maps.prefix do
   run opal.source_maps
 end
@@ -15,14 +15,14 @@ map '/assets' do
 end
 get '/' do
-  <<-EOS
+  <<-HTML
     <!doctype html>
     <html>
       <head>
         <script src="/assets/application.js"></script>
       </head>
     </html>
-  EOS
+  HTML
 end
 run Sinatra::Application

data/lib/mspec/opal/main.rb.erb CHANGED Viewed

@@ -1,8 +1,8 @@
-<% require_asset 'spec_helper' %>
+require 'spec_helper'
 # This file just greps for all spec files in spec/ and requires them
 <% ENV['OPAL_SPEC'].split(',').each do |s| %>
-  <% require_asset s %>
+  require <%= s.inspect %>
 <% end %>
 # All specs have been run, so we notify mspec that we are done

data/lib/mspec/opal/rake_task.rb CHANGED Viewed

@@ -11,10 +11,14 @@ class Opal::Nodes::CallNode
         compiler.requires << target
       end
-      return fragment("nil")
+      push fragment("nil")
     end
+  end
-    nil
+  add_special :not_supported_on do
+    unless meth == :not_supported_on and arglist[1][1] == :opal
+      compile_default!
+    end
   end
 end
@@ -24,7 +28,6 @@ require 'webrick'
 module MSpec
   module Opal
-    DEFAULT_PATTERN = 'spec/{corelib,opal,stdlib}/**/*_spec.rb'
     DEFAULT_BASEDIR = 'spec'
     require 'rake'
@@ -119,18 +122,21 @@ module MSpec
       def initialize(basedir = nil, pattern = nil)
         ::Opal::Processor.arity_check_enabled = true
-        ::Opal::Processor.dynamic_require_severity = :ignore
-        super()
+        ::Opal::Processor.dynamic_require_severity = :error
         @pattern = pattern
         @basedir = basedir = File.expand_path(basedir || DEFAULT_BASEDIR)
-        append_path basedir
-        use_gem 'mspec'
+        ::Opal.append_path basedir
+        ::Opal.use_gem 'mspec'
         stubs.each do |asset|
           ::Opal::Processor.stub_file asset
         end
         ENV['OPAL_SPEC'] ||= files_to_run(pattern).join(',')
+        super()
       end
       def stubs
@@ -159,25 +165,23 @@ module MSpec
         @files ||= []
       end
-      def add_files specs
-        puts "Adding #{specs.size} spec files..."
-        files.concat specs.flatten
-      end
-      def paths_from_glob pattern
-        Dir.glob(File.expand_path(pattern)).map do |s|
-          s.sub(/^#{basedir}\//, '').sub(/\.rb$/, '')
-        end
-      end
-      def rubyspec_paths
-        rubyspec_white_list.map do |path|
+      def add_files specs, tag = ''
+        tag = "[#{tag}] "
+        puts "#{tag}Adding #{specs.size} spec files..."
+        specs = specs.flatten.map do |path|
           dirname = File.join([basedir, path])
           if File.directory? dirname
             rubyspec_paths_in_dir(dirname, path)
           else
             path
           end
+        end.flatten
+        files.concat specs
+      end
+      def paths_from_glob pattern
+        Dir.glob(File.expand_path(pattern)).map do |s|
+          s.sub(/^#{basedir}\//, '').sub(/\.rb$/, '')
         end
       end
@@ -197,18 +201,20 @@ module MSpec
       def files_to_run(pattern=nil)
         # add any filters in spec/filters of specs we dont want to run
-        add_files paths_from_glob("#{basedir}/filters/**/*.rb")
+        add_files paths_from_glob("#{basedir}/filters/**/*.rb"), :filters
         if pattern
           # add custom opal specs from spec/
-          add_files paths_from_glob(pattern) & rubyspec_paths
+          add_files paths_from_glob(pattern) & rubyspec_white_list, :rubyspec_custom_pattern
+          add_files paths_from_glob(pattern).grep(/(?!spec\/(corelib|stdlib)\/)/), :other_custom_pattern
         else
           # add opal specific specs
-          add_files paths_from_glob("#{basedir}/{opal}/**/*_spec.rb")
+          add_files paths_from_glob("#{basedir}/opal/**/*_spec.rb"), 'opal/*'
+          add_files paths_from_glob("#{basedir}/lib/{lexer_spec.rb,parser/**/*_spec.rb}"), 'lib/{lexer,parser}'
           # add any rubyspecs we want to run (defined in spec/rubyspecs)
-          add_files rubyspec_paths
+          add_files rubyspec_white_list, :rubyspec_white_list
         end
       end
@@ -246,6 +252,7 @@ module MSpec
       <!DOCTYPE html>
       <html>
         <head>
+          <meta charset="UTF-8" />
           <title>Opal Specs</title>
         </head>
         <body>

data/lib/mspec/opal/runner.rb CHANGED Viewed

@@ -133,6 +133,22 @@ class PhantomFormatter < BrowserFormatter
   def log(str)
     `console.log(str)`
   end
+  def after(state)
+    super
+    unless exception?
+      print '.'
+    else
+      print failure? ? 'F' : 'E'
+    end
+  end
+end
+class PhantomDebugFormatter < PhantomFormatter
+  def after(state = nil)
+    (@exception && state) ? red(state.description) : green(state.description)
+    super
+  end
 end
 module MSpec
@@ -178,7 +194,8 @@ module OutputSilencer
     original_stdout = $stdout
     new_stdout = IO.new
     new_stdout.extend IO::Writable
-    def new_stdout.write(string) end
+    new_stdout.write_proc = ->s{}
     begin
       $stdout = new_stdout
       yield

data/lib/mspec/opal/sprockets.js CHANGED Viewed

@@ -14,6 +14,23 @@ page.onInitialized = function() {
   });
 };
+var system = require('system');
+page.onCallback = function(data) {
+  switch (data[0]) {
+  case 'exit':
+    var status = data[1] || 0;
+    phantom.exit(status);
+  case 'stdout':
+    system.stdout.write(data[1] || '');
+    break;
+  case 'stderr':
+    system.stderr.write(data[1] || '');
+    break;
+  default:
+    console.error('Unknown callback data: ', data);
+  }
+};
 page.open(args[0], function(status) {
   if (status !== 'success') {
     console.error("Cannot load: " + args[0]);

data/lib/opal.rb CHANGED Viewed

@@ -2,43 +2,10 @@ require 'opal/compiler'
 require 'opal/builder'
 require 'opal/erb'
 require 'opal/sprockets'
+require 'opal/paths'
 require 'opal/version'
 # Opal is a ruby to javascript compiler, with a runtime for running
 # in any javascript environment.
 module Opal
-  def self.gem_dir
-    File.expand_path('..', __FILE__.untaint)
-  end
-  def self.core_dir
-    File.expand_path('../../opal', __FILE__.untaint)
-  end
-  def self.std_dir
-    File.expand_path('../../stdlib', __FILE__.untaint)
-  end
-  # Add a file path to opals load path. Any gem containing ruby code that Opal
-  # has access to should add a load path through this method. Load paths added
-  # here should only be paths which contain code targeted at being compiled by
-  # Opal.
-  def self.append_path(path)
-    paths << path
-  end
-  def self.use_gem(gem_name, include_dependecies = true)
-    spec = Gem::Specification.find_by_name(gem_name)
-    spec.runtime_dependencies.each do |dependency|
-      use_gem dependency.name
-    end if include_dependecies
-    Opal.append_path File.join(spec.gem_dir, 'lib')
-  end
-  # Private, don't add to these directly (use .append_path instead).
-  def self.paths
-    @paths ||= [core_dir.untaint, std_dir.untaint, gem_dir.untaint]
-  end
 end

data/lib/opal/builder.rb CHANGED Viewed

@@ -1,101 +1,135 @@
-require 'opal/compiler'
-require 'erb'
-require 'pathname'
+require 'opal/path_reader'
+require 'opal/builder_processors'
+require 'set'
 module Opal
   class Builder
+    include BuilderProcessors
-    BUILDERS = { ".rb" => :build_ruby, ".js" => :build_js, ".erb" => :build_erb }
+    def initialize(options = nil)
+      (options || {}).each_pair do |k,v|
+        public_send("#{k}=", v)
+      end
+      @compiler_options  ||= {}
+      @default_processor ||= RubyProcessor
+      @processors  ||= DEFAULT_PROCESSORS
+      @stubs       ||= []
+      @preload     ||= []
+      @prerequired ||= []
+      @path_reader ||= PathReader.new
-    def self.build(name)
-      Builder.new.build name
+      @processed = []
     end
-    def initialize(options = {})
-      @paths = options.delete(:paths) || Opal.paths.clone
-      @options = options
-      @handled = {}
+    def self.build(*args, &block)
+      new.build(*args, &block)
     end
-    def append_path(path)
-      @paths << path
+    def build(path, options = {})
+      source = read(path)
+      build_str(source, path, options)
     end
-    def build(path)
-      @segments = []
+    def build_str source, filename, options = {}
+      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
+    end
-      require_asset path
+    def build_require(path, options = {})
+      process_require(path, options)
+    end
-      @segments.join
+    def to_s
+      processed.map(&:to_s).join("\n")
     end
-    def build_str(str, options = {})
-      @segments = []
-      @segments << compile_ruby(str, options)
-      @segments.join
+    def source_map
+      processed.map(&:source_map).reduce(:+).as_json.to_json
     end
-    def require_asset(path)
-      location = find_asset path
+    attr_reader :processed
-      unless @handled[location]
-        @handled[location] = true
-        build_asset location
-      end
-    end
+    attr_accessor :processors, :default_processor, :path_reader,
+                  :compiler_options, :stubs, :prerequired, :preload
-    def find_asset(path)
-      return path if Pathname(path).absolute?
-      path.untaint if path =~ /\A(\w[-.\w]*\/?)+\Z/
-      file_types = %w[.rb .js .js.erb]
-      @paths.each do |root|
-        file_types.each do |type|
-          test = File.join root, "#{path}#{type}"
-          if File.exist? test
-            return test
-          end
-        end
+    private
+    def tree_requires(asset, path)
+      if path.nil? or path.empty?
+        dirname = Dir.pwd
+      else
+        dirname = File.dirname(File.expand_path(path))
       end
-      raise "Could not find asset: #{path}"
-    end
+      paths = path_reader.paths.map{|p| File.expand_path(p)}
-    def build_asset(path)
-      ext = File.extname path
+      asset.required_trees.flat_map do |tree|
+        expanded = File.expand_path(tree, dirname)
+        base = paths.find { |p| expanded.start_with?(p) }
+        next [] if base.nil?
-      unless builder = BUILDERS[ext]
-        raise "Unknown builder for #{ext}"
+        globs = extensions.map { |ext| File.join base, tree, "*.#{ext}" }
+        Dir[*globs].map do |file|
+          Pathname(file).relative_path_from(Pathname(base)).to_s.gsub(/(\.js)?(\.(?:#{extensions.join '|'}))$/, '')
+        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
-      @segments << __send__(builder, path)
+    def read(path)
+      path_reader.read(path) or
+        raise ArgumentError, "can't find file: #{path.inspect} in #{path_reader.paths.inspect}"
     end
-    def compile_ruby(str, options = nil)
-      options ||= @options.clone
+    def process_require(filename, options)
+      return if prerequired.include?(filename)
+      return if already_processed.include?(filename)
+      already_processed << filename
-      compiler = Compiler.new
-      result = compiler.compile str, options
+      source = stub?(filename) ? '' : read(filename)
-      compiler.requires.each do |r|
-        require_asset r
+      if source.nil?
+        message = "can't find file: #{filename.inspect}"
+        case @compiler_options[:dynamic_require_severity]
+        when :error then raise LoadError, message
+        when :warning then warn "can't find file: #{filename.inspect}"
+        end
       end
-      result
+      path = path_reader.expand(filename).to_s unless stub?(filename)
+      asset = processor_for(source, filename, path, options.merge(requirable: true))
+      process_requires(asset.requires+tree_requires(asset, path), options)
+      processed << asset
+    end
+    def process_requires(requires, options)
+      requires.map { |r| process_require(r, options) }
     end
-    def build_ruby(path)
-      compile_ruby File.read(path), @options.clone
+    def already_processed
+      @already_processed ||= Set.new
     end
-    def build_js(path)
-      File.read(path)
+    def stub? filename
+      stubs.include?(filename)
     end
-    def build_erb(path)
-      ::ERB.new(File.read(path)).result binding
+    def extensions
+      @extensions ||= DEFAULT_PROCESSORS.flat_map(&:extensions).compact
     end
   end
 end