cucumber-gherkin 28.0.0 → 30.0.0

data/lib/gherkin/pickles/compiler.rb

@@ -11,6 +11,7 @@ module Gherkin
         pickles = []
 
         return pickles unless gherkin_document.feature
+
         feature = gherkin_document.feature
         language = feature.language
         tags = feature.tags
@@ -143,9 +144,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 +179,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

@@ -12,11 +12,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 +26,7 @@ module Gherkin
 
     def update_feature(feature)
       return if feature.nil?
+
       store_nodes_location(feature.tags)
 
       feature.children.each do |child|
@@ -35,6 +38,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

@@ -11,37 +11,38 @@ module Gherkin
         @sources = sources
         @options = options
 
-        id_generator = options[:id_generator] || Cucumber::Messages::IdGenerator::UUID.new
+        id_generator = options[:id_generator] || Cucumber::Messages::Helpers::IdGenerator::UUID.new
         @parser = Parser.new(AstBuilder.new(id_generator))
         @compiler = Pickles::Compiler.new(id_generator)
       end
 
       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 +50,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 +62,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_formatter_builder.rb

@@ -5,35 +5,35 @@ module Gherkin
     end
 
     def reset
-      @tokens_text = ""
+      @tokens_text = ''
     end
 
     def build(token)
       @tokens_text << "#{format_token(token)}\n"
     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
     end
 
     private
+
     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

@@ -48,21 +48,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 +71,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)
@@ -108,6 +109,7 @@ module Gherkin
 
     def match_EOF(token)
       return false unless token.eof?
+
       set_token_matched(token, :EOF)
       true
     end
@@ -132,22 +134,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

@@ -14,7 +14,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,7 +25,7 @@ module Gherkin
     end
 
     def read
-      location = {line: @line_number += 1}
+      location = { line: @line_number += 1 }
       if @io.nil? || line = @io.gets
         gherkin_line = line ? GherkinLine.new(line, location[:line]) : nil
         Token.new(gherkin_line, location)
@@ -35,6 +35,5 @@ module Gherkin
         Token.new(nil, location)
       end
     end
-
   end
 end

data/lib/gherkin.rb

@@ -7,28 +7,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: 28.0.0
+  version: 30.0.0
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,68 +10,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 19.1.4
+        version: '25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '24'
+        version: '28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 19.1.4
+        version: '25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '24'
+        version: '28'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-    - - ">="
+        version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.26.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 1.26.0
 description: Gherkin parser
 email: cukes@googlegroups.com
 executables:
@@ -80,6 +82,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - bin/gherkin
 - bin/gherkin-ruby
@@ -98,13 +101,6 @@ files:
 - lib/gherkin/token_formatter_builder.rb
 - lib/gherkin/token_matcher.rb
 - lib/gherkin/token_scanner.rb
-- spec/capture_warnings.rb
-- spec/gherkin/dialect_spec.rb
-- spec/gherkin/gherkin_line_spec.rb
-- spec/gherkin/gherkin_spec.rb
-- spec/gherkin/parser_spec.rb
-- spec/gherkin/query_spec.rb
-- spec/gherkin/stream/parser_message_stream_spec.rb
 homepage: https://github.com/cucumber/gherkin
 licenses:
 - MIT
@@ -123,22 +119,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.8
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
-summary: cucumber-gherkin-28.0.0
-test_files:
-- spec/capture_warnings.rb
-- spec/gherkin/dialect_spec.rb
-- spec/gherkin/gherkin_line_spec.rb
-- spec/gherkin/gherkin_spec.rb
-- spec/gherkin/parser_spec.rb
-- spec/gherkin/query_spec.rb
-- spec/gherkin/stream/parser_message_stream_spec.rb
+summary: cucumber-gherkin-30.0.0
+test_files: []

data/spec/capture_warnings.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-# With thanks to @myronmarston
-# https://github.com/vcr/vcr/blob/master/spec/capture_warnings.rb
-
-module CaptureWarnings
-  def report_warnings(&block)
-    current_dir = Dir.pwd
-    warnings, errors = capture_error(&block).partition { |line| line.include?('warning') }
-    project_warnings, other_warnings = warnings.uniq.partition { |line| line.include?(current_dir) }
-
-    if errors.any?
-      puts errors.join("\n")
-    end
-
-    if other_warnings.any?
-      puts "#{ other_warnings.count } warnings detected, set VIEW_OTHER_WARNINGS=true to see them."
-      print_warnings('other', other_warnings) if ENV['VIEW_OTHER_WARNINGS']
-    end
-
-    # Until they fix https://bugs.ruby-lang.org/issues/10661
-    if RUBY_VERSION == "2.2.0"
-      project_warnings = project_warnings.reject { |w| w =~ /warning: possible reference to past scope/ }
-    end
-
-    if project_warnings.any?
-      puts "#{ project_warnings.count } warnings detected"
-      print_warnings('cucumber-expressions', project_warnings)
-      fail "Please remove all cucumber-expressions warnings."
-    end
-
-    ensure_system_exit_if_required
-  end
-
-  def capture_error(&block)
-    old_stderr = STDERR.clone
-    pipe_r, pipe_w = IO.pipe
-    pipe_r.sync    = true
-    error          = String.new
-    reader = Thread.new do
-      begin
-        loop do
-          error << pipe_r.readpartial(1024)
-        end
-      rescue EOFError
-      end
-    end
-    STDERR.reopen(pipe_w)
-    block.call
-  ensure
-    capture_system_exit
-    STDERR.reopen(old_stderr)
-    pipe_w.close
-    reader.join
-    return error.split("\n")
-  end
-
-  def print_warnings(type, warnings)
-    puts
-    puts "-" * 30 + " #{type} warnings: " + "-" * 30
-    puts
-    puts warnings.join("\n")
-    puts
-    puts "-" * 75
-    puts
-  end
-
-  def ensure_system_exit_if_required
-    raise @system_exit if @system_exit
-  end
-
-  def capture_system_exit
-    @system_exit = $!
-  end
-end

data/spec/gherkin/dialect_spec.rb

@@ -1,13 +0,0 @@
-# coding: utf-8
-require 'rspec'
-require 'gherkin/dialect'
-
-module Gherkin
-  describe Dialect do
-    it 'provides an interface to the keywords of a dialect' do
-      dialect_en = Dialect.for('en')
-
-      expect(dialect_en.feature_keywords).to eq(['Feature', 'Business Need', 'Ability'])
-    end
-  end
-end

data/spec/gherkin/gherkin_line_spec.rb

@@ -1,36 +0,0 @@
-require 'rspec'
-require 'gherkin/gherkin_line'
-
-describe Gherkin::GherkinLine do
-  context '#tags' do
-    def tags(line)
-      Gherkin::GherkinLine.new(line, 12).tags.map(&:text)
-    end
-
-    it 'allows any non-space characters in a tag' do
-      expect(tags("   @foo:bar  @zap🥒yo")).to eq(['@foo:bar', '@zap🥒yo'])
-    end
-  end
-
-  context '#table_cells' do
-    def cells_text(line)
-      Gherkin::GherkinLine.new(line, 12).table_cells.map(&:text)
-    end
-
-    it 'trims white spaces before cell content' do
-      expect(cells_text("|   \t spaces before|")).to eq(['spaces before'])
-    end
-
-    it 'trims white spaces after cell content' do
-      expect(cells_text("|spaces after   |")).to eq(['spaces after'])
-    end
-
-    it 'trims white spaces around cell content' do
-      expect(cells_text("|   \t spaces everywhere   \t|")).to eq(['spaces everywhere'])
-    end
-
-    it 'does not drop white spaces inside a cell' do
-      expect(cells_text("| foo()\n  bar\nbaz |")).to eq(["foo()\n  bar\nbaz"])
-    end
-  end
-end

data/spec/gherkin/gherkin_spec.rb

@@ -1,45 +0,0 @@
-require 'rspec'
-require 'gherkin'
-
-describe Gherkin do
-  it "can process feature file paths" do
-    messages = Gherkin.from_paths(
-      ["../testdata/good/minimal.feature"],
-      {include_source: true,
-       include_gherkin_document: true,
-       include_pickles: true}
-    ).to_a
-
-    expect(messages.length).to eq(3)
-  end
-
-  it "can process feature file content" do
-    data = File.open("../testdata/good/minimal.feature", 'r:UTF-8', &:read)
-
-    messages = Gherkin.from_source(
-      "uri",
-      data,
-      {include_source: true,
-       include_gherkin_document: true,
-       include_pickles: true}
-    ).to_a
-
-    expect(messages.length).to eq(3)
-  end
-
-  it "can set the default dialect for the feature file content" do
-    data = File.open("../testdata/good/i18n_no.feature", 'r:UTF-8', &:read)
-    data_without_language_header = data.split("\n")[1..-1].join("\n")
-
-    messages = Gherkin.from_source(
-      "uri",
-      data,
-      {include_source: true,
-       include_gherkin_document: true,
-       include_pickles: true,
-       default_dialect: "no"}
-    ).to_a
-
-    expect(messages.length).to eq(3)
-  end
-end

data/spec/gherkin/parser_spec.rb

@@ -1,10 +0,0 @@
-require 'rspec'
-require 'gherkin'
-
-describe Gherkin::Parser do
-  context '.new' do
-    it 'can be invoked with no args' do
-      Gherkin::Parser.new
-    end
-  end
-end