cucumber-gherkin 15.0.2 → 20.0.1

data/lib/gherkin/pickles/compiler.rb

@@ -37,7 +37,9 @@ module Gherkin
         end
       end
 
-      def compile_rule(pickles, language, tags, feature_background_steps, rule, source)
+      def compile_rule(pickles, language, feature_tags, feature_background_steps, rule, source)
+        tags = [].concat(feature_tags).concat(rule.tags)
+
         rule_background_steps = feature_background_steps.dup
         rule.children.each do |child|
           if child.background
@@ -53,10 +55,10 @@ module Gherkin
         end
       end
 
-      def compile_scenario(feature_tags, background_steps, scenario, language, pickles, source)
+      def compile_scenario(inherited_tags, background_steps, scenario, language, pickles, source)
         steps = scenario.steps.empty? ? [] : [].concat(pickle_steps(background_steps))
 
-        tags = [].concat(feature_tags).concat(scenario.tags)
+        tags = [].concat(inherited_tags).concat(scenario.tags)
 
         scenario.steps.each do |step|
           steps.push(pickle_step(step))
@@ -74,17 +76,17 @@ module Gherkin
         pickles.push(pickle)
       end
 
-      def compile_scenario_outline(feature_tags, background_steps, scenario, language, pickles, source)
+      def compile_scenario_outline(inherited_tags, background_steps, scenario, language, pickles, source)
         scenario.examples.reject { |examples| examples.table_header.nil? }.each do |examples|
           variable_cells = examples.table_header.cells
           examples.table_body.each do |values_row|
             value_cells = values_row.cells
             steps = scenario.steps.empty? ? [] : [].concat(pickle_steps(background_steps))
-            tags = [].concat(feature_tags).concat(scenario.tags).concat(examples.tags)
+            tags = [].concat(inherited_tags).concat(scenario.tags).concat(examples.tags)
 
-            scenario.steps.each do |scenario_outline_step|
-              step_props = pickle_step_props(scenario_outline_step, variable_cells, values_row)
-              steps.push(Cucumber::Messages::Pickle::PickleStep.new(step_props))
+            scenario.steps.each do |scenario_step|
+              step_props = pickle_step_props(scenario_step, variable_cells, values_row)
+              steps.push(Cucumber::Messages::PickleStep.new(**step_props))
             end
 
             pickle = Cucumber::Messages::Pickle.new(
@@ -97,7 +99,7 @@ module Gherkin
               ast_node_ids: [
                 scenario.id,
                 values_row.id
-              ],
+              ]
             )
             pickles.push(pickle)
 
@@ -120,7 +122,7 @@ module Gherkin
       end
 
       def pickle_step(step)
-        Cucumber::Messages::Pickle::PickleStep.new(pickle_step_props(step, [], nil))
+        Cucumber::Messages::PickleStep.new(**pickle_step_props(step, [], nil))
       end
 
       def pickle_step_props(step, variable_cells, values_row)
@@ -150,11 +152,11 @@ module Gherkin
       end
 
       def pickle_data_table(data_table, variable_cells, value_cells)
-        Cucumber::Messages::PickleStepArgument::PickleTable.new(
+        Cucumber::Messages::PickleTable.new(
           rows: data_table.rows.map do |row|
-            Cucumber::Messages::PickleStepArgument::PickleTable::PickleTableRow.new(
+            Cucumber::Messages::PickleTableRow.new(
               cells: row.cells.map do |cell|
-                Cucumber::Messages::PickleStepArgument::PickleTable::PickleTableRow::PickleTableCell.new(
+                Cucumber::Messages::PickleTableCell.new(
                   value: interpolate(cell.value, variable_cells, value_cells)
                 )
               end
@@ -170,7 +172,7 @@ module Gherkin
         if doc_string.media_type
           props[:media_type] = interpolate(doc_string.media_type, variable_cells, value_cells)
         end
-        Cucumber::Messages::PickleStepArgument::PickleDocString.new(props)
+        Cucumber::Messages::PickleDocString.new(**props)
       end
 
       def pickle_tags(tags)
@@ -178,7 +180,7 @@ module Gherkin
       end
 
       def pickle_tag(tag)
-        Cucumber::Messages::Pickle::PickleTag.new(
+        Cucumber::Messages::PickleTag.new(
           name: tag.name,
           ast_node_id: tag.id
         )

data/lib/gherkin/query.rb

@@ -27,6 +27,9 @@ module Gherkin
     end
 
     def update_rule(rule)
+      return if rule.nil?
+      store_nodes_location(rule.tags)
+
       rule.children.each do |child|
         update_background(child.background) if child.background
         update_scenario(child.scenario) if child.scenario
@@ -42,8 +45,8 @@ module Gherkin
       store_nodes_location(scenario.tags)
       update_steps(scenario.steps)
       scenario.examples.each do |examples|
-        store_nodes_location(examples.tags)
-        store_nodes_location(examples.table_body)
+        store_nodes_location(examples.tags || [])
+        store_nodes_location(examples.table_body || [])
       end
     end
 

data/lib/gherkin/stream/parser_message_stream.rb

@@ -88,8 +88,11 @@ module Gherkin
         else
           gd = @parser.parse(source.data)
         end
-        gd[:uri] = source.uri
-        Cucumber::Messages::GherkinDocument.new(gd)
+        Cucumber::Messages::GherkinDocument.new(
+          uri: source.uri,
+          feature: gd.feature,
+          comments: gd.comments
+        )
       end
     end
   end

data/lib/gherkin/token_scanner.rb

@@ -25,7 +25,7 @@ module Gherkin
     end
 
     def read
-      location = {line: @line_number += 1, column: 0}
+      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)

data/spec/gherkin/gherkin_line_spec.rb

@@ -2,7 +2,17 @@ require 'rspec'
 require 'gherkin/gherkin_line'
 
 describe Gherkin::GherkinLine do
-  context '#table_cell' 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

data/spec/gherkin/query_spec.rb

@@ -3,7 +3,7 @@ require 'gherkin'
 require 'gherkin/query'
 
 describe Gherkin::Query do
-  let(:subject) { Gherkin::Query.new() }
+  let(:subject) { Gherkin::Query.new }
 
   def filter_messages_by_attribute(messages, attribute)
     messages.map do |message|
@@ -18,7 +18,7 @@ describe Gherkin::Query do
 
   let(:gherkin_document) { find_message_by_attribute(messages, :gherkin_document) }
 
-  let(:messages) {
+  let(:messages) do
     Gherkin.from_source(
       "some/path",
       feature_content,
@@ -26,9 +26,9 @@ describe Gherkin::Query do
         include_gherkin_document: true
       }
     ).to_a
-  }
+  end
 
-  let(:feature_content) {
+  let(:feature_content) do
     """
     @feature-tag
     Feature: my feature
@@ -43,12 +43,12 @@ describe Gherkin::Query do
       Scenario Outline: with examples
         Given a <Status> step
 
-        @example-tag
+        @examples-tag
         Examples:
           | Status |
           | passed |
 
-
+      @rule-tag
       Rule: this is a rule
         Background:
           Given the passed step in the rule background
@@ -56,31 +56,28 @@ describe Gherkin::Query do
         @ruled-scenario-tag
         Scenario: a ruled scenario
           Given a step in the ruled scenario
-      """
-  }
+    """
+  end
 
-  context '#update' do
+  describe '#update' do
     context 'when the feature file is empty' do
       let(:feature_content) { '' }
 
       it 'does not fail' do
-        expect {
-          messages.each { |message|
-            subject.update(message)
-          }
-        }.not_to raise_exception
+        expect do
+          messages.each { |message| subject.update(message) }
+        end.not_to raise_exception
       end
     end
   end
 
-  context '#location' do
+  describe '#location' do
     before do
-      messages.each { |message|
-        subject.update(message)
-      }
+      messages.each { |message| subject.update(message) }
     end
 
     let(:background) { find_message_by_attribute(gherkin_document.feature.children, :background) }
+    let(:rule) { find_message_by_attribute(gherkin_document.feature.children, :rule) }
     let(:scenarios) { filter_messages_by_attribute(gherkin_document.feature.children, :scenario) }
     let(:scenario) { scenarios.first }
 
@@ -112,8 +109,9 @@ describe Gherkin::Query do
 
     context 'when querying tags' do
       let(:feature_tag) { gherkin_document.feature.tags.first }
+      let(:rule_tag) { rule.tags.first }
       let(:scenario_tag) { scenario.tags.first }
-      let(:example_tag) { scenarios.last.examples.first.tags.first }
+      let(:examples_tag) { scenarios.last.examples.first.tags.first }
 
       it 'provides the location of a feature tags' do
         expect(subject.location(feature_tag.id)).to eq(feature_tag.location)
@@ -123,13 +121,16 @@ describe Gherkin::Query do
         expect(subject.location(scenario_tag.id)).to eq(scenario_tag.location)
       end
 
-      it 'provides the location of a scenario example tags' do
-        expect(subject.location(example_tag.id)).to eq(example_tag.location)
+      it 'provides the location of scenario examples tags' do
+        expect(subject.location(examples_tag.id)).to eq(examples_tag.location)
+      end
+
+      it 'provides the location of a rule tag' do
+        expect(subject.location(rule_tag.id)).to eq(rule_tag.location)
       end
     end
 
     context 'when children are scoped in a Rule' do
-      let(:rule) { find_message_by_attribute(gherkin_document.feature.children, :rule) }
       let(:rule_background) { find_message_by_attribute(rule.children, :background) }
       let(:rule_background_step) { rule_background.steps.first }
       let(:rule_scenario) { find_message_by_attribute(rule.children, :scenario) }
@@ -153,4 +154,4 @@ describe Gherkin::Query do
       end
     end
   end
-end
+end

data/spec/gherkin/stream/parser_message_stream_spec.rb

@@ -11,11 +11,11 @@ module Gherkin
       }
 
       let(:source_feature) {
-        Cucumber::Messages::Source.new({
+        Cucumber::Messages::Source.new(
           uri: '//whatever/uri',
           data: feature_content,
           media_type: 'text/x.cucumber.gherkin+plain'
-        })
+        )
       }
 
       let(:options) {
@@ -64,4 +64,4 @@ module Gherkin
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-gherkin
 version: !ruby/object:Gem::Version
-  version: 15.0.2
+  version: 20.0.1
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '17.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 17.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '17.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 17.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,27 +51,27 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 description: Gherkin parser
 email: cukes@googlegroups.com
 executables:
@@ -95,7 +95,6 @@ files:
 - lib/gherkin/pickles/compiler.rb
 - lib/gherkin/query.rb
 - lib/gherkin/stream/parser_message_stream.rb
-- lib/gherkin/stream/subprocess_message_stream.rb
 - lib/gherkin/token.rb
 - lib/gherkin/token_formatter_builder.rb
 - lib/gherkin/token_matcher.rb
@@ -107,16 +106,15 @@ files:
 - spec/gherkin/parser_spec.rb
 - spec/gherkin/query_spec.rb
 - spec/gherkin/stream/parser_message_stream_spec.rb
-- spec/gherkin/stream/subprocess_message_stream_spec.rb
 homepage: https://github.com/cucumber/gherkin-ruby
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/cucumber/cucumber/issues
-  changelog_uri: https://github.com/cucumber/cucumber/blob/master/gherkin/CHANGELOG.md
+  changelog_uri: https://github.com/cucumber/common/blob/main/gherkin/CHANGELOG.md
   documentation_uri: https://cucumber.io/docs/gherkin/
   mailing_list_uri: https://groups.google.com/forum/#!forum/cukes
-  source_code_uri: https://github.com/cucumber/cucumber/blob/master/gherkin/ruby
+  source_code_uri: https://github.com/cucumber/common/blob/main/gherkin/ruby
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -136,13 +134,12 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-gherkin-15.0.2
+summary: cucumber-gherkin-20.0.1
 test_files:
-- spec/gherkin/dialect_spec.rb
+- spec/capture_warnings.rb
 - spec/gherkin/gherkin_line_spec.rb
-- spec/gherkin/stream/parser_message_stream_spec.rb
-- spec/gherkin/stream/subprocess_message_stream_spec.rb
+- spec/gherkin/dialect_spec.rb
 - spec/gherkin/parser_spec.rb
-- spec/gherkin/gherkin_spec.rb
+- spec/gherkin/stream/parser_message_stream_spec.rb
 - spec/gherkin/query_spec.rb
-- spec/capture_warnings.rb
+- spec/gherkin/gherkin_spec.rb

data/lib/gherkin/stream/subprocess_message_stream.rb

@@ -1,26 +0,0 @@
-require 'open3'
-require 'cucumber/messages'
-
-module Gherkin
-  module Stream
-    class SubprocessMessageStream
-      def initialize(gherkin_executable, paths, print_source, print_ast, print_pickles)
-        @gherkin_executable, @paths, @print_source, @print_ast, @print_pickles = gherkin_executable, paths, print_source, print_ast, print_pickles
-      end
-
-      def messages
-        args = [@gherkin_executable]
-        args.push('--no-source') unless @print_source
-        args.push('--no-ast') unless @print_ast
-        args.push('--no-pickles') unless @print_pickles
-        args = args.concat(@paths)
-        stdin, stdout, stderr, wait_thr = Open3.popen3(*args)
-        if(stdout.eof?)
-          error = stderr.read
-          raise error
-        end
-        Cucumber::Messages::BinaryToMessageEnumerator.new(stdout)
-      end
-    end
-  end
-end