jasmine 1.0.1 → 1.0.1.1

data/MIT.LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008-2010 Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb

@@ -3,17 +3,28 @@ $:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing
 require 'rubygems'
 require 'jasmine'
 jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
-require jasmine_config_overrides if File.exists?(jasmine_config_overrides)
+require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
+if Jasmine::rspec2?
+  require 'rspec'
+else
+  require 'spec'
+end
 
 jasmine_config = Jasmine::Config.new
 spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
 
 should_stop = false
 
-Spec::Runner.configure do |config|
-  config.after(:suite) do
+if Jasmine::rspec2?
+  RSpec.configuration.after(:suite) do
     spec_builder.stop if should_stop
   end
+else
+  Spec::Runner.configure do |config|
+    config.after(:suite) do
+      spec_builder.stop if should_stop
+    end
+  end
 end
 
 spec_builder.start

data/lib/jasmine/base.rb

@@ -1,6 +1,5 @@
 require 'socket'
 require 'erb'
-require 'json/pure'
 
 module Jasmine
   def self.root
@@ -56,4 +55,12 @@ module Jasmine
       "#{file_name}?cachebust=#{digest}"
     end
   end
+
+  def self.rspec2?
+    Gem.available? "rspec", ">= 2.0"
+  end
+  
+  def self.rails3?
+    Gem.available? "rails", ">= 3.0"
+  end
 end

data/lib/jasmine/command_line_tool.rb

@@ -59,9 +59,12 @@ module Jasmine
         File.open(template_path('INSTALL'), 'r').each_line do |line|
           puts line
         end
+      elsif argv[0] == "license"
+        puts File.new(expand(cwd, "MIT.LICENSE")).read
       else
         puts "unknown command #{argv}"
         puts "Usage: jasmine init"
+        puts "               license"
       end
     end
   end

data/lib/jasmine/config.rb

@@ -41,7 +41,7 @@ module Jasmine
 
     def windows?
       require 'rbconfig'
-      ::Config::CONFIG['host_os'] =~ /mswin|mingw/
+      ::RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
 
     def start_selenium_server
@@ -76,6 +76,10 @@ module Jasmine
       @client.eval_js(script)
     end
 
+    def json_generate(obj)
+      @client.json_generate(obj)
+    end
+
     def match_files(dir, patterns)
       dir = File.expand_path(dir)
       patterns.collect do |pattern|

data/lib/jasmine/selenium_driver.rb

@@ -1,6 +1,7 @@
 module Jasmine
   class SeleniumDriver
     def initialize(selenium_host, selenium_port, selenium_browser_start_command, http_address)
+      require 'json/pure' unless defined?(JSON)
       require 'selenium/client'
       @driver = Selenium::Client::Driver.new(
         selenium_host,
@@ -40,5 +41,9 @@ module Jasmine
       result = @driver.get_eval("try { eval(#{escaped_script}, window); } catch(err) { window.eval(#{escaped_script}); }")
       JSON.parse("{\"result\":#{result}}")["result"]
     end
+
+    def json_generate(obj)
+      JSON.generate(obj)
+    end
   end
 end

data/lib/jasmine/server.rb

@@ -58,7 +58,7 @@ module Jasmine
       [
         200,
         { 'Content-Type' => 'text/html' },
-        body
+        [body]
       ]
     end
   end
@@ -82,7 +82,7 @@ module Jasmine
       [
         200,
         { 'Content-Type' => 'application/javascript' },
-        "document.write('<p>Couldn\\'t load #{env["PATH_INFO"]}!</p>');"
+        ["document.write('<p>Couldn\\'t load #{env["PATH_INFO"]}!</p>');"]
       ]
     end
   end

data/lib/jasmine/spec_builder.rb

@@ -69,7 +69,7 @@ module Jasmine
     def load_results
       @spec_results = {}
       @spec_ids.each_slice(50) do |slice|
-        @spec_results.merge!(eval_js("var result = jsApiReporter.resultsForSpecs(#{JSON.generate(slice)}); if (window.Prototype && Object.toJSON) { Object.toJSON(result) } else { JSON.stringify(result) }"))
+        @spec_results.merge!(eval_js("var result = jsApiReporter.resultsForSpecs(#{json_generate(slice)}); if (window.Prototype && Object.toJSON) { Object.toJSON(result) } else { JSON.stringify(result) }"))
       end
       @spec_results
     end
@@ -109,8 +109,14 @@ module Jasmine
       example_name = spec["name"]
       @spec_ids << spec["id"]
       backtrace = @example_locations[parent.description + " " + example_name]
-      parent.it example_name, {}, backtrace do
-        me.report_spec(spec["id"])
+      if Jasmine::rspec2?
+        parent.it example_name, {} do
+          me.report_spec(spec["id"])
+        end
+      else
+        parent.it example_name, {}, backtrace do
+          me.report_spec(spec["id"])
+        end
       end
     end
 
@@ -148,5 +154,9 @@ module Jasmine
     def eval_js(js)
       @runner.eval_js(js)
     end
+
+    def json_generate(obj)
+      @runner.json_generate(obj)
+    end
   end
 end

data/lib/jasmine/tasks/jasmine.rake

@@ -5,20 +5,33 @@ namespace :jasmine do
 
   desc "Run continuous integration tests"
   task :ci => "jasmine:require" do
-    require "spec"
-    require 'spec/rake/spectask'
+    if Jasmine::rspec2?
+      require "rspec"
+      require "rspec/core/rake_task"
+    else
+      require "spec"
+      require 'spec/rake/spectask'
+    end
 
-    Spec::Rake::SpecTask.new(:jasmine_continuous_integration_runner) do |t|
-      t.spec_opts = ["--color", "--format", "specdoc"]
-      t.verbose = true
-      t.spec_files = ['spec/javascripts/support/jasmine_runner.rb']
+    if Jasmine::rspec2?
+      RSpec::Core::RakeTask.new(:jasmine_continuous_integration_runner) do |t|
+        t.rspec_opts = ["--color", "--format", "progress"]
+        t.verbose = true
+        t.pattern = ['spec/javascripts/support/jasmine_runner.rb']
+      end
+    else
+      Spec::Rake::SpecTask.new(:jasmine_continuous_integration_runner) do |t|
+        t.spec_opts = ["--color", "--format", "specdoc"]
+        t.verbose = true
+        t.spec_files = ['spec/javascripts/support/jasmine_runner.rb']
+      end
     end
     Rake::Task["jasmine_continuous_integration_runner"].invoke
   end
 
   task :server => "jasmine:require" do
     jasmine_config_overrides = 'spec/javascripts/support/jasmine_config.rb'
-    require jasmine_config_overrides if File.exists?(jasmine_config_overrides)
+    require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
 
     puts "your tests are here:"
     puts "  http://localhost:8888/"

data/spec/bug_fixes_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "Jasmine bug fixes" do
+  before :each do
+    temp_dir_before
+    Dir::chdir @tmp
+
+    @bootstrap = "$:.unshift('#{@root}/lib')"
+  end
+
+  after :each do
+    temp_dir_after
+  end
+
+  module Foo end
+  describe "require 'json_pure'" do
+    it "should not happen until SeleniumDriver is initialized, which is late enough that it won't conflict with Rails" do
+      json_is_defined = `ruby -e "#{@bootstrap}; require 'jasmine'; puts defined?(JSON)"`
+      json_is_defined.chomp.should == "nil"
+    end
+
+    it "should happen when SeleniumDriver is initialized" do
+      json_is_defined = `ruby -e "#{@bootstrap}; require 'jasmine'; Jasmine::SeleniumDriver.new(nil, nil, nil, nil); puts defined?(JSON)"`
+      json_is_defined.chomp.should == "constant"
+    end
+
+    it "should not happen if another json implementation is already loaded" do
+      json_is_defined = `ruby -e "#{@bootstrap}; require 'jasmine'; JSON="123"; Jasmine::SeleniumDriver.new(nil, nil, nil, nil); puts defined?(JSON)"`
+      json_is_defined.chomp.should == "constant"
+    end
+  end
+end

data/spec/config_spec.rb

@@ -8,12 +8,16 @@ describe Jasmine::Config do
       temp_dir_before
 
       Dir::chdir @tmp
-      `rails rails-project`
+      create_rails 'rails-project'
       Dir::chdir 'rails-project'
 
       FileUtils.cp_r(File.join(@root, 'generators'), 'vendor')
 
-      `./script/generate jasmine`
+      if rails3?
+        raise Exception.new('rails 3 generators not yet implemented!')
+      else
+        `./script/generate jasmine`
+      end
 
       Dir::chdir @old_dir
 
@@ -73,9 +77,7 @@ describe Jasmine::Config do
 
       it "should parse ERB" do
         @config.stub!(:simple_config_file).and_return(File.expand_path(File.join(File.dirname(__FILE__), 'fixture/jasmine.erb.yml')))
-        Dir.stub!(:glob).and_return do |glob_string|
-          glob_string
-        end
+        Dir.stub!(:glob).and_return { |glob_string| [glob_string] }
         @config.src_files.should == [
           'file0.js',
           'file1.js',
@@ -110,10 +112,8 @@ describe Jasmine::Config do
 
       describe "should use the first appearance of duplicate filenames" do
         before(:each) do
-          Dir.stub!(:glob).and_return do |glob_string|
-            glob_string
-          end
-          fake_config = Hash.new.stub!(:[]).and_return(["file1.ext", "file2.ext", "file1.ext"])
+          Dir.stub!(:glob).and_return { |glob_string| [glob_string] }
+          fake_config = Hash.new.stub!(:[]).and_return {|x| ["file1.ext", "file2.ext", "file1.ext"]}
           @config.stub!(:simple_config).and_return(fake_config)
         end
 
@@ -154,9 +154,7 @@ describe Jasmine::Config do
       it "simple_config stylesheets" do
         @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
         YAML.stub!(:load).and_return({'stylesheets' => ['foo.css', 'bar.css']})
-        Dir.stub!(:glob).and_return do |glob_string|
-          glob_string
-        end
+        Dir.stub!(:glob).and_return { |glob_string| [glob_string] }
         @config.stylesheets.should == ['foo.css', 'bar.css']
       end
 

data/spec/jasmine_command_line_tool_spec.rb

@@ -11,9 +11,7 @@ describe "Jasmine command line tool" do
   end
 
   it "should create files on init" do
-    output = capture_stdout do
-      Jasmine::CommandLineTool.new.process ["init"]
-    end
+    output = capture_stdout { Jasmine::CommandLineTool.new.process ["init"] }
     output.should =~ /Jasmine has been installed with example specs./
 
     my_jasmine_lib = File.expand_path(File.join(@root, "lib"))
@@ -23,4 +21,9 @@ describe "Jasmine command line tool" do
     ci_output = `rake -E "#{bootstrap}" --trace jasmine:ci`
     ci_output.should =~ (/[1-9][0-9]* examples, 0 failures/)
   end
+
+  it "should include license info" do
+    output = capture_stdout { Jasmine::CommandLineTool.new.process ["license"] }
+    output.should =~ /Copyright/
+  end
 end

data/spec/jasmine_self_test_spec.rb

@@ -7,10 +7,16 @@ spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
 
 should_stop = false
 
-Spec::Runner.configure do |config|
-  config.after(:suite) do
+if rspec2?
+  RSpec.configuration.after(:suite) do
     spec_builder.stop if should_stop
   end
+else
+  Spec::Runner.configure do |config|
+    config.after(:suite) do
+      spec_builder.stop if should_stop
+    end
+  end
 end
 
 spec_builder.start

data/spec/rails_generator_spec.rb

@@ -11,17 +11,21 @@ describe "Jasmine rails generator" do
   end
 
   it "should create files on init" do
-    `rails rails-project`
-    Dir::chdir 'rails-project'
+    if rails3? # todo -- get this working
+      raise Exception.new('rails 3 generators not yet implemented!')
+    else
+      create_rails 'rails-project'
+      Dir::chdir 'rails-project'
 
-    FileUtils.cp_r(File.join(@root, 'generators'), 'vendor')
+      FileUtils.cp_r(File.join(@root, 'generators'), 'vendor')
 
-    output = `./script/generate jasmine`
-    output.should =~ /Jasmine has been installed with example specs./
+      output = `./script/generate jasmine`
+      output.should =~ /Jasmine has been installed with example specs./
 
-    bootstrap = "$:.unshift('#{@root}/lib')"
-    ENV['JASMINE_GEM_PATH'] = "#{@root}/lib"
-    ci_output = `rake -E \"#{bootstrap}\" --trace jasmine:ci`
-    ci_output.should =~ (/[1-9][0-9]* examples, 0 failures/)
+      bootstrap = "$:.unshift('#{@root}/lib')"
+      ENV['JASMINE_GEM_PATH'] = "#{@root}/lib"
+      ci_output = `rake -E \"#{bootstrap}\" --trace jasmine:ci`
+      ci_output.should =~ (/[1-9][0-9]* examples, 0 failures/)
+    end
   end
 end

data/spec/server_spec.rb

@@ -43,9 +43,7 @@ describe "Jasmine.app" do
   end
 
   it "should serve focused suites when prefixing spec files with /__suite__/" do
-    Dir.stub!(:glob).and_return do |glob_string|
-      [glob_string]
-    end
+    Dir.stub!(:glob).and_return { |glob_string| [glob_string] }
     get "/__suite__/file2.js"
     last_response.status.should == 200
     last_response.content_type.should == "text/html"

data/spec/spec_helper.rb

@@ -1,15 +1,36 @@
 require "rubygems"
 require "bundler"
 require 'stringio'
+require 'tmpdir'
 
 Bundler.setup(:default, :test)
 
-require 'spec'
+def rspec2?
+  Gem.available? "rspec", ">= 2.0"
+end
+
+def rails3?
+  Gem.available? "rails", ">= 3.0"
+end
+
+if rspec2?
+  require 'rspec'
+else
+  require 'spec'
+end
 
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib")))
 
 require "jasmine"
 
+def create_rails(name)
+  if rails3?
+    `rails new #{name}`
+  else
+    `rails #{name}`
+  end
+end
+
 def create_temp_dir
   tmp = File.join(Dir.tmpdir, 'jasmine-gem-test')
   FileUtils.rm_r(tmp, :force => true)

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: jasmine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 89
   prerelease: false
   segments: 
   - 1
   - 0
   - 1
-  version: 1.0.1
+  - 1
+  version: 1.0.1.1
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-11-09 00:00:00 -05:00
 default_executable: jasmine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +126,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- MIT.LICENSE
 - generators/jasmine/jasmine_generator.rb
 - generators/jasmine/templates/INSTALL
 - generators/jasmine/templates/jasmine-example/SpecRunner.html
@@ -151,6 +153,7 @@ files:
 - lib/jasmine/spec_builder.rb
 - lib/jasmine/tasks/jasmine.rake
 - README.markdown
+- spec/bug_fixes_spec.rb
 - spec/config_spec.rb
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_self_test_config.rb
@@ -194,6 +197,7 @@ signing_key:
 specification_version: 3
 summary: Jasmine Runner for Ruby
 test_files: 
+- spec/bug_fixes_spec.rb
 - spec/config_spec.rb
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_self_test_config.rb