cucumber-gherkin 30.0.0 → 30.0.2

data/lib/gherkin/pickles/compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/messages'
 
 module Gherkin
@@ -66,8 +68,11 @@ module Gherkin
         unless scenario.steps.empty?
           [].concat(background_steps).concat(scenario.steps).each do |step|
             last_keyword_type =
-              step.keyword_type == Cucumber::Messages::StepKeywordType::CONJUNCTION ?
-                last_keyword_type : step.keyword_type
+              if step.keyword_type == Cucumber::Messages::StepKeywordType::CONJUNCTION
+                last_keyword_type
+              else
+                step.keyword_type
+              end
             steps.push(Cucumber::Messages::PickleStep.new(**pickle_step_props(step, [], nil, last_keyword_type)))
           end
         end
@@ -96,15 +101,21 @@ module Gherkin
             unless scenario.steps.empty?
               background_steps.each do |step|
                 last_keyword_type =
-                  step.keyword_type == Cucumber::Messages::StepKeywordType::CONJUNCTION ?
-                    last_keyword_type : step.keyword_type
+                  if step.keyword_type == Cucumber::Messages::StepKeywordType::CONJUNCTION
+                    last_keyword_type
+                  else
+                    step.keyword_type
+                  end
                 step_props = pickle_step_props(step, [], nil, last_keyword_type)
                 steps.push(Cucumber::Messages::PickleStep.new(**step_props))
               end
               scenario.steps.each do |step|
                 last_keyword_type =
-                  step.keyword_type == Cucumber::Messages::StepKeywordType::CONJUNCTION ?
-                    last_keyword_type : step.keyword_type
+                  if step.keyword_type == Cucumber::Messages::StepKeywordType::CONJUNCTION
+                    last_keyword_type
+                  else
+                    step.keyword_type
+                  end
                 step_props = pickle_step_props(step, variable_cells, values_row, last_keyword_type)
                 steps.push(Cucumber::Messages::PickleStep.new(**step_props))
               end
@@ -123,7 +134,6 @@ module Gherkin
               ]
             )
             pickles.push(pickle)
-
           end
         end
       end

data/lib/gherkin/query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gherkin
   class Query
     def initialize

data/lib/gherkin/stream/parser_message_stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/messages'
 require_relative '../parser'
 require_relative '../token_matcher'

data/lib/gherkin/token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gherkin
   class Token < Struct.new(:line, :location)
     attr_accessor :matched_type, :matched_text, :matched_keyword, :matched_indent,

data/lib/gherkin/token_formatter_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gherkin
   class TokenFormatterBuilder
     def initialize
@@ -5,11 +7,11 @@ module Gherkin
     end
 
     def reset
-      @tokens_text = ''
+      @tokens = []
     end
 
     def build(token)
-      @tokens_text << "#{format_token(token)}\n"
+      tokens << token
     end
 
     def start_rule(_rule_type); end
@@ -17,11 +19,15 @@ module Gherkin
     def end_rule(_rule_type); end
 
     def get_result
-      @tokens_text
+      tokens.map { |token| "#{format_token(token)}\n" }.join
     end
 
     private
 
+    def tokens
+      @tokens ||= []
+    end
+
     def format_token(token)
       return 'EOF' if token.eof?
 

data/lib/gherkin/token_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/messages'
 require_relative 'dialect'
 require_relative 'errors'
@@ -35,7 +37,7 @@ module Gherkin
 
     def match_ScenarioLine(token)
       match_title_line(token, :ScenarioLine, @dialect.scenario_keywords) ||
-          match_title_line(token, :ScenarioLine, @dialect.scenario_outline_keywords)
+        match_title_line(token, :ScenarioLine, @dialect.scenario_outline_keywords)
     end
 
     def match_BackgroundLine(token)
@@ -83,7 +85,7 @@ module Gherkin
       if @active_doc_string_separator.nil?
         # open
         _match_DocStringSeparator(token, '"""', true) ||
-            _match_DocStringSeparator(token, '```', true)
+          _match_DocStringSeparator(token, '```', true)
       else
         # close
         _match_DocStringSeparator(token, @active_doc_string_separator, false)
@@ -121,11 +123,12 @@ module Gherkin
     end
 
     def match_StepLine(token)
-      keywords = @dialect.given_keywords +
-          @dialect.when_keywords +
-          @dialect.then_keywords +
-          @dialect.and_keywords +
-          @dialect.but_keywords
+      keywords =
+        @dialect.given_keywords +
+        @dialect.when_keywords +
+        @dialect.then_keywords +
+        @dialect.and_keywords +
+        @dialect.but_keywords
 
       keyword = keywords.detect { |k| token.line.start_with?(k) }
 

data/lib/gherkin/token_scanner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require_relative 'token'
 require_relative 'gherkin_line'
@@ -26,8 +28,10 @@ module Gherkin
 
     def read
       location = { line: @line_number += 1 }
-      if @io.nil? || line = @io.gets
-        gherkin_line = line ? GherkinLine.new(line, location[:line]) : nil
+      if @io.nil?
+        Token.new(nil, location)
+      elsif (line = @io.gets)
+        gherkin_line = GherkinLine.new(line, location[:line])
         Token.new(gherkin_line, location)
       else
         @io.close unless @io.closed? # ARGF closes the last file after final gets

data/lib/gherkin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'gherkin/stream/parser_message_stream'
 
 module Gherkin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-gherkin
 version: !ruby/object:Gem::Version
-  version: 30.0.0
+  version: 30.0.2
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -126,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.2.8
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
-summary: cucumber-gherkin-30.0.0
+summary: cucumber-gherkin-30.0.2
 test_files: []