cucumber-expressions 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e67bd863422fd1397a0e2fb99a9269c9c0938173
-  data.tar.gz: 6798e6ce638df6ef8cce74010c6f8d210c947127
+  metadata.gz: 10a2279494e6d21d2ae58e07cf6ae1ea9e39649d
+  data.tar.gz: 7efbabfceb72c3efb98e72bab08cc32d9d50752d
 SHA512:
-  metadata.gz: aefbfc1c763e4fa55eca30be560c6446b5ad13c255fc0e5da3acefdc993fa70339d7b318be8b2011b1b39268d806c71c77a0406add436726e6125468aa0c1ced
-  data.tar.gz: 26b9ee07ef6924a332a759835a65ca749c833ab232d78278f1a3ef5a4f9fa8fb462514663e324db7f0be14c889aa2f0c633b3e92f70049c2826134c7ff6697c3
+  metadata.gz: a964b7806d22e66902aac68a3c135ac02abe4269b747a6b9e7496d38cf8747095cbc2c086a7f64700ab5082f28388478ab1d9fd97d4f61e65c5b5eac3a8bae4b
+  data.tar.gz: c6b73917402c7b55f1615e7e0878d2001c3d2224954f1f53cf34ef28098055263bc04eca7b8e546e43e4267f6d1009066c6ca3ae57441f4ff7a25a0805705ad8

data/cucumber-expressions.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'cucumber-expressions'
-  s.version     = '5.0.4'
+  s.version     = '5.0.5'
   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

@@ -5,6 +5,8 @@ require 'cucumber/cucumber_expressions/errors'
 module Cucumber
   module CucumberExpressions
     class CucumberExpression
+      # Does not include (){} characters because they have special meaning
+      ESCAPE_REGEXP = /([\\^\[$.|?*+\]])/
       PARAMETER_REGEXP = /{([^}]+)}/
       OPTIONAL_REGEXP = /\(([^)]+)\)/
       ALTERNATIVE_NON_WHITESPACE_TEXT_REGEXP = /([^\s^\/]+)((\/[^\s^\/]+)+)/
@@ -17,8 +19,7 @@ module Cucumber
         regexp = '^'
         match_offset = 0
 
-        # Escape Does not include (){} because they have special meaning
-        expression = expression.gsub(/([\\\^\[$.|?*+\]])/, '\\\\\1')
+        expression = expression.gsub(ESCAPE_REGEXP, '\\\\\1')
 
         # Create non-capturing, optional capture groups from parenthesis
         expression = expression.gsub(OPTIONAL_REGEXP, '(?:\1)?')

data/lib/cucumber/cucumber_expressions/parameter_type.rb

@@ -38,7 +38,7 @@ module Cucumber
         if @transformer.arity == 1
           non_nil_group_values = group_values.compact
           raise CucumberExpressionError.new(
-              "Single transformer unexpectedly matched 2 values - \"#{non_nil_group_values[0]}\" and \"${non_nil_group_values[1]}\""
+              "Single transformer unexpectedly matched 2 values - \"#{non_nil_group_values[0]}\" and \"#{non_nil_group_values[1]}\""
           ) if non_nil_group_values.length >= 2
           args = [non_nil_group_values[0]]
         else
@@ -49,15 +49,31 @@ module Cucumber
 
       def <=>(other)
         return -1 if prefer_for_regexp_match? && !other.prefer_for_regexp_match?
-        return 1  if other.prefer_for_regexp_match? && !prefer_for_regexp_match?
+        return 1 if other.prefer_for_regexp_match? && !prefer_for_regexp_match?
         name <=> other.name
       end
 
       private
 
-      def string_array(regexp)
-        array = regexp.is_a?(Array) ? regexp : [regexp]
-        array.map { |r| r.is_a?(String) ? r : r.source }
+      def string_array(regexps)
+        array = regexps.is_a?(Array) ? regexps : [regexps]
+        array.map {|regexp| regexp.is_a?(String) ? regexp : regexp_source(regexp)}
+      end
+
+      def regexp_source(regexp)
+        [
+          'EXTENDED',
+          'FIXEDENCODING',
+          'IGNORECASE',
+          'MULTILINE',
+          'NOENCODING'
+        ].each do |option_name|
+          option = Regexp.const_get(option_name)
+          if regexp.options & option != 0
+            raise CucumberExpressionError.new("ParameterType Regexps can't use option Regexp::#{option_name}")
+          end
+        end
+        regexp.source
       end
     end
   end

data/lib/cucumber/cucumber_expressions/parameter_type_matcher.rb

@@ -13,7 +13,7 @@ module Cucumber
       end
 
       def find
-        !@match.nil?
+        !@match.nil? && !group.empty?
       end
 
       def start

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -79,6 +79,28 @@ module Cucumber
         expect(types).to eq([Integer, Float])
       end
 
+      it "ignores parameter types with optional capture groups" do
+        @parameter_type_registry.define_parameter_type(ParameterType.new(
+            'optional-flight',
+            /(1st flight)?/,
+            String,
+            lambda {|s| s},
+            true,
+            false
+        ))
+        @parameter_type_registry.define_parameter_type(ParameterType.new(
+            'optional-hotel',
+            /(1st hotel)?/,
+            String,
+            lambda {|s| s},
+            true,
+            false
+        ))
+
+        expression = @generator.generate_expressions("I reach Stage4: 1st flight-1st hotl")[0]
+        expect(expression.source).to eq("I reach Stage{int}: {int}st flight{int}st hotl")
+      end
+
       def assert_expression(expected_expression, expected_argument_names, text)
         generated_expression = @generator.generate_expression(text)
         expect(generated_expression.parameter_names).to eq(expected_argument_names)

data/spec/cucumber/cucumber_expressions/parameter_type_spec.rb

@@ -0,0 +1,15 @@
+require 'cucumber/cucumber_expressions/parameter_type'
+
+module Cucumber
+  module CucumberExpressions
+    describe ParameterType do
+      it 'does not allow ignore flag on regexp' do
+        expect do
+          ParameterType.new("case-insensitive", /[a-z]+/i, String, lambda {|s| s}, true, true)
+        end.to raise_error(
+          CucumberExpressionError,
+          "ParameterType Regexps can't use option Regexp::IGNORECASE")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -104,6 +104,7 @@ files:
 - spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb
 - spec/cucumber/cucumber_expressions/expression_examples_spec.rb
 - spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb
+- spec/cucumber/cucumber_expressions/parameter_type_spec.rb
 - spec/cucumber/cucumber_expressions/regular_expression_spec.rb
 - spec/cucumber/cucumber_expressions/tree_regexp_spec.rb
 homepage: https://github.com/cucumber/cucumber-expressions-ruby#readme
@@ -130,7 +131,7 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-5.0.4
+summary: cucumber-expressions-5.0.5
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb
@@ -141,5 +142,6 @@ test_files:
 - spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb
 - spec/cucumber/cucumber_expressions/expression_examples_spec.rb
 - spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb
+- spec/cucumber/cucumber_expressions/parameter_type_spec.rb
 - spec/cucumber/cucumber_expressions/regular_expression_spec.rb
 - spec/cucumber/cucumber_expressions/tree_regexp_spec.rb