cucumber-tag-expressions 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f706cda9810598cd7d38933b862a0e50e2870be4525012e64e4b0b6596b3b3
-  data.tar.gz: 40b6af7268af69b1af1406d567cf0e536bd00d6d28dd3a6693a29c822b4e4876
+  metadata.gz: 47563b3d91bae578ee83c3f510081724ba64d4322cb6196beaf0da543d4b21c0
+  data.tar.gz: 5bcf02d2e8b2e0aa0b7b2906ba9aecde5224f967b12fc7deb7f013e6defa5614
 SHA512:
-  metadata.gz: 838196e211cb93599402f1ae4f928ca91f039a2a3ae5cdf7b1245e1ad8dc5609edf5ca1ce6f6e56d722a642c37a3afa6a7d8c89ce8a0baf3de8f2ee551631287
-  data.tar.gz: 3ab907243a1fa9a2ab3330829650f6fdf8769dcc532b7fddb04bc70bf8acaaa51e5fa74426840975d1bfcf15fd32084a2fcccab0f950d374dd10775457d5d665
+  metadata.gz: 724e4dc685894201c18998973edd45866ebe13a75799119c847c19209c0f9b6b8c9042d81001d8faf2e6f922b926a5d14053b0672457394f5f6b8096cb2ccf9b
+  data.tar.gz: 64044f10e31c417e6348c02d7f21043e8f0aa223b6a0b892cbfe4a74b266007d85140c66c4b6528075d4cce1340a7292453810ecebfc28142e87df319d2edc16

data/lib/cucumber/tag_expressions/parser.rb

@@ -8,14 +8,6 @@ module Cucumber
       def initialize
         @expressions = []
         @operators = []
-
-        @operator_types = {
-          'or' => { type: :binary_operator,    precedence: 0, assoc: :left },
-          'and' => { type: :binary_operator,   precedence: 1, assoc: :left },
-          'not' => { type: :unary_operator,   precedence: 2, assoc: :right },
-          ')' => { type: :close_paren,       precedence: -1 },
-          '(' => { type: :open_paren,        precedence: 1 }
-        }
       end
 
       def parse(infix_expression)
@@ -24,11 +16,7 @@ module Cucumber
         return True.new if tokens.empty?
 
         tokens.each do |token|
-          if @operator_types[token]
-            expected_token_type = send("handle_#{@operator_types.dig(token, :type)}", infix_expression, token, expected_token_type)
-          else
-            expected_token_type = handle_literal(infix_expression, token, expected_token_type)
-          end
+          expected_token_type = handle_sequential_tokens(token, infix_expression, expected_token_type)
         end
 
         while @operators.any?
@@ -43,7 +31,7 @@ module Cucumber
       private
 
       def assoc_of(token, value)
-        @operator_types.dig(token, :assoc) == value
+        operator_types.dig(token, :assoc) == value
       end
 
       def lower_precedence?(operation)
@@ -52,11 +40,11 @@ module Cucumber
       end
 
       def operator?(token)
-        [:unary_operator, :binary_operator].include?(@operator_types.dig(token, :type))
+        %i[unary_operator binary_operator].include?(operator_types.dig(token, :type))
       end
 
       def precedence(token)
-        @operator_types.dig(token, :precedence)
+        operator_types.dig(token, :precedence)
       end
 
       def tokenize(infix_expression)
@@ -89,10 +77,18 @@ module Cucumber
 
       def push_expression(token)
         case token
-        when 'and'; @expressions.push(And.new(*pop(@expressions, 2)))
-        when 'or';  @expressions.push(Or.new(*pop(@expressions, 2)))
-        when 'not'; @expressions.push(Not.new(pop(@expressions)))
-        else        @expressions.push(Literal.new(token))
+        when 'and' then @expressions.push(And.new(*pop(@expressions, 2)))
+        when 'or'  then @expressions.push(Or.new(*pop(@expressions, 2)))
+        when 'not' then @expressions.push(Not.new(pop(@expressions)))
+        else            @expressions.push(Literal.new(token))
+        end
+      end
+
+      def handle_sequential_tokens(token, infix_expression, expected_token_type)
+        if operator_types[token]
+          send("handle_#{operator_types.dig(token, :type)}", infix_expression, token, expected_token_type)
+        else
+          handle_literal(infix_expression, token, expected_token_type)
         end
       end
 
@@ -143,6 +139,16 @@ module Cucumber
         amount == 1 ? result.first : result
       end
 
+      def operator_types
+        {
+          'or' => { type: :binary_operator, precedence: 0, assoc: :left },
+          'and' => { type: :binary_operator, precedence: 1, assoc: :left },
+          'not' => { type: :unary_operator, precedence: 2, assoc: :right },
+          ')' => { type: :close_paren, precedence: -1 },
+          '(' => { type: :open_paren, precedence: 1 }
+        }
+      end
+
       def whitespace?(char)
         char.match(/\s/)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-tag-expressions
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Andrea Nodari
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,10 +98,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.8
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
-summary: cucumber-tag-expressions-6.1.0
+summary: cucumber-tag-expressions-6.1.1
 test_files:
 - spec/errors_spec.rb
 - spec/evaluations_spec.rb