Avoid use of Sprockets::AssetAttributes (2.x only)

elia · elia · commit bdbfad84cc65 · 2015-03-24T11:22:33.000+01:00
ref: rails/sprockets#10
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -85,18 +85,20 @@ def evaluate(context, locals, &block)
     end
 
     def self.load_asset_code(sprockets, name)
-      asset = sprockets[name.sub(/(\.js)?$/, '.js')]
+      asset = sprockets[name.sub(/(\.(js|rb|opal))*$/, '.js')]
       return '' if asset.nil?
 
+      opal_extnames = sprockets.engines.map do |ext, engine|
+        ext if engine <= ::Opal::Processor
+      end.compact
+
       module_name = -> asset { asset.logical_path.sub(/\.js$/, '') }
+      path_extnames = -> path { File.basename(path).scan(/\.[^.]+/) }
       mark_as_loaded = -> path { "Opal.mark_as_loaded(#{path.inspect});" }
-      processed_by_opal = -> asset, sprockets {
-        attributes = ::Sprockets::AssetAttributes.new(sprockets, asset.pathname)
-        attributes.engines.any? { |engine| engine <= ::Opal::Processor }
-      }
+      processed_by_opal = -> asset { (path_extnames[asset.pathname] & opal_extnames).any? }
 
       non_opal_assets = ([asset]+asset.dependencies)
-        .select { |asset| not(processed_by_opal[asset, sprockets]) }
+        .select { |asset| not(processed_by_opal[asset]) }
         .map { |asset| module_name[asset] }
 
       mark_as_loaded = (non_opal_assets + stubbed_files.to_a)
diff --git a/spec/lib/sprockets/processor_spec.rb b/spec/lib/sprockets/processor_spec.rb
@@ -3,12 +3,12 @@
 
 describe Opal::Processor do
   let(:pathname) { Pathname("/Code/app/mylib/opal/foo.#{ext}") }
-  let(:environment) { double('environment',
+  let(:environment) { double(Sprockets::Environment,
     cache: nil,
     :[] => nil,
     resolve: pathname.expand_path.to_s,
   ) }
-  let(:sprockets_context) { double('context',
+  let(:sprockets_context) { double(Sprockets::Context,
     logical_path: "foo.#{ext}",
     environment: environment,
     pathname: pathname,
@@ -55,6 +55,8 @@
       described_class.stub_file stubbed_file
       asset = double(dependencies: [], pathname: Pathname('bar'), logical_path: 'bar')
       environment.stub(:[]).with('bar.js') { asset }
+      environment.stub(:engines) { {'.rb' => described_class, '.opal' => described_class} }
+
       code = described_class.load_asset_code(environment, 'bar')
       code.should match stubbed_file
     end
