jspec 2.11.7 → 2.11.8

data/History.rdoc

@@ -1,4 +1,9 @@
 
+=== 2.11.8 / 2009-10-16
+
+* Fixed newline support in grammar (supports \r\n, \n, \r)
+* Fixed tabs in grammar [#11]
+
 === 2.11.7 / 2009-10-15
 
 * Fixed minor grammar issues for windows users [thanks Tony]

data/README.rdoc

@@ -756,9 +756,6 @@ your spec/server.rb file may support additional browsers.
   
 == Known Issues
 
-* Tabs may cause a parse error. To prevent this use 'soft tabs' (setting in your IDE/Editor)
-  or use JSpec's grammar-less alternative (mentioned above).
-  
 * The preprocessor is not (yet) capable of multiline conversions. For example the following is invalid
   
   object.stub('getContentsOfURL').and_return(function(url){

data/bin/jspec

@@ -12,7 +12,7 @@ require 'server/server'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.11.7'
+program :version, '2.11.8'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 

data/jspec.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.11.7"
+  s.version = "2.11.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-10-15}
+  s.date = %q{2009-10-16}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.11.7',
+    version   : '2.11.8',
     cache     : {},
     suites    : [],
     modules   : [],
@@ -1338,11 +1338,12 @@
       if (typeof input != 'string') return
       input = hookImmutable('preprocessing', input)
       return input.
-        replace(/\r\n/gm, '\n').
+        replace(/\t/gm, '  ').
+        replace(/\r\n|\n|\r/gm, '\n').
         replace(/([\w\.]+)\.(stub|destub)\((.*?)\)$/gm, '$2($1, $3)').
         replace(/describe\s+(.*?)$/gm, 'describe($1, function(){').
         replace(/^\s+it\s+(.*?)$/gm, ' it($1, function(){').
-        replace(/^\s*(before_each|after_each|before|after)(?=\s|$)/gm, 'JSpec.currentSuite.addHook("$1", function(){').
+        replace(/^ *(before_each|after_each|before|after)(?= |\n|$)/gm, 'JSpec.currentSuite.addHook("$1", function(){').
         replace(/^\s*end(?=\s|$)/gm, '});').
         replace(/-\{/g, 'function(){').
         replace(/(\d+)\.\.(\d+)/g, function(_, a, b){ return range(a, b) }).

data/spec/spec.grammar.js

@@ -106,6 +106,22 @@ describe 'Grammar'
     'bar'.should.not.equal 'foo'
   end
   
+	describe 'with tabs'
+		before_each
+			foo = 'bar'
+		end
+		
+		it 'should work'
+		  foo.should.eql 'bar'
+		end
+		
+	  it 'should work'
+		  true.should.be	true
+		  true.should.be(true)
+		  true.should.be(true);
+		end
+	end
+  
   describe 'with nested describe'
     it 'should work'
       true.should.be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jspec
 version: !ruby/object:Gem::Version 
-  version: 2.11.7
+  version: 2.11.8
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -07:00
+date: 2009-10-16 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency