opal · Apr 9, 2014 · Apr 9, 2014 · Apr 9, 2014
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Opal is a ruby to javascript source-to-source compiler. It also has an
 implementation of the ruby corelib.
 
 Opal is [hosted on github](http://github.com/opal/opal), and there
-is a Freenode IRC channel at [#opal](http://webchat.freenode.net/?channels=opal), 
+is a Freenode IRC channel at [#opal](http://webchat.freenode.net/?channels=opal),
 ask questions on [stackoverflow#opalrb](http://stackoverflow.com/questions/ask?tags=opalrb).
 
 
@@ -58,17 +58,36 @@ First, install dependencies:
 
     $ bundle install
 
-Rubyspecs must be cloned as a gitsubmodule:
+RubySpec related repos must be cloned as a gitsubmodules:
 
     $ git submodule update --init
 
-Tests can be run with phantomjs using:
+The test suite can be run using (requires [phantomjs][]):
 
     $ rake
 
+This will command will run all RSpec and MSpec examples in sequence.
+
+### MSpec
+
+[MSpec][] tests can be run with:
+
+    $ rake mspec
+
 Alternatively, you can just load up a rack instance using `rackup spec/config.ru`, and
 visit `http://localhost:9292/` in any web browser.
 
+### Rspec
+
+[RSpec][] tests can be run with
+
+    $ rake rspec
+
+Alternatively [spectator][] can be used in an autotest fashion with this command:
+
+    BASE_DIR_GLOB='lib/opal' SPEC_DIR_GLOB='spec/cli' spectator
+
+
 ## Code Overview
 
 What code is supposed to run where?
@@ -95,6 +114,10 @@ StringScanner, Date, etc.
 
 ### spec
 
+* **rubyspecs** (file) a whitelist of RubySpec files to be ran
+* **corelib** RubySpec examples (submodule)
+* **stdlib** `rubysl-*` examples (submodules)
+* **filters** The list of MSpec/RubySpec examples that are either bugs or unsupported
 * **opal** opal additions/special behaviour in the runtime/corelib
 * **cli** specs for opal lib (parser, lexer, grammar, compiler etc)
 
@@ -145,3 +168,7 @@ THE SOFTWARE.
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/opal/opal/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
+[phantomjs]: http://phantomjs.org
+[spectator]: https://github.com/elia/spectator#readme
+[MSpec]: https://github.com/rubyspec/mspec#readme
+[RSpec]: https://github.com/rspec/rspec#readme
diff --git a/lib/opal/sprockets/erb.rb b/lib/opal/sprockets/erb.rb
@@ -1,23 +1,11 @@
 require 'opal'
-require 'opal/compiler'
+require 'opal/erb'
+require 'opal/sprockets/processor'
 require 'sprockets'
 
 module Opal
   module ERB
-    class Processor < Tilt::Template
-      self.default_mime_type = 'application/javascript'
-
-      def self.engine_initialized?
-        true
-      end
-
-      def initialize_engine
-        require_template_library 'opal'
-      end
-
-      def prepare
-      end
-
+    class Processor < ::Opal::Processor
       def evaluate(context, locals, &block)
         context.require_asset 'erb'
         Opal::ERB.compile data, context.logical_path.sub(/^templates\//, '')

diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -68,6 +68,18 @@ def initialize_engine
     def prepare
     end
 
+    class SprocketsPathFinder
+      def initialize(path_resolver)
+        @path_resolver ||= path_resolver
+      end
+
+      def find path
+        path_resolver.resolve(path)
+      end
+
+      attr_reader :path_resolver
+    end
+
     def evaluate(context, locals, &block)
       options = {
         :method_missing           => self.class.method_missing_enabled,
@@ -79,7 +91,8 @@ def evaluate(context, locals, &block)
 
       path = context.logical_path
       prerequired = []
-      builder = NewBuilder.new(:compiler_options => options, :stubbed_files => stubbed_files)
+
+      builder = NewBuilder.new({:compiler_options => options, :stubbed_files => stubbed_files}, PathReader.new(SprocketsPathFinder.new(context)))
       result = builder.build_str(data, path, prerequired)
 
       # prerequired is mutated by the builder

diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -855,22 +855,22 @@
 
 	Opal.loaded_features = ['corelib/runtime.js'];
 	Opal.require_table = {'corelib/runtime.js': true};
+	Opal.modules = {};
 	Opal.require = function(path) {
+		var module;
+
 		if (Opal.require_table[path]) {
 			return false;
 		} else {
 			Opal.require_table[path] = true;
 			Opal.loaded_features.push(path);
-			// if (!Opal.modules[path]) throw "LOAD ERROR: can't find: "+path;
-
-			if (Opal.modules[path]) {Opal.modules[path](Opal);}
-			else {console.log("LOAD ERROR: can't find: "+path);}
+			module = Opal.modules[path];
+			if (module) module(Opal);
+			else throw("LOAD ERROR: can't find: "+path);
 			return true;
 		}
 	};
 
-	Opal.modules = {}
-
   // Initialization
   // --------------
 

diff --git a/spec/cli/fixtures/sprockets_file.js.rb b/spec/cli/fixtures/sprockets_file.js.rb
@@ -0,0 +1,3 @@
+require 'opal'
+require 'native'
+puts 'sprockets!'
diff --git a/spec/cli/sprockets/environment_spec.rb b/spec/cli/sprockets/environment_spec.rb
@@ -0,0 +1,14 @@
+require 'cli/spec_helper'
+require 'opal/sprockets/environment'
+
+describe Opal::Environment do
+  let(:env) { described_class.new }
+  let(:logical_path) { 'sprockets_file' }
+
+  before { env.append_path File.expand_path('../../fixtures/', __FILE__) }
+
+  it 'compiles Ruby to JS' do
+    expect(env[logical_path].source).to include('$puts(')
+    expect(env[logical_path+'.js'].source).to include('$puts(')
+  end
+end
diff --git a/spec/cli/sprockets/erb_spec.rb b/spec/cli/sprockets/erb_spec.rb
@@ -0,0 +1,26 @@
+require 'cli/spec_helper'
+# require 'opal/sprockets/erb'
+require 'opal/sprockets/processor'
+
+describe Opal::ERB::Processor do
+  let(:pathname) { Pathname("/Code/app/mylib/opal/foo.#{ext}") }
+  let(:_context) { double('_context', :logical_path => "foo.#{ext}", :pathname => pathname) }
+  let(:required_assets) { [] }
+  let(:template) { described_class.new { |t| %Q{<a href="<%= url %>"><%= name %></a>} } }
+  before { _context.stub(:require_asset) {|asset| required_assets << asset } }
+
+  let(:ext) { 'opalerb' }
+
+  it "is registered for '.opalerb' files" do
+    expect(Tilt["test.#{ext}"]).to eq(described_class)
+  end
+
+  it 'renders the template' do
+    expect(template.render(_context)).to include('"<a href=\""')
+  end
+
+  it 'implicitly requires "erb"' do
+    template.render(_context)
+    expect(required_assets).to eq(['erb'])
+  end
+end
diff --git a/spec/cli/sprockets/processor_spec.rb b/spec/cli/sprockets/processor_spec.rb
@@ -0,0 +1,44 @@
+require 'cli/spec_helper'
+require 'opal/sprockets/processor'
+
+describe Opal::Processor do
+  let(:pathname) { Pathname("/Code/app/mylib/opal/foo.#{ext}") }
+  let(:_context) { double('_context', :logical_path => "foo.#{ext}", :pathname => pathname, :resolve => pathname.expand_path) }
+
+  %w[rb js.rb opal js.opal].each do |ext|
+    let(:ext) { ext }
+
+    describe %Q{with extension ".#{ext}"} do
+      it "is registered for '.#{ext}' files" do
+        expect(Tilt["test.#{ext}"]).to eq(described_class)
+      end
+
+      it "compiles and evaluates the template on #render" do
+        template = described_class.new { |t| "puts 'Hello, World!'\n" }
+        expect(template.render(_context)).to include('"Hello, World!"')
+      end
+
+      it "can be rendered more than once" do
+        template = described_class.new(_context) { |t| "puts 'Hello, World!'\n" }
+        3.times { expect(template.render(_context)).to include('"Hello, World!"') }
+      end
+    end
+  end
+
+end
+
+describe Opal::Processor::SprocketsPathFinder do
+  subject(:path_finder) { described_class.new(env) }
+
+  let(:path_reader) { Opal::PathReader.new path_finder }
+  let(:env) { Opal::Environment.new }
+  let(:logical_path) { 'sprockets_file' }
+  let(:fixtures_dir) { File.expand_path('../../fixtures/', __FILE__) }
+  let(:full_path) { File.join(fixtures_dir, logical_path+'.js.rb') }
+
+  before { env.append_path fixtures_dir }
+
+  it 'can read stuff from sprockets env' do
+    expect(path_reader.read(logical_path)).to eq(File.read(full_path))
+  end
+end