cucumber-cucumber-expressions 13.1.3 → 15.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b015bc63f3dc328fbeaaca9b20daf5e602f16f26cdfca8161ced76165397630f
-  data.tar.gz: 422f74a5f429d13f1f5895e2f2acbf2e81140b325e09abfec2ca47f61c014aa7
+  metadata.gz: 2ef20202d47a4e26bfaad49aeae395550fdf1a676dfd4a20295fc037a534e2a1
+  data.tar.gz: 6e5e0cba8961035a9eae0bbf0377ca687e6a4636d3399710bd279edcc26eb93e
 SHA512:
-  metadata.gz: 795cd977c9827da57538d3bcd955cefdf81db77e475a6924c61f6917fff5c65082452457af4a2e7c560c47221f797af232785e9a01a62c79070232827726c896
-  data.tar.gz: bc55bfcaa4e6b190c53470c2ddaea86c78f1ccb82bdb343b519c5cd02ddd4b970065899ab4559f25aec9066c0c77901622560a520cea934d318feb5eb9a17858
+  metadata.gz: 4c8451036eeb1c7846a88dc2e16e7641446a8fbd4eb2b5a3909b77d3630ea26b47195c90061007820baab4d08e61ec38ee9031148f4daf08e8798982d5a5014d
+  data.tar.gz: 8600450db1083601afb7a7df6de20d9b9c5e10c165beb6bcd31bac244c299d580fa91088412f0882ab87c4f23cf0c74dbf1fa62d7921f198738dd5f6bacd2782

data/VERSION

@@ -1 +1 @@
-13.1.3
+15.0.2

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: 13.1.3
+  version: 15.0.2
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,12 +59,10 @@ files:
 - ".rspec"
 - Gemfile
 - LICENSE
-- Makefile
 - README.md
 - Rakefile
 - VERSION
 - cucumber-cucumber-expressions.gemspec
-- default.mk
 - lib/cucumber/cucumber_expressions/argument.rb
 - lib/cucumber/cucumber_expressions/ast.rb
 - lib/cucumber/cucumber_expressions/combinatorial_generated_expression_factory.rb
@@ -90,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
@@ -124,7 +123,7 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-13.1.3
+summary: cucumber-expressions-15.0.2
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/cucumber_expressions/argument_spec.rb
@@ -133,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

data/Makefile

@@ -1 +0,0 @@
-include default.mk

data/default.mk

@@ -1,93 +0,0 @@
-SHELL := /usr/bin/env bash
-RUBY_SOURCE_FILES = $(shell find . -name "*.rb")
-GEMSPEC = $(shell find . -name "*.gemspec")
-LIBNAME := $(shell basename $$(dirname $$(pwd)))
-GEM := cucumber-$(LIBNAME)-$(NEW_VERSION).gem
-IS_TESTDATA = $(findstring -testdata,${CURDIR})
-
-# https://stackoverflow.com/questions/2483182/recursive-wildcards-in-gnu-make
-rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
-
-default: .tested
-.PHONY: default
-
-.deps: Gemfile.lock
-	touch $@
-
-Gemfile.lock: Gemfile $(GEMSPEC)
-	bundle install
-	touch $@
-
-.tested: .deps $(RUBY_SOURCE_FILES)
-	bundle exec rspec --color
-	touch $@
-
-update-dependencies:
-	./scripts/update-gemspec
-.PHONY: update-dependencies
-
-ifdef NEW_VERSION
-ifneq (,$(GEMSPEC))
-gem: $(GEM)
-else
-gem:
-	@echo "Not building gem because there is no gemspec"
-endif
-endif
-.PHONY: gem
-
-$(GEM): .tested
-	gem build $(GEMSPEC)
-	test -s "$(GEM)" || { echo "Gem not built: $(GEM)"; exit 1; }
-
-remove-local-dependencies:
-	cat Gemfile | sed 's/^gem /#gem /' > Gemfile.tmp
-	mv Gemfile.tmp Gemfile
-.PHONY: remove-local-dependencies
-
-pre-release: remove-local-dependencies update-version update-dependencies gem
-.PHONY: pre-release
-
-update-version:
-ifeq ($(IS_TESTDATA),-testdata)
-	# no-op
-else
-ifdef NEW_VERSION
-	@echo "$(NEW_VERSION)" > VERSION
-endif
-endif
-.PHONY: update-version
-
-publish: gem
-ifeq ($(IS_TESTDATA),-testdata)
-	# no-op
-else
-ifneq (,$(GEMSPEC))
-	gem push $(GEM)
-else
-	@echo "Not publishing because there is no gemspec"
-endif
-endif
-.PHONY: publish
-
-post-release:
-	cat Gemfile | sed 's/^#gem /gem /' > Gemfile.tmp
-	mv Gemfile.tmp Gemfile
-.PHONY: post-release
-
-clean: clean-ruby
-.PHONY: clean
-
-clean-ruby:
-	rm -rf .deps .linked .tested* Gemfile.lock *.gem acceptance
-.PHONY: clean-ruby
-
-### COMMON stuff for all platforms
-
-BERP_VERSION = 1.3.0
-BERP_GRAMMAR = gherkin.berp
-
-define berp-generate-parser =
--! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
-berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
-endef