cucumber-cucumber-expressions 14.0.0 → 15.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a32df17b80432aa451bc8f8d5822dfa3b919e44a3feefd657d6dffc730ca56c4
-  data.tar.gz: 12157d0f708a0eaff7b0fc6ad1afb0b68668dfdfd87a370091466cae29d3fcfe
+  metadata.gz: 8628e719f25a444f3a037e9a361b9b19b4f9023a0b9d047d0171b843931d8a3e
+  data.tar.gz: 9efbaac6092ddc16918a7b878d7bc05036451891dcfaaaead7e967d6547c64ec
 SHA512:
-  metadata.gz: 95c6db3127e8a2111ec7f50b06dab07443649e2fd1f759818552df4ac24ec715bd8fb4aad2bd79b3e8054d88dc9751594c75880fa3c15b06f000c82dd88bb37e
-  data.tar.gz: 59ba7dabc703d4b3f4ce6e0d319c0275dfa1dc78b0589544a51f5a070f8a3c6c183dcf0bfa60dbac168209944ee9f5ce95a7ed280f4b5f5f28c817b84b40a937
+  metadata.gz: 409bacfe1c4dbf2aa2fda4eef18fbf8975bfd0f709e5ca3e0380259d7f59cb925939ef37a077cacc88794b2f885a059a07dcdf8facbe47fec32996dea65a7d45
+  data.tar.gz: 78d3abbeae4da6de3b5c96c4a22c44fdab57e9a6543a5446d16228ff5c475e48810be0a3e8ef5fc555a8a134c94b0cf453b66948feb52b3ef98696a9c3732159

data/VERSION

@@ -1 +1 @@
-14.0.0
+15.1.0

data/cucumber-cucumber-expressions.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
                   }
 
   s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
-  s.add_development_dependency 'rspec', '~> 3.10', '>= 3.10.0'
+  s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0'
 
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n").reject {|path| path =~ /\.gitignore$/ }

data/lib/cucumber/cucumber_expressions/parameter_type_registry.rb

@@ -1,6 +1,7 @@
 require 'cucumber/cucumber_expressions/parameter_type'
 require 'cucumber/cucumber_expressions/errors'
 require 'cucumber/cucumber_expressions/cucumber_expression_generator'
+require 'bigdecimal'
 
 module Cucumber
   module CucumberExpressions
@@ -20,6 +21,12 @@ module Cucumber
         define_parameter_type(ParameterType.new('word', WORD_REGEXP, String, lambda {|s = nil| s}, false, false))
         define_parameter_type(ParameterType.new('string', STRING_REGEXP, String, lambda { |s1, s2| arg = s1 != nil ? s1 : s2; arg.gsub(/\\"/, '"').gsub(/\\'/, "'")}, true, false))
         define_parameter_type(ParameterType.new('', ANONYMOUS_REGEXP, String, lambda {|s = nil| s}, false, true))
+        define_parameter_type(ParameterType.new('bigdecimal', FLOAT_REGEXP, BigDecimal, lambda {|s = nil| BigDecimal(s)}, false, false))
+        define_parameter_type(ParameterType.new('biginteger', INTEGER_REGEXPS, Integer, lambda {|s = nil| s && s.to_i}, false, false))
+        define_parameter_type(ParameterType.new('byte', INTEGER_REGEXPS, Integer, lambda {|s = nil| s && s.to_i}, false, false))
+        define_parameter_type(ParameterType.new('short', INTEGER_REGEXPS, Integer, lambda {|s = nil| s && s.to_i}, false, false))
+        define_parameter_type(ParameterType.new('long', INTEGER_REGEXPS, Integer, lambda {|s = nil| s && s.to_i}, false, false))
+        define_parameter_type(ParameterType.new('double', FLOAT_REGEXP, Float, lambda {|s = nil| s && s.to_f}, false, false))
       end
 
       def lookup_by_type_name(name)

data/spec/cucumber/cucumber_expressions/cucumber_expression_parser_spec.rb

@@ -1,21 +1,20 @@
 require 'yaml'
-require 'json'
 require 'cucumber/cucumber_expressions/cucumber_expression_parser'
 require 'cucumber/cucumber_expressions/errors'
 
 module Cucumber
   module CucumberExpressions
-    describe 'Cucumber expression parser' do
-      Dir['../testdata/ast/*.yaml'].each do |testcase|
-        expectation = YAML.load_file(testcase) # encoding?
-        it "#{testcase}" do
+    describe CucumberExpressionParser do
+      Dir['../testdata/cucumber-expression/parser/*.yaml'].each do |path|
+        expectation = YAML.load_file(path)
+        it "parses #{path}" do
           parser = CucumberExpressionParser.new
-          if expectation['exception'].nil?
+          if expectation['exception']
+            expect { parser.parse(expectation['expression']) }.to raise_error(expectation['exception'])
+          else
             node = parser.parse(expectation['expression'])
             node_hash = node.to_hash
-            expect(node_hash).to eq(JSON.parse(expectation['expected']))
-          else
-            expect { parser.parse(expectation['expression']) }.to raise_error(expectation['exception'])
+            expect(node_hash).to eq(expectation['expected_ast'])
           end
         end
       end

data/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'json'
 require 'cucumber/cucumber_expressions/cucumber_expression'
 require 'cucumber/cucumber_expressions/parameter_type_registry'
 
@@ -7,33 +6,36 @@ module Cucumber
   module CucumberExpressions
     describe CucumberExpression do
 
-      Dir['../testdata/expression/*.yaml'].each do |testcase|
-        expectation = YAML.load_file(testcase) # encoding?
-        it "#{testcase}" do
+      Dir['../testdata/cucumber-expression/matching/*.yaml'].each do |path|
+        expectation = YAML.load_file(path)
+        it "matches #{path}" do
           parameter_registry = ParameterTypeRegistry.new
-          if expectation['exception'].nil?
-            cucumber_expression = CucumberExpression.new(expectation['expression'], parameter_registry)
-            matches = cucumber_expression.match(expectation['text'])
-            values = matches.nil? ? nil : matches.map { |arg| arg.value(nil) }
-            expect(values).to eq(JSON.parse(expectation['expected']))
-          else
+          if expectation['exception']
             expect {
               cucumber_expression = CucumberExpression.new(expectation['expression'], parameter_registry)
               cucumber_expression.match(expectation['text'])
             }.to raise_error(expectation['exception'])
+          else
+            cucumber_expression = CucumberExpression.new(expectation['expression'], parameter_registry)
+            matches = cucumber_expression.match(expectation['text'])
+            values = matches.nil? ? nil : matches.map do |arg|
+              value = arg.value(nil)
+              case value
+              when BigDecimal
+                # Format {bigdecimal} as string (because it must be a string in matches-bigdecimal.yaml)
+                value.to_s('f')
+              when Integer
+                # Format {bigint} as string (because it must be a string in matches-bigint.yaml)
+                value.bit_length > 64 ? value.to_s : value
+              else
+                value
+              end
+            end
+            expect(values).to eq(expectation['expected_args'])
           end
         end
       end
 
-      Dir['../testdata/regex/*.yaml'].each do |testcase|
-        expectation = YAML.load_file(testcase) # encoding?
-        it "#{testcase}" do
-          parameter_registry = ParameterTypeRegistry.new
-          cucumber_expression = CucumberExpression.new(expectation['expression'], parameter_registry)
-          expect(cucumber_expression.regexp.source).to eq(expectation['expected'])
-        end
-      end
-
       it "documents match arguments" do
         parameter_registry = ParameterTypeRegistry.new
 

data/spec/cucumber/cucumber_expressions/cucumber_expression_tokenizer_spec.rb

@@ -1,21 +1,20 @@
 require 'yaml'
-require 'json'
 require 'cucumber/cucumber_expressions/cucumber_expression_tokenizer'
 require 'cucumber/cucumber_expressions/errors'
 
 module Cucumber
   module CucumberExpressions
-    describe 'Cucumber expression tokenizer' do
-      Dir['../testdata/tokens/*.yaml'].each do |testcase|
-        expectation = YAML.load_file(testcase) # encoding?
-        it "#{testcase}" do
+    describe CucumberExpressionTokenizer do
+      Dir['../testdata/cucumber-expression/tokenizer/*.yaml'].each do |path|
+        expectation = YAML.load_file(path)
+        it "tokenizes #{path}" do
           tokenizer = CucumberExpressionTokenizer.new
-          if expectation['exception'].nil?
+          if expectation['exception']
+            expect { tokenizer.tokenize(expectation['expression']) }.to raise_error(expectation['exception'])
+          else
             tokens = tokenizer.tokenize(expectation['expression'])
             token_hashes = tokens.map{|token| token.to_hash}
-            expect(token_hashes).to eq(JSON.parse(expectation['expected']))
-          else
-            expect { tokenizer.tokenize(expectation['expression']) }.to raise_error(expectation['exception'])
+            expect(token_hashes).to eq(expectation['expected_tokens'])
           end
         end
       end

data/spec/cucumber/cucumber_expressions/cucumber_expression_transformation_spec.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+require 'cucumber/cucumber_expressions/cucumber_expression'
+require 'cucumber/cucumber_expressions/parameter_type_registry'
+
+module Cucumber
+  module CucumberExpressions
+    describe CucumberExpression do
+      Dir['../testdata/cucumber-expression/transformation/*.yaml'].each do |path|
+        expectation = YAML.load_file(path)
+        it "transforms #{path}" do
+          parameter_registry = ParameterTypeRegistry.new
+          if expectation['exception']
+            expect {
+              cucumber_expression = CucumberExpression.new(expectation['expression'], parameter_registry)
+              cucumber_expression.match(expectation['text'])
+            }.to raise_error(expectation['exception'])
+          else
+            cucumber_expression = CucumberExpression.new(expectation['expression'], parameter_registry)
+            matches = cucumber_expression.match(expectation['text'])
+            values = matches.nil? ? nil : matches.map { |arg| arg.value(nil) }
+            expect(values).to eq(expectation['expected_args'])
+          end
+        end
+      end
+    end
+  end
+end

data/spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb

@@ -7,13 +7,10 @@ module Cucumber
     class Color
       attr_reader :name
 
-      ### [color-constructor]
       def initialize(name)
         @name = name
       end
 
-      ### [color-constructor]
-
       def ==(other)
         other.is_a?(Color) && other.name == name
       end
@@ -46,7 +43,6 @@ module Cucumber
     describe "Custom parameter type" do
       before do
         parameter_type_registry = ParameterTypeRegistry.new
-        ### [add-color-parameter-type]
         parameter_type_registry.define_parameter_type(ParameterType.new(
             'color',                   # name
             /red|blue|yellow/,         # regexp
@@ -55,7 +51,6 @@ module Cucumber
             true,                      # use_for_snippets
             false                      # prefer_for_regexp_match
         ))
-        ### [add-color-parameter-type]
         @parameter_type_registry = parameter_type_registry
       end
 

data/spec/cucumber/cucumber_expressions/regular_expression_spec.rb

@@ -1,19 +1,19 @@
+require 'yaml'
 require 'cucumber/cucumber_expressions/regular_expression'
 require 'cucumber/cucumber_expressions/parameter_type_registry'
 
 module Cucumber
   module CucumberExpressions
     describe RegularExpression do
-      it "documents match arguments" do
-        parameter_type_registry = ParameterTypeRegistry.new
-
-        ### [capture-match-arguments]
-        expr = /I have (\d+) cukes? in my (\w*) now/
-        expression = RegularExpression.new(expr, parameter_type_registry)
-        args = expression.match("I have 7 cukes in my belly now")
-        expect( args[0].value(nil) ).to eq(7)
-        expect( args[1].value(nil) ).to eq("belly")
-        ### [capture-match-arguments]
+      Dir['../testdata/regular-expression/matching/*.yaml'].each do |path|
+        expectation = YAML.load_file(path)
+        it "matches #{path}" do
+          parameter_registry = ParameterTypeRegistry.new
+          expression = RegularExpression.new(Regexp.new(expectation['expression']), parameter_registry)
+          matches = expression.match(expectation['text'])
+          values = matches.map { |arg| arg.value(nil) }
+          expect(values).to eq(expectation['expected_args'])
+        end
       end
 
       it "does no transform by default" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 14.0.0
+  version: 15.1.0
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 description: Cucumber Expressions - a simpler alternative to Regular Expressions
 email: cukes@googlegroups.com
 executables: []
@@ -88,6 +88,7 @@ files:
 - spec/cucumber/cucumber_expressions/cucumber_expression_parser_spec.rb
 - spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb
 - spec/cucumber/cucumber_expressions/cucumber_expression_tokenizer_spec.rb
+- spec/cucumber/cucumber_expressions/cucumber_expression_transformation_spec.rb
 - spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb
 - spec/cucumber/cucumber_expressions/expression_factory_spec.rb
 - spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb
@@ -122,7 +123,7 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-14.0.0
+summary: cucumber-expressions-15.1.0
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/cucumber_expressions/argument_spec.rb
@@ -131,6 +132,7 @@ test_files:
 - spec/cucumber/cucumber_expressions/cucumber_expression_parser_spec.rb
 - spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb
 - spec/cucumber/cucumber_expressions/cucumber_expression_tokenizer_spec.rb
+- spec/cucumber/cucumber_expressions/cucumber_expression_transformation_spec.rb
 - spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb
 - spec/cucumber/cucumber_expressions/expression_factory_spec.rb
 - spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb