pivotal-screw-unit-server 0.5.9 → 0.5.10

data/CHANGES

@@ -1,3 +1,6 @@
+0.5.10
+- Updated to erector 0.6.7, which fixes a bug related to including modules into Representations.
+
 0.5.9
 - Allow test suite to clear all cookies
 

data/Rakefile

@@ -20,7 +20,7 @@ begin
     s.rdoc_options = ["--main", "README.markdown"]
     s.extra_rdoc_files = ["README.markdown", "CHANGES"]
     s.add_dependency("thin", ">=1.2.1")
-    s.add_dependency("erector", ">=0.6.6")
+    s.add_dependency("erector", ">=0.6.7")
     s.add_dependency("selenium-client")
   end
 rescue LoadError

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 5
-:patch: 9
 :major: 0
+:minor: 5
+:patch: 10

data/lib/screw_unit.rb

@@ -4,11 +4,11 @@ dir = File.dirname(__FILE__)
 $:.unshift(File.expand_path("#{dir}/../vendor/js-test-core/lib"))
 require "js_test_core"
 
-require "#{dir}/screw_unit/representations"
-require "#{dir}/screw_unit/server"
+require "#{dir}/screw_unit/representations/spec.html"
 
 JsTestCore.core_path = File.expand_path("#{dir}/../core/lib")
 JsTestCore::Resources::SpecFile.spec_representation_class = ScrewUnit::Representations::Spec
+JsTestCore::Server.rackup_path = File.expand_path("#{dir}/../standalone.ru")
 module ScrewUnit
   include JsTestCore
 

data/spec/functional/functional_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path("#{File.dirname(__FILE__)}/functional_spec_helper")
 
-describe "ScrewUnit" do
+describe ScrewUnit do
   attr_reader :stdout, :request
   before do
     @stdout = StringIO.new

data/spec/unit/{js_test_core/specs/spec_file_spec.rb → spec_file_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/unit_spec_helper")
 
 module JsTestCore
   module Resources

data/standalone.ru

@@ -1,20 +1,3 @@
 dir = File.dirname(__FILE__)
 require "#{dir}/lib/screw_unit"
-require "sinatra"
-
-ScrewUnit.spec_root_path = ENV["SCREW_UNIT_SPEC_ROOT"] || File.expand_path("./spec/javascripts")
-if File.directory?(ScrewUnit.spec_root_path)
-  puts "SCREW_UNIT_SPEC_ROOT is #{ScrewUnit.spec_root_path}"
-else
-  raise "SCREW_UNIT_SPEC_ROOT #{ScrewUnit.spec_root_path} must be a directory"
-end
-
-ScrewUnit.public_path = ENV["SCREW_UNIT_PUBLIC"] || File.expand_path("./public")
-if File.directory?(ScrewUnit.public_path)
-  puts "SCREW_UNIT_PUBLIC is #{ScrewUnit.public_path}"
-else
-  raise "SCREW_UNIT_PUBLIC #{ScrewUnit.public_path} must be a directory"
-end
-
-use ScrewUnit::App
-run Sinatra::Application
+ScrewUnit::Server.standalone_rackup(self, ENV["SCREW_UNIT_SPEC_ROOT"], ENV["SCREW_UNIT_PUBLIC"])

data/vendor/js-test-core/CHANGES

@@ -1,3 +1,4 @@
+- Updated to erector 0.6.7, which fixes a bug related to including modules into Representations.
 - Allow test suite to clear all cookies
 - No longer using the /implementanions directory. Replace all cases of /implementations with /javascripts.
 - Added support for custom suite files

data/vendor/js-test-core/lib/js_test_core.rb

@@ -1,6 +1,6 @@
 require "rubygems"
 gem "thin", ">=1.2.1"
-gem "erector", ">=0.6.6"
+gem "erector", ">=0.6.7"
 gem "selenium-client"
 
 dir = File.dirname(__FILE__)
@@ -22,6 +22,7 @@ require "#{dir}/js_test_core/extensions"
 require "#{dir}/js_test_core/models"
 require "#{dir}/js_test_core/resources"
 require "#{dir}/js_test_core/representations"
+require "#{dir}/js_test_core/server"
 
 require "#{dir}/js_test_core/client"
 require "#{dir}/js_test_core/selenium_server_configuration"

data/vendor/js-test-core/lib/js_test_core/server.rb

@@ -0,0 +1,36 @@
+module JsTestCore
+  class Server
+    class << self
+      attr_accessor :rackup_path
+      def start
+        require "thin"
+        Thin::Runner.new([
+          "--port", "8080",
+          "--rackup", File.expand_path(rackup_path),
+          "start"]
+        ).run!
+      end
+
+      def standalone_rackup(rack_builder, spec_root_path=nil, public_path=nil)
+        require "sinatra"
+
+        JsTestCore.spec_root_path = spec_root_path || File.expand_path("./spec/javascripts")
+        if File.directory?(JsTestCore.spec_root_path)
+          puts "Spec root path is #{JsTestCore.spec_root_path}"
+        else
+          raise ArgumentError, "#{spec_root_path} #{JsTestCore.spec_root_path} must be a directory"
+        end
+
+        JsTestCore.public_path = public_path || File.expand_path("./public")
+        if File.directory?(JsTestCore.public_path)
+          puts "Public path is #{JsTestCore.public_path}"
+        else
+          raise ArgumentError, "#{public_path} #{JsTestCore.public_path} must be a directory"
+        end
+
+        rack_builder.use JsTestCore::App
+        rack_builder.run Sinatra::Application
+      end
+    end
+  end
+end

data/vendor/js-test-core/spec/unit/js_test_core/server_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../unit_spec_helper")
+
+module JsTestCore
+  describe Server do
+    describe ".standalone_rackup" do
+      attr_reader :builder
+      before do
+        stub(Server).puts
+        @builder = "builder"
+      end
+
+      context "when passed a nil spec_root_path and a nil public_path" do
+        it "defaults spec_root_path to ./spec/javascripts and public_path to ./public" do
+          expected_spec_root_path = File.expand_path("./spec/javascripts")
+          mock(File).directory?( expected_spec_root_path) {true}
+          expected_public_path = File.expand_path("./public")
+          mock(File).directory?( expected_public_path) {true}
+          mock(builder).use(JsTestCore::App)
+          mock(builder).run(Sinatra::Application)
+
+          Server.standalone_rackup(builder, nil, nil)
+
+          JsTestCore.spec_root_path.should == File.expand_path(expected_spec_root_path)
+          JsTestCore.public_path.should == File.expand_path(expected_public_path)
+        end
+      end
+
+      context "when the spec_root_path is not a directory" do
+        it "raises an ArgumentError" do
+          mock(File).directory?("spec_root_path") {false}
+
+          lambda do
+            Server.standalone_rackup(builder, "spec_root_path", nil)
+          end.should raise_error(ArgumentError)
+        end
+      end
+
+      context "when the public_path is not a directory" do
+        it "raises an ArgumentError" do
+          mock(File).directory?("spec_root_path") {true}
+          mock(File).directory?("public_path") {false}
+
+          lambda do
+            Server.standalone_rackup(builder, "spec_root_path", "public_path")
+          end.should raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-screw-unit-server
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-14 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.6
+        version: 0.6.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: selenium-client
@@ -87,9 +87,7 @@ files:
 - core/spec/with_screw_context_spec.js
 - init.rb
 - lib/screw_unit.rb
-- lib/screw_unit/representations.rb
 - lib/screw_unit/representations/spec.html.rb
-- lib/screw_unit/server.rb
 - spec/functional_suite.rb
 - spec/spec_suite.rb
 - spec/unit_suite.rb
@@ -121,6 +119,7 @@ files:
 - vendor/js-test-core/lib/js_test_core/resources/spec_file.rb
 - vendor/js-test-core/lib/js_test_core/resources/web_root.rb
 - vendor/js-test-core/lib/js_test_core/selenium_server_configuration.rb
+- vendor/js-test-core/lib/js_test_core/server.rb
 - vendor/js-test-core/spec/example_core/JsTestCore.css
 - vendor/js-test-core/spec/example_core/JsTestCore.js
 - vendor/js-test-core/spec/example_core/subdir/SubDirFile.js
@@ -152,6 +151,7 @@ files:
 - vendor/js-test-core/spec/unit/js_test_core/resources/spec_file_spec.rb
 - vendor/js-test-core/spec/unit/js_test_core/resources/web_root_spec.rb
 - vendor/js-test-core/spec/unit/js_test_core/selenium_server_configuration_spec.rb
+- vendor/js-test-core/spec/unit/js_test_core/server_spec.rb
 - vendor/js-test-core/spec/unit/unit_spec_helper.rb
 - vendor/js-test-core/spec/unit_suite.rb
 - vendor/js-test-core/vendor/lucky-luciano/README.markdown
@@ -195,6 +195,6 @@ test_files:
 - spec/functional/functional_spec.rb
 - spec/functional/functional_spec_helper.rb
 - spec/spec_suite.rb
-- spec/unit/js_test_core/specs/spec_file_spec.rb
 - spec/unit/unit_spec_helper.rb
+- spec/unit/spec_file_spec.rb
 - spec/functional_suite.rb

data/lib/screw_unit/representations.rb

@@ -1,2 +0,0 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/representations/spec.html"

data/lib/screw_unit/server.rb

@@ -1,12 +0,0 @@
-module ScrewUnit
-  class Server
-    def self.start
-      require "thin"
-      Thin::Runner.new([
-        "--port", "8080",
-        "--rackup", File.expand_path("#{File.dirname(__FILE__)}/../../standalone.ru"),
-        "start"]
-      ).run!      
-    end
-  end
-end