opal-spec 0.2.8 → 0.2.9

data/lib/assets/javascripts/opal/spec/runner.rb

@@ -1,80 +1,78 @@
-module Opal
-  module Spec
-    class Runner
-      def self.in_browser?
-        %x{
-          if (typeof(window) !== 'undefined' && typeof(document) !== 'undefined') {
-            return true;
-          }
-
-          return false;
+module Spec
+  class Runner
+    def self.in_browser?
+      %x{
+        if (typeof(window) !== 'undefined' && typeof(document) !== 'undefined') {
+          return true;
         }
-      end
 
-      def self.in_phantom?
-        %x{
-          if (typeof(phantom) !== 'undefined' || typeof(OPAL_SPEC_PHANTOM) !== 'undefined') {
-            return true;
-          }
+        return false;
+      }
+    end
 
-          return false;
+    def self.in_phantom?
+      %x{
+        if (typeof(phantom) !== 'undefined' || typeof(OPAL_SPEC_PHANTOM) !== 'undefined') {
+          return true;
         }
-      end
 
-      def self.autorun
-        if in_browser?
-          %x{
-            setTimeout(function() {
-              #{ Runner.new.run };
-            }, 0);
-          }
-        else
-          Runner.new.run
-        end
-      end
+        return false;
+      }
+    end
 
-      def initialize
-        if Runner.in_phantom?
-          @formatter = PhantomFormatter.new
-        elsif Runner.in_browser?
-          @formatter = BrowserFormatter.new
-        end
+    def self.autorun
+      if in_browser?
+        %x{
+          setTimeout(function() {
+            #{ Runner.new.run };
+          }, 0);
+        }
+      else
+        Runner.new.run
       end
+    end
 
-      def run
-        @groups = ExampleGroup.example_groups.dup
-        @formatter.start
-        run_next_group
+    def initialize
+      if Runner.in_phantom?
+        @formatter = PhantomFormatter.new
+      elsif Runner.in_browser?
+        @formatter = BrowserFormatter.new
       end
+    end
 
-      def run_next_group
-        if @groups.empty?
-          @formatter.finish
-        else
-          @groups.shift.run self
-        end
-      end
+    def run
+      @groups = ExampleGroup.example_groups.dup
+      @formatter.start
+      run_next_group
+    end
 
-      def example_group_started group
-        @formatter.example_group_started group
+    def run_next_group
+      if @groups.empty?
+        @formatter.finish
+      else
+        @groups.shift.run self
       end
+    end
 
-      def example_group_finished group
-        @formatter.example_group_finished group
-        run_next_group
-      end
+    def example_group_started group
+      @formatter.example_group_started group
+    end
 
-      def example_started example
-        @formatter.example_started example
-      end
+    def example_group_finished group
+      @formatter.example_group_finished group
+      run_next_group
+    end
 
-      def example_passed example
-        @formatter.example_passed example
-      end
+    def example_started example
+      @formatter.example_started example
+    end
 
-      def example_failed example
-        @formatter.example_failed example
-      end
+    def example_passed example
+      @formatter.example_passed example
+    end
+
+    def example_failed example
+      @formatter.example_failed example
     end
   end
 end

data/lib/assets/javascripts/opal/spec/sprockets_runner.js.erb

@@ -0,0 +1,11 @@
+/*
+  This file is used by Opal::Spec::Server to basically load all spec files that
+  can be found in the spec/ directory.
+*/
+
+<% require_asset 'opal' %>
+<% require_asset 'opal-spec' %>
+
+<% Dir.glob('spec/**/*.{rb,opal}').each do |s| %>
+<% require_asset s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '') %>
+<% end %>

data/lib/assets/javascripts/opal/spec.rb

@@ -1,4 +1,5 @@
 require 'opal'
+
 require 'opal/spec/example'
 require 'opal/spec/example_group'
 require 'opal/spec/matchers'
@@ -9,5 +10,7 @@ require 'opal/spec/browser_formatter'
 require 'opal/spec/phantom_formatter'
 require 'opal/spec/kernel'
 
-# Compatibility with older versions
-OpalSpec = Opal::Spec
+module Opal
+  # Compatibility with older versions
+  Spec = ::Spec
+end

data/lib/opal/spec/rake_task.rb

@@ -1,4 +1,5 @@
 require 'opal/spec'
+require 'opal/spec/server'
 
 module Opal
   module Spec
@@ -22,7 +23,7 @@ module Opal
           require 'webrick'
 
           server = fork do
-            Rack::Server.start(:config => 'config.ru', :Port => port,
+            Rack::Server.start(:app => Opal::Spec::Server.new, :Port => port,
               :Logger => WEBrick::Log.new("/dev/null"), :AccessLog => [])
           end
 
@@ -37,7 +38,7 @@ module Opal
       end
 
       def runner_path
-        @runner_path || File.join(File.dirname(__FILE__), '..', '..', '..', 'vendor', 'runner.js')
+        @runner_path || File.join(VENDOR_PATH, 'spec_runner.js')
       end
 
       def url_path

data/lib/opal/spec/server.rb

@@ -0,0 +1,49 @@
+require 'opal/spec'
+require 'erb'
+
+module Opal
+  module Spec
+    class Server
+      class Index
+        def initialize(app, sprockets)
+          @app = app
+          @sprockets = sprockets
+        end
+
+        def call(env)
+          if env['PATH_INFO'] == '/'
+            [200, { 'Content-Type' => 'text/html' }, [self.html]]
+          else
+            @app.call env
+          end
+        end
+
+        def html
+          source = File.read File.join(VENDOR_PATH, 'spec_runner.html.erb')
+          ERB.new(source).result binding
+        end
+
+        def javascript_include_tag(source)
+          paths = @sprockets[source].to_a.map { |d| "#{d.logical_path}?body=1" }
+          tags  = paths.map { |p| "<script src=\"/assets/#{p}\"></script>" }
+          tags.join "\n"
+        end
+      end
+
+      def initialize
+        @sprockets = sprockets = Opal::Environment.new
+        sprockets.append_path 'spec'
+
+        @app = Rack::Builder.app do
+          map('/assets') { run sprockets }
+          use Index, sprockets
+          run Rack::Directory.new('spec')
+        end
+      end
+
+      def call(env)
+        @app.call env
+      end
+    end
+  end
+end

data/lib/opal/spec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Spec
-    VERSION = '0.2.8'
+    VERSION = '0.2.9'
   end
 end

data/lib/opal/spec.rb

@@ -1,9 +1,11 @@
 require 'opal'
-require 'opal/spec/runner'
 require 'opal/spec/version'
 
-# Compatibility with old namespace
-OpalSpec = Opal::Spec
+module Opal
+  module Spec
+    VENDOR_PATH = File.join(File.dirname(__FILE__), '..', '..', 'vendor')
+  end
+end
 
 # Just register our opal code path with opal build tools
 Opal.append_path File.join(File.dirname(__FILE__), '..', 'assets', 'javascripts')

data/spec/specs.rb

@@ -1,6 +1,3 @@
-require 'opal'
-require 'opal-spec'
-
 @passed = 0
 @failures = []
 
@@ -54,16 +51,16 @@ describe 'Another group' do
     nil.should be_nil
   end
 
-  async 'this should pass (in 1 second time)' do
-    set_timeout(1000) do
+  async 'this should pass (in 0.1 second time)' do
+    set_timeout(100) do
       run_async {
         1.should == 1
       }
     end
   end
 
-  async 'this should fail (in 1 second time)' do
-    set_timeout(1000) do
+  async 'this should fail (in 0.1 second time)' do
+    set_timeout(100) do
       run_async {
         1.should == 5
       }

data/vendor/spec_runner.html.erb

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>opal-spec</title>
+</head>
+<body>
+  <%= javascript_include_tag 'opal/spec/sprockets_runner' %>
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-spec
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies: []
 description: Opal compatible spec library
 email: adam.beynon@gmail.com
@@ -21,6 +21,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- config.ru
 - lib/assets/javascripts/opal-spec.rb
 - lib/assets/javascripts/opal/spec.rb
 - lib/assets/javascripts/opal/spec/browser_formatter.rb
@@ -32,15 +33,16 @@ files:
 - lib/assets/javascripts/opal/spec/phantom_formatter.rb
 - lib/assets/javascripts/opal/spec/runner.rb
 - lib/assets/javascripts/opal/spec/scratch_pad.rb
+- lib/assets/javascripts/opal/spec/sprockets_runner.js.erb
 - lib/opal-spec.rb
 - lib/opal/spec.rb
 - lib/opal/spec/rake_task.rb
-- lib/opal/spec/runner.rb
+- lib/opal/spec/server.rb
 - lib/opal/spec/version.rb
 - opal-spec.gemspec
-- spec/index.html
 - spec/specs.rb
-- vendor/runner.js
+- vendor/spec_runner.html.erb
+- vendor/spec_runner.js
 homepage: http://opalrb.org
 licenses: []
 post_install_message: 

data/lib/opal/spec/runner.rb

@@ -1,12 +0,0 @@
-module Opal
-  module Spec
-
-    # Run tests on the command line using phantomjs. Phantomjs **must** be
-    # installed, and the runner assumes you have an HTML file at
-    # ./spec/index.html which will be run.
-    def self.runner
-      runner = File.join File.dirname(__FILE__), '..', '..', '..', 'vendor', 'runner.js'
-      system "phantomjs #{runner} spec/index.html"
-    end
-  end
-end

data/spec/index.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>opal-spec specs</title>
-</head>
-<body>
-  <script src="../build/specs.js"></script>
-</body>
-</html>