YOLO!

elia · elia · commit f4120f50aea2 · 2015-03-19T00:42:50.000+01:00
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -78,7 +78,7 @@ def evaluate(context, locals, &block)
       # result = builder.build_str(data, path, :prerequired => prerequired)
 
       if self.class.source_map_enabled
-        map_contents = compiler.source_map.to_s
+        map_contents = compiler.source_map.as_json.to_json
         ::Opal::SourceMapServer.set_map_cache(context.environment, path, map_contents)
       end
 
diff --git a/lib/opal/sprockets/server.rb b/lib/opal/sprockets/server.rb
@@ -114,8 +114,18 @@ def html
       end
 
       def javascript_include_tag source
+        sprockets = @server.sprockets
+        asset = sprockets[source]
+
+        mark_as_loaded = asset.dependencies.reject do |a|
+          ::Sprockets::AssetAttributes.new(sprockets, a.pathname).engines.include?(::Opal::Processor)
+        end.map do |asset|
+          path = asset.logical_path.gsub(/\.js$/, '')
+          "Opal.mark_as_loaded(Opal.normalize_loadable_path(#{path.inspect}));"
+        end.join("\n")
+
         if @server.debug
-          assets = @server.sprockets[source].to_a
+          assets = asset.to_a
 
           raise "Cannot find asset: #{source}" if assets.empty?
 
@@ -126,7 +136,12 @@ def javascript_include_tag source
           scripts.join "\n"
         else
           "<script src=\"/assets/#{source}.js\"></script>"
-        end
+        end + <<-HTML
+        <script>
+        #{mark_as_loaded}
+        Opal.load(#{source.inspect});
+        </script>
+        HTML
       end
 
       SOURCE = <<-HTML
diff --git a/lib/opal/sprockets/source_map_server.rb b/lib/opal/sprockets/source_map_server.rb
@@ -44,9 +44,13 @@ def cache_set(key, value)
       end
     end
 
+    def self.logger
+      @logger ||= defined?(::Rails) ? Rails.logger : Logger.new($stdout)
+    end
+
     def self.get_map_cache(sprockets, logical_path)
       logical_path = logical_path.gsub(/\.js$/, '')
-      ::Rails.logger.info "get_map_cache #{logical_path}"
+      logger.info "get_map_cache #{logical_path}"
       cache_key = cache_key_for_path(logical_path+'.map')
       cache(sprockets).cache_get(cache_key)
     end
