RubyGems - qunited - Versions diffs - 0.4.3 → 0.4.4 - Mend

qunited 0.4.3 → 0.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

data/lib/qunited/server/test_suite.html.erb +9 -9
data/lib/qunited/server.rb +91 -21
data/lib/qunited/version.rb +1 -1
metadata +2 -2

data/lib/qunited/server/test_suite.html.erb CHANGED Viewed

@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>QUnit Test Suite</title>
-    <%= asset_css_tag 'qunit.css' %>
+  <title>QUnit Test Suite</title>
+  <%= qunited_asset_css_tag 'qunit.css' %>
 </head>
 <body>
-    <h1 id="qunit-header">QUnit Test Suite</h1>
-    <h2 id="qunit-banner"></h2>
-    <div id="qunit-testrunner-toolbar"></div>
-    <h2 id="qunit-userAgent"></h2>
-    <ol id="qunit-tests"></ol>
-    <div id="qunit-fixture"></div>
+  <h1 id="qunit-header">QUnit Test Suite</h1>
+  <h2 id="qunit-banner"></h2>
+  <div id="qunit-testrunner-toolbar"></div>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <div id="qunit-fixture"></div>
 </body>
-<%= asset_script_tag 'qunit.js' %>
+<%= qunited_asset_script_tag 'qunit.js' %>
 <% source_files.each do |file| %>
   <%= source_script_tag file %>

data/lib/qunited/server.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 require 'webrick'
 require 'erb'
 require 'pathname'
+require 'tempfile'
 module QUnited
   class Server
@@ -13,6 +14,8 @@ module QUnited
     QUNITED_ASSET_FILE_PREFIX = 'qunited-asset'
+    COFFEESCRIPT_EXTENSIONS = ['coffee', 'cs']
     attr_accessor :source_files, :test_files
     def initialize(opts={})
@@ -32,40 +35,42 @@ module QUnited
         end
       end
-      @server = ::WEBrick::HTTPServer.new(server_options)
+      @server = create_server(server_options)
+    end
+    def start
+      ['INT', 'TERM'].each do |signal|
+        trap(signal) { @server.shutdown }
+      end
+      $stderr.puts "Serving QUnit test suite on port #{@port}\nCtrl-C to shutdown"
+      @server.start
+    end
-      @server.mount_proc '/' do |request, response|
+    private
+    def create_server(options)
+      server = ::WEBrick::HTTPServer.new(options)
+      server.mount_proc '/' do |request, response|
         response.status = 200
         case request.path
         when /^\/#{SOURCE_FILE_PREFIX}\/(.*)/, /^\/#{TEST_FILE_PREFIX}\/(.*)/
           response['Content-Type'] = 'application/javascript'
-          response.body = IO.read($1)
+          response.body = js_file_contents($1)
         when /^\/#{QUNITED_ASSET_FILE_PREFIX}\/(.*)/
           filename = $1
           response['Content-Type'] = (filename =~ /\.js$/) ? 'application/javascript' : 'text/css'
-          response.body = IO.read(asset_path filename)
+          response.body = IO.read(qunited_asset_path filename)
         else
           response['Content-Type'] = 'text/html'
-          test_suite_template = ::ERB.new(IO.read(asset_path 'test_suite.html.erb'))
+          test_suite_template = ::ERB.new(IO.read(qunited_asset_path 'test_suite.html.erb'))
           response.body = test_suite_template.result(binding)
         end
       end
-      ['INT', 'TERM'].each do |signal|
-        trap(signal) { @server.shutdown }
-      end
-    end
-    def start
-      $stderr.puts "Serving QUnit test suite on port #{@port}\nCtrl-C to shutdown"
-      @server.start
-    end
-    private
-    def asset_path(filename)
-      File.join(ASSETS_PATH, filename)
+      server
     end
     def source_script_tag(file_path)
@@ -76,16 +81,81 @@ module QUnited
       script_tag "#{TEST_FILE_PREFIX}/#{file_path}"
     end
-    def asset_script_tag(filename)
+    def qunited_asset_script_tag(filename)
       script_tag "#{QUNITED_ASSET_FILE_PREFIX}/#{filename}"
     end
-    def asset_css_tag(filename)
+    def qunited_asset_css_tag(filename)
       %{<link rel="stylesheet" type="text/css" href="#{QUNITED_ASSET_FILE_PREFIX}/#{filename}">}
     end
+    def qunited_asset_path(filename)
+      File.join(ASSETS_PATH, filename)
+    end
     def script_tag(src)
       %{<script type="text/javascript" src="#{src}"></script>}
     end
+    def js_file_contents(file)
+      if COFFEESCRIPT_EXTENSIONS.include? File.extname(file).sub(/^\./, '')
+        compile_coffeescript(file)
+      else
+        IO.read(file)
+      end
+    end
+    # Compile the CoffeeScript file with the given filename to JavaScript. Returns the compiled
+    # code as a string. Returns failing test JavaScript if CoffeeScript support is not installed.
+    # Also adds a failing test on compilation failure.
+    def compile_coffeescript(file)
+      begin
+        require 'coffee-script'
+      rescue LoadError
+        $stderr.puts <<-ERROR_MSG
+You must install an additional gem to use CoffeeScript source or test files.
+Run the following command (with sudo if necessary): gem install coffee-script
+        ERROR_MSG
+        return <<-ERROR_MSG_SCRIPT
+module('CoffeeScript');
+test('coffee-script gem must be installed to compile this file: #{file}', function() {
+  ok(false, 'Install CoffeeScript support with `gem install coffee-script`')
+});
+        ERROR_MSG_SCRIPT
+      end
+      previously_compiled_file = compiled_coffeescript_files[file]
+      if previously_compiled_file && File.mtime(file) < File.mtime(previously_compiled_file.path)
+        return File.read previously_compiled_file.path
+      end
+      compiled_js_file = Tempfile.new(["compiled_#{File.basename(file).gsub('.', '_')}", '.js'])
+      begin
+        contents = CoffeeScript.compile(File.read(file))
+      rescue => e
+        return <<-COMPILATION_ERROR_SCRIPT
+module('CoffeeScript');
+test('CoffeeScript compilation error', function() {
+  ok(false, "#{e.message.gsub('"', '\"')}")
+});
+        COMPILATION_ERROR_SCRIPT
+      end
+      compiled_js_file.write contents
+      compiled_js_file.close
+      compiled_coffeescript_files[file] = compiled_js_file
+      contents
+    end
+    # Hash that maps CoffeeScript file paths to temporary compiled JavaScript files. This is
+    # used partially because we need to keep around references to the temporary files or else
+    # they could be deleted.
+    def compiled_coffeescript_files
+      @compiled_coffeescript_files ||= {}
+    end
   end
 end

data/lib/qunited/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module QUnited
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qunited
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies: []
 description: QUnited runs headless QUnit tests as part of your normal build
 email: