cucumber-expressions 5.0.18 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d661edfcc1203904d6471736027ab45c6036ec6a4015347ca190a7397b9a18f0
-  data.tar.gz: 5aefbf1fbc78226c404a23b39131e966bcdac8f621711ab6b3b9997d23f4bd1f
+  metadata.gz: a4e80f6b342fd980a7e30ed217e54f83d5ee4da8198e93487470daff410e4959
+  data.tar.gz: 9cb0efc96dfc3f26257ac35998bdce354470543ccafdb604e227645fb6f5dd75
 SHA512:
-  metadata.gz: 727ad5c75d452c0ad4b549045cbb2cfc15dc4cd5bc8e0b34333dd4d176969cac8960b780ce452927bca5c81cfdba7e2faff31c3ca0d7c21ac56688ced0b4e981
-  data.tar.gz: 6e1a3dc1fe998cd396278f48a0fcd410e2bbe5b8e6eb35a43aea857c70f74391dda987106b4b7b13b40da0f512f2eb5b165897cf20dafb64e9c60c5db28833d5
+  metadata.gz: 844a25bb968e193a071b4bdfef1a79cc9bd3da3f5211c75adeef363b74ba3e34f7b6cbe578c06fbaf7e6d8f118eae33be2acdca0af5ecd70c8c77c42aac78252
+  data.tar.gz: e9359ff92fccbc88eb457bec080607397d723d6c488ee4ce87053b360e43268d8a5b3bd4523c3415e76ac8c1b79965db9aff7d4ae6ddb486f3acf02e08e32c7c

data/cucumber-expressions.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'cucumber-expressions'
-  s.version     = '5.0.18'
+  s.version     = '6.0.0'
   s.authors     = ["Aslak Hellesøy"]
   s.description = 'Cucumber Expressions - a simpler alternative to Regular Expressions'
   s.summary     = "cucumber-expressions-#{s.version}"

data/lib/cucumber/cucumber_expressions/cucumber_expression.rb

@@ -11,6 +11,8 @@ module Cucumber
       OPTIONAL_REGEXP = /(\\\\)?\(([^)]+)\)/
       ALTERNATIVE_NON_WHITESPACE_TEXT_REGEXP = /([^\s^\/]+)((\/[^\s^\/]+)+)/
       DOUBLE_ESCAPE = '\\\\'
+      PARAMETER_TYPES_CANNOT_BE_ALTERNATIVE = 'Parameter types cannot be alternative: '
+      PARAMETER_TYPES_CANNOT_BE_OPTIONAL = 'Parameter types cannot be optional: '
 
       attr_reader :source
 
@@ -48,8 +50,10 @@ module Cucumber
       def process_optional(expression)
         # Create non-capturing, optional capture groups from parenthesis
         expression.gsub(OPTIONAL_REGEXP) do
+          g2 = $2
+          check_no_parameter_type(g2, PARAMETER_TYPES_CANNOT_BE_OPTIONAL)
           # look for double-escaped parentheses
-          $1 == DOUBLE_ESCAPE ? "\\(#{$2}\\)" : "(?:#{$2})?"
+          $1 == DOUBLE_ESCAPE ? "\\(#{g2}\\)" : "(?:#{g2})?"
         end
       end
 
@@ -58,7 +62,14 @@ module Cucumber
           # replace \/ with /
           # replace / with |
           replacement = $&.tr('/', '|').gsub(/\\\|/, '/')
-          "(?:#{replacement})"
+          if replacement.include?('|')
+            replacement.split(/\|/).each do |part|
+              check_no_parameter_type(part, PARAMETER_TYPES_CANNOT_BE_ALTERNATIVE)
+            end
+            "(?:#{replacement})"
+          else
+            replacement
+          end
         end
       end
 
@@ -83,6 +94,12 @@ module Cucumber
         capture_groups = regexps.map { |group| "(?:#{group})" }
         "(#{capture_groups.join('|')})"
       end
+
+      def check_no_parameter_type(s, message)
+        if PARAMETER_REGEXP =~ s
+          raise CucumberExpressionError.new("#{message}#{source}")
+        end
+      end
     end
   end
 end

data/lib/cucumber/cucumber_expressions/parameter_type.rb

@@ -35,7 +35,7 @@ module Cucumber
       end
 
       def transform(self_obj, group_values)
-        self_obj.instance_exec(*group_values, &@transformer)
+        group_values.empty? ? nil : self_obj.instance_exec(*group_values, &@transformer)
       end
 
       def <=>(other)

data/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -80,6 +80,18 @@ module Cucumber
         expect {match("{unknown}", "something")}.to raise_error('Undefined parameter type {unknown}')
       end
 
+      it "does not allow optional parameter types" do
+        expect {match("({int})", "3")}.to raise_error('Parameter types cannot be optional: ({int})')
+      end
+
+      it "does not allow text/parameter type alternation" do
+        expect {match("x/{int}", "3")}.to raise_error('Parameter types cannot be alternative: x/{int}')
+      end
+
+      it "does not allow parameter type/text alternation" do
+        expect {match("{int}/x", "3")}.to raise_error('Parameter types cannot be alternative: {int}/x')
+      end
+
       it "exposes source" do
         expr = "I have {int} cuke(s)"
         expect(CucumberExpression.new(expr, ParameterTypeRegistry.new).source).to eq(expr)

data/spec/cucumber/cucumber_expressions/regular_expression_spec.rb

@@ -55,6 +55,13 @@ module Cucumber
         ).to eq(["I", "can", 1, "slide"])
       end
 
+      it "matches capture group nested in optional one" do
+        regexp = /^a (pre-commercial transaction |pre buyer fee model )?purchase(?: for \$(\d+))?$/
+        expect( match(regexp, 'a purchase') ).to eq([nil, nil])
+        expect( match(regexp, 'a purchase for $33') ).to eq([nil, 33])
+        expect( match(regexp, 'a pre buyer fee model purchase') ).to eq(['pre buyer fee model ', nil])
+      end
+
       it "works with escaped parenthesis" do
         expect( match(/Across the line\(s\)/, 'Across the line(s)') ).to eq([])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 5.0.18
+  version: 6.0.0
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-5.0.18
+summary: cucumber-expressions-6.0.0
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb