cucumber-tag-expressions 2.0.4 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be7d303752ffa2d234ab77aa7bd2058ab04d45c748e4338cd1e40bb753dd1d4e
-  data.tar.gz: 6edcd46332cf28e9299196f578b0727e0bcdeb50b8624a97c958912b25312aef
+  metadata.gz: add075dc395b297351352601837188db90a7e347035845e63e8af7028ecc9d90
+  data.tar.gz: d9e1ed8d2291b2338c2a64303581e6cfa84854265aff0422d75bf8641f156c5e
 SHA512:
-  metadata.gz: a990e25f228922ccbffec8b9e9c5394ba4674061c5893ffa6eedab32972cc42ae0dc3d084799fe0a48476e62c1abdc5fc55175f4a71c7478bdff56742f0fb220
-  data.tar.gz: 15af8848563ebd7f790e27af1f9f26f4c1f43714b40d8c38dfd8cf4fdf58e5fb7fa3333d464f4c85712c738a80cfceee80ee809d952d432592c8643c21763463
+  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: 2.0.4
+  version: 4.1.0
 platform: ruby
 authors:
 - Andrea Nodari
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -20,7 +20,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
@@ -30,47 +30,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
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.23
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.23
+        version: 3.10.0
 description: Cucumber tag expressions for ruby
 email: cukes@googlegroups.com
 executables: []
@@ -83,7 +63,6 @@ files:
 - lib/cucumber/tag_expressions/expressions.rb
 - lib/cucumber/tag_expressions/parser.rb
 - spec/capture_warnings.rb
-- spec/coverage.rb
 - spec/expressions_spec.rb
 - spec/parser_spec.rb
 homepage: https://cucumber.io/docs/cucumber/api/#tag-expressions
@@ -91,10 +70,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/cucumber/cucumber/issues
-  changelog_uri: https://github.com/cucumber/cucumber/blob/master/tag-expressions/CHANGELOG.md
+  changelog_uri: https://github.com/cucumber/common/blob/main/tag-expressions/CHANGELOG.md
   documentation_uri: https://cucumber.io/docs/cucumber/api/#tag-expressions
   mailing_list_uri: https://groups.google.com/forum/#!forum/cukes
-  source_code_uri: https://github.com/cucumber/cucumber/blob/master/tag-expressions/ruby
+  source_code_uri: https://github.com/cucumber/common/blob/main/tag-expressions/ruby
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -111,13 +90,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-tag-expressions-2.0.4
+summary: cucumber-tag-expressions-4.1.0
 test_files:
+- spec/expressions_spec.rb
 - spec/capture_warnings.rb
 - spec/parser_spec.rb
-- spec/coverage.rb
-- spec/expressions_spec.rb

data/spec/coverage.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-require 'simplecov'
-formatters = [ SimpleCov::Formatter::HTMLFormatter ]
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(*formatters)
-SimpleCov.add_filter 'spec/'
-SimpleCov.start