opal · May 14, 2015 · May 14, 2015 · May 14, 2015 · May 14, 2015 · May 14, 2015
Showing with 15 additions and 9 deletions.

+3 −4 app/controllers/opal_spec_controller.rb

+1 −1 lib/opal/rails/engine.rb

+1 −1 opal-rails.gemspec

+5 −3 spec/integration/source_map_spec.rb

+5 −0 test_app/config/environments/test.rb
diff --git a/app/controllers/opal_spec_controller.rb b/app/controllers/opal_spec_controller.rb
@@ -7,12 +7,11 @@ class OpalSpecController < ActionController::Base
   helper_method :check_errors_for
 
   def run
-    logical_path = builder.runner_logical_path+'.js'
+    logical_path = builder.runner_logical_path
     sprockets = Rails.application.config.assets
     runner = builder.runner_pathname
-
-    runner.open('w') { |f| f << builder.main_code }
-    sleep 0.1 unless sprockets[logical_path]
+    runner.open('w') { |f| f << builder.main_code; f.fsync }
+    sprockets[logical_path]
   end
 
 

diff --git a/lib/opal/rails/engine.rb b/lib/opal/rails/engine.rb
@@ -51,7 +51,7 @@ class Engine < ::Rails::Engine
         end
 
         app.routes.prepend do
-          if Opal::Processor.source_map_enabled && config.assets.compile
+          if Opal::Processor.source_map_enabled && config.assets.compile && config.assets.debug
             maps_prefix = '/__OPAL_SOURCE_MAPS__'
             maps_app    = Opal::SourceMapServer.new(app.assets, maps_prefix)
 

diff --git a/opal-rails.gemspec b/opal-rails.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   required_ruby_version = '>= 1.9.3'
 
   s.add_dependency 'rails',               '>= 3.2', '< 5.0'
-  s.add_dependency 'opal',                '~> 0.8.0.dev'
+  s.add_dependency 'opal',                '~> 0.8.0.beta'
   s.add_dependency 'opal-jquery',         '~> 0.3.0'
   s.add_dependency 'opal-rspec',          '~> 0.4.2'
   s.add_dependency 'jquery-rails'

diff --git a/spec/integration/source_map_spec.rb b/spec/integration/source_map_spec.rb
@@ -2,10 +2,12 @@
 require 'opal/source_map'
 
 describe Opal::SourceMap do
-  let(:js_asset_path) { '/assets/source_map_example.js' }
+  let(:js_asset_path) { '/assets/source_map_example.self.js' }
 
   before do
     expect(Rails.application.config.opal.source_map_enabled).to be_truthy
+    expect(Rails.application.config.assets.compile).to be_truthy
+    expect(Rails.application.config.assets.debug).to be_truthy
     get js_asset_path
   end
 
@@ -32,8 +34,8 @@
 
   def extract_map_path response
     source_map_regexp = %r{^//[@#] sourceMappingURL=([^\n]+)}
-    header_map_path = response.headers['X-SourceMap']
-    comment_map_path = response.body.scan(source_map_regexp).flatten.first.to_s.strip
+    header_map_path = response.headers['X-SourceMap'].presence
+    comment_map_path = response.body.scan(source_map_regexp).flatten.first.to_s.strip.presence
 
     header_map_path or comment_map_path
   end

diff --git a/test_app/config/environments/test.rb b/test_app/config/environments/test.rb
@@ -34,4 +34,9 @@
   config.active_support.deprecation = :stderr
 
   config.eager_load = false if Rails.version.to_i == 4
+
+
+  # Allow sourcemaps to be compiled in test mode
+  config.assets.debug = true
+  config.assets.compile = true
 end