jasmine 1.1.0.rc3 → 1.1.0.rc4

data/jasmine.gemspec

@@ -50,7 +50,6 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'gem-release', ">= 0.0.16"
   s.add_development_dependency 'ci_reporter'
   s.add_development_dependency 'json_pure'
 

data/lib/jasmine/base.rb

@@ -39,19 +39,6 @@ module Jasmine
     end
   end
 
-  def self.cachebust(files, root_dir="", replace=nil, replace_with=nil)
-    require 'digest/md5'
-    files.collect do |file_name|
-      real_file_name = replace && replace_with ? file_name.sub(replace, replace_with) : file_name
-      begin
-        digest = Digest::MD5.hexdigest(File.read("#{root_dir}#{real_file_name}"))
-      rescue
-        digest = "MISSING-FILE"
-      end
-      "#{file_name}?cachebust=#{digest}"
-    end
-  end
-
   def self.rspec2?
     Gem::Specification::find_by_name "rspec", ">= 2.0"
   rescue

data/lib/jasmine/selenium_driver.rb

@@ -45,7 +45,7 @@ module Jasmine
 
     def eval_js(script)
       result = @driver.execute_script(script)
-      JSON.parse("{\"result\":#{result}}")["result"]
+      JSON.parse("{\"result\":#{result}}", :max_nesting => false)["result"]
     end
 
     def json_generate(obj)

data/lib/jasmine/server.rb

@@ -30,7 +30,7 @@ module Jasmine
       body = ERB.new(File.read(File.join(File.dirname(__FILE__), "run.html.erb"))).result(binding)
       [
         200,
-        { 'Content-Type' => 'text/html' },
+        { 'Content-Type' => 'text/html', 'Cache-Control' => 'no-cache', 'Pragma' => 'no-cache' },
         [body]
       ]
     end

data/lib/jasmine/tasks/jasmine.rake

@@ -39,7 +39,7 @@ namespace :jasmine do
   end
 
   task :server => "jasmine:require" do
-    jasmine_config_overrides = './spec/javascripts/support/jasmine_config.rb'
+    jasmine_config_overrides = File.join(Jasmine::Config.new.project_root, 'spec', 'javascripts' ,'support' ,'jasmine_config.rb')
     require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
 
     port = ENV['JASMINE_PORT'] || 8888

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "1.1.0.rc3"
+  VERSION = "1.1.0.rc4"
 end

data/spec/server_spec.rb

@@ -74,8 +74,15 @@ describe "Jasmine.app" do
     it "should return an empty 200 for HEAD requests to /" do
       head "/"
       last_response.status.should == 200
-      last_response.headers.should == { 'Content-Type' => 'text/html' }
+      last_response.headers['Content-Type'].should == 'text/html'
       last_response.body.should == ''
     end
+
+    it "should tell the browser not to cache any assets" do
+      head "/"
+      ['Cache-Control', 'Pragma'].each do |key|
+        last_response.headers[key].should == 'no-cache'
+      end
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jasmine
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc3
+  version: 1.1.0.rc4
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 -04:00
+date: 2011-09-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,18 +60,18 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: gem-release
+  name: ci_reporter
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.16
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ci_reporter
+  name: json_pure
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,20 +81,9 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jasmine-core
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,10 +91,10 @@ dependencies:
         version: 1.1.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,10 +102,10 @@ dependencies:
         version: "1.1"
   type: :runtime
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,10 +113,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,7 +124,7 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id010
 description: Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.
 email: jasmine-js@googlegroups.com
 executables: 
@@ -228,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 520847695
+      hash: 848058131
       segments: 
       - 0
       version: "0"