opal · Sep 5, 2014 · Sep 5, 2014 · Sep 5, 2014 · Sep 5, 2014
Showing with 10 additions and 5 deletions.

+4 −0 Gemfile

+2 −1 lib/opal/sprockets/processor.rb

+3 −1 opal.gemspec

+1 −3 spec/lib/sprockets/path_reader_spec.rb
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,10 @@ gem 'json', '< 1.8.1'  if RUBY_VERSION.to_f == 2.1 and RUBY_ENGINE == 'ruby'
 gem 'rubysl', :platform => :rbx
 gem 'thin', platform: :mri
 
+# Uncomment to try with sprockets 3.0:
+#
+#   gem 'sprockets', github: 'sstephenson/sprockets', branch: 'master'
+
 group :repl do
   gem 'therubyracer', :platform => :mri, :require => 'v8'
   gem 'therubyrhino', :platform => :jruby

diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -1,4 +1,5 @@
 require 'set'
+require 'tilt'
 require 'sprockets'
 require 'opal/version'
 require 'opal/builder'
@@ -64,7 +65,7 @@ class << self
 
     def evaluate(context, locals, &block)
       return Opal.compile data unless context.is_a? ::Sprockets::Context
-      
+
       path = context.logical_path
       prerequired = []
 

diff --git a/opal.gemspec b/opal.gemspec
@@ -19,7 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'source_map'
-  s.add_dependency 'sprockets'
+  s.add_dependency 'sprockets', '~> 2.12.1'
+  s.add_dependency 'hike', '~> 1.2'
+  s.add_dependency 'tilt', '~> 1.4'
 
   s.add_development_dependency 'mspec', '1.5.20'
   s.add_development_dependency 'rake'

diff --git a/spec/lib/sprockets/path_reader_spec.rb b/spec/lib/sprockets/path_reader_spec.rb
@@ -6,9 +6,7 @@
   subject(:path_reader) { described_class.new(env, context) }
 
   let(:env) { Opal::Environment.new }
-
-  # TODO: use stubs and expect calls on #depend_on and #depend_on_asset
-  let(:context) { env.context_class.new(env, 'foo', Pathname('bar/baz/foo.js')) }
+  let(:context) { double('context', depend_on: nil, depend_on_asset: nil) }
 
   let(:logical_path) { 'sprockets_file' }
   let(:fixtures_dir) { File.expand_path('../../fixtures/', __FILE__) }