Rely on the sprockets path reader for deps tracking

elia · elia · commit 1a933cb9f8bf · 2014-04-23T22:18:17.000+02:00
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -65,19 +65,22 @@ def self.stubbed_files
     end
 
     class SprocketsPathReader
-      def initialize(env)
+      def initialize(env, context)
         @env ||= env
+        @context ||= context
       end
 
       def read path
         if path.end_with? '.js'
+          context.depend_on_asset(path)
           env[path].to_s
         else
+          context.depend_on(path)
           File.read(env.resolve(path))
         end
       end
 
-      attr_reader :env
+      attr_reader :env, :context
     end
 
     def evaluate(context, locals, &block)
@@ -95,14 +98,10 @@ def evaluate(context, locals, &block)
       builder = Builder.new(
         :compiler_options => options,
         :stubbed_files    => stubbed_files,
-        :path_reader      => SprocketsPathReader.new(context.environment)
+        :path_reader      => SprocketsPathReader.new(context.environment, context)
       )
       result = builder.build_str(data, path, prerequired)
 
-      # prerequired is mutated by the builder
-      dependencies = prerequired.uniq - stubbed_files.to_a
-      dependencies.each { |asset| context.depend_on(asset) }
-
       if self.class.source_map_enabled
         $OPAL_SOURCE_MAPS[context.pathname] = '' #compiler.source_map(source_file_url(context)).to_s
         "#{result}\n//# sourceMappingURL=#{source_map_url(context)}\n"
diff --git a/spec/cli/sprockets/processor_spec.rb b/spec/cli/sprockets/processor_spec.rb
@@ -35,9 +35,13 @@
 end
 
 describe Opal::Processor::SprocketsPathReader do
-  subject(:path_reader) { described_class.new(env) }
+  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(:logical_path) { 'sprockets_file' }
   let(:fixtures_dir) { File.expand_path('../../fixtures/', __FILE__) }
   let(:full_path) { File.join(fixtures_dir, logical_path+'.js.rb') }
