opal · Nov 12, 2014 · Nov 13, 2014 · Nov 15, 2014 · Nov 15, 2014
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## edge (upcoming 0.7)
 
+*   Deprecated `Opal::Sprockets::Environment`. It can easily be replaced by `Opal::Server` or by appending `Opal.paths` to a `Sprockets::Environment`:
+
+        Sprockets::Environment.new.tap { |e| Opal.paths.each {|p| e.append_path(p)} }
+
 *   Add `Set` methods `#classify`, `#collect!`, `#map!`, `#subtract` `#replace`,
     `#difference` and `#eql?`
 

diff --git a/lib/opal/sprockets.rb b/lib/opal/sprockets.rb
@@ -1,4 +1,3 @@
-require 'opal/sprockets/environment'
 require 'opal/sprockets/processor'
 require 'opal/sprockets/erb'
 require 'opal/sprockets/server'
diff --git a/lib/opal/sprockets/environment.rb b/lib/opal/sprockets/environment.rb
@@ -19,6 +19,8 @@ def self.process asset
   # do this for you.
   class Environment < ::Sprockets::Environment
     def initialize *args
+      warn "Opal::Sprockets::Environment is deprecated. "\
+           "Please use Opal::Server directly or append Opal.paths to the environment manually."
       super
       append_opal_paths
     end

diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -75,7 +75,7 @@ def evaluate(context, locals, &block)
 
       if self.class.source_map_enabled
         register_source_map(context.logical_path, result.source_map.to_s)
-        "#{result.to_s}\n//# sourceMappingURL=#{context.logical_path}.map\n"
+        "#{result.to_s}\n//# sourceMappingURL=#{File.basename(context.logical_path)}.map\n"
       else
         result.to_s
       end

diff --git a/lib/opal/sprockets/server.rb b/lib/opal/sprockets/server.rb
@@ -6,7 +6,7 @@
 require 'rack/directory'
 require 'rack/showexceptions'
 require 'opal/source_map'
-require 'opal/sprockets/environment'
+require 'sprockets'
 require 'erb'
 
 module Opal
@@ -73,10 +73,12 @@ def initialize debug_or_options = {}
       @use_index   = true
       @public_root = nil
       @public_urls = ['/']
-      @sprockets   = options.fetch(:sprockets, Environment.new)
+      @sprockets   = options.fetch(:sprockets, ::Sprockets::Environment.new)
       @debug       = options.fetch(:debug, true)
       @prefix      = options.fetch(:prefix, '/assets')
 
+      Opal.paths.each { |p| @sprockets.append_path(p) }
+
       yield self if block_given?
       create_app
     end

diff --git a/lib/opal/version.rb b/lib/opal/version.rb
@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.7.0.beta2'
+  VERSION = '0.7.0.beta3'
 end
diff --git a/spec/lib/fixtures/source_map.rb b/spec/lib/fixtures/source_map.rb
@@ -0,0 +1 @@
+puts 'smap!'
diff --git a/spec/lib/fixtures/source_map/subfolder/other_file.rb b/spec/lib/fixtures/source_map/subfolder/other_file.rb
@@ -0,0 +1 @@
+puts 'other!'
diff --git a/spec/lib/sprockets/environment_spec.rb b/spec/lib/sprockets/environment_spec.rb
diff --git a/spec/lib/sprockets/path_reader_spec.rb b/spec/lib/sprockets/path_reader_spec.rb
@@ -5,7 +5,7 @@
 describe Opal::Sprockets::PathReader do
   subject(:path_reader) { described_class.new(env, context) }
 
-  let(:env) { Opal::Environment.new }
+  let(:env) { Sprockets::Environment.new.tap { |e| Opal.paths.each {|p| e.append_path(p)} } }
   let(:context) { double('context', depend_on: nil, depend_on_asset: nil) }
 
   let(:logical_path) { 'sprockets_file' }

diff --git a/spec/lib/sprockets/server_spec.rb b/spec/lib/sprockets/server_spec.rb
@@ -8,6 +8,7 @@ def app
     described_class.new { |s|
       s.main = 'opal'
       s.debug = false
+      s.append_path "#{__dir__}/../fixtures"
       s.sprockets.logger = Logger.new('/dev/null')
     }
   end
@@ -17,4 +18,33 @@ def app
     expect(last_response).to be_ok
   end
 
+  describe 'source maps' do
+    it 'serves map on a top level file' do
+      get '/assets/source_map.js'
+      expect(last_response).to be_ok
+
+      get '/assets/source_map.map'
+      expect(last_response).to be_ok
+    end
+
+    it 'serves map on a subfolder file' do
+      js_path = '/assets/source_map/subfolder/other_file.js'
+      map_path = '/assets/source_map/subfolder/other_file.map'
+
+      get js_path
+
+      expect(last_response).to be_ok
+      received_map_path = extract_linked_map(last_response.body)
+      expect(File.expand_path(received_map_path, js_path+'/..')).to eq(map_path)
+
+      get '/assets/source_map/subfolder/other_file.map'
+      expect(last_response).to be_ok
+    end
+  end
+
+  def extract_linked_map(body)
+    source_map_comment_regexp = %r{//# sourceMappingURL=(.*)$}
+    expect(body).to match(source_map_comment_regexp)
+    body.scan(source_map_comment_regexp).first.first
+  end
 end