gherkin 2.12.1 → 2.12.2

data/lib/gherkin/listener/formatter_listener.rb

@@ -12,6 +12,7 @@ module Gherkin
       def initialize(formatter)
         @formatter = formatter
         @stash = Stash.new
+        @current_builder = nil
       end
 
       def comment(value, line)
@@ -57,13 +58,13 @@ module Gherkin
 
       def step(keyword, name, line)
         replay_step_or_examples
-        @stash.basic_statement do |comments, id|
+        @stash.step do |comments|
           @current_builder = Formatter::Model::Step::Builder.new(comments, keyword, name, line)
         end
       end
 
       def row(cells, line)
-        @stash.basic_statement do |comments, id|
+        @stash.row do |comments, id|
           @current_builder.row(comments, cells, line, id)
         end
       end
@@ -117,13 +118,19 @@ module Gherkin
           yield @comments, @tags, @examples_id
           @comments, @tags = [], []
         end
-        
-        def basic_statement
+
+        def step
           @row_index += 1
-          yield @comments, "#{@examples_id};#{@row_index}"
+          yield @comments
           @comments = []
         end
-        
+
+        def row
+          @row_index += 1
+          yield @comments, defined?(@examples_id) ? "#{@examples_id};#{@row_index}" : :undefined_examples_id
+          @comments = []
+        end
+
         def tag(tag)
           @tags << tag
         end

data/lib/gherkin/platform.rb

@@ -3,8 +3,8 @@
 module Gherkin
 unless defined?(Gherkin::VERSION)
   # See the comment in gherkin.gemspec if you bump the MINOR version (MAJOR.MINOR.PATCH).
-  VERSION       = '2.12.1'
-  JRUBY         = defined?(JRUBY_VERSION)
+  VERSION = '2.12.2'
+  JRUBY   = defined?(JRUBY_VERSION)
 
   if !JRUBY && !(RUBY_VERSION =~ /^(1\.9\.3|2\.0)/)
     warn("WARNING: Unsupported Ruby version - #{RUBY_VERSION}")

data/lib/gherkin/tag_expression.rb

@@ -21,6 +21,7 @@ module Gherkin
     def evaluate(tags)
       return true if @ands.flatten.empty?
       vars = Hash[*tags.map{|tag| [tag.name, true]}.flatten]
+      raise "No vars" if vars.nil? # Useless statement to prevent ruby warnings about unused var
       !!Kernel.eval(ruby_expression)
     end
 

data/ragel/lexer.js.rl.erb

@@ -115,7 +115,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/cucumber/gherkin/lexingerror for more information.";
+      throw new Error("Lexing error on line " + this.line_number + ": '" + content + "'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information.");
     } else {
       this.listener.eof();
     }
@@ -128,6 +128,7 @@
 %% write data;
 %% access this.;
 %% variable data data;
+%% getkey signedCharValue(data[p]);
 
 var Lexer = function(listener) {
   // Check that listener has the required functions
@@ -135,7 +136,7 @@ var Lexer = function(listener) {
   for(var i=0, len=events.length; i<len; i++) {
     var event = events[i];
     if(typeof listener[event] != 'function') {
-      throw "Error. No " + event + " function exists on " + JSON.stringify(listener);
+      throw new Error("Error. No " + event + " function exists on " + JSON.stringify(listener));
     }
   }
   this.listener = listener;
@@ -157,30 +158,124 @@ Lexer.prototype.scan = function(data) {
 
   this.line_number = 1;
   this.last_newline = 0;
+  var signedCharValue=function(v){return v > 127 ? v-256 : v; };
 
   %% write init;
   %% write exec;
 };
 
+
+/*
+ * Decode utf-8 byte sequence to string.
+ */
+var decodeUtf8 = function(bytes) {
+  var result = "";
+  var i = 0;
+  var wc;
+  var c;
+
+  while (i < bytes.length) {
+    /* parse as UTF-8 lead byte */
+    wc = bytes[i++];
+    if (wc < 0x80) {
+      count = 0;
+    } else if (wc < 0xC2 || wc >= 0xF8) {
+      throw new Error("input is not a valid UTF-8 lead octet");
+    } else if (wc < 0xE0) {
+      count = 1;
+      wc = (wc & 0x1F) << 6;
+    } else if (wc < 0xF0) {
+      count = 2;
+      wc = (wc & 0x0F) << 12;
+    } else /* wc < 0xF8 */ {
+      count = 3;
+      wc = (wc & 0x07) << 18;
+    }
+
+    /* parse trail bytes, if any */
+    while (count) {
+      if (!(i < bytes.length)) {
+        throw new Error("short read");
+      }
+      if ((c = bytes[i++] ^ 0x80) > 0x3F) {
+        throw new Error("input is not a valid UTF-8 trail octet");
+      }
+      wc |= c << (6 * --count);
+      if (wc < (1 << (5 * count + 6))) {
+        throw new Error("invalid non-minimal encoded input");
+      }
+    }
+
+    /* handle conversion to UTF-16 if needed */
+    if (wc > 0xFFFF) {
+      wc -= 0x10000;
+      result += String.fromCharCode(0xD800 + (wc >> 10));
+      wc = 0xDC00 + (wc & 0x3FF);
+    }
+    result += String.fromCharCode(wc);
+  }
+
+  return result;
+};
+
+/*
+ * Encode string to an array of bytes using utf8 encoding.
+ *
+ * Javascript internally stores character data as utf16 (like java).
+ * String.charCodeAt() does *not* produce unicode points, but simply
+ * reflects this internal representation. Thus, it is necessary
+ * to first decode the utf-16 representation before encoding to
+ * utf-8.
+ */
+var encodeUtf8 = function(string) {
+  var bytes = [];
+  var i = 0;
+  var j = 0;
+  var wc;
+
+  while (i < string.length) {
+    wc = string.charCodeAt(i++);
+    if (wc >= 0xD800 && wc <= 0xDBFF && i < string.length && string.charCodeAt(i) >= 0xDC00 && string.charCodeAt(i) <= 0xDFFF) {
+      /* decode UTF-16 */
+      wc = 0x10000 + ((wc & 0x3FF) << 10) + (string.charCodeAt(i++) & 0x3FF);
+    }
+
+    /* emit lead byte */
+    if (wc < 0x80) {
+      bytes[j++] = wc;
+      count = 0;
+    } else if (wc < 0x800) {
+      bytes[j++] = 0xC0 | (wc >> 6);
+      count = 1;
+    } else if (wc < 0x10000) {
+      bytes[j++] = 0xE0 | (wc >> 12);
+      count = 2;
+    } else {
+      /* SMP: 21-bit Unicode */
+      bytes[j++] = 0xF0 | (wc >> 18);
+      count = 3;
+    }
+
+    /* emit trail bytes, if any */
+    while (count) {
+      bytes[j++] = 0x80 | ((wc >> (6 * --count)) & 0x3F);
+    }
+  }
+
+  return bytes;
+
+};
+
 Lexer.prototype.bytesToString = function(bytes) {
   if(typeof bytes.write == 'function') {
     // Node.js
     return bytes.toString('utf-8');
-  } else {
-    var result = "";
-    for(var b in bytes) {
-      result += String.fromCharCode(bytes[b]);
-    }
-    return result;
   }
+  return decodeUtf8(bytes);
 };
 
 Lexer.prototype.stringToBytes = function(string) {
-  var bytes = [];
-  for(var i = 0; i < string.length; i++) {
-    bytes[i] = string.charCodeAt(i);
-  }
-  return bytes;
+  return encodeUtf8(string);
 };
 
 Lexer.prototype.unindent = function(startcol, text) {
@@ -202,7 +297,7 @@ Lexer.prototype.store_keyword_content = function(event, data, p, eof) {
 };
 
 Lexer.prototype.current_line_content = function(data, p) {
-  var rest = data.slice(this.last_newline, -1);
+  var rest = Array.prototype.slice.call(data,this.last_newline, -1);
   var end = rest.indexOf(10) || -1;
   return this.bytesToString(rest.slice(0, end)).trim();
 };

data/ragel/lexer.rb.rl.erb

@@ -126,6 +126,9 @@ module Gherkin
  
       def initialize(listener)
         @listener = listener
+
+        # Initialize ivars to avoid warnings
+        @keyword = nil
         %% write data;
       end
  

data/spec/gherkin/i18n_spec.rb

@@ -198,6 +198,7 @@ module Gherkin
       | is        | Icelandic           | Íslenska          |
       | it        | Italian             | italiano          |
       | ja        | Japanese            | 日本語               |
+      | kn        | Kannada             | ಕನ್ನಡ             |
       | ko        | Korean              | 한국어               |
       | lt        | Lithuanian          | lietuvių kalba    |
       | lu        | Luxemburgish        | Lëtzebuergesch    |

data/spec/gherkin/json_parser_spec.rb

@@ -98,28 +98,6 @@ module Gherkin
                       {
                           "id":"one/a-scenario",
                           "type":"scenario",
-                          "before": [
-                              {
-                                  "match":{
-                                      "location":"features/step_definitions/hooks.rb:1"
-                                  },
-                                  "result":{
-                                      "status":"passed",
-                                      "error_message":"Passed hook",
-                                      "duration": 3
-                                  }
-                              },
-                              {
-                                  "match":{
-                                      "location":"features/step_definitions/hooks.rb:2"
-                                  },
-                                  "result":{
-                                      "status":"failed",
-                                      "error_message":"Failed hook",
-                                      "duration": 22
-                                  }
-                              }
-                          ],
                           "steps":[
                               {
                                   "keyword":"Given ",
@@ -152,6 +130,16 @@ module Gherkin
                               }
                           ],
                           "after": [
+                              {
+                                  "match":{
+                                      "location":"features/step_definitions/hooks.rb:1"
+                                  },
+                                  "result":{
+                                      "status":"passed",
+                                      "error_message":"Passed after",
+                                      "duration": 3
+                                  }
+                              },
                               {
                                   "match":{
                                       "location":"features/step_definitions/hooks.rb:3"

data/spec/gherkin/lexer/i18n_lexer_spec.rb

@@ -11,9 +11,13 @@ module Gherkin
 
         it "should store the i18n language of the last scanned feature" do
           @lexer.scan("# language: fr\n")
-          @lexer.i18n_language.iso_code.should == "fr"
-          @lexer.scan("# language: no\n")
-          @lexer.i18n_language.iso_code.should == "no"
+          # This if is kind of dumb - it's just to avoid warnings from ruby
+          if(@lexer.i18n_language.iso_code.should == "fr")
+            @lexer.scan("# language: no\n")
+            @lexer.i18n_language.iso_code.should == "no"
+          else
+            fail
+          end
         end
 
         it "should detect language when there are spaces and CRLF" do

data/spec/gherkin/parser/parser_spec.rb

@@ -5,7 +5,7 @@ module Gherkin
     describe Parser do
       unless defined?(JRUBY_VERSION)
         it "should raise when feature doesn't parse" do
-          p = Parser.new(mock('formatter').as_null_object)
+          p = Parser.new(double('formatter').as_null_object)
           lambda do
             p.parse("Feature: f\nFeature: f", __FILE__, __LINE__-1)
           end.should raise_error(Regexp.new("Parse error at #{__FILE__}:\\d+"))

data/spec/gherkin/rubify_spec.rb

@@ -7,7 +7,7 @@ if defined?(JRUBY_VERSION)
     module Rubify
       describe "rubify" do
         before do
-          @java_collection = [mock("Java.java.util.ArrayList")]
+          @java_collection = [double("Java.java.util.ArrayList")]
           @java_collection.stub(:===).and_return(Java.java.util.Collection)
           @java_collection.stub(:line).and_return(15)
           @rubified_array = rubify(@java_collection)

data/spec/gherkin/shared/doc_string_group.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'spec_helper'
-
 module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer lexing doc_strings" do

data/spec/gherkin/shared/encoding_group.rb

@@ -1,6 +1,4 @@
 #encoding: utf-8
-require 'spec_helper'
-
 module Gherkin
   module Lexer
     shared_examples_for "encoding" do

data/spec/gherkin/shared/lexer_group.rb

@@ -1,6 +1,4 @@
 #encoding: utf-8
-require 'spec_helper'
-
 module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer" do

data/spec/gherkin/shared/row_group.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'spec_helper'
-
 module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer lexing rows" do

data/spec/gherkin/shared/tags_group.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'spec_helper'
-
 module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer lexing tags" do

data/spec/spec_helper.rb

@@ -1,6 +1,16 @@
+def silence_warnings(&block)
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  result = block.call
+  $VERBOSE = warn_level
+  result
+end
+
 if RUBY_VERSION =~ /1\.9|2\.0/
-  Encoding.default_external = Encoding::UTF_8
-  Encoding.default_internal = Encoding::UTF_8
+  silence_warnings do
+    Encoding.default_external = Encoding::UTF_8
+    Encoding.default_internal = Encoding::UTF_8
+  end
 end
 if defined?(JRUBY_VERSION)
   java_import java.util.ArrayList
@@ -30,7 +40,7 @@ module GherkinSpecHelper
 
   def fixture(file)
     encoding = Gherkin::Lexer::Encoding.new
-    source = encoding.read_file(File.dirname(__FILE__) + "/gherkin/fixtures/" + file)
+    encoding.read_file(File.dirname(__FILE__) + "/gherkin/fixtures/" + file)
   end
 
   def rubify_hash(hash)
@@ -51,8 +61,10 @@ end
 # Allows comparison of Java List with Ruby Array (rows)
 RSpec::Matchers.define :r do |expected|
   match do |row|
-    def row.inspect
-      "r " + self.map{|cell| cell}.inspect
+    silence_warnings do
+      def row.inspect
+        "r " + self.map{|cell| cell}.inspect
+      end
     end
     row.map{|cell| cell}.should == expected
   end
@@ -60,8 +72,10 @@ end
 
 RSpec::Matchers.define :a do |expected|
   match do |array|
-    def array.inspect
-      "a " + self.map{|e| e.to_sym}.inspect
+    silence_warnings do
+      def array.inspect
+        "a " + self.map{|e| e.to_sym}.inspect
+      end
     end
     array.map{|e| e.to_sym}.should == expected
   end

data/tasks/ikvm.rake

@@ -55,8 +55,8 @@ namespace :ikvm do
     mkdir_p File.dirname(pkg_dir) unless File.directory?(pkg_dir)
     nuget("Pack #{GHERKIN_NUSPEC} -Version #{GHERKIN_VERSION} -OutputDirectory #{pkg_dir}")
     # Now, verify that we have a proper dll inside the package
-    require 'zip/zipfilesystem'
-    Zip::ZipFile.open(GHERKIN_NUPKG) do |zipfile|
+    require 'zip'
+    Zip::File.open(GHERKIN_NUPKG) do |zipfile|
       dll = zipfile.get_entry('lib/gherkin.dll')
       if(dll.size < 3_000_000)
         raise "Looks like the dll is too small."

data/tasks/ragel_task.rb

@@ -39,6 +39,14 @@ class RagelTask
         # Minify
         sh %{node #{UGLIFYJS} #{target} > #{min_target}}
       end
+
+      if(@lang == 'rb')
+        # Prettify the code so we don't get indentation warnings
+        sh %{rbeautify #{target} > tmp.rb}
+        sh %{mv tmp.rb #{target}}
+        # rbeautify has a bug with class << self ... end alignment. Fix it.
+        sh %{perl -i -0pe 's/            end\n        self._/        end\n        self._/g' #{target}}
+      end
     end
 
     if(@lang != 'java')