jasmine 0.4.1 → 0.4.2

data/README.markdown

@@ -1,21 +1,37 @@
 jasmine-ruby
 ============
 
-    git clone git://github.com/ragaskar/jasmine-ruby.git
-    cd jasmine-ruby
-    rake jeweler:build
-    rake jeweler:install
-    cd ..
-    mkdir test-jasmine
-    cd test-jasmine
-    jasmine init
-    rake jasmine
+Jasmine Ruby dynamically serves HTML suites for [Jasmine](http://github.com/pivotal/jasmine)
 
-then
+To use:
 
-    http://localhost:8888
+`(sudo) gem install jasmine`
 
-and go!
+Post-installation:
 
-After a few more touch-ups, I'll update the gemcutter.org gem ...
+For Rails support, use
 
+`script/generate jasmine`
+
+For other projects, use
+
+`jasmine init`
+
+After initializing a project, you may
+
+`rake jasmine`
+
+to set up a server. Opening localhost:8888 in a web browser will now run your jasmine specs.
+
+You may also
+
+`rake jasmine:ci`
+
+which will run your Jasmine suites using selenium and rspec. This task is suitable for running in continuous integration environments.
+
+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.
+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/bin/jasmine

@@ -32,14 +32,14 @@ if ARGV[0] == 'init'
   copy_unless_exists('spec/javascripts/SpecHelper.js')
   copy_unless_exists('spec/javascripts/ExampleSpec.js')
   copy_unless_exists('spec/javascripts/support/jasmine_config.rb')
-  copy_unless_exists('spec/javascripts/support/jasmine_spec.rb')
+  copy_unless_exists('spec/javascripts/support/jasmine_runner.rb')
 
   rails_tasks_dir = dest_path('lib/tasks')
   if File.exist?(rails_tasks_dir)
     copy_unless_exists('lib/tasks/jasmine.rake')
-    copy_unless_exists('spec/javascripts/support/jasmine-rails.yaml', 'spec/javascripts/support/jasmine.yaml')
+    copy_unless_exists('spec/javascripts/support/jasmine-rails.yml', 'spec/javascripts/support/jasmine.yml')
   else
-    copy_unless_exists('spec/javascripts/support/jasmine.yaml')
+    copy_unless_exists('spec/javascripts/support/jasmine.yml')
     write_mode = 'w'
     if File.exist?(dest_path('Rakefile'))
       load dest_path('Rakefile')

data/generators/jasmine/jasmine_generator.rb

@@ -8,8 +8,8 @@ class JasmineGenerator < Rails::Generator::Base
 
       m.directory "spec/javascripts/support"
       m.file "spec/javascripts/support/jasmine_config.rb", "spec/javascripts/support/jasmine_config.rb"
-      m.file "spec/javascripts/support/jasmine_spec.rb", "spec/javascripts/support/jasmine_spec.rb"
-      m.file "spec/javascripts/support/jasmine-rails.yaml", "spec/javascripts/support/jasmine.yaml"
+      m.file "spec/javascripts/support/jasmine_runner.rb", "spec/javascripts/support/jasmine_runner.rb"
+      m.file "spec/javascripts/support/jasmine-rails.yml", "spec/javascripts/support/jasmine.yml"
 
       m.directory "lib/tasks"
       m.file "lib/tasks/jasmine.rake", "lib/tasks/jasmine.rake"

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

@@ -7,7 +7,7 @@ namespace :jasmine do
   Spec::Rake::SpecTask.new(:ci) do |t|
     t.spec_opts = ["--color", "--format", "specdoc"]
     t.verbose = true
-    t.spec_files = ['spec/javascripts/support/jasmine_spec.rb']
+    t.spec_files = ['spec/javascripts/support/jasmine_runner.rb']
   end
     task :server do
       require 'spec/javascripts/support/jasmine_config'

data/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml

@@ -0,0 +1,20 @@
+#  Return an array of filepaths relative to src_dir to include before jasmine specs.
+src_files:
+  - javascripts/prototype.js
+  - javascripts/effects.js
+  - javascripts/controls.js
+  - javascripts/dragdrop.js
+  - javascripts/application.js
+
+#  Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+stylesheets:
+  - stylesheets/**/*.css
+#  Return an array of filepaths relative to spec_dir to include before jasmine specs.
+spec_files:
+  - **/*.js
+
+#  Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+src_dir: public
+
+#  Spec directory path. Your spec_files must be returned relative to this path.
+spec_dir: spec/javascripts

data/generators/jasmine/templates/spec/javascripts/support/jasmine.yml

@@ -0,0 +1,20 @@
+#  Return an array of filepaths relative to src_dir to include before jasmine specs.
+#src_files:
+#  - lib/source1.js
+#  - lib/source2.js
+#  - dist/**/*.js
+
+#  Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+#stylesheets:
+#  - css/style.css
+#  - stylesheets/*.css
+
+#  Return an array of filepaths relative to spec_dir to include before jasmine specs.
+#spec_files:
+#  - **/*.js
+
+#  Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+#src_dir:
+
+#  Spec directory path. Your spec_files must be returned relative to this path.
+#spec_dir: spec/javascripts

data/jasmine/contrib/ruby/jasmine_spec_builder.rb

@@ -58,7 +58,7 @@ module Jasmine
         sleep 0.1
       end
 
-      @suites = eval_js('JSON.stringify(jsApiReporter.suites())')
+      @suites = eval_js("var result = jsApiReporter.suites(); if (window.Prototype && result && result.toJSON) { result.toJSON()} else { JSON.stringify(result) }")
     end
 
     def results_for(spec_id)
@@ -69,7 +69,7 @@ module Jasmine
     def load_results
       @spec_results = {}
       @spec_ids.each_slice(50) do |slice|
-        @spec_results.merge!(eval_js("JSON.stringify(jsApiReporter.resultsForSpecs(#{JSON.generate(slice)}))"))
+        @spec_results.merge!(eval_js("var result = jsApiReporter.resultsForSpecs(#{JSON.generate(slice)}); if (window.Prototype && result && result.toJSON) { result.toJSON()} else { JSON.stringify(result) }"))        
       end
       @spec_results
     end

data/jasmine/lib/jasmine-0.10.0.js

@@ -2257,5 +2257,5 @@ jasmine.version_= {
   "major": 0,
   "minor": 10,
   "build": 0,
-  "revision": 1261768736
+  "revision": 1264648722
   };

data/jasmine/lib/jasmine.css

@@ -82,5 +82,5 @@ body .run_spec {
 
 #jasmine_content {
   position:fixed;
-  left: 100%;
+  right: 100%;
 }

data/spec/config_spec.rb

@@ -4,11 +4,14 @@ describe Jasmine::Config do
   before(:each) do
     @template_dir = File.expand_path(File.join(File.dirname(__FILE__), "../generators/jasmine/templates"))
     @config = Jasmine::Config.new
-    @config.stub!(:src_dir).and_return(File.join(@template_dir, "public"))
-    @config.stub!(:spec_dir).and_return(File.join(@template_dir, "spec"))
   end
 
-  describe "simple_config" do
+  describe "configuration" do
+    before(:each) do
+      @config.stub!(:src_dir).and_return(File.join(@template_dir, "public"))
+      @config.stub!(:spec_dir).and_return(File.join(@template_dir, "spec"))
+    end
+
     it "if sources.yaml not found" do
       File.stub!(:exist?).and_return(false)
       @config.src_files.should == []
@@ -20,7 +23,7 @@ describe Jasmine::Config do
       }
     end
 
-    it "if sources.yaml is empty" do
+    it "if jasmine.yml is empty" do
       @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yaml'))
       YAML.stub!(:load).and_return(false)
       @config.src_files.should == []
@@ -32,8 +35,8 @@ describe Jasmine::Config do
       }
     end
 
-    it "using default jasmine.yaml" do
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yaml'))
+    it "using default jasmine.yml" do
+      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
       @config.src_files.should == []
       @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
       @config.mappings.should == {
@@ -43,7 +46,7 @@ describe Jasmine::Config do
     end
 
     it "simple_config stylesheets" do
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yaml'))
+      @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
@@ -60,7 +63,7 @@ describe Jasmine::Config do
           original_glob.call(glob_string)
         end
       end
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine-rails.yaml'))
+      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine-rails.yml'))
       @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
       @config.src_files.should == ['javascripts/prototype.js',
                                    'javascripts/effects.js',
@@ -77,6 +80,21 @@ describe Jasmine::Config do
         '/__spec__/javascripts/SpecHelper.js',
       ]
     end
+
+    it "should provide a list of all spec files with full paths" do
+      @config.spec_files_full_paths.should == [
+        File.join(@template_dir, 'spec/javascripts/ExampleSpec.js'),
+        File.join(@template_dir, 'spec/javascripts/SpecHelper.js')
+      ]
+    end
+
+  end
+
+  it "src_dir uses root when src dir is blank" do
+    @config.stub!(:project_root).and_return('some_project_root')
+    @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
+    YAML.stub!(:load).and_return({'src_dir' => nil})
+    @config.src_dir.should == 'some_project_root'
   end
 
 
@@ -87,11 +105,4 @@ describe Jasmine::Config do
     }
   end
 
-  it "should provide a list of all spec files with full paths" do
-    @config.spec_files_full_paths.should == [
-      File.join(@template_dir, 'spec/javascripts/ExampleSpec.js'),
-      File.join(@template_dir, 'spec/javascripts/SpecHelper.js')
-    ]
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jasmine
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -08:00
+date: 2010-01-27 00:00:00 -08:00
 default_executable: jasmine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,10 +87,10 @@ files:
 - generators/jasmine/templates/lib/tasks/jasmine.rake
 - generators/jasmine/templates/spec/javascripts/ExampleSpec.js
 - generators/jasmine/templates/spec/javascripts/SpecHelper.js
-- generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yaml
-- generators/jasmine/templates/spec/javascripts/support/jasmine.yaml
+- 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_spec.rb
+- generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb
 - jasmine/contrib/ruby/jasmine_runner.rb
 - jasmine/contrib/ruby/jasmine_spec_builder.rb
 - jasmine/contrib/ruby/run.html

data/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yaml

@@ -1,10 +0,0 @@
-src_files:
-  - javascripts/prototype.js
-  - javascripts/effects.js
-  - javascripts/controls.js
-  - javascripts/dragdrop.js
-  - javascripts/application.js
-spec_files:
-  - **/*.js
-src_dir: public
-spec_dir: spec/javascripts

data/generators/jasmine/templates/spec/javascripts/support/jasmine.yaml

@@ -1,10 +0,0 @@
-#src_files:
-#  - lib/source1.js
-#  - lib/source2.js
-#  - dist/**/*.js
-#stylesheets:
-#  - css/style.css
-#spec_files:
-#  -
-#src_dir:
-#spec_dir: spec/javascripts