opal · Mar 19, 2015 · Mar 19, 2015 · Mar 19, 2015 · Mar 19, 2015 · Mar 19, 2015
Showing with 34 additions and 24 deletions.

+21 −0 lib/opal/sprockets/processor.rb

+13 −24 lib/opal/sprockets/server.rb
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -85,6 +85,27 @@ def evaluate(context, locals, &block)
       result.to_s
     end
 
+    def self.load_asset_code(sprockets, name)
+      asset = sprockets[name]
+      module_name = -> asset { asset.logical_path.sub(/\.js$/, '').inspect }
+
+      non_opal_assets = ([asset]+asset.dependencies).reject do |a|
+        asset_attributes = ::Sprockets::AssetAttributes.new(sprockets, a.pathname)
+        asset_attributes.engines.include?(::Opal::Processor)
+      end
+
+      mark_as_loaded = non_opal_assets.map do |asset|
+        "Opal.mark_as_loaded(#{module_name[asset]});"
+      end
+
+      <<-JS
+      if (typeof(Opal) !== 'undefined') {
+        #{mark_as_loaded.join(";")};
+        Opal.load(#{module_name[asset]});
+      }
+      JS
+    end
+
     def self.stubbed_files
       @stubbed_files ||= []
     end

diff --git a/lib/opal/sprockets/server.rb b/lib/opal/sprockets/server.rb
@@ -113,35 +113,24 @@ def html
         end
       end
 
-      def javascript_include_tag source
+      def javascript_include_tag name
         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")
+        prefix = @server.prefix
+        asset = sprockets[name]
+        raise "Cannot find asset: #{name}" if asset.nil?
+        scripts = []
 
         if @server.debug
-          assets = asset.to_a
-
-          raise "Cannot find asset: #{source}" if assets.empty?
-
-          scripts = assets.map do |a|
-            %Q{<script src="/assets/#{ a.logical_path }?body=1"></script>}
+          asset.to_a.map do |dependency|
+            scripts << %Q{<script src="#{prefix}/#{dependency.logical_path}?body=1"></script>}
           end
-
-          scripts.join "\n"
         else
-          "<script src=\"/assets/#{source}.js\"></script>"
-        end + <<-HTML
-        <script>
-        #{mark_as_loaded}
-        Opal.load(#{source.inspect});
-        </script>
-        HTML
+          scripts << "<script src=\"#{prefix}/#{name}.js\"></script>"
+        end
+
+        scripts << "<script>#{Opal::Processor.load_asset_code(sprockets, name)}</script>"
+
+        scripts.join "\n"
       end
 
       SOURCE = <<-HTML