RubyGems - pivotal-screw-unit - Versions diffs - 0.4.1 → 0.4.2 - Mend

pivotal-screw-unit 0.4.1 → 0.4.2

Files changed (13) hide show

data/VERSION.yml CHANGED Viewed

@@ -1,4 +1,4 @@
 ---
-:minor: 4
-:patch: 1
+:patch: 2
 :major: 0
+:minor: 4

data/core/lib/screw.builder.js CHANGED Viewed

@@ -1,9 +1,9 @@
 var Screw = (function($) {
   var screw = {
     Unit: function(fn) {
-      var contents = fn.toString().match(/^[^\{]*{((.*\n*)*)}/m)[1];
       var wrappedFn;
       if(fn.length == 0) {
+        var contents = fn.toString().match(/^[^\{]*{((.*\n*)*)}/m)[1];
         wrappedFn = new Function("matchers", "specifications",
         "with (specifications) { with (matchers) { " + contents + " } }"
         );
@@ -79,16 +79,17 @@ var Screw = (function($) {
   };
   $(screw).queue(function() { $(screw).trigger('loading') });
-  $(function() {
+  $(window).load(function(){
     $('<div class="describe">')
       .append('<h3 class="status" />')
       .append('<ol class="befores">')
       .append('<ul class="describes">')
       .append('<ol class="afters">')
       .appendTo('body');
     $(screw).dequeue();
     $(screw).trigger('loaded');
   });
   return screw;
 })(jQuery);

data/spec/functional/functional_spec_helper.rb CHANGED Viewed

@@ -20,9 +20,11 @@ class Spec::ExampleGroup
     @spec_root_path = FunctionalSpecServerStarter.spec_root_path
     @public_path = FunctionalSpecServerStarter.public_path
     @implementation_root_path = FunctionalSpecServerStarter.implementation_root_path
-#    Thread.start do
-#      SeleniumRC::Server.boot
-#    end
+    unless SeleniumRC::Server.service_is_running?
+      Thread.start do
+        SeleniumRC::Server.boot
+      end
+    end
     FunctionalSpecServerStarter.call
     TCPSocket.wait_for_service :host => "0.0.0.0", :port => "4444"
   end

@@ -1,6 +1,7 @@
 module JsTestCore
   module Representations
     class Spec < Page
+      needs :spec_files
       protected
       def title_text
         "Js Test Core Suite"

@@ -24,7 +24,7 @@ module JsTestCore
         end
         def render_spec
-          Spec.spec_representation_class.new(self, :spec_files => spec_files).to_s
+          Spec.spec_representation_class.new(:spec_files => spec_files).to_s
         end
       end
     end

@@ -1,5 +1,6 @@
 require "rubygems"
 require "spec"
+require "spec/autorun"
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift File.expand_path("#{dir}/../../lib")

@@ -1,11 +1,12 @@
 module ThinRest
   module Representations
     class InternalError < Page
+      needs :error
       protected
       def body_content
         h1 error.message
         ul do
-          error.backtrace.split("\n").each do |line|
+          error.backtrace.each do |line|
             li line
           end
         end

@@ -1,7 +1,7 @@
 module ThinRest
   module Representations
     class Page < Erector::Widget
-      def render(&block)
+      def content(&block)
         rawtext %Q{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">}
         html :xmlns => "http://www.w3.org/1999/xhtml", :"xml:lang" => "en" do
           head do

@@ -1,6 +1,7 @@
 module ThinRest
   module Representations
     class ResourceNotFound < Page
+      needs :path_info
       protected
       def body_content
         h1 message
@@ -11,7 +12,7 @@ module ThinRest
       end
       def message
-        "File #{path} not found"
+        "File #{path_info} not found"
       end
     end
   end

@@ -4,7 +4,7 @@ module ThinRest
       property :error
       def get
         connection.send_head(500)
-        connection.send_body(Representations::InternalError.new(self, :error => error).to_s)
+        connection.send_body(Representations::InternalError.new(:error => error).to_s)
       end
     end
   end

@@ -10,7 +10,7 @@ module ThinRest
       property :name
       def get
         connection.send_head(404)
-        connection.send_body(Representations::ResourceNotFound.new(self).to_s) do
+        connection.send_body(Representations::ResourceNotFound.new(:path_info => connection.rack_request.path_info).to_s) do
           raise RoutingError, "Invalid route: #{connection.rack_request.path_info} ; name: #{name}"
         end
       end

@@ -2,6 +2,7 @@ dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(File.expand_path("#{dir}/../lib"))
 require "thin_rest"
 require "spec"
+require "spec/autorun"
 require "guid"
 Spec::Runner.configure do |config|

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-screw-unit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Pivotal Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-05-11 00:00:00 -07:00
+date: 2009-06-04 00:00:00 -07:00
 default_executable:
 dependencies: []
@@ -145,7 +145,7 @@ files:
 - vendor/js-test-core/vendor/thin-rest/spec/thin_rest/resources/resource_spec.rb
 - vendor/js-test-core/vendor/thin-rest/spec/thin_rest/resources/root_spec.rb
 - vendor/js-test-core/vendor/thin-rest/spec/thin_rest_spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/pivotal/screw-unit-server
 post_install_message:
 rdoc_options:
@@ -170,15 +170,15 @@ requirements: []
 rubyforge_project:
 rubygems_version: 1.2.0
 signing_key:
-specification_version: 2
+specification_version: 3
 summary: Server and helpers for your Screw Unit tests.
 test_files:
-- spec/unit_suite.rb
-- spec/functional/functional_spec_server_starter.rb
 - spec/functional/functional_spec.rb
 - spec/functional/functional_spec_helper.rb
+- spec/functional/functional_spec_server_starter.rb
+- spec/functional_suite.rb
 - spec/spec_suite.rb
 - spec/unit/js_test_core/specs/spec_dir_spec.rb
 - spec/unit/js_test_core/specs/spec_file_spec.rb
 - spec/unit/unit_spec_helper.rb
-- spec/functional_suite.rb
+- spec/unit_suite.rb