cucumber-cucumber-expressions 12.1.0 → 13.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31e788a0cba723b92294827b90ed91c55a52107870621ff3b1cadedb36ba5426
-  data.tar.gz: 4c0217f9b26d92c3f81c6eb917029283053e32281c6f4641552ba315c43fd61a
+  metadata.gz: abdf3cd3e3ef1625435edf7a0c7076c148deb20f311f3c1f25f02cd7b4f4085d
+  data.tar.gz: 545703ed396856e7775307a49746dc2fdb4a2bba7aa732d9960b90d83976a155
 SHA512:
-  metadata.gz: d2c3bf7e7bf1c14e3b1fa3073e5200e6e49f39c24c25fce78baf44534890788e6f261c7948c4f1ed1ea1c26b40387ffaa1170726ca15d93e0b4e279edd5f4721
-  data.tar.gz: dec5ce7cbac4cc50b94e31699175c84f8d5f416df03c52af498538f4a61b240d2f03cd4e83fddd192f3348e71873bc6a308ffe0ac64dfb68e549d05c0990e02b
+  metadata.gz: 449a4b0ccc31d0398bea421da4cb5ff5f6be6daf437bd819a46e238c26c63989e18a32ed6e9e3fc71e099757e837bb04e9be1834b74852da39fc5b1b1581fe71
+  data.tar.gz: 699da85cd5fdd9851b021b9505da384c80047cf6b12d2b3b9abebf189199f4952db2331328cbed1d9bab9d1c69478f34e8a46f463fa8f951eecb364bc2444857

data/VERSION

@@ -1 +1 @@
-12.1.0
+13.0.1

data/cucumber-cucumber-expressions.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
 
   s.metadata    = {
                     'bug_tracker_uri'   => 'https://github.com/cucumber/cucumber/issues',
-                    'changelog_uri'     => 'https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/CHANGELOG.md',
+                    'changelog_uri'     => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/CHANGELOG.md',
                     'documentation_uri' => 'https://cucumber.io/docs/cucumber/cucumber-expressions/',
                     'mailing_list_uri'  => 'https://groups.google.com/forum/#!forum/cukes',
-                    'source_code_uri'   => 'https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/ruby',
+                    'source_code_uri'   => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/ruby',
                   }
 
-  s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.3'
+  s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   s.add_development_dependency 'rspec', '~> 3.10', '>= 3.10.0'
 
   s.rubygems_version = ">= 1.6.1"

data/default.mk

@@ -81,3 +81,13 @@ clean: clean-ruby
 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

data/lib/cucumber/cucumber_expressions/cucumber_expression.rb

@@ -105,17 +105,17 @@ module Cucumber
       end
 
       def assert_not_empty(node, &raise_error)
-        text_nodes = node.nodes.filter { |astNode| NodeType::TEXT == astNode.type }
+        text_nodes = node.nodes.select { |astNode| NodeType::TEXT == astNode.type }
         raise_error.call(node) if text_nodes.length == 0
       end
 
       def assert_no_parameters(node, &raise_error)
-        nodes = node.nodes.filter { |astNode| NodeType::PARAMETER == astNode.type }
+        nodes = node.nodes.select { |astNode| NodeType::PARAMETER == astNode.type }
         raise_error.call(nodes[0]) if nodes.length > 0
       end
 
       def assert_no_optionals(node, &raise_error)
-        nodes = node.nodes.filter { |astNode| NodeType::OPTIONAL == astNode.type }
+        nodes = node.nodes.select { |astNode| NodeType::OPTIONAL == astNode.type }
         raise_error.call(nodes[0]) if nodes.length > 0
       end
     end

data/lib/cucumber/cucumber_expressions/cucumber_expression_generator.rb

@@ -9,10 +9,6 @@ module Cucumber
         @parameter_type_registry = parameter_type_registry
       end
 
-      def generate_expression(text)
-        generate_expressions(text)[0]
-      end
-
       def generate_expressions(text)
         parameter_type_combinations = []
         parameter_type_matchers = create_parameter_type_matchers(text)

data/scripts/update-gemspec

@@ -5,7 +5,7 @@
 set -uf -o pipefail
 IFS=$'\n'
 
-gemspec=$(find . -type f -maxdepth 1 -name "*.gemspec")
+gemspec=$(find . -maxdepth 1 -type f -name "*.gemspec")
 if [ "${gemspec}" = "" ]; then
   exit 0
 fi

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -19,7 +19,7 @@ module Cucumber
         ### [generate-expression]
         generator = CucumberExpressionGenerator.new(parameter_registry)
         undefined_step_text = "I have 2 cucumbers and 1.5 tomato"
-        generated_expression = generator.generate_expression(undefined_step_text)
+        generated_expression = generator.generate_expressions(undefined_step_text)[0]
         expect(generated_expression.source).to eq("I have {int} cucumbers and {float} tomato")
         expect(generated_expression.parameter_types[1].type).to eq(Float)
         ### [generate-expression]
@@ -93,7 +93,7 @@ module Cucumber
       end
 
       it "exposes parameters in generated expression" do
-        expression = @generator.generate_expression("I have 2 cukes and 1.5 euro")
+        expression = @generator.generate_expressions("I have 2 cukes and 1.5 euro")[0]
         types = expression.parameter_types.map(&:type)
         expect(types).to eq([Integer, Float])
       end
@@ -175,18 +175,18 @@ module Cucumber
         end
 
         it "at the beginning of a word" do
-          expect(@generator.generate_expression("When I download a picture").source).not_to eq("When I {direction}load a picture")
-          expect(@generator.generate_expression("When I download a picture").source).to eq("When I download a picture")
+          expect(@generator.generate_expressions("When I download a picture")[0].source).not_to eq("When I {direction}load a picture")
+          expect(@generator.generate_expressions("When I download a picture")[0].source).to eq("When I download a picture")
         end
 
         it "inside a word" do
-          expect(@generator.generate_expression("When I watch the muppet show").source).not_to eq("When I watch the m{direction}pet show")
-          expect(@generator.generate_expression("When I watch the muppet show").source).to eq("When I watch the muppet show")
+          expect(@generator.generate_expressions("When I watch the muppet show")[0].source).not_to eq("When I watch the m{direction}pet show")
+          expect(@generator.generate_expressions("When I watch the muppet show")[0].source).to eq("When I watch the muppet show")
         end
 
         it "at the end of a word" do
-          expect(@generator.generate_expression("When I create a group").source).not_to eq("When I create a gro{direction}")
-          expect(@generator.generate_expression("When I create a group").source).to eq("When I create a group")
+          expect(@generator.generate_expressions("When I create a group")[0].source).not_to eq("When I create a gro{direction}")
+          expect(@generator.generate_expressions("When I create a group")[0].source).to eq("When I create a group")
         end
       end
 
@@ -203,19 +203,19 @@ module Cucumber
         end
 
         it "a full word" do
-          expect(@generator.generate_expression("When I go down the road").source).to eq("When I go {direction} the road")
-          expect(@generator.generate_expression("When I walk up the hill").source).to eq("When I walk {direction} the hill")
-          expect(@generator.generate_expression("up the hill, the road goes down").source).to eq("{direction} the hill, the road goes {direction}")
+          expect(@generator.generate_expressions("When I go down the road")[0].source).to eq("When I go {direction} the road")
+          expect(@generator.generate_expressions("When I walk up the hill")[0].source).to eq("When I walk {direction} the hill")
+          expect(@generator.generate_expressions("up the hill, the road goes down")[0].source).to eq("{direction} the hill, the road goes {direction}")
         end
 
         it 'wrapped around punctuation characters' do
-          expect(@generator.generate_expression("When direction is:down").source).to eq("When direction is:{direction}")
-          expect(@generator.generate_expression("Then direction is down.").source).to eq("Then direction is {direction}.")
+          expect(@generator.generate_expressions("When direction is:down")[0].source).to eq("When direction is:{direction}")
+          expect(@generator.generate_expressions("Then direction is down.")[0].source).to eq("Then direction is {direction}.")
         end
       end
 
       def assert_expression(expected_expression, expected_argument_names, text)
-        generated_expression = @generator.generate_expression(text)
+        generated_expression = @generator.generate_expressions(text)[0]
         expect(generated_expression.parameter_names).to eq(expected_argument_names)
         expect(generated_expression.source).to eq(expected_expression)
 

data/spec/cucumber/cucumber_expressions/regular_expression_spec.rb

@@ -36,6 +36,10 @@ module Cucumber
         expect( match(/hello/, "world") ).to be_nil
       end
 
+      it "matches empty string when there is an empty string match" do
+        expect( match(/^The value equals "([^"]*)"$/, 'The value equals ""') ).to eq([''])
+      end
+
       it "matches nested capture group without match" do
         expect( match(/^a user( named "([^"]*)")?$/, 'a user') ).to eq([nil])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 13.0.1
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -19,7 +19,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -208,10 +208,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/cucumber/cucumber/issues
-  changelog_uri: https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/CHANGELOG.md
+  changelog_uri: https://github.com/cucumber/common/blob/main/cucumber-expressions/CHANGELOG.md
   documentation_uri: https://cucumber.io/docs/cucumber/cucumber-expressions/
   mailing_list_uri: https://groups.google.com/forum/#!forum/cukes
-  source_code_uri: https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/ruby
+  source_code_uri: https://github.com/cucumber/common/blob/main/cucumber-expressions/ruby
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -231,7 +231,7 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-12.1.0
+summary: cucumber-expressions-13.0.1
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/cucumber_expressions/argument_spec.rb