jasmine 0.10.3.2 → 0.10.3.3

data/README.markdown

@@ -31,7 +31,7 @@ which will run your Jasmine suites using selenium and rspec. This task is suitab
 
 Simple Configuration:
 
-Customize `spec/javascripts/support/jasmine.yaml` to enumerate the source files, stylesheets, and spec files you would like the Jasmine runner to include.
+Customize `spec/javascripts/support/jasmine.yml` to enumerate the source files, stylesheets, and spec files you would like the Jasmine runner to include.
 You may use dir glob strings.
 
 It is also possible to add overrides into the `spec/javascripts/support/jasmine_config.rb` file directly if you require further customization.

data/generators/jasmine/templates/lib/tasks/jasmine.rake

@@ -21,7 +21,7 @@ namespace :jasmine do
     require jasmine_config_overrides if File.exists?(jasmine_config_overrides)
 
     puts "your tests are here:"
-    puts "  http://localhost:8888/run.html"
+    puts "  http://localhost:8888/"
 
     Jasmine::Config.new.start_server
   end

data/lib/jasmine/config.rb

@@ -12,7 +12,8 @@ module Jasmine
     end
 
     def start_server(port = 8888)
-      Jasmine::Server.new(port, self).start
+      handler = Rack::Handler.default
+      handler.run Jasmine.app(self), :Port => port
     end
 
     def start
@@ -32,10 +33,9 @@ module Jasmine
 
     def start_jasmine_server
       @jasmine_server_port = Jasmine::find_unused_port
-      server = Jasmine::Server.new(@jasmine_server_port, self)
       @jasmine_server_pid = fork do
         Process.setpgrp
-        server.start
+        start_server(@jasmine_server_port)
         exit! 0
       end
       puts "jasmine server started.  pid is #{@jasmine_server_pid}"
@@ -106,13 +106,6 @@ module Jasmine
       "/__root__"
     end
 
-    def mappings
-      {
-        spec_path => spec_dir,
-        root_path => project_root
-      }
-    end
-
     def js_files(spec_filter = nil)
       spec_files_to_include = spec_filter.nil? ? spec_files : match_files(spec_dir, spec_filter)
       src_files.collect {|f| "/" + f } + helpers.collect {|f| File.join(spec_path, f) } + spec_files_to_include.collect {|f| File.join(spec_path, f) }

data/lib/jasmine/server.rb

@@ -1,3 +1,29 @@
+require 'rack'
+
+# Backport Rack::Handler.default from Rack 1.1.0 for Rails 2.3.x compatibility.
+unless Rack::Handler.respond_to?(:default)
+  module Rack::Handler
+    def self.default(options = {})
+      # Guess.
+      if ENV.include?("PHP_FCGI_CHILDREN")
+        # We already speak FastCGI
+        options.delete :File
+        options.delete :Port
+
+        Rack::Handler::FastCGI
+      elsif ENV.include?("REQUEST_METHOD")
+        Rack::Handler::CGI
+      else
+        begin
+          Rack::Handler::Mongrel
+        rescue LoadError => e
+          Rack::Handler::WEBrick
+        end
+      end
+    end
+  end
+end
+
 module Jasmine
   class RunAdapter
     def initialize(config)
@@ -13,8 +39,7 @@ module Jasmine
 
     def call(env)
       return not_found if env["PATH_INFO"] != "/"
-      return [200, { 'Content-Type' => 'text/html' }, ''] if (env['REQUEST_METHOD'] == 'HEAD')
-      run if env['REQUEST_METHOD'] == 'GET'
+      run
     end
 
     def not_found
@@ -37,8 +62,6 @@ module Jasmine
         body
       ]
     end
-
-
   end
 
   class Redirect
@@ -74,49 +97,25 @@ module Jasmine
       run_adapter = Jasmine::RunAdapter.new(@config)
       run_adapter.run(env["PATH_INFO"])
     end
-
   end
 
-  class Server
-    attr_reader :thin
+  def self.app(config)
+    Rack::Builder.app do
+      use Rack::Head
 
-    def initialize(port, config)
-      @port = port
-      @config = config
-
-      require 'thin'
-      thin_config = {
-        '/__suite__/' => Jasmine::FocusedSuite.new(@config),
-        '/run.html' => Jasmine::Redirect.new('/'),
-        '/' => Jasmine::RunAdapter.new(@config)
-      }
-
-      @config.mappings.each do |from, to|
-        thin_config[from] = Rack::File.new(to)
-      end
+      map('/run.html')         { run Jasmine::Redirect.new('/') }
+      map('/__suite__')        { run Jasmine::FocusedSuite.new(config) }
 
-      thin_config["/__JASMINE_ROOT__"] = Rack::File.new(Jasmine.root)
+      map('/__JASMINE_ROOT__') { run Rack::File.new(Jasmine.root) }
+      map(config.spec_path)    { run Rack::File.new(config.spec_dir) }
+      map(config.root_path)    { run Rack::File.new(config.project_root) }
 
-      app = Rack::Cascade.new([
-        Rack::URLMap.new({'/' => Rack::File.new(@config.src_dir)}),
-        Rack::URLMap.new(thin_config)
-#        JsAlert.new
-      ])
-#      Thin::Logging.trace = true
-      @thin = Thin::Server.new('0.0.0.0', @port, app)
-    end
-
-    def start
-      begin
-        thin.start
-      rescue RuntimeError => e
-        raise e unless e.message == 'no acceptor'
-        raise RuntimeError.new("A server is already running on port #{@port}")
+      map('/') do
+        run Rack::Cascade.new([
+          Rack::URLMap.new('/' => Rack::File.new(config.src_dir)),
+          Jasmine::RunAdapter.new(config)
+        ])
       end
     end
-
-    def stop
-      thin.stop
-    end
   end
 end

data/spec/config_spec.rb

@@ -23,13 +23,6 @@ describe Jasmine::Config do
         @config.simple_config_file.should == (File.join('some_project_root', 'spec/javascripts/support/jasmine.yml'))
       end
 
-
-      it "should provide dir mappings" do
-        @config.mappings.should == {
-          '/__root__' => @config.project_root,
-          '/__spec__' => @config.spec_dir
-        }
-      end
     end
 
 
@@ -52,10 +45,6 @@ describe Jasmine::Config do
           @config.js_files("ExampleSpec.js").should ==
             ['/__spec__/helpers/SpecHelper.js',
              '/__spec__/ExampleSpec.js']
-          @config.mappings.should == {
-            '/__root__' => @config.project_root,
-            '/__spec__' => @config.spec_dir
-          }
           @config.spec_files_full_paths.should == [
             File.join(@template_dir, 'spec/javascripts/ExampleSpec.js'),
           ]
@@ -122,8 +111,8 @@ describe Jasmine::Config do
         end
 
         it "spec_files_full_paths" do
-          @config.spec_files_full_paths.should == ["/Users/ragaskar/workspace/jasmine-ruby/generators/jasmine/templates/spec/javascripts/file1.ext",
-                                                   "/Users/ragaskar/workspace/jasmine-ruby/generators/jasmine/templates/spec/javascripts/file2.ext"]
+          @config.spec_files_full_paths.should == [File.expand_path("../../generators/jasmine/templates/spec/javascripts/file1.ext", __FILE__),
+                                                   File.expand_path("../../generators/jasmine/templates/spec/javascripts/file2.ext", __FILE__)]
         end
 
       end

data/spec/server_spec.rb

@@ -1,86 +1,82 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'rack/test'
 
-def read(body)
-  return body if body.is_a?(String)
-  out = ""
-  body.each {|data| out += data }
-  out
-end
+describe "Jasmine.app" do
+  include Rack::Test::Methods
 
-describe Jasmine::Server do
-  before(:each) do
+  def app
     config = Jasmine::Config.new
+    config.stub!(:project_root).and_return(Jasmine.root)
     config.stub!(:spec_dir).and_return(File.join(Jasmine.root, "spec"))
     config.stub!(:src_dir).and_return(File.join(Jasmine.root, "src"))
     config.stub!(:src_files).and_return(["file1.js"])
     config.stub!(:spec_files).and_return(["file2.js"])
-
-    @server = Jasmine::Server.new(0, config)
-    @thin_app = @server.thin.app
-  end
-
-  after(:each) do
-    @server.thin.stop if @server && @server.thin.running?
+    Jasmine.app(config)
   end
 
   it "should serve static files from spec dir under __spec__" do
-    code, headers, body = @thin_app.call("PATH_INFO" => "/__spec__/suites/EnvSpec.js", "SCRIPT_NAME" => "xxx")
-    code.should == 200
-    headers["Content-Type"].should == "application/javascript"
-    read(body).should == File.read(File.join(Jasmine.root, "spec/suites/EnvSpec.js"))
+    get "/__spec__/suites/EnvSpec.js"
+    last_response.status.should == 200
+    last_response.content_type.should == "application/javascript"
+    last_response.body.should == File.read(File.join(Jasmine.root, "spec/suites/EnvSpec.js"))
     end
 
-  it "should serve static files from root dir under /" do
-    code, headers, body = @thin_app.call("PATH_INFO" => "/base.js", "SCRIPT_NAME" => "xxx")
-    code.should == 200
-    headers["Content-Type"].should == "application/javascript"
-    read(body).should == File.read(File.join(Jasmine.root, "src/base.js"))
+  it "should serve static files from root dir under __root__" do
+    get "/__root__/src/base.js"
+    last_response.status.should == 200
+    last_response.content_type.should == "application/javascript"
+    last_response.body.should == File.read(File.join(Jasmine.root, "src/base.js"))
+  end
+
+  it "should serve static files from src dir under /" do
+    get "/base.js"
+    last_response.status.should == 200
+    last_response.content_type.should == "application/javascript"
+    last_response.body.should == File.read(File.join(Jasmine.root, "src/base.js"))
   end
 
   it "should serve Jasmine static files under /__JASMINE_ROOT__/" do
-    code, headers, body = @thin_app.call("PATH_INFO" => "/__JASMINE_ROOT__/lib/jasmine.css", "SCRIPT_NAME" => "xxx")
-    code.should == 200
-    headers["Content-Type"].should == "text/css"
-    read(body).should == File.read(File.join(Jasmine.root, "lib/jasmine.css"))
+    get "/__JASMINE_ROOT__/lib/jasmine.css"
+    last_response.status.should == 200
+    last_response.content_type.should == "text/css"
+    last_response.body.should == File.read(File.join(Jasmine.root, "lib/jasmine.css"))
   end
 
   it "should serve focused suites when prefixing spec files with /__suite__/" do
     Dir.stub!(:glob).and_return do |glob_string|
       [glob_string]
     end
-    code, headers, body = @thin_app.call("PATH_INFO" => "/__suite__/file2.js", "SCRIPT_NAME" => "xxx")
-    code.should == 200
-    headers["Content-Type"].should == "text/html"
-    read(body).should include("\"/__spec__/file2.js")
+    get "/__suite__/file2.js"
+    last_response.status.should == 200
+    last_response.content_type.should == "text/html"
+    last_response.body.should include("\"/__spec__/file2.js")
   end
 
   it "should redirect /run.html to /" do
-    code, headers, body = @thin_app.call("PATH_INFO" => "/run.html", "SCRIPT_NAME" => "xxx")
-    code.should == 302
-    headers["Location"].should == "/"
+    get "/run.html"
+    last_response.status.should == 302
+    last_response.location.should == "/"
   end
 
   it "should 404 non-existent files" do
-    code, headers, body = @thin_app.call("PATH_INFO" => "/some-non-existent-file", "SCRIPT_NAME" => "xxx")
-    code.should == 404
-
+    get "/some-non-existent-file"
+    last_response.should be_not_found
   end
 
   describe "/ page" do
     it "should load each js file in order" do
-      code, headers, body = @thin_app.call("PATH_INFO" => "/", "SCRIPT_NAME" => "xxx", "REQUEST_METHOD" => 'GET')
-      code.should == 200
-      body = read(body)
-      body.should include("\"/file1.js")
-      body.should include("\"/__spec__/file2.js")
-      body.should satisfy {|s| s.index("/file1.js") < s.index("/__spec__/file2.js") }
+      get "/"
+      last_response.status.should == 200
+      last_response.body.should include("\"/file1.js")
+      last_response.body.should include("\"/__spec__/file2.js")
+      last_response.body.should satisfy {|s| s.index("/file1.js") < s.index("/__spec__/file2.js") }
     end
 
     it "should return an empty 200 for HEAD requests to /" do
-      code, headers, body = @thin_app.call("PATH_INFO" => "/", "SCRIPT_NAME" => "xxx", "REQUEST_METHOD" => 'HEAD')
-      code.should == 200
-      headers.should == { 'Content-Type' => 'text/html' }
-      body.should == ''
+      head "/"
+      last_response.status.should == 200
+      last_response.headers.should == { 'Content-Type' => 'text/html' }
+      last_response.body.should == ''
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require File.expand_path('../../.bundle/environment', __FILE__)
-Bundler.require(:default, :test)
+require "rubygems"
+require "bundler"
+
+Bundler.setup(:default, :test)
 
 require 'spec'
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 10
   - 3
-  - 2
-  version: 0.10.3.2
+  - 3
+  version: 0.10.3.3
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -16,13 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -07:00
+date: 2010-04-21 00:00:00 -07:00
 default_executable: jasmine
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -31,26 +29,12 @@ dependencies:
         - 1
         - 5
         version: 1.1.5
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
+  name: rspec
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 9
-        version: 1.1.9
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -59,26 +43,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: thin
+  name: rack
+  requirement: *id002
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 4
-        version: 1.2.4
   type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: selenium-rc
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -87,12 +57,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
+  name: selenium-rc
+  requirement: *id003
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: selenium-client
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -101,8 +71,10 @@ dependencies:
         - 2
         - 17
         version: 1.2.17
+  name: selenium-client
+  requirement: *id004
+  prerelease: false
   type: :runtime
-  version_requirements: *id006
 description: Javascript BDD test framework
 email: ragaskar@gmail.com
 executables: