cucumber-gherkin 23.0.1 → 24.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92e8633ce3259f5f5667b48c7c6a90db7e26c3dd2c7b22ee4ce739557d8184d8
-  data.tar.gz: cd3632fd9b741e133c307a0c9d346111374e23270ebdaddd61ba04274703e0f6
+  metadata.gz: 7f066daa131750379a87000be3403923d23d19bce878eb1691b0da2186097a89
+  data.tar.gz: aae3d31b3e3228638813562d1f6574f2d886fe82b8bded9758703979f0f33b6c
 SHA512:
-  metadata.gz: e30b4e2d3810caded572fae28310668537ff81b33659fbd7a8b634ded7247d8f324eab81a67216c4093147dec31be93d986e1a30ee72d781ece050c1c27192c7
-  data.tar.gz: 9837170de884a9f01c939f9fa005132db1ef44d91517f54726397cb6c3caac6316f0ca2dc537d1314fd8a7da04857a192f3c949a15210ac7c51433c7650879b8
+  metadata.gz: fb1517adbea8387bf7a9cd079943bac765c97ee258bf121b0fe0bdaeeba5851434c37ec0c1131923b7bd969e6abf49ee9aa18880d623383b04de882fccc750fd
+  data.tar.gz: d0e28f48adc93600dc502485c1ea935198bab88246545b792f36b7080b3deeab84ec5e683dcfd42623eb2e394328bd8fe37912958923bc2df2bcb21d481a41b5

data/lib/gherkin/ast_builder.rb

@@ -116,6 +116,7 @@ module Gherkin
         step = Cucumber::Messages::Step.new(
           location: get_location(step_line, 0),
           keyword: step_line.matched_keyword,
+          keyword_type: step_line.matched_keyword_type,
           text: step_line.matched_text,
           data_table: data_table,
           doc_string: doc_string,

data/lib/gherkin/dialect.rb

@@ -1,3 +1,4 @@
+require 'cucumber/messages'
 require 'json'
 
 module Gherkin

data/lib/gherkin/gherkin-languages.json

@@ -967,9 +967,12 @@
     ],
     "when": [
       "* ",
-      "Tha ",
-      "Þa ",
-      "Ða "
+      "Bæþsealf ",
+      "Bæþsealfa ",
+      "Bæþsealfe ",
+      "Ciricæw ",
+      "Ciricæwe ",
+      "Ciricæwa "
     ]
   },
   "en-pirate": {
@@ -2395,7 +2398,7 @@
     "and": [
       "* ",
       "र ",
-      "अनी "
+      "अनि "
     ],
     "background": [
       "पृष्ठभूमी"
@@ -3459,7 +3462,7 @@
     ],
     "given": [
       "* ",
-      "Агар "
+      "Belgilangan "
     ],
     "name": "Uzbek",
     "native": "Узбекча",

data/lib/gherkin/pickles/compiler.rb

@@ -1,3 +1,5 @@
+require 'cucumber/messages'
+
 module Gherkin
   module Pickles
     class Compiler
@@ -56,12 +58,17 @@ module Gherkin
       end
 
       def compile_scenario(inherited_tags, background_steps, scenario, language, pickles, source)
-        steps = scenario.steps.empty? ? [] : [].concat(pickle_steps(background_steps))
-
         tags = [].concat(inherited_tags).concat(scenario.tags)
 
-        scenario.steps.each do |step|
-          steps.push(pickle_step(step))
+        last_keyword_type = Cucumber::Messages::PickleStepType::UNKNOWN
+        steps = []
+        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
+            steps.push(Cucumber::Messages::PickleStep.new(**pickle_step_props(step, [], nil, last_keyword_type)))
+          end
         end
 
         pickle = Cucumber::Messages::Pickle.new(
@@ -81,12 +88,25 @@ module Gherkin
           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(inherited_tags).concat(scenario.tags).concat(examples.tags)
 
-            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))
+            last_keyword_type = nil
+            steps = []
+            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
+                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
+                step_props = pickle_step_props(step, variable_cells, values_row, last_keyword_type)
+                steps.push(Cucumber::Messages::PickleStep.new(**step_props))
+              end
             end
 
             pickle = Cucumber::Messages::Pickle.new(
@@ -115,21 +135,12 @@ module Gherkin
         name
       end
 
-      def pickle_steps(steps)
-        steps.map do |step|
-          pickle_step(step)
-        end
-      end
-
-      def pickle_step(step)
-        Cucumber::Messages::PickleStep.new(**pickle_step_props(step, [], nil))
-      end
-
-      def pickle_step_props(step, variable_cells, values_row)
+      def pickle_step_props(step, variable_cells, values_row, keyword_type)
         value_cells = values_row ? values_row.cells : []
         props = {
           id: @id_generator.new_id,
           ast_node_ids: [step.id],
+          type: keyword_type,
           text: interpolate(step.text, variable_cells, value_cells),
         }
         if values_row

data/lib/gherkin/token.rb

@@ -1,7 +1,7 @@
 module Gherkin
   class Token < Struct.new(:line, :location)
     attr_accessor :matched_type, :matched_text, :matched_keyword, :matched_indent,
-                  :matched_items, :matched_gherkin_dialect
+                  :matched_items, :matched_gherkin_dialect, :matched_keyword_type
 
     def eof?
       line.nil?

data/lib/gherkin/token_formatter_builder.rb

@@ -30,7 +30,7 @@ module Gherkin
         token.location[:line],
         token.location[:column],
         token.matched_type,
-        token.matched_keyword,
+        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(',')
     end

data/lib/gherkin/token_matcher.rb

@@ -1,3 +1,4 @@
+require 'cucumber/messages'
 require_relative 'dialect'
 require_relative 'errors'
 
@@ -20,7 +21,7 @@ module Gherkin
     def match_TagLine(token)
       return false unless token.line.start_with?('@')
 
-      set_token_matched(token, :TagLine, nil, nil, nil, token.line.tags)
+      set_token_matched(token, :TagLine, nil, nil, nil, nil, token.line.tags)
       true
     end
 
@@ -48,7 +49,8 @@ module Gherkin
     def match_TableRow(token)
       return false unless token.line.start_with?('|')
       # TODO: indent
-      set_token_matched(token, :TableRow, nil, nil, nil, token.line.table_cells)
+      set_token_matched(token, :TableRow, nil, nil, nil, nil,
+                        token.line.table_cells)
       true
     end
 
@@ -128,18 +130,40 @@ module Gherkin
       return false unless keyword
 
       title = token.line.get_rest_trimmed(keyword.length)
-      set_token_matched(token, :StepLine, title, keyword)
+      keyword_types = @keyword_types[keyword]
+      keyword_type = keyword_types[0]
+      if keyword_types.length() > 1
+        keyword_type = Cucumber::Messages::StepKeywordType::UNKNOWN
+      end
+
+      set_token_matched(token,
+                        :StepLine, title, keyword, nil, keyword_type)
       return 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] += [type]
+      end
+    end
+
     def change_dialect(dialect_name, location)
       dialect = Dialect.for(dialect_name)
       raise NoSuchLanguageException.new(dialect_name, location) if dialect.nil?
 
       @dialect_name = dialect_name
       @dialect = dialect
+      @keyword_types = {}
+      add_keyword_type_mappings(@dialect.given_keywords, Cucumber::Messages::StepKeywordType::CONTEXT)
+      add_keyword_type_mappings(@dialect.when_keywords, Cucumber::Messages::StepKeywordType::ACTION)
+      add_keyword_type_mappings(@dialect.then_keywords, Cucumber::Messages::StepKeywordType::OUTCOME)
+      add_keyword_type_mappings(@dialect.and_keywords + @dialect.but_keywords,
+                                Cucumber::Messages::StepKeywordType::CONJUNCTION)
     end
 
     def match_title_line(token, token_type, keywords)
@@ -152,12 +176,13 @@ module Gherkin
       true
     end
 
-    def set_token_matched(token, matched_type, text = nil, keyword = nil, indent = nil, items = [])
+    def set_token_matched(token, matched_type, text = nil, keyword = nil, indent = nil, keyword_type = nil, items = [])
       token.matched_type = matched_type
       token.matched_text = text && text.chomp
       token.matched_keyword = keyword
       token.matched_indent = indent || (token.line && token.line.indent) || 0
       token.matched_items = items
+      token.matched_keyword_type = keyword_type
       token.location[:column] = token.matched_indent + 1
       token.matched_gherkin_dialect = @dialect_name
     end

data/spec/gherkin/gherkin_spec.rb

@@ -4,7 +4,7 @@ require 'gherkin'
 describe Gherkin do
   it "can process feature file paths" do
     messages = Gherkin.from_paths(
-      ["testdata/good/minimal.feature"],
+      ["../testdata/good/minimal.feature"],
       {include_source: true,
        include_gherkin_document: true,
        include_pickles: true}
@@ -14,7 +14,7 @@ describe Gherkin do
   end
 
   it "can process feature file content" do
-    data = File.open("testdata/good/minimal.feature", 'r:UTF-8', &:read)
+    data = File.open("../testdata/good/minimal.feature", 'r:UTF-8', &:read)
 
     messages = Gherkin.from_source(
       "uri",
@@ -28,7 +28,7 @@ describe Gherkin do
   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 = 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(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-gherkin
 version: !ruby/object:Gem::Version
-  version: 23.0.1
+  version: 24.0.0
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '19.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 18.0.0
+        version: 19.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '18.0'
+        version: '19.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 18.0.0
+        version: 19.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-gherkin-23.0.1
+summary: cucumber-gherkin-24.0.0
 test_files:
 - spec/capture_warnings.rb
 - spec/gherkin/gherkin_line_spec.rb