cucumber-gherkin 29.0.0 → 30.0.1

data/lib/gherkin/pickles/compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/messages'
 
 module Gherkin
@@ -11,6 +13,7 @@ module Gherkin
         pickles = []
 
         return pickles unless gherkin_document.feature
+
         feature = gherkin_document.feature
         language = feature.language
         tags = feature.tags
@@ -65,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
@@ -95,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
@@ -122,7 +134,6 @@ module Gherkin
               ]
             )
             pickles.push(pickle)
-
           end
         end
       end
@@ -143,9 +154,7 @@ module Gherkin
           type: keyword_type,
           text: interpolate(step.text, variable_cells, value_cells),
         }
-        if values_row
-          props[:ast_node_ids].push(values_row.id)
-        end
+        props[:ast_node_ids].push(values_row.id) if values_row
 
         if step.data_table
           data_table = Cucumber::Messages::PickleStepArgument.new(
@@ -180,14 +189,12 @@ module Gherkin
         props = {
           content: interpolate(doc_string.content, variable_cells, value_cells)
         }
-        if doc_string.media_type
-          props[:media_type] = interpolate(doc_string.media_type, variable_cells, value_cells)
-        end
+        props[:media_type] = interpolate(doc_string.media_type, variable_cells, value_cells) if doc_string.media_type
         Cucumber::Messages::PickleDocString.new(**props)
       end
 
       def pickle_tags(tags)
-        tags.map {|tag| pickle_tag(tag)}
+        tags.map { |tag| pickle_tag(tag) }
       end
 
       def pickle_tag(tag)

data/lib/gherkin/query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gherkin
   class Query
     def initialize
@@ -12,11 +14,13 @@ module Gherkin
 
     def scenario_parent_locations(scenario_node_id)
       return @scenario_parent_locations[scenario_node_id] if @scenario_parent_locations.has_key?(scenario_node_id)
+
       raise AstNodeNotLocatedException, "No scenario parent locations found for #{scenario_node_id} }. Known: #{@scenario_parent_locations.keys}"
     end
 
     def location(ast_node_id)
       return @ast_node_locations[ast_node_id] if @ast_node_locations.has_key?(ast_node_id)
+
       raise AstNodeNotLocatedException, "No location found for #{ast_node_id} }. Known: #{@ast_node_locations.keys}"
     end
 
@@ -24,6 +28,7 @@ module Gherkin
 
     def update_feature(feature)
       return if feature.nil?
+
       store_nodes_location(feature.tags)
 
       feature.children.each do |child|
@@ -35,6 +40,7 @@ module Gherkin
 
     def update_rule(feature, rule)
       return if rule.nil?
+
       store_nodes_location(rule.tags)
       rule.children.each do |child|
         update_background(rule, child.background) if child.background

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'
@@ -18,30 +20,31 @@ module Gherkin
 
       def messages
         enumerated = false
-        Enumerator.new do |y|
+        Enumerator.new do |yielder|
           raise DoubleIterationException, "Messages have already been enumerated" if enumerated
+
           enumerated = true
 
           sources.each do |source|
-            y.yield(Cucumber::Messages::Envelope.new(source: source)) if @options[:include_source]
+            yielder.yield(Cucumber::Messages::Envelope.new(source: source)) if @options[:include_source]
             begin
               gherkin_document = nil
 
               if @options[:include_gherkin_document]
                 gherkin_document = build_gherkin_document(source)
-                y.yield(Cucumber::Messages::Envelope.new(gherkin_document: gherkin_document))
+                yielder.yield(Cucumber::Messages::Envelope.new(gherkin_document: gherkin_document))
               end
               if @options[:include_pickles]
                 gherkin_document ||= build_gherkin_document(source)
                 pickles = @compiler.compile(gherkin_document, source)
                 pickles.each do |pickle|
-                  y.yield(Cucumber::Messages::Envelope.new(pickle: pickle))
+                  yielder.yield(Cucumber::Messages::Envelope.new(pickle: pickle))
                 end
               end
-            rescue CompositeParserException => err
-              yield_parse_errors(y, err.errors, source.uri)
-            rescue ParserException => err
-              yield_parse_errors(y, [err], source.uri)
+            rescue CompositeParserException => e
+              yield_parse_errors(yielder, e.errors, source.uri)
+            rescue ParserException => e
+              yield_parse_errors(yielder, [e], source.uri)
             end
           end
         end
@@ -49,7 +52,7 @@ module Gherkin
 
       private
 
-      def yield_parse_errors(y, errors, uri)
+      def yield_parse_errors(yielder, errors, uri)
         errors.each do |err|
           parse_error = Cucumber::Messages::ParseError.new(
             source: Cucumber::Messages::SourceReference.new(
@@ -61,22 +64,22 @@ module Gherkin
             ),
             message: err.message
           )
-          y.yield(Cucumber::Messages::Envelope.new(parse_error: parse_error))
+          yielder.yield(Cucumber::Messages::Envelope.new(parse_error: parse_error))
         end
       end
 
       def sources
-        Enumerator.new do |y|
+        Enumerator.new do |yielder|
           @paths.each do |path|
             source = Cucumber::Messages::Source.new(
               uri: path,
               data: File.open(path, 'r:UTF-8', &:read),
               media_type: 'text/x.cucumber.gherkin+plain'
             )
-            y.yield(source)
+            yielder.yield(source)
           end
           @sources.each do |source|
-            y.yield(source)
+            yielder.yield(source)
           end
         end
       end

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,35 +7,39 @@ 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
+    def start_rule(_rule_type); end
 
-    def end_rule(rule_type)
-    end
+    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?
+      return 'EOF' if token.eof?
 
-      sprintf "(%s:%s)%s:%s/%s/%s",
+      sprintf(
+        "(%s:%s)%s:%s/%s/%s",
         token.location[:line],
         token.location[:column],
         token.matched_type,
         token.matched_keyword ? sprintf("(%s)%s", token.matched_keyword_type, token.matched_keyword) : "",
         token.matched_text,
-        Array(token.matched_items).map { |i| "#{i.column}:#{i.text}"}.join(',')
+        Array(token.matched_items).map { |i| "#{i.column}:#{i.text}" }.join(',')
+      )
     end
-
   end
 end

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)
@@ -48,21 +50,22 @@ module Gherkin
 
     def match_TableRow(token)
       return false unless token.line.start_with?('|')
-      # TODO: indent
-      set_token_matched(token, :TableRow, nil, nil, nil, nil,
-                        token.line.table_cells)
+
+      set_token_matched(token, :TableRow, nil, nil, nil, nil, token.line.table_cells)
       true
     end
 
     def match_Empty(token)
       return false unless token.line.empty?
+
       set_token_matched(token, :Empty, nil, nil, 0)
       true
     end
 
     def match_Comment(token)
       return false unless token.line.start_with?('#')
-      text = token.line.get_line_text(0) #take the entire line, including leading space
+
+      text = token.line.get_line_text(0) # take the entire line, including leading space
       set_token_matched(token, :Comment, text, nil, 0)
       true
     end
@@ -70,7 +73,7 @@ module Gherkin
     def match_Language(token)
       return false unless token.line.trimmed_line_text =~ LANGUAGE_PATTERN
 
-      dialect_name = $1
+      dialect_name = Regexp.last_match(1)
       set_token_matched(token, :Language, dialect_name)
 
       change_dialect(dialect_name, token.location)
@@ -82,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)
@@ -108,6 +111,7 @@ module Gherkin
 
     def match_EOF(token)
       return false unless token.eof?
+
       set_token_matched(token, :EOF)
       true
     end
@@ -119,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) }
 
@@ -132,22 +137,18 @@ module Gherkin
       title = token.line.get_rest_trimmed(keyword.length)
       keyword_types = @keyword_types[keyword]
       keyword_type = keyword_types[0]
-      if keyword_types.length() > 1
-        keyword_type = Cucumber::Messages::StepKeywordType::UNKNOWN
-      end
+      keyword_type = Cucumber::Messages::StepKeywordType::UNKNOWN if keyword_types.length > 1
 
       set_token_matched(token,
                         :StepLine, title, keyword, nil, keyword_type)
-      return true
+      true
     end
 
     private
 
     def add_keyword_type_mappings(keywords, type)
       keywords.each do |keyword|
-        if not @keyword_types.has_key?(keyword)
-          @keyword_types[keyword] = []
-        end
+        @keyword_types[keyword] = [] unless @keyword_types.has_key?(keyword)
         @keyword_types[keyword] += [type]
       end
     end

data/lib/gherkin/token_scanner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require_relative 'token'
 require_relative 'gherkin_line'
@@ -14,7 +16,7 @@ module Gherkin
     def initialize(source_or_io)
       @line_number = 0
 
-      case(source_or_io)
+      case source_or_io
       when String
         @io = StringIO.new(source_or_io)
       when StringIO, IO
@@ -25,9 +27,11 @@ module Gherkin
     end
 
     def read
-      location = {line: @line_number += 1}
-      if @io.nil? || line = @io.gets
-        gherkin_line = line ? GherkinLine.new(line, location[:line]) : nil
+      location = { line: @line_number += 1 }
+      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
@@ -35,6 +39,5 @@ module Gherkin
         Token.new(nil, location)
       end
     end
-
   end
 end

data/lib/gherkin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'gherkin/stream/parser_message_stream'
 
 module Gherkin
@@ -7,28 +9,26 @@ module Gherkin
     include_pickles: true
   }.freeze
 
-  def self.from_paths(paths, options={})
+  def self.from_paths(paths, options = {})
     Stream::ParserMessageStream.new(
-        paths,
-        [],
-        options
+      paths,
+      [],
+      options
     ).messages
   end
 
-  def self.from_sources(sources, options={})
+  def self.from_sources(sources, options = {})
     Stream::ParserMessageStream.new(
-        [],
-        sources,
-        options
+      [],
+      sources,
+      options
     ).messages
   end
 
-  def self.from_source(uri, data, options={})
+  def self.from_source(uri, data, options = {})
     from_sources([encode_source_message(uri, data)], options)
   end
 
-  private
-
   def self.encode_source_message(uri, data)
     Cucumber::Messages::Source.new(
       uri: uri,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-gherkin
 version: !ruby/object:Gem::Version
-  version: 29.0.0
+  version: 30.0.1
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -21,7 +21,7 @@ dependencies:
         version: '25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '26'
+        version: '28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '26'
+        version: '28'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.2.8
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
-summary: cucumber-gherkin-29.0.0
+summary: cucumber-gherkin-30.0.1
 test_files: []