cucumber-gherkin 28.0.0 → 30.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece34082ea75a09a5cbeae3980afa533c15807b6bfdcebff24b757f01dbccc5e
-  data.tar.gz: c36a3c7b537533d54653d8ac71e4f7514a20a9898712c04c3c19dc49881fbbe8
+  metadata.gz: 2d2a74d7544ccbaad3636051f909746a07a82b2a408a1497c5d5e22aef7cc5e3
+  data.tar.gz: c3df41f699ce69242dbc4f031bf21d9f806c097d73abf9977d43c8896ce6803e
 SHA512:
-  metadata.gz: 6c81377d145f9944910004eeb22b75570ecc850d4c2cccbb9d851e2b9c89bcdbd5e54fafcc531bdb27a7833275ebf3be6504bc6dee23f457a401e8ebcbbf459c
-  data.tar.gz: 553a43f5d6e5ce49d0573ba64b4c42b5089519c0e56c66b20dd92fb70e9790db6e3000581d922df5f312389a6860cc1d59adc4ef300224f280680874cd94e099
+  metadata.gz: 1792227ceb4578bd08cdd47d59baf77d1eb6419c08e233ced30415ed53725e648f1ea6723a2529edf7808094ced7702befca1d8c1a823ccf8b5922682503e4b1
+  data.tar.gz: c4645bec78256b431bffbf2092bb9fd926de65fc66456efd01978778042d30ec72fc7155fa230d71cc47ded7651bb60534510fe30d62e6a52031b85828d71334

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Cucumber Ltd, Gaspar Nagy, Björn Rasmusson, Peter Sergeant, and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/bin/gherkin

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-$VERBOSE=nil # Shut up JRuby warnings on Travis
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"../lib"))
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../lib'))
 
 require 'optparse'
 require 'json'
@@ -15,32 +15,33 @@ options = {
 }
 
 OptionParser.new do |opts|
-  opts.on("--[no-]source", "Don't print source messages") do |v|
-    options[:include_source] = v
+  opts.on('--[no-]source', "Don't print source messages") do |value|
+    options[:include_source] = value
   end
-  opts.on("--[no-]ast", "Don't print ast messages") do |v|
-    options[:include_gherkin_document] = v
+  opts.on('--[no-]ast', "Don't print ast messages") do |value|
+    options[:include_gherkin_document] = value
   end
-  opts.on("--[no-]pickles", "Don't print pickle messages") do |v|
-    options[:include_pickles] = v
+  opts.on('--[no-]pickles', "Don't print pickle messages") do |value|
+    options[:include_pickles] = value
   end
-  opts.on("--predictable-ids", "Generate incrementing ids rather than UUIDs") do |v|
-    options[:id_generator] = Cucumber::Messages::IdGenerator::Incrementing.new if v
+  opts.on('--predictable-ids', 'Generate incrementing ids rather than UUIDs') do |value|
+    options[:id_generator] = Cucumber::Messages::Helpers::IdGenerator::Incrementing.new if value
   end
 end.parse!
 
-def process_messages(messages, options)
+def process_messages(messages, _options)
   messages.each do |message|
-    STDOUT.write(message.to_json)
-    STDOUT.write("\n")
+    $stdout.write(message.to_json)
+    $stdout.write("\n")
   end
 end
 
-if ARGV.empty?
-  # Read from STDIN
-  messages = Cucumber::Messages::NdjsonToMessageEnumerator.new(STDIN)
-else
-  messages = Gherkin.from_paths(ARGV, options)
-end
+messages =
+  if ARGV.empty?
+    # Read from $stdin
+    Cucumber::Messages::Helpers::NdjsonToMessageEnumerator.new($stdin)
+  else
+    Gherkin.from_paths(ARGV, options)
+  end
 
 process_messages(messages, options)

data/lib/gherkin/ast_builder.rb

@@ -24,10 +24,12 @@ module Gherkin
 
     def build(token)
       if token.matched_type == :Comment
-        @comments.push(Cucumber::Messages::Comment.new(
-          location: get_location(token, 0),
-          text: token.matched_text
-        ))
+        @comments.push(
+          Cucumber::Messages::Comment.new(
+            location: get_location(token, 0),
+            text: token.matched_text
+          )
+        )
       else
         current_node.add(token.matched_type, token)
       end
@@ -56,11 +58,13 @@ module Gherkin
 
       tags_node.get_tokens(:TagLine).each do |token|
         token.matched_items.each do |tag_item|
-          tags.push(Cucumber::Messages::Tag.new(
-            location: get_location(token, tag_item.column),
-            name: tag_item.text,
-            id: @id_generator.new_id
-          ))
+          tags.push(
+            Cucumber::Messages::Tag.new(
+              location: get_location(token, tag_item.column),
+              name: tag_item.text,
+              id: @id_generator.new_id
+            )
+          )
         end
       end
 
@@ -81,11 +85,10 @@ module Gherkin
 
     def ensure_cell_count(rows)
       return if rows.empty?
+
       cell_count = rows[0].cells.length
       rows.each do |row|
-        if row.cells.length != cell_count
-          raise AstBuilderException.new("inconsistent cell count within the table", row.location.to_h)
-        end
+        raise AstBuilderException.new('inconsistent cell count within the table', row.location.to_h) if row.cells.length != cell_count
       end
     end
 
@@ -196,14 +199,16 @@ module Gherkin
         line_tokens = node.get_tokens(:Other)
         # Trim trailing empty lines
         last_non_empty = line_tokens.rindex { |token| !token.line.trimmed_line_text.empty? }
-        description = line_tokens[0..last_non_empty].map { |token| token.matched_text }.join("\n")
-        return description
+        line_tokens[0..last_non_empty].map { |token| token.matched_text }.join("\n")
+
       when :Feature
         header = node.get_single(:FeatureHeader)
         return unless header
+
         tags = get_tags(header)
         feature_line = header.get_token(:FeatureLine)
         return unless feature_line
+
         children = []
         background = node.get_single(:Background)
         children.push(Cucumber::Messages::FeatureChild.new(background: background)) if background
@@ -228,8 +233,10 @@ module Gherkin
       when :Rule
         header = node.get_single(:RuleHeader)
         return unless header
+
         rule_line = header.get_token(:RuleLine)
         return unless rule_line
+
         tags = get_tags(header)
         children = []
         background = node.get_single(:Background)
@@ -255,7 +262,7 @@ module Gherkin
           feature: feature
         )
       else
-        return node
+        node
       end
     end
   end

data/lib/gherkin/dialect.rb

@@ -2,13 +2,14 @@ require 'cucumber/messages'
 require 'json'
 
 module Gherkin
-  DIALECT_FILE_PATH = File.expand_path("gherkin-languages.json", File.dirname(__FILE__))
+  DIALECT_FILE_PATH = File.expand_path('gherkin-languages.json', File.dirname(__FILE__))
   DIALECTS = JSON.parse File.open(DIALECT_FILE_PATH, 'r:UTF-8').read
 
   class Dialect
     def self.for(name)
       spec = DIALECTS[name]
       return nil unless spec
+
       new(spec)
     end
 

data/lib/gherkin/errors.rb

@@ -33,7 +33,7 @@ module Gherkin
     def initialize(received_token, expected_token_types, state_comment)
       message = "expected: #{expected_token_types.join(", ")}, got '#{received_token.token_value.strip}'"
       column = received_token.location[:column]
-      location =  (column.nil? || column.zero?) ? {line: received_token.location[:line], column: received_token.line.indent + 1} : received_token.location
+      location = (column.nil? || column.zero?) ? { line: received_token.location[:line], column: received_token.line.indent + 1 } : received_token.location
       super(message, location)
     end
   end

data/lib/gherkin/gherkin-languages.json

@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -1474,7 +1474,7 @@
     "name": "Gujarati",
     "native": "ગુજરાતી",
     "rule": [
-      "Rule"
+      "નિયમ"
     ],
     "scenario": [
       "ઉદાહરણ",
@@ -2133,15 +2133,15 @@
   "ko": {
     "and": [
       "* ",
-      "그리고"
+      "그리고 "
     ],
     "background": [
       "배경"
     ],
     "but": [
       "* ",
-      "하지만",
-      "단"
+      "하지만 ",
+      "단 "
     ],
     "examples": [
       "예"
@@ -2151,8 +2151,8 @@
     ],
     "given": [
       "* ",
-      "조건",
-      "먼저"
+      "조건 ",
+      "먼저 "
     ],
     "name": "Korean",
     "native": "한국어",
@@ -2167,12 +2167,12 @@
     ],
     "then": [
       "* ",
-      "그러면"
+      "그러면 "
     ],
     "when": [
       "* ",
-      "만일",
-      "만약"
+      "만일 ",
+      "만약 "
     ]
   },
   "lt": {
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],
@@ -3134,7 +3133,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3141,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",

data/lib/gherkin/gherkin_line.rb

@@ -1,6 +1,7 @@
 module Gherkin
   class GherkinLine
     attr_reader :indent, :trimmed_line_text
+
     def initialize(line_text, line_number)
       @line_text = line_text
       @line_number = line_number
@@ -13,7 +14,7 @@ module Gherkin
     end
 
     def start_with_title_keyword?(keyword)
-      start_with?(keyword+':') # The C# impl is more complicated. Find out why.
+      start_with?(keyword + ':') # The C# impl is more complicated. Find out why.
     end
 
     def get_rest_trimmed(length)
@@ -66,7 +67,7 @@ module Gherkin
           cell = ''
           start_col = col + 1
         elsif char == '\\'
-          char = row[col]
+          char = row[col] || ''
           col += 1
           if char == 'n'
             cell += "\n"
@@ -89,9 +90,7 @@ module Gherkin
       tags = []
       items.each { |untrimmed|
         item = untrimmed.strip
-        if item.length == 0
-          next
-        end
+        next if item.length == 0
 
         unless item =~ /^\S+$/
           location = { line: @line_number, column: column }