opal · Jan 17, 2014 · Jan 18, 2014 · Jan 18, 2014
Showing with 44 additions and 10 deletions.

+1 −1 examples/rack/Gemfile

+5 −1 lib/opal/compiler.rb

+5 −1 lib/opal/nodes/call.rb

+10 −2 lib/opal/nodes/top.rb

+16 −5 lib/opal/sprockets/processor.rb

+7 −0 opal/corelib/runtime.js
diff --git a/examples/rack/Gemfile b/examples/rack/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'opal', :path => '../../../'
+gem 'opal', :path => '../../'
diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -38,9 +38,13 @@ def self.compiler_option(name, default_value, mid = nil)
     # compile top level local vars with support for irb style vars
     compiler_option :irb, false, :irb?
 
-    # how to handle dynamic requires (:error, :warning, :ignore)
+    # how to handle dynamic requires (:error, :warning, :ignore, false)
     compiler_option :dynamic_require_severity, :error
 
+    # Prepare the code for future requires
+    compiler_option :requireable, false, :requireable?
+
+
     attr_reader :result, :fragments
 
     # Current scope

diff --git a/lib/opal/nodes/call.rb b/lib/opal/nodes/call.rb
@@ -109,7 +109,7 @@ def handle_special
       add_special :require do
         str = DependencyResolver.new(compiler, arglist[1]).resolve
         compiler.requires << str unless str.nil?
-        stmt? ? fragment('') : fragment('true')
+        stmt? ? fragment("Opal.require(#{str.inspect})") : fragment('true')
       end
 
       add_special :autoload do
@@ -181,6 +181,10 @@ def handle_part(sexp)
             @compiler.error msg, @sexp.line
           when :warning
             @compiler.warning msg, @sexp.line
+          when :ignore
+            #noop
+          else
+            # TODO
           end
         end
 

diff --git a/lib/opal/nodes/top.rb b/lib/opal/nodes/top.rb
@@ -12,7 +12,11 @@ class TopNode < ScopeNode
       def compile
         push version_comment
 
-        line "(function($opal) {"
+        if compiler.requireable?
+          line "Opal.modules[#{compiler.file.inspect}] = function($opal) {"
+        else
+          line "(function($opal) {"
+        end
 
         in_scope do
           body_code = stmt(stmts)
@@ -32,7 +36,11 @@ def compile
           line body_code
         end
 
-        line "})(Opal);\n"
+        if compiler.requireable?
+          line "};\n"
+        else
+          line "})(Opal);\n"
+        end
       end
 
       def stmts

diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -78,15 +78,25 @@ def evaluate(context, locals, &block)
       }
 
       compiler = Opal::Compiler.new
-      result = compiler.compile data, options
+      file_result = compiler.compile data, options
 
-      compiler.requires.each do |r|
+      requires_result = compiler.requires.map do |r|
         next if stubbed_file? r
         path = find_opal_require context.environment, r
-        context.require_asset path
-      end
+
+        if path
+          context.depend_on path
+          compiler.compile File.read(path), options.merge(:file => r, :requireable => true)
+        else
+          context.require_asset r
+          ''
+        end
+      end.join("\n")
+
+      result = requires_result + file_result
 
       if self.class.source_map_enabled
+        # FIXME
         $OPAL_SOURCE_MAPS[context.pathname] = compiler.source_map(source_file_url(context)).to_s
         "#{result}\n//# sourceMappingURL=#{source_map_url(context)}\n"
       else
@@ -111,11 +121,12 @@ def stubbed_file?(name)
     end
 
     def find_opal_require(environment, r)
+      puts environment.paths
       path = environment.paths.find do |p|
         File.exist?(File.join(p, "#{r}.rb"))
       end
 
-      path ? File.join(path, "#{r}.rb") : r
+      path ? File.join(path, "#{r}.rb") : nil
     end
   end
 end

diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -884,4 +884,11 @@
   bridge_class('Time', Date);
 
   TypeError._super = Error;
+
+  Opal.modules = {};
+  Opal.require = function(name) {
+    var module;
+    module = Opal.modules[name] || throw Opal.LoadError.$new("cannot load such file -- "+name);
+    module(Opal);
+  }
 }).call(this);