cucumber-tag-expressions 6.1.0 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f706cda9810598cd7d38933b862a0e50e2870be4525012e64e4b0b6596b3b3
-  data.tar.gz: 40b6af7268af69b1af1406d567cf0e536bd00d6d28dd3a6693a29c822b4e4876
+  metadata.gz: bddf0d042650b79fc5886aed9537224e09c014fcdf858606cf71a78ed3a039c1
+  data.tar.gz: 6f22aa0faeb10909fed7db9af1f4b7dff6e040d46a10da31681edb55df4376f9
 SHA512:
-  metadata.gz: 838196e211cb93599402f1ae4f928ca91f039a2a3ae5cdf7b1245e1ad8dc5609edf5ca1ce6f6e56d722a642c37a3afa6a7d8c89ce8a0baf3de8f2ee551631287
-  data.tar.gz: 3ab907243a1fa9a2ab3330829650f6fdf8769dcc532b7fddb04bc70bf8acaaa51e5fa74426840975d1bfcf15fd32084a2fcccab0f950d374dd10775457d5d665
+  metadata.gz: a0b216d933ee4aca4eae8e1114b75acff19565f179931c3b61c531b94eb4d233af2ec16ac954513121d06d35d352ade10e730949314b137adf7bf114612309b6
+  data.tar.gz: d1f799fa7b759c0c6be6a7cd2d49e89924880b5a1aa708659755448ccec974fecfaad43f6945bd3f3dd5c3c4afff4c850c74637631b3f8991d9b24035ac1892f

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,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-tag-expressions
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.2
 platform: ruby
 authors:
 - Andrea Nodari
 - Aslak Hellesøy
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -69,10 +62,6 @@ files:
 - lib/cucumber/tag_expressions.rb
 - lib/cucumber/tag_expressions/expressions.rb
 - lib/cucumber/tag_expressions/parser.rb
-- spec/errors_spec.rb
-- spec/evaluations_spec.rb
-- spec/parsing_spec.rb
-- spec/spec_helper.rb
 homepage: https://cucumber.io/docs/cucumber/api/#tag-expressions
 licenses:
 - MIT
@@ -82,7 +71,6 @@ metadata:
   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/tag-expressions/tree/main/ruby
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -98,12 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.8
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
-summary: cucumber-tag-expressions-6.1.0
-test_files:
-- spec/errors_spec.rb
-- spec/evaluations_spec.rb
-- spec/parsing_spec.rb
-- spec/spec_helper.rb
+summary: cucumber-tag-expressions-6.1.2
+test_files: []

data/spec/errors_spec.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-tests = YAML.load_file('../testdata/errors.yml')
-
-describe 'Errors' do
-  tests.each do |test|
-    let(:parser) { Cucumber::TagExpressions::Parser.new }
-
-    it "fails to parse '#{test['expression']}' with '#{test['error']}'" do
-      expect { parser.parse(test['expression']) }.to raise_error(test['error'])
-    end
-  end
-end

data/spec/evaluations_spec.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-evaluations = YAML.load_file('../testdata/evaluations.yml')
-
-describe 'Evaluations' do
-  evaluations.each do |evaluation|
-    context evaluation['expression'] do
-      let(:parser) { Cucumber::TagExpressions::Parser.new }
-
-      evaluation['tests'].each do |test|
-        it "evaluates [#{test['variables'].join(', ')}] to #{test['result']}" do
-          expect(parser.parse(evaluation['expression']).evaluate(test['variables'])).to eq(test['result'])
-        end
-      end
-    end
-  end
-end

data/spec/parsing_spec.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-tests = YAML.load_file('../testdata/parsing.yml')
-
-describe 'Parsing' do
-  let(:parser) { Cucumber::TagExpressions::Parser.new }
-
-  tests.each do |test|
-    it "parses '#{test['expression']}' into '#{test['formatted']}'" do
-      expect(parser.parse(test['expression']).to_s).to eq(test['formatted'])
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'cucumber/tag_expressions/parser'
-require 'yaml'