opal · Apr 9, 2015 · Apr 9, 2015 · Apr 12, 2015 · Apr 12, 2015 · Apr 12, 2015
diff --git a/Rakefile b/Rakefile
@@ -10,4 +10,4 @@ import 'tasks/documenting.rake'
 import 'tasks/testing.rake'
 import 'tasks/building.rake'
 
-task :default => [:rspec, :mspec_node, :cruby_tests]
+task :default => [:rspec, :mspec_node, :cruby_tests, :mspec_phantom]
diff --git a/lib/mspec/opal/rake_task.rb b/lib/mspec/opal/rake_task.rb
@@ -37,7 +37,16 @@ def initialize(name, &task_block)
 
     class Runner
       def initialize &block
-        @app = RackApp.new(&block).to_app
+        @app = Rack::Builder.new do
+          ::Opal::Processor.arity_check_enabled = true
+          ::Opal::Processor.dynamic_require_severity = :raise
+
+          use Rack::ShowExceptions
+          use Rack::ShowStatus
+          use MSpec::Opal::Index
+          run MSpec::Opal::Environment.new
+        end
+
         @port = 9999
       end
 
@@ -86,20 +95,14 @@ def start_phantomjs
       end
 
       def start_server
-        @server = Thread.new do
-          Rack::Server.start(:app => app, :Port => port, :AccessLog => [],
-            :Logger => WEBrick::Log.new("/dev/null"))
-        end
+        @server = Thread.new { Rack::Server.start(:app => app, :Port => port) }
       end
     end
 
     class Environment < ::Sprockets::Environment
       attr_reader :basedir, :pattern
 
       def initialize(basedir = nil, pattern = nil)
-        ::Opal::Processor.arity_check_enabled = true
-        ::Opal::Processor.dynamic_require_severity = :error
-
         @pattern = pattern
         @basedir = basedir = File.expand_path(basedir || DEFAULT_BASEDIR)
 
@@ -205,27 +208,6 @@ def build_specs file = "#{basedir}/build/specs.js"
       end
     end
 
-    class RackApp < Rack::Builder
-      attr_accessor :pattern, :basedir
-
-      def initialize
-        self.pattern = nil
-        self.basedir = DEFAULT_BASEDIR
-
-        yield(self) if block_given?
-        super()
-
-        use Rack::ShowExceptions
-        use Rack::ShowStatus
-        use Index
-        run environment
-      end
-
-      def environment
-        @environment ||= Environment.new(basedir, pattern)
-      end
-    end
-
     class Index
       HTML = <<-HTML
       <!DOCTYPE html>
@@ -236,6 +218,7 @@ class Index
         </head>
         <body>
           <script src="/mspec/opal/main.js"></script>
+          <script>Opal.load('mspec/opal/main');</script>
         </body>
       </html>
       HTML

diff --git a/lib/mspec/opal/special_calls.rb b/lib/mspec/opal/special_calls.rb
@@ -22,6 +22,12 @@ class Opal::Nodes::CallNode
     end
   end
 
+  add_special :not_compliant_on do
+    unless arglist.flatten.include? :opal
+      compile_default!
+    end
+  end
+
   add_special :platform_is_not do
     unless arglist.flatten.include? :opal
       compile_default!

diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -101,6 +101,7 @@ def read(path)
     end
 
     def process_require(filename, options)
+      filename.gsub(/\.(rb|js|opal)$/, '')
       return if prerequired.include?(filename)
       return if already_processed.include?(filename)
       already_processed << filename

diff --git a/lib/opal/builder_processors.rb b/lib/opal/builder_processors.rb
@@ -87,7 +87,7 @@ def source_map
 
       def compiled
         @compiled ||= begin
-          compiler = compiler_for(@source, file: @filename)
+          compiler = compiler_for(@source, file: @filename.gsub(/\.(rb|js|opal)$/, ''))
           compiler.compile
           compiler
         end

diff --git a/lib/opal/sprockets/erb.rb b/lib/opal/sprockets/erb.rb
@@ -1,33 +1,19 @@
 require 'tilt'
 require 'sprockets'
+require 'opal/sprockets/processor'
 
 module Opal
   module ERB
-    class Processor < Tilt::Template
-      # vvv BOILERPLATE vvv
-      self.default_mime_type = 'application/javascript'
-
-      def self.engine_initialized?
-        true
-      end
-
-      def self.version
-        ::Opal::VERSION
-      end
-
+    class Processor < ::Opal::Processor
       def initialize_engine
-        require_template_library 'opal'
+        super
         require_template_library 'opal/erb'
       end
 
-      def prepare
-      end
-      # ^^^ BOILERPLATE ^^^
-
-
       def evaluate(context, locals, &block)
-        context.require_asset 'erb'
-        Opal::ERB.compile data, context.logical_path.sub(/^templates\//, '')
+        compiler = Opal::ERB::Compiler.new(@data, context.logical_path.sub(/^templates\//, ''))
+        @data = compiler.prepared_source
+        super
       end
     end
   end

diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -42,6 +42,10 @@ def prepare
     end
     # ^^^ BOILERPLATE ^^^
 
+    def self.inherited(subclass)
+      subclass.default_mime_type = 'application/javascript'
+    end
+
 
     class << self
       attr_accessor :method_missing_enabled
@@ -80,9 +84,8 @@ def evaluate(context, locals, &block)
       compiler = Compiler.new(data, compiler_options)
       result = compiler.compile
 
-      compiler.requires.each do |required|
-        context.require_asset required unless stubbed_files.include? required
-      end
+      process_requires(compiler.requires, context)
+      process_required_trees(compiler.required_trees, context)
 
       if self.class.source_map_enabled
         map_contents = compiler.source_map.as_json.to_json
@@ -98,6 +101,48 @@ def compiler_options
       ::Opal::Processor.compiler_options
     end
 
+    def process_requires(requires, context)
+      requires.each do |required|
+        context.require_asset required unless stubbed_files.include? required
+      end
+    end
+
+    # Mimics (v2) Sprockets::DirectiveProcessor#process_require_tree_directive
+    def process_required_trees(required_trees, context)
+      return if required_trees.empty?
+
+      # This is the root dir of the logical path, we need this because
+      # the compiler gives us the path relative to the file's logical path.
+      dirname = File.dirname(file).gsub(/#{Regexp.escape File.dirname(context.logical_path)}$/, '')
+      dirname = Pathname(dirname)
+
+      required_trees.each do |original_required_tree|
+        required_tree = Pathname(original_required_tree)
+
+        unless required_tree.relative?
+          raise ArgumentError, "require_tree argument must be a relative path: #{required_tree.inspect}"
+        end
+
+        required_tree = dirname.join(required_tree)
+
+        unless required_tree.directory?
+          raise ArgumentError, "require_tree argument must be a directory: #{[original_required_tree, required_tree].inspect}"
+        end
+
+        context.depend_on required_tree
+
+        context.environment.each_entry(required_tree) do |pathname|
+          if pathname.to_s == file
+            next
+          elsif pathname.directory?
+            context.depend_on(pathname)
+          elsif context.asset_requirable?(pathname)
+            context.require_asset(pathname)
+          end
+        end
+      end
+    end
+
     def self.load_asset_code(sprockets, name)
       asset = sprockets[name.sub(/(\.js)?$/, '.js')]
       return '' if asset.nil?

diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -1194,7 +1194,7 @@
         obj = arguments[0];
         for (key in obj) {
           khash = key.$hash();
-          map[khash] = obj[khash];
+          smap[khash] = obj[khash];
           keys.push(key);
         }
       }
@@ -1260,8 +1260,8 @@
   // Require system
   // --------------
   (function(Opal) {
-    var loaded_features = ['corelib/runtime.js'],
-        require_table   = {'corelib/runtime.js': true},
+    var loaded_features = ['corelib/runtime'],
+        require_table   = {'corelib/runtime': true},
         modules         = {};
 
     var current_dir  = '.';
@@ -1284,6 +1284,7 @@
         path = current_dir.replace(/\/*$/, '/') + path;
       }
 
+      path = path.replace(/\.(rb|opal|js)$/, '');
       parts = path.split(SEPARATOR);
 
       for (var i = 0, ii = parts.length; i < ii; i++) {

diff --git a/spec/lib/sprockets/erb_spec.rb b/spec/lib/sprockets/erb_spec.rb
@@ -3,7 +3,17 @@
 
 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(:environment) { double('environment',
+    cache: nil,
+    :[] => nil,
+    resolve: pathname.expand_path.to_s,
+  ) }
+  let(:_context) { double('context',
+    logical_path: "foo.#{ext}",
+    environment: environment,
+    pathname: pathname,
+    is_a?: true,
+  ) }
   let(:required_assets) { [] }
   let(:template) { described_class.new { |t| %Q{<a href="<%= url %>"><%= name %></a>} } }
   before { _context.stub(:require_asset) {|asset| required_assets << asset } }

diff --git a/spec/opal/core/runtime_spec.rb b/spec/opal/core/runtime_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe '`Opal.hash`' do
+  it 'converts object literals to hashes' do
+    `Opal.hash({a: 1, b: 2})`.should == {a: 1, b: 2}
+  end
+end