Merge pull request #775 from opal/sprockets-3

elia · elia · commit 522afc7360a5 · 2015-04-13T17:22:14.000+02:00
Restore Sprockets 3 support
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,9 @@ matrix:
     - rvm: 2.2
       env: RUN=default TZ="/usr/share/zoneinfo/Pacific/Fiji"
 
+    - rvm: 2.2
+      env: RUN=default SPROCKETS_VERSION="~> 2.12.3"
+
     - rvm: 2.1
       env: RUN=rspec
 
diff --git a/Gemfile b/Gemfile
@@ -25,3 +25,6 @@ unless ENV['CI']
 end
 
 gem 'mspec', github: 'rubyspec/mspec'
+
+sprockets_version = ENV['SPROCKETS_VERSION']
+gem 'sprockets', sprockets_version if sprockets_version
diff --git a/lib/opal/sprockets/path_reader.rb b/lib/opal/sprockets/path_reader.rb
@@ -20,7 +20,9 @@ def read path
       end
 
       def expand path
-        env.resolve(path)
+        env.resolve(path) or
+          # Sprockets 3 just returns nil for unknown paths
+          raise ::Sprockets::FileNotFound, path.inspect
       end
 
       def paths
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -99,24 +99,26 @@ def compiler_options
     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 = (['opal'] + non_opal_assets + stubbed_files.to_a)
         .map { |path| mark_as_loaded[path] }
 
-      if processed_by_opal[asset, sprockets]
+      if processed_by_opal[asset]
         load_asset_code = "Opal.load(#{module_name[asset].inspect});"
       end
 
diff --git a/spec/lib/fixtures/complex_sprockets.js.rb.erb b/spec/lib/fixtures/complex_sprockets.js.rb.erb
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
diff --git a/spec/lib/sprockets/server_spec.rb b/spec/lib/sprockets/server_spec.rb
@@ -22,14 +22,22 @@ def app
   end
 
   it 'serves assets with complex sprockets requires' do
-    assets = app.sprockets['complex_sprockets'].to_a.map(&:logical_path)
+    asset = app.sprockets['complex_sprockets']
+    expect(asset).to be_truthy
+
+    assets = asset.to_a.map do |sub_asset|
+      sub_asset.logical_path.gsub(/\.self\.js$/, '.js')
+    end
+
     %w[
       no_requires.js
       jst_file.js
       required_tree_test/required_file1.js
       required_tree_test/required_file2.js
       file_with_directives.js
-    ].each { |logical_path| expect(assets).to include(logical_path) }
+    ].each do |logical_path|
+      expect(assets).to include(logical_path)
+    end
   end
 
   describe 'source maps' do
