Use Builder directly on opal spec controller

elia · elia · commit 0fc5cee243e5 · 2015-03-13T19:04:08.000+01:00
diff --git a/app/controllers/opal_spec_controller.rb b/app/controllers/opal_spec_controller.rb
@@ -1,42 +1,59 @@
 class OpalSpecController < ActionController::Base
-  helper_method :spec_files
+  helper_method :spec_files, :pattern, :clean_spec_path
 
   def run
   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
+    sprockets   = Rails.application.config.assets
+    path_finder = Opal::HikePathFinder.new(Opal.paths + sprockets.paths)
+
+    builder = Opal::Builder.new(
+      compiler_options: Opal::Processor.compiler_options,
+      stubs:            Opal::Processor.stubbed_files,
+      path_reader:      Opal::PathReader.new(path_finder),
+    )
+
+    builder.build 'opal'
+    builder.build 'opal-rspec'
+    spec_files.each do |spec_file|
+      file = File.new spec_file
+      builder.build_str file.read, spec_file
+    end
+    builder.build_str 'Opal::RSpec::Runner.autorun', '(exit)'
+    # builder.build_str 'exit', '(exit)'
 
     render js: builder.to_s
   end
 
+
+
+
   private
 
+  def clean_spec_path(path)
+    path.split("#{spec_location}/").flatten.last.gsub(/(\.rb|\.opal)/, '')
+  end
+
   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
+    return if pattern.blank?
+    pattern.split(':').map { |path| spec_files_for_glob(path) }.flatten
   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
+    Dir[Rails.root.join("#{spec_location}/#{glob}.{rb,opal}")]
   end
 
   def spec_location
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,17 @@
 <h2>Running:</h2>
 
 <ul>
+  <% if pattern.present? %>
+    <li><%= link_to 'All specs', opal_spec_path %></li>
+  <% end %>
+
   <% 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_files_path(pattern: pattern) %>
diff --git a/lib/opal/rails/engine.rb b/lib/opal/rails/engine.rb
@@ -45,8 +45,8 @@ class Engine < ::Rails::Engine
             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
+          get '/opal_spec_files' => 'opal_spec#file', as: :opal_spec_files
         end
       end
 
