cucumber-tag-expressions 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2dc32ca080c6d1a891598da9057b1c648002a770bb271b2836bd13e0c4440d
-  data.tar.gz: 33f531d5d359782af4f4f0c975c72cbf7a788f2be84a015b7befb31f8a818455
+  metadata.gz: add075dc395b297351352601837188db90a7e347035845e63e8af7028ecc9d90
+  data.tar.gz: d9e1ed8d2291b2338c2a64303581e6cfa84854265aff0422d75bf8641f156c5e
 SHA512:
-  metadata.gz: ee2697573e51ccc628b456682814a11bd89652f85d5859b0292e1286eda5403f21fcab77df1b597e5d0a3d8f8b73212665d658f04da8c10843a9e0df862351f4
-  data.tar.gz: de63fd74e729c530bc383ffed30a1783cf5f4381e9611390418c5259bee04e187f1ecd1c82066b1d5d013a75d6b67a8d3b0cca5db65fa85a7c16c076bbddecfe
+  metadata.gz: 258a7f1a40ba0022491144dba178f8b6ac6a2e9c6180273e2c19244981b463651cb586c9ee6bf4acf4c34c42400f28305165d75571749be6de275fe9fb68d3ed
+  data.tar.gz: e03fbb76b4a951de7a8f4a1d6a3f60b3d47ed9c79b158e729ec153880b36bb28181bbc95c14125cd6ace08ab3578def4ca68781d90fbee64f455d04e4a6ad232

data/lib/cucumber/tag_expressions/expressions.rb

@@ -3,7 +3,7 @@ module Cucumber
     # Literal expression node
     class Literal
       def initialize(value)
-        @value = value.gsub(/\\\(/, '(').gsub(/\\\)/, ')')
+        @value = value
       end
 
       def evaluate(variables)
@@ -11,7 +11,7 @@ module Cucumber
       end
 
       def to_s
-        @value.gsub(/\(/, '\\(').gsub(/\)/, '\\)')
+        @value.gsub(/\\/, "\\\\\\\\").gsub(/\(/, "\\(").gsub(/\)/, "\\)")
       end
     end
 

data/lib/cucumber/tag_expressions/parser.rb

@@ -53,7 +53,36 @@ module Cucumber
       end
 
       def tokens(infix_expression)
-        infix_expression.gsub(/(?<!\\)\(/, ' ( ').gsub(/(?<!\\)\)/, ' ) ').strip.split(/\s+/)
+        escaped = false
+        token = ""
+        result = []
+        infix_expression.chars.each do | ch |
+          if ch == '\\' && !escaped
+            escaped = true
+          else
+            if ch.match(/\s/)
+              if token.length > 0
+                result.push(token)
+                token = ""
+              end
+            else
+              if (ch == '(' || ch == ')') && !escaped
+                if token.length > 0
+                  result.push(token)
+                  token = ""
+                end
+                result.push(ch)
+              else
+                token = token + ch
+              end
+            end
+            escaped = false
+          end
+        end
+        if token.length > 0
+          result.push(token)
+        end
+        result
       end
 
       def process_tokens!(infix_expression)

data/spec/expressions_spec.rb

@@ -52,4 +52,33 @@ describe 'Expression node' do
       include_examples 'expression node', infix_expression, data
     end
   end
+
+  describe Cucumber::TagExpressions::Or do
+    context '#evaluate' do
+      infix_expression = 'x\\\\ or (y\\\\\\)) or (z\\\\)'
+      data = [[%w(), false],
+              [%w(x), false],
+              [%w(y\)), false],
+              [%w(z), false],
+              [%w(x\\), true],
+              [%w(y\\\)), true],
+              [%w(z\\), true]]
+      include_examples 'expression node', infix_expression, data
+    end
+  end
+
+  describe Cucumber::TagExpressions::Or do
+    context '#evaluate' do
+      infix_expression = '\\x or y\\ or z\\'
+      data = [[%w(), false],
+              [%w(\\x), false],
+              [%w(y\\), false],
+              [%w(z\\), false],
+              [%w(x), true],
+              [%w(y), true],
+              [%w(z), true]]
+      include_examples 'expression node', infix_expression, data
+    end
+  end
+
 end

data/spec/parser_spec.rb

@@ -9,7 +9,11 @@ describe Cucumber::TagExpressions::Parser do
     ['not a or b and not c or not d or e and f',
      '( ( ( not ( a ) or ( b and not ( c ) ) ) or not ( d ) ) or ( e and f ) )'],
     ['not a\\(\\) or b and not c or not d or e and f',
-     '( ( ( not ( a\\(\\) ) or ( b and not ( c ) ) ) or not ( d ) ) or ( e and f ) )']
+     '( ( ( not ( a\\(\\) ) or ( b and not ( c ) ) ) or not ( d ) ) or ( e and f ) )'],
+     ['a\\\\ and b', '( a\\\\ and b )'],
+     ['\\a and b\\ and c\\', '( ( a and b ) and c )'],
+     ['(a and b\\\\)', '( a and b\\\\ )'],
+     ['a\\\\\\( and b\\\\\\)', '( a\\\\\\( and b\\\\\\) )']
   ]
 
   error_test_data = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-tag-expressions
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Andrea Nodari
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,8 +93,8 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-tag-expressions-4.0.2
+summary: cucumber-tag-expressions-4.1.0
 test_files:
-- spec/parser_spec.rb
-- spec/capture_warnings.rb
 - spec/expressions_spec.rb
+- spec/capture_warnings.rb
+- spec/parser_spec.rb