gherkin 2.3.7 → 2.4.0

data/lib/gherkin/rubify.rb

@@ -8,9 +8,9 @@ module Gherkin
         case(o)
         when Java.java.util.Collection, Array
           o.map{|e| rubify(e)}
-        when Java.gherkin.formatter.model.PyString
+        when Java.gherkin.formatter.model.DocString
           require 'gherkin/formatter/model'
-          Formatter::Model::PyString.new(o.value, o.line)
+          Formatter::Model::DocString.new(o.value, o.line)
         else
           o
         end

data/ragel/lexer.c.rl.erb

@@ -328,13 +328,13 @@ store_pystring_content(VALUE listener,
   unescape_escaped_quotes = rb_reg_regcomp(rb_str_new2("\\\\\"\\\\\"\\\\\""));
   rb_funcall(con, rb_intern("sub!"), 2, re2, rb_str_new2(""));
   rb_funcall(con, rb_intern("gsub!"), 2, unescape_escaped_quotes, rb_str_new2("\"\"\""));
-  rb_funcall(listener, rb_intern("py_string"), 2, con, INT2FIX(current_line));
+  rb_funcall(listener, rb_intern("doc_string"), 2, con, INT2FIX(current_line));
 }
 
 static void 
 raise_lexer_error(const char * at, int line)
 { 
-  rb_raise(rb_eGherkinLexingError, "Lexing error on line %d: '%s'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information.", line, at);
+  rb_raise(rb_eGherkinLexingError, "Lexing error on line %d: '%s'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information.", line, at);
 }
 
 static void lexer_init(lexer_state *lexer) {

data/ragel/lexer.java.rl.erb

@@ -32,7 +32,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
     action store_pystring_content {
       String con = unindent(startCol, substring(data, contentStart, nextKeywordStart-1).replaceFirst("(\\r?\\n)?([\\t ])*\\Z", "").replaceAll("\\\\\"\\\\\"\\\\\"", "\"\"\""));
-      listener.pyString(con, currentLine);
+      listener.docString(con, currentLine);
     }
 
     action store_feature_content {
@@ -131,7 +131,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
     action end_feature {
       if(cs < lexer_first_final) {
         String content = currentLineContent(data, lastNewline);
-        throw new LexingError("Lexing error on line " + lineNumber + ": '" + content + "'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information.");
+        throw new LexingError("Lexing error on line " + lineNumber + ": '" + content + "'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information.");
       } else {
         listener.eof();
       }

data/ragel/lexer.js.rl.erb

@@ -23,7 +23,7 @@
       this.start_col, 
       this.bytesToString(data.slice(this.content_start, this.next_keyword_start-1)).replace(/(\r?\n)?([\t ])*$/, '').replace(/ESCAPED_TRIPLE_QUOTE/mg, '"""')
     );
-    this.listener.py_string(con, this.current_line); 
+    this.listener.doc_string(con, this.current_line); 
   }
 
   action store_feature_content {
@@ -106,7 +106,7 @@
   action end_feature {
     if(this.cs < lexer_first_final) {
       var content = this.current_line_content(data, p);
-      throw "Lexing error on line " + this.line_number + ": '" + content + "'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information.";
+      throw "Lexing error on line " + this.line_number + ": '" + content + "'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information.";
     } else {
       this.listener.eof();
     }
@@ -122,7 +122,7 @@
 
 var Lexer = function(listener) {
   // Check that listener has the required functions
-  var events = ['comment', 'tag', 'feature', 'background', 'scenario', 'scenario_outline', 'examples', 'step', 'py_string', 'row', 'eof'];
+  var events = ['comment', 'tag', 'feature', 'background', 'scenario', 'scenario_outline', 'examples', 'step', 'doc_string', 'row', 'eof'];
   for(e in events) {
     var event = events[e];
     if(typeof listener[event] != 'function') {
@@ -198,11 +198,13 @@ Lexer.prototype.current_line_content = function(data, p) {
   return this.bytesToString(rest.slice(0, end)).trim();
 };
 
-if(typeof exports != 'undefined') {
+// Node.js export
+if(typeof exports !== 'undefined') {
   exports.Lexer = Lexer;
 }
-if(typeof window != 'undefined') {
-  window.Lexer = Lexer;
+// Require.js export
+if (typeof define !== 'undefined' && define.amd) {
+  define('gherkin/lexer/<%= @i18n.underscored_iso_code %>', [], function() {return Lexer});
 }
 
 })();

data/ragel/lexer.rb.rl.erb

@@ -23,7 +23,7 @@ module Gherkin
 
         action store_pystring_content {
           con = unindent(@start_col, utf8_pack(data[@content_start...@next_keyword_start-1]).sub(/(\r?\n)?([\t ])*\Z/, '').gsub(/\\"\\"\\"/, '"""'))
-          @listener.py_string(con, @current_line) 
+          @listener.doc_string(con, @current_line) 
         }
  
         action store_feature_content {
@@ -106,7 +106,7 @@ module Gherkin
         action end_feature {
           if cs < lexer_first_final
             content = current_line_content(data, p)
-            raise Gherkin::Lexer::LexingError.new("Lexing error on line %d: '%s'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information." % [@line_number, content])
+            raise Gherkin::Lexer::LexingError.new("Lexing error on line %d: '%s'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information." % [@line_number, content])
           else
             @listener.eof
           end

data/ragel/lexer_common.rl.erb

@@ -40,11 +40,11 @@
   RowBody = space* Cell** PIPE :>> (space* EOL+ space*) %store_row;
   Row = StartRow :>> RowBody <: EndRow?;
   
-  StartPyString = '"""' >start_pystring space* :>> EOL; 
-  EndPyString = (space* '"""') >next_keyword_start; 
-  PyString = space* StartPyString %begin_pystring_content (^EOL | EOL)* :>> EndPyString %store_pystring_content space* EOL+;
+  StartDocString = '"""' >start_pystring space* :>> EOL; 
+  EndDocString = (space* '"""') >next_keyword_start; 
+  DocString = space* StartDocString %begin_pystring_content (^EOL | EOL)* :>> EndDocString %store_pystring_content space* EOL+;
   
-  Tokens = BOM? (space | EOL)* (Tags | Comment | FeatureHeading | BackgroundHeading | ScenarioHeading | ScenarioOutlineHeading | ExamplesHeading | Step | Row | PyString)* (space | EOL)* EOF;
+  Tokens = BOM? (space | EOL)* (Tags | Comment | FeatureHeading | BackgroundHeading | ScenarioHeading | ScenarioOutlineHeading | ExamplesHeading | Step | Row | DocString)* (space | EOL)* EOF;
 
   main := Tokens %end_feature @!end_feature;
 }%%

data/spec/gherkin/c_lexer_spec.rb

@@ -13,7 +13,7 @@ module Gherkin
 
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
       it_should_behave_like "parsing windows files"
     end

data/spec/gherkin/fixtures/complex.json

@@ -129,7 +129,7 @@
         { "name" : "All work and no play", 
           "keyword": "Given ",
           "multiline_arg": {
-            "type": "py_string",
+            "type": "doc_string",
             "value": "Makes Homer something something\nAnd something else",
             "line": 777
           }

data/spec/gherkin/java_lexer_spec.rb

@@ -12,7 +12,7 @@ module Gherkin
 
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
     end
   end

data/spec/gherkin/js_lexer_spec.rb

@@ -1,5 +1,5 @@
 #encoding: utf-8
-if !defined?(JRUBY_VERSION) && !(defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby") && ENV['GHERKIN_JS']
+if !defined?(JRUBY_VERSION) && !(defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby") && ENV['GHERKIN_JS'] && !ENV['SKIP_JS_SPECS']
 require 'spec_helper'
 require 'gherkin/js_lexer'
 
@@ -13,7 +13,7 @@ module Gherkin
     
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
       # TODO - make this pass!
       # it_should_behave_like "parsing windows files"

data/spec/gherkin/rb_lexer_spec.rb

@@ -12,7 +12,7 @@ module Gherkin
 
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
       it_should_behave_like "parsing windows files"
     end

data/spec/gherkin/sexp_recorder.rb

@@ -10,10 +10,10 @@ module Gherkin
     end
 
     # We can't use method_missing - therubyracer isn't able to invoke methods like that.
-    [:comment, :tag, :feature, :background, :scenario, :scenario_outline, :examples, :step, :py_string, :row, :eof, :uri, :syntax_error].each do |event|
+    [:comment, :tag, :feature, :background, :scenario, :scenario_outline, :examples, :step, :doc_string, :row, :eof, :uri, :syntax_error].each do |event|
       define_method(event) do |*args|
         event = :scenario_outline if event == :scenarioOutline # Special Java Lexer handling
-        event = :py_string if event == :pyString # Special Java Lexer handling
+        event = :doc_string if event == :docString # Special Java Lexer handling
         event = :syntax_error if event == :syntaxError # Special Java Lexer handling
         args  = rubify(args)
         args  = sexpify(args)

data/spec/gherkin/shared/{py_string_group.rb → doc_string_group.rb}

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 module Gherkin
   module Lexer
-    shared_examples_for "a Gherkin lexer lexing py_strings" do
+    shared_examples_for "a Gherkin lexer lexing doc_strings" do
       def scan(gherkin)
         @lexer.scan(gherkin)
       end
@@ -23,47 +23,47 @@ Feature: some feature
     """
     Then bar
 EOS
-        @listener.should_receive(:py_string).with("  Hello\nGoodbye", 4)
+        @listener.should_receive(:doc_string).with("  Hello\nGoodbye", 4)
         scan(str)
       end
 
-      it "should parse a simple py_string" do
-        @listener.should_receive(:py_string).with("I am a py_string", 1)
-        scan ps("I am a py_string")
+      it "should parse a simple doc_string" do
+        @listener.should_receive(:doc_string).with("I am a doc_string", 1)
+        scan ps("I am a doc_string")
       end
 
-      it "should parse an empty py_string" do
-        @listener.should_receive(:py_string).with("", 4)
+      it "should parse an empty doc_string" do
+        @listener.should_receive(:doc_string).with("", 4)
         scan("Feature: Hi\nScenario: Hi\nGiven a step\n\"\"\"\n\"\"\"")
       end
 
       it "should treat a string containing only newlines as only newlines" do
-py_string = <<EOS
+doc_string = <<EOS
 """
 
 
 
 """
 EOS
-        @listener.should_receive(:py_string).with("\n\n", 1)
-        scan(py_string)
+        @listener.should_receive(:doc_string).with("\n\n", 1)
+        scan(doc_string)
       end
       
       it "should parse content separated by two newlines" do
         scan ps("A\n\nB")
         @listener.to_sexp.should == [
-          [:py_string, "A\n\nB", 1],
+          [:doc_string, "A\n\nB", 1],
           [:eof]
         ]
       end
       
       it "should parse a multiline string" do
-        @listener.should_receive(:py_string).with("A\nB\nC\nD", 1)
+        @listener.should_receive(:doc_string).with("A\nB\nC\nD", 1)
         scan ps("A\nB\nC\nD")
       end
             
       it "should ignore unescaped quotes inside the string delimeters" do
-        @listener.should_receive(:py_string).with("What does \"this\" mean?", 1)
+        @listener.should_receive(:doc_string).with("What does \"this\" mean?", 1)
         scan ps('What does "this" mean?')
       end
       
@@ -74,17 +74,17 @@ str = <<EOS
  Line two
     """
 EOS
-        @listener.should_receive(:py_string).with("  Line one\nLine two", 1)
+        @listener.should_receive(:doc_string).with("  Line one\nLine two", 1)
         scan(str)
       end
             
       it "should preserve tabs within the content" do
-        @listener.should_receive(:py_string).with("I have\tsome tabs\nInside\t\tthe content", 1)
+        @listener.should_receive(:doc_string).with("I have\tsome tabs\nInside\t\tthe content", 1)
         scan ps("I have\tsome tabs\nInside\t\tthe content")
       end
   
-      it "should handle complex py_strings" do
-py_string = <<EOS
+      it "should handle complex doc_strings" do
+doc_string = <<EOS
 # Feature comment
 @one
 Feature: Sample
@@ -98,34 +98,34 @@ Feature: Sample
 
 EOS
         
-        @listener.should_receive(:py_string).with(py_string, 1)
-        scan ps(py_string)
+        @listener.should_receive(:doc_string).with(doc_string, 1)
+        scan ps(doc_string)
       end
  
-      it "should allow whitespace after the closing py_string delimiter" do
+      it "should allow whitespace after the closing doc_string delimiter" do
 str = <<EOS
     """
       Line one
     """           
 EOS
-        @listener.should_receive(:py_string).with("  Line one", 1)
+        @listener.should_receive(:doc_string).with("  Line one", 1)
         scan(str)
       end
 
-      it "should preserve the last newline(s) at the end of a py_string" do
+      it "should preserve the last newline(s) at the end of a doc_string" do
 str = <<EOS
      """
-     PyString text
+     DocString text
 
 
      """
 EOS
-        @listener.should_receive(:py_string).with("PyString text\n\n",1)
+        @listener.should_receive(:doc_string).with("DocString text\n\n",1)
         scan(str)
       end        
 
-      it "should preserve CRLFs within py_strings" do
-        @listener.should_receive(:py_string).with("Line one\r\nLine two\r\n", 1)
+      it "should preserve CRLFs within doc_strings" do
+        @listener.should_receive(:doc_string).with("Line one\r\nLine two\r\n", 1)
         scan("\"\"\"\r\nLine one\r\nLine two\r\n\r\n\"\"\"")
       end
 
@@ -135,7 +135,7 @@ str = <<EOS
     \\"\\"\\"
     """
 EOS
-        @listener.should_receive(:py_string).with('"""', 1)
+        @listener.should_receive(:doc_string).with('"""', 1)
         scan(str)
       end
 
@@ -145,7 +145,7 @@ str = <<EOS
     \\" \\"\\"
     """
 EOS
-        @listener.should_receive(:py_string).with('\" \"\"', 1)
+        @listener.should_receive(:doc_string).with('\" \"\"', 1)
         scan(str)
       end
     end

data/spec/gherkin/shared/lexer_group.rb

@@ -282,11 +282,11 @@ f'real
           ]
         end
         
-        it "should parse steps with inline py_string" do
+        it "should parse steps with inline doc_string" do
           scan("Given I have a string\n\"\"\"\nhello\nworld\n\"\"\"")
           @listener.to_sexp.should == [
             [:step, "Given ", "I have a string", 1],
-            [:py_string, "hello\nworld", 2],
+            [:doc_string, "hello\nworld", 2],
             [:eof]
           ]
         end
@@ -497,7 +497,7 @@ f'real
             [:step, "Then ", "I am happy", 37],
             [:scenario, "Scenario", "Hammerzeit", "", 39],
             [:step, "Given ", "All work and no play", 40],
-            [:py_string, "Makes Homer something something\nAnd something else", 41 ],
+            [:doc_string, "Makes Homer something something\nAnd something else", 41 ],
             [:step, "Then ", "crazy", 45],
             [:eof]
           ]
@@ -540,7 +540,7 @@ f'real
             [:step, "Then ", "I am happy", 37],
             [:scenario, "Scenario", "Hammerzeit", "", 39],
             [:step, "Given ", "All work and no play", 40],
-            [:py_string, "Makes Homer something something\r\nAnd something else", 41],
+            [:doc_string, "Makes Homer something something\r\nAnd something else", 41],
             [:step, "Then ", "crazy", 45],
             [:eof]
           ]

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ require 'gherkin/java_libs'
 require 'gherkin/shared/bom_group'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'
-require 'gherkin/shared/py_string_group'
+require 'gherkin/shared/doc_string_group'
 require 'gherkin/shared/row_group'
 $:.unshift(File.dirname(__FILE__))
 

data/tasks/compile.rake

@@ -12,7 +12,8 @@ CLEAN.include [
   'ext/**/*.c',
   'java/src/main/java/gherkin/lexer/i18n/*.java',
   'java/src/main/resources/gherkin/*.properties',
-  'js/lib/gherkin/lexer/*.js'
+  'js/lib/gherkin/lexer/*.js',
+  'doc'
 ]
 
 desc "Compile the Java extensions"
@@ -72,7 +73,7 @@ langs.each do |i18n|
         io.write(<<-EOF)
 require 'mkmf'
 CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
-$CFLAGS << ' -O0 -Wall -Werror' if CONFIG['CC'] =~ /gcc/
+$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc/
 dir_config("gherkin_lexer_#{i18n.underscored_iso_code}")
 have_library("c", "main")
 create_makefile("gherkin_lexer_#{i18n.underscored_iso_code}")

data/tasks/cucumber.rake

@@ -1,4 +1,4 @@
-unless ENV['RUBY_CC_VERSION']
+unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber) do |t|

data/tasks/gems.rake

@@ -8,7 +8,7 @@ namespace :gems do
     sh "rvm 1.8.6-p399@cucumber rake cross compile RUBY_CC_VERSION=1.8.6"
     sh "rvm 1.9.1-p243@cucumber rake cross compile RUBY_CC_VERSION=1.9.1"
     # This will copy the .so files to the proper place
-    sh "rake cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
+    sh "rake -t cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
   end
 
   desc 'Prepare JRuby binares'
@@ -20,7 +20,7 @@ namespace :gems do
   task :ironruby => [:jruby, 'ikvm:dll', 'ikvm:copy_ikvm_dlls']
 
   task :sanity do
-    raise "The jruby gem looks too small" if File.stat("release/gherkin-#{Gherkin::VERSION}-java.gem").size < 1000000
+    raise "The jruby gem looks too small" if File.stat("release/gherkin-#{GHERKIN_VERSION}-java.gem").size < 1000000
   end
 
   desc "Prepare binaries for all gems"

data/tasks/ikvm.rake

@@ -52,14 +52,14 @@ namespace :ikvm do
 
   desc 'Make a .NET .exe'
   task :exe => ['lib/gherkin.jar', :dependent_dlls] do
-    ikvmc("-target:exe lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.exe #{references}")
+    ikvmc("-target:exe lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.exe #{references}")
   end
 
   desc 'Make a .NET .dll'
   task :dll => ['lib/gherkin.jar', :dependent_dlls] do
     mkdir_p 'release' unless File.directory?('release')
-    ikvmc("-target:library lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.dll  #{references}")
-    cp "release/gherkin-#{Gherkin::VERSION}.dll", 'lib/gherkin.dll'
+    ikvmc("-target:library lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.dll  #{references}")
+    cp "release/gherkin-#{GHERKIN_VERSION}.dll", 'lib/gherkin.dll'
   end
 
   desc 'Copy the IKVM .dll files over to the pkg dir'
@@ -74,7 +74,7 @@ end
 
 task :ikvm => ['ikvm:copy_ikvm_dlls', 'ikvm:exe', 'ikvm:dll'] do
   puts "************** Pretty printing some features with .NET. **************"
-  mono "release/gherkin-#{Gherkin::VERSION}.exe features"
+  mono "release/gherkin-#{GHERKIN_VERSION}.exe features"
   puts "************** DONE Pretty printing some features with .NET. All OK. **************"
 end