Merge pull request #43 from opal/elia/wip-back-to-sprockets

elia · elia · commit 836fc8c6d08f · 2015-03-23T10:37:27.000+01:00
Back to sprockets ✨
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,8 @@ gemspec
 
 gem 'capybara-webkit'
 # gem 'opal-jquery', github: 'opal/opal-jquery'
-# gem 'opal',        github: 'opal'
+gem 'opal',        github: 'opal', branch: 'elia/wip-back-to-sprockets'
+# gem 'opal',        github: 'opal', branch: 'elia/source-maps-fix'
 # gem 'opal-jquery', path: '../opal-jquery'
 # gem 'opal',        path: '../opal'
 
diff --git a/Rakefile b/Rakefile
@@ -10,5 +10,10 @@ Bundler::GemHelper.install_tasks
 # TEST
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new :default
+RSpec::Core::RakeTask.new :rspec
 
+
+require File.expand_path('../test_app/config/application', __FILE__)
+TestApp::Application.load_tasks
+
+task :default => [:rspec, 'opal:spec']
diff --git a/app/controllers/opal_spec_controller.rb b/app/controllers/opal_spec_controller.rb
@@ -1,45 +1,29 @@
+require 'opal/rails/spec_builder'
+
 class OpalSpecController < ActionController::Base
-  helper_method :spec_files
+  helper_method :spec_files, :pattern, :clean_spec_path
 
   def run
+    respond_to do |format|
+      format.html
+      format.js { render js: builder.to_s }
+    end
   end
 
-  def file
-    spec_file = Dir["#{spec_location}/#{params[:path]}*.{rb,opal}"].first
-    Opal.paths.concat Rails.application.config.assets.paths
-    builder = Opal::Builder.new
-    file = File.new spec_file
-    builder.build_str file.read, spec_file
-
-    render js: builder.to_s
-  end
 
   private
 
-  def spec_files
-    @spec_files ||= some_spec_files || all_spec_files
-  end
-
-  def specs_param
+  def pattern
     params[:pattern]
   end
 
-  def some_spec_files
-    return if specs_param.blank?
-    specs_param.split(':').map { |path| spec_files_for_glob(path) }.flatten
+  def builder
+    @builder ||= Opal::Rails::SpecBuilder.new(
+      spec_location: Rails.application.config.opal.spec_location,
+      sprockets: Rails.application.config.assets,
+      pattern: pattern,
+    )
   end
 
-  def all_spec_files
-    spec_files_for_glob '**/*_spec{.js,}'
-  end
-
-  def spec_files_for_glob glob = '**'
-    Dir[Rails.root.join("#{spec_location}/#{glob}.{rb,opal}")].map do |path|
-      path.split("#{spec_location}/").flatten.last.gsub(/(\.rb|\.opal)/, '')
-    end.uniq
-  end
-
-  def spec_location
-    Rails.application.config.opal.spec_location
-  end
+  delegate :spec_files, :clean_spec_path, to: :builder
 end
diff --git a/app/helpers/opal_helper.rb b/app/helpers/opal_helper.rb
@@ -5,14 +5,16 @@ def opal_tag(&block)
     javascript_tag js_code
   end
 
-  def spec_include_tag(*sources)
-    options = sources.extract_options!.stringify_keys
-    path_options = options.extract!('protocol', 'extname').symbolize_keys
-    sources.uniq.map { |source|
-      tag_options = {
-        "src" => "/opal_spec_files/#{source}"
-      }.merge!(options)
-      content_tag(:script, "", tag_options)
-    }.join("\n").html_safe
+  def javascript_include_tag(*sources)
+    sources_copy = sources.dup.tap(&:extract_options!)
+    sprockets = Rails.application.assets
+
+    script_tags = super
+
+    sources_copy.map do |source|
+      loading_code = Opal::Processor.load_asset_code(sprockets, source)
+      script_tags << javascript_tag(loading_code)
+    end
+    script_tags
   end
 end
diff --git a/app/views/layouts/opal_spec.html.erb b/app/views/layouts/opal_spec.html.erb
@@ -3,8 +3,6 @@
 <head>
   <meta charset="utf-8">
   <title>Opal Spec Runner</title>
-    <%= javascript_include_tag 'opal-rspec-runner' %>
-    <%= spec_include_tag *spec_files.map { |f| "#{f}"} %>
   <style>
     body { font-family: sans-serif; }
   </style>
diff --git a/app/views/opal_spec/run.html.erb b/app/views/opal_spec/run.html.erb
@@ -1,9 +1,16 @@
-<h2>Running:</h2>
+<% if pattern.present? %>
+  <%= link_to 'All specs', opal_spec_path %>
+<% end %>
 
+<h2>Running:</h2>
 <ul>
   <% spec_files.each do |spec_file| %>
     <li>
-      <%= link_to spec_file, "/opal_spec?pattern=#{URI.escape(spec_file)}" %>
+      <% spec_file = clean_spec_path(spec_file) %>
+      <%= link_to spec_file, opal_spec_path(pattern: spec_file) %>
     </li>
   <% end %>
 </ul>
+
+
+<%= javascript_include_tag opal_spec_path(pattern: pattern) %>
diff --git a/lib/assets/javascripts/opal-rspec-runner.js.rb b/lib/assets/javascripts/opal-rspec-runner.js.rb
diff --git a/lib/assets/javascripts/opal_ujs.js b/lib/assets/javascripts/opal_ujs.js
diff --git a/lib/assets/javascripts/opal_ujs.js.rb b/lib/assets/javascripts/opal_ujs.js.rb
@@ -0,0 +1,4 @@
+require 'jquery'
+require 'jquery_ujs'
+require 'opal'
+require 'opal-jquery'
diff --git a/lib/assets/javascripts/sprockets_runner.rb.erb b/lib/assets/javascripts/sprockets_runner.rb.erb
diff --git a/lib/opal/rails/engine.rb b/lib/opal/rails/engine.rb
@@ -36,14 +36,16 @@ class Engine < ::Rails::Engine
         end
 
         app.routes.prepend do
-          if Opal::Processor.source_map_enabled
-            prefix = app.config.assets.prefix
-            maps_app = Opal::SourceMapServer.new(app.assets, prefix)
-            mount Rack::Cascade.new([maps_app, app.assets]) => prefix
+          if Opal::Processor.source_map_enabled && config.assets.compile
+            maps_prefix = '/__OPAL_SOURCE_MAPS__'
+            maps_app    = Opal::SourceMapServer.new(app.assets, maps_prefix)
+
+            ::Opal::Sprockets::SourceMapHeaderPatch.inject!(maps_prefix)
+
+            mount maps_app => maps_prefix
           end
 
-          get '/opal_spec' => 'opal_spec#run'
-          get '/opal_spec_files/*path' => 'opal_spec#file'
+          get '/opal_spec' => 'opal_spec#run', as: :opal_spec
         end
       end
 
diff --git a/lib/opal/rails/spec_builder.rb b/lib/opal/rails/spec_builder.rb
@@ -0,0 +1,68 @@
+module Opal
+  module Rails
+    class SpecBuilder
+      def initialize(options)
+        @root = options.fetch(:root) { ::Rails.root }
+        @pattern = options.fetch(:pattern, nil)
+        @sprockets = options.fetch(:sprockets)
+        @spec_location = options.fetch(:spec_location)
+      end
+
+      attr_reader :sprockets, :pattern, :spec_location, :root
+
+      def to_s
+        builder.build_str main_code, 'opal_spec'
+        builder.to_s + 'Opal.load("opal_spec");'
+      end
+
+      def builder
+        @builder ||= begin
+          path_finder = Opal::HikePathFinder.new(paths)
+
+          Opal::Builder.new(
+            compiler_options: Opal::Processor.compiler_options,
+            stubs:            Opal::Processor.stubbed_files,
+            path_reader:      Opal::PathReader.new(path_finder),
+          )
+        end
+      end
+
+      def paths
+        [spec_location] + Opal.paths + sprockets.paths
+      end
+
+      def main_code(files = spec_files)
+        requires(files).map { |file| "require #{file.inspect}\n" }.join + boot_code
+      end
+
+      def requires(files)
+        ['opal', 'opal-rspec', *files.map{|f| clean_spec_path(f)}]
+      end
+
+      def boot_code
+        'Opal::RSpec::Runner.autorun'
+      end
+
+      def spec_files
+        @spec_files ||= some_spec_files || all_spec_files
+      end
+
+      def some_spec_files
+        return if pattern.blank?
+        pattern.split(':').map { |path| spec_files_for_glob(path) }.flatten
+      end
+
+      def all_spec_files
+        spec_files_for_glob '**/*_spec'
+      end
+
+      def spec_files_for_glob glob = '**'
+        Dir[root.join("#{spec_location}/#{glob}{,.js}.{rb,opal}")]
+      end
+
+      def clean_spec_path(path)
+        path.split("#{spec_location}/").flatten.last.gsub(/(\.js)?\.(rb|opal)$/, '')
+      end
+    end
+  end
+end
diff --git a/lib/tasks/opal-rails_tasks.rake b/lib/tasks/opal-rails_tasks.rake
@@ -1,28 +1,28 @@
 require 'opal/rspec/rake_task'
 
 Opal::RSpec::RakeTask.new('opal:spec' => :environment) do |server|
-  require 'tempfile'
+  require 'opal/rails/spec_builder'
+  pattern = ENV['PATTERN'] || nil
 
-  asset_paths = Opal.paths + Rails.configuration.assets.paths.to_a
-  tempfile = Tempfile.new(['opal-rspec', '.js.rb'])
+  builder = Opal::Rails::SpecBuilder.new(
+    spec_location: Rails.application.config.opal.spec_location,
+    sprockets: Rails.application.config.assets,
+    pattern: pattern,
+  )
 
   server.sprockets.clear_paths
-  asset_paths << File.dirname(tempfile.path)
-  asset_paths << Rails.application.config.opal.spec_location
-  server.main = File.basename(tempfile.path, '.js.rb')
+  builder.paths.each { |path| server.append_path path }
 
-  asset_paths.each { |path| server.append_path path }
+  # require 'tempfile'
+  # tempfile = Tempfile.new(['opal-rspec', '.js.rb'])
+  # tempfile.puts builder.main_code
+  # tempfile.close
+  # server.main = File.basename(tempfile.path, '.js.rb')
+  # server.append_path File.dirname(tempfile.path)
 
-  required_assets = ['opal']
-  required_assets << 'opal-rspec-runner'
-
-  asset_paths.each do |path|
-    Dir["#{path}/spec/**_spec.js.{opal,rb}"].each do |spec|
-      spec = spec[path.size+1..-1] # +1 is for the trailing slash
-      required_assets << spec
-    end
-  end
-
-  required_assets.each { |a| tempfile.puts "require #{a.inspect}" }
-  tempfile.close
+  spec_file = Rails.root.join('tmp/opal_spec.rb')
+  server.append_path spec_file.dirname.to_s
+  spec_file.open('w') { |f| f << builder.main_code }
+  main = spec_file.basename.to_s.gsub(/\.rb$/, '')
+  server.main = main
 end
diff --git a/opal-rails.gemspec b/opal-rails.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails',               '>= 3.2', '< 5.0'
   s.add_dependency 'opal',                '~> 0.7.0'
   s.add_dependency 'opal-jquery',         '~> 0.3.0'
-  s.add_dependency 'opal-rspec',          '~> 0.4.0'
+  s.add_dependency 'opal-rspec',          '~> 0.4.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'opal-activesupport',  '>= 0.0.5'
 
diff --git a/spec/integration/assigns_spec.rb b/spec/integration/assigns_spec.rb
@@ -26,13 +26,14 @@ def get_source_of path
   end
 
   def opal_eval source
-    opal_source = get_source_of '/assets/opal.js'
+    builder = Opal::Builder.new
+    builder.build 'opal'
 
     # Any lib should be already required in the page,
     # require won't work in this kind of templates.
-    opal_source << get_source_of('/assets/native.js')
+    builder.build 'native'
 
-    context = ExecJS.compile opal_source
+    context = ExecJS.compile builder.to_s
     context.eval source
   rescue
     $!.message << "\n\n#{source}"
diff --git a/spec/integration/in_browser_specs_spec.rb b/spec/integration/in_browser_specs_spec.rb
@@ -3,17 +3,19 @@
 feature 'In-browser specs runner' do
   scenario 'runs all specs', :js do
     visit '/opal_spec'
-
-    page.should have_content('subdirectory/other_spec.js')
-    page.should have_content('example_spec.js ')
-    page.should have_content('2 examples, 0 failures')
+    page.should have_content('example_spec ')
+    page.should have_content('requires_opal_spec ')
+    page.should have_content('subdirectory/other_spec ')
+    page.should have_content('3 examples, 0 failures')
   end
 
   scenario "runs single spec file", :js do
     visit '/opal_spec'
-    click_link 'subdirectory/other_spec.js'
+    click_link 'subdirectory/other_spec'
 
-    page.should have_content('Running: subdirectory/other_spec.js')
+    page.should_not have_content('example_spec ')
+    page.should_not have_content('requires_opal_spec ')
+    page.should have_content('subdirectory/other_spec ')
     page.should have_content('1 examples, 0 failures')
   end
 end
diff --git a/spec/integration/source_map_spec.rb b/spec/integration/source_map_spec.rb
@@ -32,10 +32,9 @@
 
   def extract_map_path response
     source_map_regexp = %r{^//[@#] sourceMappingURL=([^\n]+)}
-    map_path = (response.headers['X-SourceMap'] ||
-                 response.body.scan(source_map_regexp).
-                 flatten.first.to_s.strip)
-    File.join(File.dirname(js_asset_path), map_path) if map_path
-  end
+    header_map_path = response.headers['X-SourceMap']
+    comment_map_path = response.body.scan(source_map_regexp).flatten.first.to_s.strip
 
+    header_map_path or comment_map_path
+  end
 end
diff --git a/test_app/app/assets/javascripts/spec/requires_opal_spec.js.rb b/test_app/app/assets/javascripts/spec/requires_opal_spec.js.rb
@@ -0,0 +1,7 @@
+require 'opal'
+
+describe 'a running spec' do
+  it 'runs successfully' do
+    'I run'.should =~ /run/
+  end
+end
diff --git a/test_app/config/environments/production.rb b/test_app/config/environments/production.rb
@@ -9,7 +9,7 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
diff --git a/test_app/config/environments/test.rb b/test_app/config/environments/test.rb
@@ -8,7 +8,7 @@
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
