cucumber-gherkin 9.2.0 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89aea7a6edadf01a74a1ebbbf96b6f78f86607048295b9f90b7ce19f759ef6c
-  data.tar.gz: 3a557a7ad81abf607bad3a8ca947283bd4c1169cd9c921b25b99e9b50194b4ac
+  metadata.gz: 01aa9e9322f0347200ffdc2e899c9ea4d70cde244d0781fb3d1d3db5dbbb1939
+  data.tar.gz: f7f687d566ad7a939243db783418a614629d39c0919bf95e6ba8b3c3846f9b2b
 SHA512:
-  metadata.gz: b87ab0250281aaa2fd367df846860840a9586f25be0a3ef7d6ee46d667c5460fa144e658049ba860e906067dbdab7877d91dca7ebb1252fb5e15f8a50c861a83
-  data.tar.gz: 9bf856638e88155bf950b3cb19171c91f28b9b9af79fc18b0dc5d595b8d1412a18013da3cd8e0f7ded3d7f01f8f95172bc8c7db98404dad8816bcfaf1ee10050
+  metadata.gz: 0d87ec9065139133f6462d8858725e68e918856a81d8c9c4d8b33877edb1a5c455bc35f52bde741b36794523da05899cee5bf0276ab476076b5175c51e068adf
+  data.tar.gz: 9cb328c9b31a3a964d3b2c62116f1c922329a894ab27bb2069179259130b4aa18a3308193dbafd298b1e46277e1a8afa67e36204d022e726023220eb52398fd1

data/lib/gherkin/gherkin_line.rb

@@ -37,8 +37,9 @@ module Gherkin
       cells = []
 
       self.split_table_cells(@trimmed_line_text) do |item, column|
-        txt_trimmed_left = item.gsub(/^[ \t\n\v\f\r\u0085\u00A0]*/, '')
-        txt_trimmed = txt_trimmed_left.gsub(/[ \t\n\v\f\r\u0085\u00A0]*$/, '')
+        # Keeps new lines
+        txt_trimmed_left = item.sub(/\A[ \t\v\f\r\u0085\u00A0]*/, '')
+        txt_trimmed = txt_trimmed_left.sub(/[ \t\v\f\r\u0085\u00A0]*\z/, '')
         cell_indent = item.length - txt_trimmed_left.length
         span = Span.new(@indent + column + cell_indent, txt_trimmed)
         cells.push(span)
@@ -81,15 +82,26 @@ module Gherkin
     end
 
     def tags
-      column = @indent + 1;
-      items = @trimmed_line_text.strip.split('@')
-      items = items[1..-1] # ignore before the first @
-      items.map do |item|
-        length = item.length
-        span = Span.new(column, '@' + item.strip)
-        column += length + 1
-        span
-      end
+      uncommented_line = @trimmed_line_text.split(/\s#/,2)[0]
+      column = @indent + 1
+      items = uncommented_line.split('@')
+
+      tags = []
+      items.each { |untrimmed|
+        item = untrimmed.strip
+        if item.length == 0
+          next
+        end
+
+        unless item =~ /^\S+$/
+          location = {line: @line_number, column: column}
+          raise ParserException.new('A tag may not contain whitespace', location)
+        end
+
+        tags << Span.new(column, '@' + item)
+        column += untrimmed.length + 1
+      }
+      tags
     end
 
     class Span < Struct.new(:column, :text); end

data/lib/gherkin/token_matcher.rb

@@ -80,7 +80,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)
@@ -118,10 +118,10 @@ module Gherkin
 
     def match_StepLine(token)
       keywords = @dialect.given_keywords +
-                 @dialect.when_keywords +
-                 @dialect.then_keywords +
-                 @dialect.and_keywords +
-                 @dialect.but_keywords
+          @dialect.when_keywords +
+          @dialect.then_keywords +
+          @dialect.and_keywords +
+          @dialect.but_keywords
 
       keyword = keywords.detect { |k| token.line.start_with?(k) }
 
@@ -152,7 +152,7 @@ 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, items = [])
       token.matched_type = matched_type
       token.matched_text = text && text.chomp
       token.matched_keyword = keyword
@@ -163,7 +163,13 @@ module Gherkin
     end
 
     def unescape_docstring(text)
-      @active_doc_string_separator ? text.gsub("\\\"\\\"\\\"", "\"\"\"") : text
+      if @active_doc_string_separator == "\"\"\""
+        text.gsub("\\\"\\\"\\\"", "\"\"\"")
+      elsif @active_doc_string_separator == "```"
+        text.gsub("\\`\\`\\`", "```")
+      else
+        text
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-gherkin
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Gáspár Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.3
+        version: 10.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.3
+        version: 10.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ rubyforge_project:
 rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
-summary: cucumber-gherkin-9.2.0
+summary: cucumber-gherkin-10.0.0
 test_files:
 - spec/gherkin/dialect_spec.rb
 - spec/gherkin/stream/parser_message_stream_spec.rb