visionmedia-jspec 2.5.1 → 2.6.0

data/History.rdoc

@@ -1,4 +1,10 @@
 
+=== 2.6.0 / 2009-07-09
+
+* Added Ruby on Rails support
+* Added exporting of JSpec (node.js etc)
+* Added be_undefined matcher [#134]
+
 === 2.5.1 / 2009-07-07
 
 * Added intermediate node.js support

data/Manifest

@@ -38,3 +38,7 @@ templates/default/spec/spec.core.js
 templates/default/spec/spec.dom.html
 templates/default/spec/spec.rhino.js
 templates/default/spec/spec.server.html
+templates/rails/spec.application.js
+templates/rails/spec.dom.html
+templates/rails/spec.rhino.js
+templates/rails/spec.server.html

data/README.rdoc

@@ -31,7 +31,7 @@ and much more.
 * Method Stubbing
 * Shared behaviors
 * Profiling
-* Rails Integration (http://github.com/bhauman/jspec-rails)
+* Ruby on Rails Integration
 * Tiny (15 kb compressed, 1300-ish LOC)
 
 == Installation
@@ -143,6 +143,7 @@ JSpec.options.failuresOnly = true, and ?failuresOnly=1 will both work.
   - be_type            be type of x
   - be_greater_than    >
   - be_less_than       <
+  - be_undefined       check if variable passed is undefined
   - throw_error        should throw an error, optionally supply the error string or regexp for message comparison
   - have               object should have n of property (person.should.have(2, 'pets'))
   - have_at_least      object should have at least n of property
@@ -559,6 +560,29 @@ Initialize project with:
 Run with:
   $ jspec run --server
   
+  
+== Ruby on Rails
+
+No additional gems are required for JSpec to work with rails, although 
+http://github.com/bhauman/jspec-rails has been created by 'bhauman'. JSpec
+supports Rails out of the box, simply execute:
+
+  $ jspec init --rails
+  
+Then while still in the root directory of your Rails project, run the following
+command which will bind to, and refresh your browsers automatically when any changes 
+are made to ./public/javascripts/*.js or ./jspec/*.js
+
+  $ jspec
+  
+Or just like regular JSpec applications, run once:
+
+  $ jspec run
+  
+Or run via the terminal using Rhino:
+
+  $ jspec run --rhino
+  
 == Known Issues
 
 * Tabs may cause a parse error. To prevent this use 'soft tabs' (setting in your IDE/Editor)

data/bin/jspec

@@ -11,7 +11,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.5.1'
+program :version, '2.6.0'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 
@@ -22,18 +22,13 @@ command :init do |c|
     when [dest] is not specified. The template includes several files for 
     running via Rhino, DOM, and the JSpec Rack server.'
   c.example 'Create a directory foo, initialized with a jspec template', 'jspec init foo'
+  c.option '-R', '--rails', 'Initialize rails template'
   c.when_called do |args, options|
     dest = args.shift || '.'
-    unless Dir[dest + '/*'].empty?
-      abort unless agree "'#{dest}' is not empty; continue? "
-    end
-    template = File.join JSPEC_ROOT, 'templates', 'default', '.'
-    FileUtils.mkdir_p dest
-    FileUtils.cp_r template, dest
-    %w( spec/spec.dom.html spec/spec.rhino.js ).each do |path|
-      path = File.join dest, path
-      contents = File.read(path).gsub 'JSPEC_ROOT', JSPEC_ROOT
-      File.open(path, 'w') { |file| file.write contents }
+    if options.rails
+      initialize_rails_to dest
+    else
+      initialize_to dest
     end
     say "Template initialized at '#{dest}'"
   end
@@ -46,13 +41,16 @@ command :update do |c|
     the latest JSpec features. Execute from JSpec project root without [paths] to
     update the default template spec files.'
   c.when_called do |args, options|
-    paths = args.empty? ? %w( spec/spec.dom.html spec/spec.rhino.js ) : args
-    paths.each do |path|
-      next unless File.exists? path
-      contents = File.read(path).gsub /visionmedia-jspec-(\d+\.\d+\.\d+)/, "visionmedia-jspec-#{program(:version)}"
-      File.open(path, 'r+'){ |file| file.write contents } 
-      say "Updated #{path} to JSpec #{program(:version)}"
+    if args.empty?
+      if rails?
+        paths = 'jspec/spec.dom.html', 'jspec/spec.rhino.js'
+      else
+        paths = 'spec/spec.dom.html', 'spec/spec.rhino.js'
+      end
+    else
+      paths = args
     end
+    update_version_in *paths
   end
 end
 
@@ -85,17 +83,23 @@ command :run do |c|
   c.option '-S', '--server', 'Run specs using the JSpec server'
   c.option '-s', '--server-only', 'Start JSpec server without running browsers'
   c.when_called do |args, options|
-    options.default :browsers => %w( Safari ), :paths => ['lib/**/*.js', 'spec/**/*.js']
+    
+    # Rails
+    if rails?
+      options.default :browsers => %w( Safari ), :paths => ['public/javascripts/**/*.js', 'jspec/**/*.js']
+    else
+      options.default :browsers => %w( Safari ), :paths => ['lib/**/*.js', 'spec/**/*.js']
+    end
     
     # Actions
     if options.rhino
-      spec = args.shift || 'spec/spec.rhino.js'
+      spec = args.shift || path_to('spec.rhino.js')
       action = lambda { rhino spec }
     elsif options.server
-      spec = args.shift || 'spec/spec.server.html'
+      spec = args.shift || path_to('spec.server.html')
       action = lambda { start_server options, spec }
     else
-      spec = args.shift || 'spec/spec.dom.html'
+      spec = args.shift || path_to('spec.dom.html')
       action = Bind::Actions::RefreshBrowsers.new spec, *options.browsers
     end
     
@@ -110,6 +114,35 @@ command :run do |c|
 end
 alias_command :bind, :run, '--bind'
 
+def initialize_to dest
+  unless Dir[dest + '/*'].empty?
+    abort unless agree "'#{dest}' is not empty; continue? "
+  end
+  copy_template_to 'default', dest
+  replace_root_in dest, 'spec/spec.dom.html', 'spec/spec.rhino.js'
+end
+
+def initialize_rails_to dest
+  unless looks_like_rails_root?(dest)
+    abort unless agree "'#{dest}' does not look like root of a rails project; continue? "
+  end
+  copy_template_to 'rails', "#{dest}/jspec"
+  replace_root_in "#{dest}/jspec", 'spec.dom.html', 'spec.rhino.js'
+end
+
+def copy_template_to name, dest
+  FileUtils.mkdir_p dest
+  FileUtils.cp_r path_to_template(name), dest
+end
+
+def path_to_template name
+  File.join JSPEC_ROOT, 'templates', name, '.'
+end
+
+def path_to file
+  rails? ? "jspec/#{file}" : "spec/#{file}"
+end
+
 def rhino file
   abort "#{file} not found" unless File.exists? file
   system "#{RHINO} #{file}"
@@ -118,4 +151,30 @@ end
 def start_server options, spec
   require 'server/server'
   JSpec::Server.start options, spec
-end
+end
+
+def rails?
+  File.directory? 'jspec'  
+end
+
+def replace_root_in dest, *paths
+  paths.each do |path|
+    path = File.join dest, path
+    contents = File.read(path).gsub 'JSPEC_ROOT', JSPEC_ROOT
+    File.open(path, 'w') { |file| file.write contents }
+  end
+end
+
+def update_version_in *paths
+  paths.each do |path|
+    next unless File.exists? path
+    contents = File.read(path).gsub /visionmedia-jspec-(\d+\.\d+\.\d+)/, "visionmedia-jspec-#{program(:version)}"
+    File.open(path, 'r+'){ |file| file.write contents } 
+    say "Updated #{path}; #{$1} -> #{program(:version)}"
+  end
+  say "Finished updating JSpec"
+end
+
+def looks_like_rails_root? path = '.'
+  File.directory? "#{path}/vendor"
+end

data/jspec.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.5.1"
+  s.version = "2.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-07-09}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["jspec"]
   s.extra_rdoc_files = ["bin/jspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "README.rdoc"]
-  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/modules.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.node.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html"]
+  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/modules.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.node.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html", "templates/rails/spec.application.js", "templates/rails/spec.dom.html", "templates/rails/spec.rhino.js", "templates/rails/spec.server.html"]
   s.homepage = %q{http://visionmedia.github.com/jspec}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.5.1',
+    version   : '2.6.0',
     suites    : [],
     modules   : [],
     allSuites : [],
@@ -1511,6 +1511,7 @@
     be_null            : "actual == null",
     be_true            : "actual == true",
     be_false           : "actual == false",
+    be_undefined       : "typeof actual == 'undefined'",
     be_type            : "typeof actual == expected",
     match              : "typeof actual == 'string' ? actual.match(expected) : false",
     respond_to         : "typeof actual[expected] == 'function'",
@@ -1623,5 +1624,7 @@
                    value === actual[property]
     }
   })
+  
+  if ('exports' in main) exports.JSpec = JSpec
 
 })()

data/spec/spec.matchers.js

@@ -82,6 +82,13 @@ describe 'Matchers'
     end
   end
   
+  describe 'be_undefined'
+    it 'should check if a var is defined'
+      var foo
+      foo.should.be_undefined
+    end
+  end
+  
   describe 'have_length'
     it 'should compare the length of an object'
       'foo'.should.have_length 3

data/templates/rails/spec.application.js

@@ -0,0 +1,8 @@
+
+describe 'YourLib'
+  describe '.someMethod()'
+    it 'should do something'
+      true.should.be true
+    end
+  end
+end

data/templates/rails/spec.dom.html

@@ -0,0 +1,20 @@
+<html>
+	<head>
+		<link type="text/css" rel="stylesheet" href="JSPEC_ROOT/lib/jspec.css" />
+		<script src="JSPEC_ROOT/lib/jspec.js"></script>
+		<script src="../public/javascripts/application.js"></script>
+		<script>
+			function runSuites() {
+				JSpec
+				.exec('spec.application.js')
+				.run()
+				.report()
+			}
+		</script>
+	</head>
+	<body class="jspec" onLoad="runSuites();">
+		<div id="jspec-top"><h2 id="jspec-title">JSpec <em><script>document.write(JSpec.version)</script></em></h2></div>
+		<div id="jspec"></div>
+		<div id="jspec-bottom"></div>
+	</body>
+</html>

data/templates/rails/spec.rhino.js

@@ -0,0 +1,7 @@
+
+load('JSPEC_ROOT/lib/jspec.js')
+
+JSpec
+.exec('spec/spec.application.js')
+.run({ formatter : JSpec.formatters.Terminal })
+.report()

data/templates/rails/spec.server.html

@@ -0,0 +1,15 @@
+<html>
+	<head>
+		<script src="jspec.js"></script>
+		<script>
+			function runSuites() {
+				JSpec
+				.exec('spec.application.js')
+				.run()
+				.reportToServer()
+			}
+		</script>
+	</head>
+	<body class="jspec" onLoad="runSuites();">
+	</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -07:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,10 @@ files:
 - templates/default/spec/spec.dom.html
 - templates/default/spec/spec.rhino.js
 - templates/default/spec/spec.server.html
+- templates/rails/spec.application.js
+- templates/rails/spec.dom.html
+- templates/rails/spec.rhino.js
+- templates/rails/spec.server.html
 has_rdoc: false
 homepage: http://visionmedia.github.com/jspec
 post_install_message: