jasmine 1.1.2 → 1.2.0.rc3

data/.travis.yml

@@ -0,0 +1,57 @@
+before_script:
+  - "sh -e /etc/init.d/xvfb start"
+script: "DISPLAY=:99.0 bundle exec rake"
+
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - "ree"
+  - "jruby"
+  - "rbx"
+
+env:
+ - "RAILS_VERSION=rails2"
+ - "RAILS_VERSION=rails2_3_5"
+ - "RAILS_VERSION=rails3"
+ - "RAILS_VERSION=pojs-rspec1"
+ - "RAILS_VERSION=pojs-rspec2"
+
+matrix:
+  exclude:
+    - rvm: rbx
+      env: RAILS_VERSION=rails2
+    - rvm: rbx
+      env: RAILS_VERSION=rails2_3_5
+    - rvm: rbx
+      env: RAILS_VERSION=pojs-rspec1
+    - rvm: rbx
+      env: RAILS_VERSION=pojs-rspec2
+    - rvm: jruby
+      env: RAILS_VERSION=rails2
+    - rvm: jruby
+      env: RAILS_VERSION=rails2_3_5
+    - rvm: jruby
+      env: RAILS_VERSION=pojs-rspec1
+    - rvm: jruby
+      env: RAILS_VERSION=pojs-rspec2
+    - rvm: 1.9.2
+      env: RAILS_VERSION=rails2
+    - rvm: 1.9.2
+      env: RAILS_VERSION=rails2_3_5
+    - rvm: 1.9.2
+      env: RAILS_VERSION=pojs-rspec1
+    - rvm: 1.9.2
+      env: RAILS_VERSION=pojs-rspec2
+    - rvm: ree
+      env: RAILS_VERSION=pojs-rspec2
+    - rvm: 1.8.7
+      env: RAILS_VERSION=rails2
+    - rvm: 1.8.7
+      env: RAILS_VERSION=rails2_3_5
+    - rvm: 1.8.7
+      env: RAILS_VERSION=pojs-rspec1
+    - rvm: 1.8.7
+      env: RAILS_VERSION=pojs-rspec2
+  allow_failures:
+    - rvm: rbx

data/Gemfile

@@ -1,3 +1,2 @@
 source "http://rubygems.org"
-gem "ci_reporter", :git => "git://github.com/nicksieger/ci_reporter.git", :ref => "af8674c7bddc338fad228c566a03e3b8188d8a22"
 gemspec

data/README.markdown

@@ -1,4 +1,4 @@
-# The Jasmine Gem
+# The Jasmine Gem <a title="Build at Travis CI" href="http://travis-ci.org/#!/pivotal/jasmine-gem"><img src="https://secure.travis-ci.org/pivotal/jasmine-gem.png" /></a>
 
 The [Jasmine](http://github.com/pivotal/jasmine) Ruby Gem is a package of helper code for developing Jasmine projects for Ruby-based web projects (Rails, Sinatra, etc.) or for JavaScript projects where Ruby is a welcome partner. It serves up a project's Jasmine suite in a browser so you can focus on your code instead of manually editing script tags in the Jasmine runner HTML file.
 

data/Rakefile

@@ -12,7 +12,6 @@ else
   require 'spec'
   require 'spec/rake/spectask'
 end
-require 'ci/reporter/rake/rspec'
 
 desc "Run all examples"
 if Jasmine::Dependencies.rspec2?
@@ -25,14 +24,14 @@ else
   end
 end
 
-task :spec => ['jasmine:copy_examples_to_gem', 'ci:setup:rspec']
+task :spec => ['jasmine:copy_examples_to_gem']
 
 task :default => :spec
 
 namespace :jasmine do
   require "jasmine-core"
   require './spec/jasmine_self_test_config'
-  task :server do          
+  task :server do
     port = ENV['JASMINE_PORT'] || 8888
     JasmineSelfTestConfig.new.start_server(port)
 

data/generators/jasmine/jasmine_generator.rb

@@ -13,20 +13,12 @@ class JasmineGenerator < Rails::Generator::Base
     m.file "jasmine-example/spec/SpecHelper.js", "spec/javascripts/helpers/SpecHelper.js"
 
     m.directory "spec/javascripts/support"
-    m.file "spec/javascripts/support/jasmine_runner.rb", "spec/javascripts/support/jasmine_runner.rb"
-    m.file "spec/javascripts/support/jasmine_config.rb", "spec/javascripts/support/jasmine_config.rb"
     m.file "spec/javascripts/support/jasmine-rails.yml", "spec/javascripts/support/jasmine.yml"
     m.readme "INSTALL"
 
-    unless ::Rails::VERSION::STRING[0,1] == "3"
-      m.directory "lib/tasks"
-      m.file "lib/tasks/jasmine.rake", "lib/tasks/jasmine.rake"
-    end
+    m.directory "lib/tasks"
+    m.file "lib/tasks/jasmine.rake", "lib/tasks/jasmine.rake"
     m
   end
 
-  def file_name
-    "create_blog"
-  end
-
-end
+end

data/generators/jasmine/templates/jasmine-example/SpecRunner.html

@@ -10,11 +10,11 @@
   <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine.js"></script>
   <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine-html.js"></script>
 
-  <!-- include spec files here... -->
+  <!-- include source files here... -->
   <script type="text/javascript" src="spec/SpecHelper.js"></script>
   <script type="text/javascript" src="spec/PlayerSpec.js"></script>
 
-  <!-- include source files here... -->
+  <!-- include spec files here... -->
   <script type="text/javascript" src="src/Player.js"></script>
   <script type="text/javascript" src="src/Song.js"></script>
 

data/jasmine.gemspec

@@ -46,7 +46,15 @@ Gem::Specification.new do |s|
     end
     # for development & test of Rails 2 Generators
     s.add_development_dependency 'rails', '2.3.11', "< 3"
-    s.add_development_dependency 'rack', '>= 1.1', "< 1.2"
+  elsif ENV['RAILS_VERSION'] == 'rails2_3_5'
+    if ENV["RUBY_VERSION"] =~ /1\.8\.6/
+      #1.3.2 buffer overflows
+      s.add_development_dependency 'rspec', '= 1.3.1'
+    else
+      s.add_development_dependency 'rspec', '>= 1.3.1', '< 2'
+    end
+    # for development & test of Rails 2 Generators
+    s.add_development_dependency 'rails', '= 2.3.5'
   else
     # for development & test of Rails 3 Generators
     s.add_development_dependency 'rspec', '>= 2.5.0'
@@ -55,11 +63,10 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'ci_reporter'
   s.add_development_dependency 'json_pure'
 
-  s.add_dependency 'jasmine-core', ">= 1.1.0"
-  s.add_dependency 'rack', '>= 1.1'
+  s.add_dependency 'jasmine-core', ">= 1.2.0.rc3"
+  s.add_dependency 'rack', '~> 1.0'
   s.add_dependency 'rspec', '>= 1.3.1'
   s.add_dependency 'selenium-webdriver', '>= 0.1.3'
 end

data/lib/jasmine/base.rb

@@ -30,7 +30,7 @@ module Jasmine
     true
   end
 
-  def self.wait_for_listener(port, name = "required process", seconds_to_wait = 10)
+  def self.wait_for_listener(port, name = "required process", seconds_to_wait = 20)
     time_out_at = Time.now + seconds_to_wait
     until server_is_listening_on "localhost", port
       sleep 0.1
@@ -39,4 +39,8 @@ module Jasmine
     end
   end
 
+  def self.runner_filepath
+    File.expand_path(File.join(File.dirname(__FILE__), "runner.rb"))
+  end
+
 end

data/lib/jasmine/command_line_tool.rb

@@ -35,8 +35,6 @@ module Jasmine
         copy_unless_exists('jasmine-example/src/Song.js', 'public/javascripts/Song.js')
         copy_unless_exists('jasmine-example/spec/PlayerSpec.js', 'spec/javascripts/PlayerSpec.js')
         copy_unless_exists('jasmine-example/spec/SpecHelper.js', 'spec/javascripts/helpers/SpecHelper.js')
-        copy_unless_exists('spec/javascripts/support/jasmine_runner.rb')
-        copy_unless_exists('spec/javascripts/support/jasmine_config.rb')
 
         rails_tasks_dir = dest_path('lib/tasks')
         if File.exist?(rails_tasks_dir)

data/lib/jasmine/config.rb

@@ -16,9 +16,14 @@ module Jasmine
     end
 
     def start_server(port = 8888)
-      server = Rack::Server.new(:Port => port, :AccessLog => [])
-      server.instance_variable_set(:@app, Jasmine.app(self)) # workaround for Rack bug, when Rack > 1.2.1 is released Rack::Server.start(:app => Jasmine.app(self)) will work
-      server.start
+      if defined? Rack::Server # Rack ~>1.0 compatibility
+        server = Rack::Server.new(:Port => port, :AccessLog => [])
+        server.instance_variable_set(:@app, Jasmine.app(self)) # workaround for Rack bug, when Rack > 1.2.1 is released Rack::Server.start(:app => Jasmine.app(self)) will work
+        server.start
+      else
+        handler = Rack::Handler.get('webrick')
+        handler.run(Jasmine.app(self), :Port => port, :AccessLog => [])
+      end
     end
 
     def start
@@ -32,10 +37,15 @@ module Jasmine
     end
 
     def start_jasmine_server
+      require 'json'
       @jasmine_server_port = jasmine_port
-      Thread.new do
-        start_server(@jasmine_server_port)
+      t = Thread.new do
+        begin
+          start_server(@jasmine_server_port)
+        rescue ChildProcess::TimeoutError; end
+        #ignore bad exits
       end
+      t.abort_on_exception = true
       Jasmine::wait_for_listener(@jasmine_server_port, "jasmine server")
       puts "jasmine server started."
     end
@@ -70,7 +80,7 @@ module Jasmine
       chosen, negated = [positive, negative].collect do |patterns|
         patterns.collect do |pattern|
           matches = Dir.glob(File.join(dir, pattern.gsub(/^!/,'')))
-          matches.collect {|f| f.sub("#{dir}/", "")}.sort
+          matches.empty? && !(pattern =~ /\*|^\!/) ? pattern : matches.collect {|f| f.sub("#{dir}/", "")}.sort
         end.flatten.uniq
       end
       chosen - negated
@@ -159,4 +169,4 @@ module Jasmine
       end
     end
   end
-end
+end

data/lib/jasmine/dependencies.rb

@@ -10,10 +10,18 @@ module Jasmine
         safe_gem_check("rails", "~> 2.3")
       end
 
+      def legacy_rails?
+        safe_gem_check("rails", "< 2.3.11")
+      end
+
       def rails3?
         safe_gem_check("rails", ">= 3.0")
       end
 
+      def rails_3_asset_pipeline?
+        rails3? && Rails.respond_to?(:application) && Rails.application.respond_to?(:assets) && Rails.application.assets
+      end
+
       private
       def safe_gem_check(gem_name, version_string)
         if Gem::Specification.respond_to?(:find_by_name)

data/lib/jasmine/railtie.rb

@@ -15,6 +15,7 @@ module Jasmine
 
     rake_tasks do
       load "jasmine/tasks/jasmine.rake"
+      load "jasmine/tasks/jasmine_rails3.rake"
     end
   end
-end
+end

data/lib/jasmine/run.html.erb

@@ -18,13 +18,13 @@
       var jasmineEnv = jasmine.getEnv();
 
       jsApiReporter = new jasmine.JsApiReporter();
-      var trivialReporter = new jasmine.TrivialReporter();
+      var htmlReporter = new jasmine.HtmlReporter();
 
       jasmineEnv.addReporter(jsApiReporter);
-      jasmineEnv.addReporter(trivialReporter);
+      jasmineEnv.addReporter(htmlReporter);
 
       jasmineEnv.specFilter = function(spec) {
-        return trivialReporter.specFilter(spec);
+        return htmlReporter.specFilter(spec);
       };
 
       var currentWindowOnload = window.onload;

data/lib/{generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb → jasmine/runner.rb}

@@ -2,7 +2,7 @@ $:.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'))
+jasmine_config_overrides = File.expand_path(File.join(Dir.pwd, 'spec', 'javascripts', 'support', 'jasmine_config.rb'))
 require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
 if Jasmine::Dependencies.rspec2?
   require 'rspec'

data/lib/jasmine/server.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'rack/utils'
 require 'jasmine-core'
 
 module Jasmine
@@ -30,7 +31,7 @@ module Jasmine
       body = ERB.new(File.read(File.join(File.dirname(__FILE__), "run.html.erb"))).result(binding)
       [
         200,
-        { 'Content-Type' => 'text/html', 'Cache-Control' => 'no-cache', 'Pragma' => 'no-cache' },
+        { 'Content-Type' => 'text/html', 'Pragma' => 'no-cache' },
         [body]
       ]
     end
@@ -71,9 +72,29 @@ module Jasmine
     end
   end
 
+  class CacheControl
+    def initialize(app)
+      @app, @content_type = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = Rack::Utils::HeaderHash.new(headers)
+      headers['Cache-Control'] ||= "max-age=0, private, must-revalidate"
+      [status, headers, body]
+    end
+  end
+
+
   def self.app(config)
     Rack::Builder.app do
       use Rack::Head
+      use Jasmine::CacheControl
+      if Jasmine::Dependencies.rails_3_asset_pipeline?
+        map('/assets') do
+          run Rails.application.assets
+        end
+      end
 
       map('/run.html')         { run Jasmine::Redirect.new('/') }
       map('/__suite__')        { run Jasmine::FocusedSuite.new(config) }

data/lib/jasmine/tasks/jasmine.rake

@@ -26,13 +26,16 @@ namespace :jasmine do
       RSpec::Core::RakeTask.new(:jasmine_continuous_integration_runner) do |t|
         t.rspec_opts = ["--colour", "--format", ENV['JASMINE_SPEC_FORMAT'] || "progress"]
         t.verbose = true
-        t.pattern = ['spec/javascripts/support/jasmine_runner.rb']
+        if Jasmine::Dependencies.rails_3_asset_pipeline?
+          t.ruby_opts = ["-r #{File.expand_path(File.join(::Rails.root, 'config', 'environment'))}"]
+        end
+        t.pattern = [Jasmine.runner_filepath]
       end
     else
       Spec::Rake::SpecTask.new(:jasmine_continuous_integration_runner) do |t|
         t.spec_opts = ["--color", "--format", ENV['JASMINE_SPEC_FORMAT'] || "specdoc"]
         t.verbose = true
-        t.spec_files = ['spec/javascripts/support/jasmine_runner.rb']
+        t.spec_files = [Jasmine.runner_filepath]
       end
     end
     Rake::Task["jasmine_continuous_integration_runner"].invoke

data/lib/jasmine/tasks/jasmine_rails3.rake

@@ -0,0 +1 @@
+task "jasmine:require" => [:environment]

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "1.1.2"
+  VERSION = "1.2.0.rc3"
 end

data/spec/config_spec.rb

@@ -162,6 +162,18 @@ describe Jasmine::Config do
         end
       end
 
+      describe "should permit explicity-declared filenames to pass through regardless of their existence" do
+        before(:each) do
+          Dir.stub!(:glob).and_return { |glob_string| [] }
+          fake_config = Hash.new.stub!(:[]).and_return { |x| ["file1.ext", "!file2.ext", "**/*file3.ext"] }
+          @config.stub!(:simple_config).and_return(fake_config)
+        end
+
+        it "should contain explicitly files" do
+          @config.src_files.should == ["file1.ext"]
+        end
+      end
+
       describe "should allow .gitignore style negation (!pattern)" do
         before(:each) do
           Dir.stub!(:glob).and_return { |glob_string| [glob_string] }
@@ -305,4 +317,5 @@ describe Jasmine::Config do
       end
     end
   end
+
 end

data/spec/dependencies_spec.rb

@@ -3,54 +3,131 @@ require 'spec_helper'
 #rspec 1 fails to stub respond_to
 if Jasmine::Dependencies.rspec2?
   describe Jasmine::Dependencies do
+    module Rails
+    end
 
-    context "with ruby gems > 1.8" do
+    context "with ruby_gems > 1.8" do
       before do
         Gem::Specification.should_receive(:respond_to?).with(:find_by_name).and_return(true)
       end
 
-      context "and rspec 2" do
-        before do
-          Gem::Specification.should_receive(:find_by_name).with("rspec", ">= 2.0").and_raise(Gem::LoadError)
+      describe ".rspec2?" do
+        subject { Jasmine::Dependencies.rspec2? }
+        context "when rspec 2 is present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rspec", ">= 2.0").and_return(true)
+          end
+          it { should be_true }
         end
-        it "should return the correct results" do
-          Jasmine::Dependencies.rspec2?.should be false
+        context "when rspec 2 is not present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rspec", ">= 2.0").and_raise(Gem::LoadError)
+          end
+          it { should be_false }
         end
+      end
 
-        it "should not raise an error" do
-          lambda do
-            Jasmine::Dependencies.rspec2?
-          end.should_not raise_error(Gem::LoadError)
+      describe ".rails2?" do
+        subject { Jasmine::Dependencies.rails2? }
+        context "when rails 2 is present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", "~> 2.3").and_return(true)
+          end
+          it { should be_true }
+        end
+        context "when rails 2 is not present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", "~> 2.3").and_raise(Gem::LoadError)
+          end
+          it { should be_false }
         end
       end
 
-      context "and rails 2" do
-        before do
-          Gem::Specification.should_receive(:find_by_name).with("rails", "~> 2.3").and_raise(Gem::LoadError)
+      describe ".legacy_rails?" do
+        subject { Jasmine::Dependencies.legacy_rails? }
+        context "when rails < 2.3.11 is present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", "< 2.3.11").and_return(true)
+          end
+          it { should be_true }
         end
-        it "should return the correct results" do
-          Jasmine::Dependencies.rails2?.should be false
+        context "when rails < 2.3.11 is not present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", "< 2.3.11").and_raise(Gem::LoadError)
+          end
+          it { should be_false }
         end
+      end
 
-        it "should not raise an error" do
-          lambda do
-            Jasmine::Dependencies.rails2?
-          end.should_not raise_error(Gem::LoadError)
+      describe ".rails3?" do
+        subject { Jasmine::Dependencies.rails3? }
+        context "when rails 3 is present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_return(true)
+          end
+          it { should be_true }
+        end
+        context "when rails 3 is not present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_raise(Gem::LoadError)
+          end
+          it { should be_false }
         end
       end
 
-      context "and rails 3" do
+      describe ".rails_3_asset_pipeline?" do
+        subject { Jasmine::Dependencies.rails_3_asset_pipeline? }
+        let(:application) { double(:application) }
         before do
-          Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_raise(Gem::LoadError)
+          Rails.stub(:respond_to?).with(:application).and_return(respond_to_application)
+          Rails.stub(:application).and_return(application)
         end
-        it "should return the correct results" do
-          Jasmine::Dependencies.rails3?.should be false
+        context "when rails 3 is present and the application pipeline is in use" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_return(true)
+            application.stub(:assets).and_return(rails_application_assets) 
+          end
+          let(:rails3_present) { true }
+          let(:respond_to_application) { true }
+          let(:rails_application_assets) { true }
+          it { should be_true }
         end
-
-        it "should not raise an error" do
-          lambda do
-            Jasmine::Dependencies.rails3?
-          end.should_not raise_error(Gem::LoadError)
+        context "when rails 3 is present and the application pipeline is not in use" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_return(true)
+            application.stub(:assets).and_return(rails_application_assets) 
+          end
+          let(:rails3_present) { true }
+          let(:respond_to_application) { true }
+          let(:rails_application_assets) { false }
+          it { should be_false }
+        end
+        context "when rails 3 is present but not loaded" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_return(true)
+            application.stub(:assets).and_return(rails_application_assets) 
+          end
+          let(:rails3_present) { true }
+          let(:respond_to_application) { false }
+          let(:rails_application_assets) { false }
+          it { should be_false }
+        end
+        context "when rails 3 is present but doesn't respond to assets" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_return(true)
+          end
+          let(:rails3_present) { true }
+          let(:respond_to_application) { true }
+          it { should be_false }
+        end
+        context "when rails 3 is not present" do
+          before do
+            Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_raise(Gem::LoadError)
+          end
+          let(:rails3_present) { false }
+          let(:respond_to_application) { false }
+          let(:rails_application_assets) { false }
+          it { should be_false }
         end
       end
     end
@@ -59,28 +136,101 @@ if Jasmine::Dependencies.rspec2?
       before do
         Gem::Specification.should_receive(:respond_to?).with(:find_by_name).and_return(false)
       end
-      context "and rspec 2" do
-        it "should not break when it is not present" do
-          Gem.should_receive(:available?).with("rspec", ">= 2.0").and_return false
-          Jasmine::Dependencies.rspec2?.should be false
+
+      describe ".rspec2?" do
+        subject { Jasmine::Dependencies.rspec2? }
+        before do
+          Gem.should_receive(:available?).with("rspec", ">= 2.0").and_return(rspec2_present)
+        end
+        context "when rspec 2 is present" do
+          let(:rspec2_present) { true }
+          it { should be_true }
+        end
+        context "when rspec 2 is not present" do
+          let(:rspec2_present) { false }
+          it { should be_false }
+        end
+      end
+
+      describe ".rails2?" do
+        subject { Jasmine::Dependencies.rails2? }
+        before do
+          Gem.should_receive(:available?).with("rails", "~> 2.3").and_return(rails2_present)
+        end
+        context "when rails 2 is present" do
+          let(:rails2_present) { true }
+          it { should be_true }
+        end
+        context "when rails 2 is not present" do
+          let(:rails2_present) { false }
+          it { should be_false }
+        end
+      end
+
+      describe ".legacy_rails?" do
+        subject { Jasmine::Dependencies.legacy_rails? }
+        before do
+          Gem.should_receive(:available?).with("rails", "< 2.3.11").and_return(legacy_rails_present)
+        end
+        context "when rails < 2.3.11 is present" do
+          let(:legacy_rails_present) { true }
+          it { should be_true }
+        end
+        context "when rails < 2.3.11 is not present" do
+          let(:legacy_rails_present) { false }
+          it { should be_false }
         end
       end
 
-      context "and rails 2" do
-        it "should not break when it is not present" do
-          Gem.should_receive(:available?).with("rails", "~> 2.3").and_return false
-          Jasmine::Dependencies.rails2?.should be false
+      describe ".rails3?" do
+        subject { Jasmine::Dependencies.rails3? }
+        before do
+          Gem.should_receive(:available?).with("rails", ">= 3.0").and_return(rails3_present)
+        end
+        context "when rails 3 is present" do
+          let(:rails3_present) { true }
+          it { should be_true }
+        end
+        context "when rails 3 is not present" do
+          let(:rails3_present) { false }
+          it { should be_false }
         end
       end
 
-      context "and rails 3" do
-        it "should not break when it is not present" do
-          Gem.should_receive(:available?).with("rails", ">= 3.0").and_return false
-          Jasmine::Dependencies.rails3?.should be false
+      describe ".rails_3_asset_pipeline?" do
+        subject { Jasmine::Dependencies.rails_3_asset_pipeline? }
+        let(:application) { double(:application, :assets => rails_application_assets)}
+        before do
+          Gem.should_receive(:available?).with("rails", ">= 3.0").and_return(rails3_present)
+          Rails.stub(:respond_to?).with(:application).and_return(respond_to_application)
+          Rails.stub(:application).and_return(application)
+        end
+        context "when rails 3 is present and the application pipeline is in use" do
+          let(:rails3_present) { true }
+          let(:respond_to_application) { true }
+          let(:rails_application_assets) { true }
+          it { should be_true }
+        end
+        context "when rails 3 is present and the application pipeline is not in use" do
+          let(:rails3_present) { true }
+          let(:respond_to_application) { true }
+          let(:rails_application_assets) { false }
+          it { should be_false }
+        end
+        context "when rails 3 is present but not loaded" do
+          let(:rails3_present) { true }
+          let(:respond_to_application) { false }
+          let(:rails_application_assets) { false }
+          it { should be_false }
+        end
+        context "when rails 3 is not present" do
+          let(:rails3_present) { false }
+          let(:respond_to_application) { false }
+          let(:rails_application_assets) { false }
+          it { should be_false }
         end
       end
     end
 
   end
-
 end

data/spec/jasmine_pojs_spec.rb

@@ -21,8 +21,6 @@ describe "POJS jasmine install" do
 
     it "should find the Jasmine configuration files" do
       File.exists?("spec/javascripts/support/jasmine.yml").should == true
-      File.exists?("spec/javascripts/support/jasmine_runner.rb").should == true
-      File.exists?("spec/javascripts/support/jasmine_config.rb").should == true
     end
 
     it "should find the Jasmine example files" do
@@ -33,8 +31,6 @@ describe "POJS jasmine install" do
       File.exists?("spec/javascripts/helpers/SpecHelper.js").should == true
 
       File.exists?("spec/javascripts/support/jasmine.yml").should == true
-      File.exists?("spec/javascripts/support/jasmine_runner.rb").should == true
-      File.exists?("spec/javascripts/support/jasmine_config.rb").should == true
     end
 
     it "should show jasmine rake task" do

data/spec/jasmine_rails2_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
-if Jasmine::Dependencies.rails2?
+if Jasmine::Dependencies.rails2? && !Jasmine::Dependencies.legacy_rails?
 
   describe "A Rails 2 app" do
 
@@ -17,7 +17,7 @@ if Jasmine::Dependencies.rails2?
 
     context "before Jasmine has been installed" do
 
-      it "should not the jasmine:install generator" do
+      it "should not show the jasmine:install generator" do
         output = `./script/generate --help`
         output.should_not include('jasmine:install')
       end
@@ -62,8 +62,6 @@ if Jasmine::Dependencies.rails2?
 
         it "should find the Jasmine configuration files" do
           File.exists?("spec/javascripts/support/jasmine.yml").should == true
-          File.exists?("spec/javascripts/support/jasmine_runner.rb").should == true
-          File.exists?("spec/javascripts/support/jasmine_config.rb").should == true
         end
 
         it "should find the Jasmine example files" do
@@ -74,8 +72,6 @@ if Jasmine::Dependencies.rails2?
           File.exists?("spec/javascripts/helpers/SpecHelper.js").should == true
 
           File.exists?("spec/javascripts/support/jasmine.yml").should == true
-          File.exists?("spec/javascripts/support/jasmine_runner.rb").should == true
-          File.exists?("spec/javascripts/support/jasmine_config.rb").should == true
         end
 
         it "should show jasmine rake task" do

data/spec/jasmine_rails3_spec.rb

@@ -49,8 +49,6 @@ if Jasmine::Dependencies.rails3?
 
           File.exists?("spec/javascripts/helpers/.gitkeep").should == true
           File.exists?("spec/javascripts/support/jasmine.yml").should == true
-          File.exists?("spec/javascripts/support/jasmine_runner.rb").should == true
-          File.exists?("spec/javascripts/support/jasmine_config.rb").should == true
         end
       end
 

data/spec/server_spec.rb

@@ -15,6 +15,12 @@ describe "Jasmine.app" do
     Jasmine.app(config)
   end
 
+  it "includes no-cache headers for specs" do
+    get "/__spec__/example_spec.js"
+    last_response.headers.should have_key("Cache-Control")
+    last_response.headers["Cache-Control"].should == "max-age=0, private, must-revalidate"
+  end
+
   it "should serve static files from spec dir under __spec__" do
     get "/__spec__/example_spec.js"
     last_response.status.should == 200
@@ -80,7 +86,7 @@ describe "Jasmine.app" do
 
     it "should tell the browser not to cache any assets" do
       head "/"
-      ['Cache-Control', 'Pragma'].each do |key|
+      ['Pragma'].each do |key|
         last_response.headers[key].should == 'no-cache'
       end
     end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 1.2.0.rc3
+  prerelease: 6
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -11,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70282392007960 !ruby/object:Gem::Requirement
+  requirement: &70119527196580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +23,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70282392007960
+  version_requirements: *70119527196580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70282392004820 !ruby/object:Gem::Requirement
+  requirement: &70119527211980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +34,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70282392004820
+  version_requirements: *70119527211980
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70282392002860 !ruby/object:Gem::Requirement
+  requirement: &70119527210920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +45,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70282392002860
+  version_requirements: *70119527210920
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70282392001920 !ruby/object:Gem::Requirement
+  requirement: &70119527210060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,21 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282392001920
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: &70282392000880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70282392000880
+  version_requirements: *70119527210060
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70282391999500 !ruby/object:Gem::Requirement
+  requirement: &70119527209120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,32 +67,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282391999500
+  version_requirements: *70119527209120
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &70282391997920 !ruby/object:Gem::Requirement
+  requirement: &70119527208320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70282391997920
+  version_requirements: *70119527208320
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70282391996620 !ruby/object:Gem::Requirement
+  requirement: &70119527207280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282391996620
+  version_requirements: *70119527207280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70282391995520 !ruby/object:Gem::Requirement
+  requirement: &70119527206480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +100,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70282391995520
+  version_requirements: *70119527206480
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70282391994420 !ruby/object:Gem::Requirement
+  requirement: &70119527205400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,7 +111,7 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70282391994420
+  version_requirements: *70119527205400
 description: Test your JavaScript without any framework dependencies, in any environment,
   and with a nice descriptive syntax.
 email: jasmine-js@googlegroups.com
@@ -133,6 +121,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - HOW_TO_TEST.markdown
 - MIT.LICENSE
@@ -150,8 +139,6 @@ files:
 - generators/jasmine/templates/lib/tasks/jasmine.rake
 - generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml
 - generators/jasmine/templates/spec/javascripts/support/jasmine.yml
-- generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb
-- generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb
 - jasmine.gemspec
 - lib/generators/jasmine/examples/USAGE
 - lib/generators/jasmine/examples/examples_generator.rb
@@ -163,15 +150,10 @@ files:
 - lib/generators/jasmine/install/install_generator.rb
 - lib/generators/jasmine/install/templates/spec/javascripts/helpers/.gitkeep
 - lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml
-- lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_config.rb
-- lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_runner.rb
-- lib/generators/jasmine/jasmine_generator.rb
 - lib/generators/jasmine/templates/INSTALL
 - lib/generators/jasmine/templates/lib/tasks/jasmine.rake
 - lib/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml
 - lib/generators/jasmine/templates/spec/javascripts/support/jasmine.yml
-- lib/generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb
-- lib/generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb
 - lib/jasmine.rb
 - lib/jasmine/base.rb
 - lib/jasmine/command_line_tool.rb
@@ -183,10 +165,12 @@ files:
 - lib/jasmine/firebug/firebug.rb
 - lib/jasmine/railtie.rb
 - lib/jasmine/run.html.erb
+- lib/jasmine/runner.rb
 - lib/jasmine/selenium_driver.rb
 - lib/jasmine/server.rb
 - lib/jasmine/spec_builder.rb
 - lib/jasmine/tasks/jasmine.rake
+- lib/jasmine/tasks/jasmine_rails3.rake
 - lib/jasmine/version.rb
 - spec/config_spec.rb
 - spec/dependencies_spec.rb
@@ -203,7 +187,6 @@ files:
 - spec/jasmine_self_test_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://pivotal.github.com/jasmine
 licenses: []
 post_install_message: 
@@ -219,19 +202,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2801835989228056808
+      hash: 4256175879128965687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2801835989228056808
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: JavaScript BDD framework

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

@@ -1,23 +0,0 @@
-module Jasmine
-  class Config
-
-    # Add your overrides or custom config code here
-
-  end
-end
-
-
-# Note - this is necessary for rspec2, which has removed the backtrace
-module Jasmine
-  class SpecBuilder
-    def declare_spec(parent, spec)
-      me = self
-      example_name = spec["name"]
-      @spec_ids << spec["id"]
-      backtrace = @example_locations[parent.description + " " + example_name]
-      parent.it example_name, {} do
-        me.report_spec(spec["id"])
-      end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-$:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
-
-require 'rubygems'
-require 'jasmine'
-jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
-require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
-if Jasmine::Dependencies.rspec2?
-  require 'rspec'
-else
-  require 'spec'
-end
-
-jasmine_config = Jasmine::Config.new
-spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
-
-should_stop = false
-
-if Jasmine::Dependencies.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
-should_stop = true
-spec_builder.declare_suites

data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_config.rb

@@ -1,23 +0,0 @@
-module Jasmine
-  class Config
-
-    # Add your overrides or custom config code here
-
-  end
-end
-
-
-# Note - this is necessary for rspec2, which has removed the backtrace
-module Jasmine
-  class SpecBuilder
-    def declare_spec(parent, spec)
-      me = self
-      example_name = spec["name"]
-      @spec_ids << spec["id"]
-      backtrace = @example_locations[parent.description + " " + example_name]
-      parent.it example_name, {} do
-        me.report_spec(spec["id"])
-      end
-    end
-  end
-end

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

@@ -1,20 +0,0 @@
-$:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
-
-require 'rubygems'
-require 'jasmine'
-require 'rspec'
-jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
-require jasmine_config_overrides if File.exists?(jasmine_config_overrides)
-
-jasmine_config = Jasmine::Config.new
-spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
-
-should_stop = false
-
-RSpec.configuration.after(:suite) do
-  spec_builder.stop if should_stop
-end
-
-spec_builder.start
-should_stop = true
-spec_builder.declare_suites

data/lib/generators/jasmine/jasmine_generator.rb

@@ -1,32 +0,0 @@
-class JasmineGenerator < Rails::Generator::Base
-  def manifest
-    m = ::Rails::Generator::Manifest.new
-
-    m.directory "public/javascripts"
-    m.file "jasmine-example/src/Player.js", "public/javascripts/Player.js"
-    m.file "jasmine-example/src/Song.js", "public/javascripts/Song.js"
-
-    m.directory "spec/javascripts"
-    m.file "jasmine-example/spec/PlayerSpec.js", "spec/javascripts/PlayerSpec.js"
-
-    m.directory "spec/javascripts/helpers"
-    m.file "jasmine-example/spec/SpecHelper.js", "spec/javascripts/helpers/SpecHelper.js"
-
-    m.directory "spec/javascripts/support"
-    m.file "spec/javascripts/support/jasmine_runner.rb", "spec/javascripts/support/jasmine_runner.rb"
-    m.file "spec/javascripts/support/jasmine_config.rb", "spec/javascripts/support/jasmine_config.rb"
-    m.file "spec/javascripts/support/jasmine-rails.yml", "spec/javascripts/support/jasmine.yml"
-    m.readme "INSTALL"
-
-    unless ::Rails::VERSION::STRING[0,1] == "3"
-      m.directory "lib/tasks"
-      m.file "lib/tasks/jasmine.rake", "lib/tasks/jasmine.rake"
-    end
-    m
-  end
-
-  def file_name
-    "create_blog"
-  end
-
-end

data/lib/generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb

@@ -1,23 +0,0 @@
-module Jasmine
-  class Config
-
-    # Add your overrides or custom config code here
-
-  end
-end
-
-
-# Note - this is necessary for rspec2, which has removed the backtrace
-module Jasmine
-  class SpecBuilder
-    def declare_spec(parent, spec)
-      me = self
-      example_name = spec["name"]
-      @spec_ids << spec["id"]
-      backtrace = @example_locations[parent.description + " " + example_name]
-      parent.it example_name, {} do
-        me.report_spec(spec["id"])
-      end
-    end
-  end
-end