cucumber-expressions 5.0.13 → 5.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e37bfd25d2fa6ce81bb76f2a0e4b155b23d7c243
-  data.tar.gz: a843eb27ff496f5744bb8fc9b7ff2993640a029a
+  metadata.gz: f0bf6d072730fe70e07cee26eb6ad35ea6da0395
+  data.tar.gz: 81fe11dab1fe72475a6d59902c42c83b9c9cf3c5
 SHA512:
-  metadata.gz: 7a9c2d12d144a509ff625e72c67cf1b1e2504a2ecab38086f85aa019150e59437ee06807efb5d65c398f7314c52f1677cb7429d75ff442316c043c0d0987d4f3
-  data.tar.gz: 8a9e6c44e79d1c713ff2dac7b6b5a2327001615df1ae4e8a356dcc682b7ac71a06629a9f0f5ac5f8d6f053380c5223657eb60ae007a3c0668bdc2a08f30996e4
+  metadata.gz: 48d4cee7861530cd5643c7737c7ee0aa1ac18c5c573b47eaa6a1ecce1efce1dd3f2d4eed4303d1347e9522f65557f322295dd4c7dd17f28b1c4825ce0e1ebbe3
+  data.tar.gz: 32c6108014efbf5ae47e260580bd919057d08f04c00c90866408d957c6c0525968c2bfb9c9b6a8d833869c0c27775b5eb7cb28faf054e357e348803dd09d4031

data/.travis.yml

@@ -3,10 +3,12 @@
 #
 #     source scripts/functions.sh && rsync_files
 #
+sudo: false
 language: ruby
 
 rvm:
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
-  - jruby-9.1.13.0
+  - "2.5.0"
+  - "2.4.3"
+  - "2.3.6"
+  - "2.2.9"
+  - "jruby-9.1.13.0"

data/cucumber-expressions.gemspec

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

@@ -7,46 +7,24 @@ module Cucumber
     class CucumberExpression
       # Does not include (){} characters because they have special meaning
       ESCAPE_REGEXP = /([\\^\[$.|?*+\]])/
-      PARAMETER_REGEXP = /{([^}]+)}/
-      OPTIONAL_REGEXP = /\(([^)]+)\)/
+      PARAMETER_REGEXP = /(\\\\)?{([^}]+)}/
+      OPTIONAL_REGEXP = /(\\\\)?\(([^)]+)\)/
       ALTERNATIVE_NON_WHITESPACE_TEXT_REGEXP = /([^\s^\/]+)((\/[^\s^\/]+)+)/
+      DOUBLE_ESCAPE = '\\\\'
 
       attr_reader :source
 
       def initialize(expression, parameter_type_registry)
         @source = expression
         @parameter_types = []
-        regexp = '^'
-        match_offset = 0
+        
+        expression = process_escapes(expression)
+        expression = process_optional(expression)
+        expression = process_alternation(expression)
+        expression = process_parameters(expression, parameter_type_registry)
+        expression = "^#{expression}$"
 
-        expression = expression.gsub(ESCAPE_REGEXP, '\\\\\1')
-
-        # Create non-capturing, optional capture groups from parenthesis
-        expression = expression.gsub(OPTIONAL_REGEXP, '(?:\1)?')
-
-        expression = expression.gsub(ALTERNATIVE_NON_WHITESPACE_TEXT_REGEXP) do |_|
-          "(?:#{$1}#{$2.tr('/', '|')})"
-        end
-
-        loop do
-          match = PARAMETER_REGEXP.match(expression, match_offset)
-          break if match.nil?
-
-          type_name = match[1]
-
-          parameter_type = parameter_type_registry.lookup_by_type_name(type_name)
-          raise UndefinedParameterTypeError.new(type_name) if parameter_type.nil?
-          @parameter_types.push(parameter_type)
-
-          text = expression.slice(match_offset...match.offset(0)[0])
-          capture_regexp = build_capture_regexp(parameter_type.regexps)
-          match_offset = match.offset(0)[1]
-          regexp += text
-          regexp += capture_regexp
-        end
-        regexp += expression.slice(match_offset..-1)
-        regexp += '$'
-        @tree_regexp = TreeRegexp.new(regexp)
+        @tree_regexp = TreeRegexp.new(expression)
       end
 
       def match(text)
@@ -63,6 +41,40 @@ module Cucumber
 
       private
 
+      def process_escapes(expression)
+        expression.gsub(ESCAPE_REGEXP, '\\\\\1')
+      end
+
+      def process_optional(expression)
+        # Create non-capturing, optional capture groups from parenthesis
+        expression.gsub(OPTIONAL_REGEXP) do
+          # look for double-escaped parentheses
+          $1 == DOUBLE_ESCAPE ? "\\(#{$2}\\)" : "(?:#{$2})?"
+        end
+      end
+
+      def process_alternation(expression)
+        expression.gsub(ALTERNATIVE_NON_WHITESPACE_TEXT_REGEXP) do
+          "(?:#{$1}#{$2.tr('/', '|')})"
+        end
+      end
+
+      def process_parameters(expression, parameter_type_registry)
+        # Create non-capturing, optional capture groups from parenthesis
+        expression.gsub(PARAMETER_REGEXP) do
+          if ($1 == DOUBLE_ESCAPE)
+            "\\{#{$2}\\}"
+          else
+            type_name = $2
+            parameter_type = parameter_type_registry.lookup_by_type_name(type_name)
+            raise UndefinedParameterTypeError.new(type_name) if parameter_type.nil?
+            @parameter_types.push(parameter_type)
+
+            build_capture_regexp(parameter_type.regexps)
+          end
+        end
+      end
+
       def build_capture_regexp(regexps)
         return "(#{regexps[0]})" if regexps.size == 1
         capture_groups = regexps.map { |group| "(?:#{group})" }

data/lib/cucumber/cucumber_expressions/cucumber_expression_generator.rb

@@ -51,7 +51,7 @@ module Cucumber
 
             parameter_type_combinations.push(parameter_types)
 
-            expression_template += escape_for_sprintf(text.slice(pos...best_parameter_type_matcher.start))
+            expression_template += escape(text.slice(pos...best_parameter_type_matcher.start))
             expression_template += "{%s}"
 
             pos = best_parameter_type_matcher.start + best_parameter_type_matcher.group.length
@@ -64,7 +64,7 @@ module Cucumber
           end
         end
 
-        expression_template += escape_for_sprintf(text.slice(pos..-1))
+        expression_template += escape(text.slice(pos..-1))
 
         CombinatorialGeneratedExpressionFactory.new(
           expression_template,
@@ -94,8 +94,10 @@ module Cucumber
         result
       end
 
-      def escape_for_sprintf(s)
+      def escape(s)
         s.gsub(/%/, '%%')
+        .gsub(/\(/, '\\(')
+        .gsub(/\{/, '\\{')
       end
     end
   end

data/lib/cucumber/cucumber_expressions/tree_regexp.rb

@@ -1,4 +1,5 @@
 require 'cucumber/cucumber_expressions/group_builder'
+require 'cucumber/cucumber_expressions/errors'
 
 module Cucumber
   module CucumberExpressions
@@ -33,6 +34,8 @@ module Cucumber
           elsif c == ':' && non_capturing_maybe
             stack.last.set_non_capturing!
             non_capturing_maybe = false
+          elsif c == '<' && non_capturing_maybe
+            raise CucumberExpressionError.new("Named capture groups are not supported. See https://github.com/cucumber/cucumber/issues/329")
           end
 
           escaping = c == '\\' && !escaping

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -1,4 +1,5 @@
 require 'cucumber/cucumber_expressions/cucumber_expression_generator'
+require 'cucumber/cucumber_expressions/cucumber_expression'
 require 'cucumber/cucumber_expressions/parameter_type'
 require 'cucumber/cucumber_expressions/parameter_type_registry'
 
@@ -28,6 +29,18 @@ module Cucumber
         assert_expression("hello", [], "hello")
       end
 
+      it "generates expression with escaped left parenthesis" do
+        assert_expression(
+          "\\(iii)", [],
+          "(iii)")
+      end
+
+      it "generates expression with escaped left curly brace" do
+        assert_expression(
+          "\\{iii}", [],
+          "{iii}")
+      end
+
       it "generates expression for int float arg" do
         assert_expression(
           "I have {int} cukes and {float} euro", ["int", "float"],
@@ -105,6 +118,10 @@ module Cucumber
         generated_expression = @generator.generate_expression(text)
         expect(generated_expression.parameter_names).to eq(expected_argument_names)
         expect(generated_expression.source).to eq(expected_expression)
+        
+        cucumber_expression = CucumberExpression.new(generated_expression.source, @parameter_type_registry)
+        match = cucumber_expression.match(text)
+        expect(match.length).to eq(expected_argument_names.length)
       end
     end
   end

data/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -26,7 +26,7 @@ module Cucumber
       it('matches multiple double quoted strings') do
         expect(match('three {string} and {string} mice', 'three "blind" and "crippled" mice')).to eq(['blind', 'crippled'])
       end
-      
+
       it('matches single quoted string') do
         expect(match('three {string} mice', "three 'blind' mice")).to eq(['blind'])
       end
@@ -55,6 +55,10 @@ module Cucumber
         expect(match('three {string} mice', "three 'bl\\'nd' mice")).to eq(["bl'nd"])
       end
 
+      it 'matches escaped parentheses' do
+        expect(match('three \\(exceptionally) {string} mice', 'three (exceptionally) "blind" mice')).to eq(['blind'])
+      end
+
       it "matches int" do
         expect(match("{int}", "22")).to eq([22])
       end

data/spec/cucumber/cucumber_expressions/tree_regexp_spec.rb

@@ -84,6 +84,13 @@ module Cucumber
         group = tr.match("hello")
         expect(group.value).to eq("hello")
       end
+
+      it 'throws an error when there are named capture groups because they are buggy in Ruby' do
+        # https://github.com/cucumber/cucumber/issues/329
+        expect {
+          TreeRegexp.new(/^I am a person( named "(?<first_name>.+) (?<last_name>.+)")?$/)
+        }.to raise_error(/Named capture groups are not supported/)
+      end
     end
   end
 end

metadata

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