cucumber-expressions 6.0.1 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9d12cb9c8cd02a9bd908fd7a7f8a4fc7923bafb4b5aa0b4ef6339cb74d634dd
-  data.tar.gz: ae0fe8368985342ea0395a1077cab630c4c699ebd65e4c392d69d577fdbf3cd6
+  metadata.gz: f1c9bb3c99f56112e47e4b97965dad048c1817e76e5f4ed0f270e519132eb86f
+  data.tar.gz: 8004b7f168e0b6a35b5d58f9d7582b87daca2b3c35b8bffaa32e2d1e25e87a96
 SHA512:
-  metadata.gz: baacf4121341d24159301ac93259656f4ca28710c6bd63a4dbbc946e7476003b85aca70f11760130d626a6dccf81fcc32e10645aac27e347f040d4897457d3f6
-  data.tar.gz: 2da1c94551f4d7d2de12360f437d080364bea94805d7eeb5bdcef2af09b03d59c9471bdf3c12c77b3d8a59a419313de66bb18c47541dd24299906aa0546a2233
+  metadata.gz: 320da65062874ccecd9131884d5c972ff1c73b748617dbd6aae6566d2d01f489997dc024530152d66f3dfed7c44f140ffee4a78141cc6845ea5122a42df1d090
+  data.tar.gz: 3c0bdf0c5270ed65247bfec949c48eea39e1aba8d6e35300c63efd0cd5e7783079690a3098818ae5eeb0021fba38fb32d94fa3e720d7576a4e862895e31a154f

data/.rsync

@@ -1,4 +1,4 @@
 ../../LICENSE LICENSE
 ../../.templates/github/ .github/
-../../.templates/ruby/.travis.yml .travis.yml
+../../.templates/ruby/ .
 ../examples.txt examples.txt

data/.subrepo

@@ -1 +1 @@
-cucumber/cucumber-expressions-ruby.git
+cucumber/cucumber-expressions-ruby

data/.travis.yml

@@ -1,16 +1,23 @@
-# Please update /.templates/ruby/.travis.yml in the cucumber/cucumber monorepo
-# and sync:
-#
-#     source scripts/functions.sh && rsync_files
-#
 sudo: false
 language: ruby
-
 rvm:
-  - "2.5.1"
-  - "2.4.4"
-  - "2.3.7"
-  - "2.2.10"
-  - "jruby-9.1.17.0"
-
-script: make default
+- 2.5.3
+- 2.4.5
+- 2.3.8
+- jruby-9.2.0.0
+script: make default
+matrix:
+  allow_failures:
+  - rvm: jruby-9.2.0.0
+jobs:
+  include:
+  - stage: deploy
+    ruby: 2.5.3
+deploy:
+  skip_cleanup: true
+  provider: rubygems
+  gem: cucumber-expressions
+  on:
+    tags: true
+  api_key:
+    secure: qe+bx0MBxImttvjLt5TVkxWlanjPkSLzqmI6q3LlrhDcNiEy7jEJhBWEdVWWD3l6FG/1AY+XN1o18Re7eaAuun8C8QKmT6MjyMsYlf4bXMH2kfJ0IeRuNne1JRSvqVG6rAlVYHvHGJsReWGwfLAxvaEN0xAmx0cTW2MAmswUtV0LWFqMohV83Vbdcgsdvk2VMvtrtWuZTGod/o1QtcIcVimdnOjvdT79lo60IjgSa+tS7B7hEoehPa1kXZs5QYMEBhZOdIxG0rXCbIzz9wAY/4V4Z2F7SaPNBCuDZXz8Fmv9ZrAEYRsPGnNAbhLX3LFpxUEzmyHwubRRIysFCXrjgDakj4oSBiYAQResGqU0EBcbLiub1rNT72XpXbydI3N8NDdLg2CyZlAE83r7aTkEPdTvNoNwVfLQxpzP9GDKAFj5Fz4VdR0BiGhB+C5uqacpRByjiOyP2G8m2sqQhW6nTxYh61ZjCb38OLlHkdi2t7qECDD8ALlTgWPiVoeFz/cH7wVQR5dD5LoFXCq/BmOoOVGdYc8VbRyy/MPJWEepxK+v0j+LQlAwZdrtqvnE9fYKh8spQQ5+WQi5MfPWJzeXl+SzRFp5l380C3HpjYT4G/5TUaLlPzkPtpehsft9AwqgWiBvuhje2P+MesRk/tUtlWitBrpVLKCG+Dnt2fzhXIE=

data/Makefile

@@ -1,8 +1 @@
-default:
-	bundle install
-	rake
-	rake install
-.PHONY: default
-
-clean:
-.PHONY: clean
+include default.mk

data/README.md

@@ -2,4 +2,4 @@
 
 [![Build Status](https://travis-ci.org/cucumber/cucumber-expressions-ruby.svg?branch=master)](https://travis-ci.org/cucumber/cucumber-expressions-ruby)
 
-[The docs are here](http://docs.cucumber.io/cucumber-expressions/).
+[The docs are here](https://docs.cucumber.io/cucumber/cucumber-expressions/).

data/cucumber-expressions.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'cucumber-expressions'
-  s.version     = '6.0.1'
+  s.version     = '6.6.2'
   s.authors     = ["Aslak Hellesøy"]
   s.description = 'Cucumber Expressions - a simpler alternative to Regular Expressions'
   s.summary     = "cucumber-expressions-#{s.version}"
@@ -11,6 +11,14 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.required_ruby_version = ">= 1.9.3"
 
+  s.metadata    = {
+                    'bug_tracker_uri'   => 'https://github.com/cucumber/cucumber/issues',
+                    'changelog_uri'     => 'https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/CHANGELOG.md',
+                    'documentation_uri' => 'https://docs.cucumber.io/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',
+                  }
+
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake',      '~> 12.3'
   s.add_development_dependency 'rspec',     '~> 3.7'

data/default.mk

@@ -0,0 +1,33 @@
+SHELL := /usr/bin/env bash
+RUBY_SOURCE_FILES = $(shell find . -name "*.rb")
+GEMSPECS = $(shell find . -name "*.gemspec")
+
+ifdef TRAVIS_BRANCH
+	LIBRARY_VERSION=$(TRAVIS_BRANCH)
+endif
+ifdef TRAVIS_TAG
+	LIBRARY_VERSION=$(TRAVIS_TAG)
+endif
+ifndef LIBRARY_VERSION
+	LIBRARY_VERSION=$(shell git rev-parse --abbrev-ref HEAD)
+endif
+
+default: .tested
+.PHONY: default
+
+.deps: Gemfile.lock
+
+Gemfile.lock: Gemfile $(GEMSPECS)
+	bundle install
+	touch $@
+
+.tested: .deps $(RUBY_SOURCE_FILES)
+	bundle exec rspec --color
+	touch $@
+
+clean: clean-ruby
+.PHONY: clean
+
+clean-ruby:
+	rm -f .deps .linked .tested Gemfile.lock
+.PHONY: clean-ruby

data/examples.txt

@@ -17,3 +17,15 @@ I have 1 cuke in my belly now
 /^Something( with an optional argument)?$/
 Something
 [null]
+---
+Привет, {word}!
+Привет, Мир!
+["Мир"]
+---
+/I have (.*) cukes? in my (.*) now/
+I have 22 cukes in my belly now
+["22","belly"]
+---
+I have {} cuke(s) in my {} now
+I have 22 cukes in my belly now
+["22","belly"]

data/lib/cucumber/cucumber_expressions/combinatorial_generated_expression_factory.rb

@@ -15,9 +15,14 @@ module Cucumber
         generated_expressions
       end
 
-      private
+      # 256 generated expressions ought to be enough for anybody
+      MAX_EXPRESSIONS = 256
 
       def generate_permutations(generated_expressions, depth, current_parameter_types)
+        if generated_expressions.length >= MAX_EXPRESSIONS
+          return
+        end
+
         if depth == @parameter_type_combinations.length
           generated_expression = GeneratedExpression.new(@expression_template, current_parameter_types)
           generated_expressions.push(generated_expression)
@@ -25,6 +30,10 @@ module Cucumber
         end
 
         (0...@parameter_type_combinations[depth].length).each do |i|
+          # Avoid recursion if no elements can be added.
+          if generated_expressions.length >= MAX_EXPRESSIONS
+            return
+          end
           new_current_parameter_types = current_parameter_types.dup # clone
           new_current_parameter_types.push(@parameter_type_combinations[depth][i])
           generate_permutations(

data/lib/cucumber/cucumber_expressions/cucumber_expression.rb

@@ -7,7 +7,7 @@ module Cucumber
     class CucumberExpression
       # Does not include (){} characters because they have special meaning
       ESCAPE_REGEXP = /([\\^\[$.|?*+\]])/
-      PARAMETER_REGEXP = /(\\\\)?{([^}]+)}/
+      PARAMETER_REGEXP = /(\\\\)?{([^}]*)}/
       OPTIONAL_REGEXP = /(\\\\)?\(([^)]+)\)/
       ALTERNATIVE_NON_WHITESPACE_TEXT_REGEXP = /([^\s^\/]+)((\/[^\s^\/]+)+)/
       DOUBLE_ESCAPE = '\\\\'
@@ -19,7 +19,7 @@ module Cucumber
       def initialize(expression, parameter_type_registry)
         @source = expression
         @parameter_types = []
-        
+
         expression = process_escapes(expression)
         expression = process_optional(expression)
         expression = process_alternation(expression)
@@ -51,9 +51,22 @@ module Cucumber
         # 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)
+          # When using Parameter Types, the () characters are used to represent an optional
+          # item such as (a ) which would be equivalent to (?:a )? in regex
+          #
+          # You cannot have optional Parameter Types i.e. ({int}) as this causes
+          # problems during the conversion phase to regex. So we check for that here
+          #
+          # One exclusion to this rule is if you actually want the brackets i.e. you
+          # want to capture (3) then we still permit this as an individual rule
+          # See: https://github.com/cucumber/cucumber-ruby/issues/1337 for more info
           # look for double-escaped parentheses
-          $1 == DOUBLE_ESCAPE ? "\\(#{g2}\\)" : "(?:#{g2})?"
+          if $1 == DOUBLE_ESCAPE
+            "\\(#{g2}\\)"
+          else
+            check_no_parameter_type(g2, PARAMETER_TYPES_CANNOT_BE_OPTIONAL)
+            "(?:#{g2})?"
+          end
         end
       end
 

data/lib/cucumber/cucumber_expressions/parameter_type_matcher.rb

@@ -9,7 +9,14 @@ module Cucumber
       end
 
       def advance_to(new_match_position)
-        self.class.new(parameter_type, @regexp, @text, new_match_position)
+        (new_match_position...@text.length).each {|advancedPos|
+          matcher = self.class.new(parameter_type, @regexp, @text, advancedPos)
+          if matcher.find
+            return matcher
+          end
+        }
+
+        self.class.new(parameter_type, @regexp, @text, @text.length)
       end
 
       def find

data/lib/cucumber/cucumber_expressions/parameter_type_registry.rb

@@ -7,17 +7,19 @@ module Cucumber
     class ParameterTypeRegistry
       INTEGER_REGEXPS = [/-?\d+/, /\d+/]
       FLOAT_REGEXP = /-?\d*\.\d+/
-      WORD_REGEXP = /\w+/
+      WORD_REGEXP = /[^\s]+/
       STRING_REGEXP = /"([^"\\]*(\\.[^"\\]*)*)"|'([^'\\]*(\\.[^'\\]*)*)'/
+      ANONYMOUS_REGEXP = /.*/
 
       def initialize
         @parameter_type_by_name = {}
         @parameter_types_by_regexp = Hash.new {|hash, regexp| hash[regexp] = []}
 
-        define_parameter_type(ParameterType.new('int', INTEGER_REGEXPS, Integer, lambda {|s=nil| s && s.to_i}, true, true))
-        define_parameter_type(ParameterType.new('float', FLOAT_REGEXP, Float, lambda {|s=nil| s && s.to_f}, true, false))
-        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 {|s=nil| s && s.gsub(/\\"/, '"').gsub(/\\'/, "'")}, true, false))
+        define_parameter_type(ParameterType.new('int', INTEGER_REGEXPS, Integer, lambda {|s = nil| s && s.to_i}, true, true))
+        define_parameter_type(ParameterType.new('float', FLOAT_REGEXP, Float, lambda {|s = nil| s && s.to_f}, true, false))
+        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 {|s = nil| s && s.gsub(/\\"/, '"').gsub(/\\'/, "'")}, true, false))
+        define_parameter_type(ParameterType.new('', ANONYMOUS_REGEXP, String, lambda {|s = nil| s}, false, true))
       end
 
       def lookup_by_type_name(name)
@@ -42,9 +44,13 @@ module Cucumber
       end
 
       def define_parameter_type(parameter_type)
-        if parameter_type.name
+        if parameter_type.name != nil
           if @parameter_type_by_name.has_key?(parameter_type.name)
-            raise CucumberExpressionError.new("There is already a parameter with name #{parameter_type.name}")
+            if parameter_type.name.length == 0
+              raise CucumberExpressionError.new("The anonymous parameter type has already been defined")
+            else
+              raise CucumberExpressionError.new("There is already a parameter with name #{parameter_type.name}")
+            end
           end
           @parameter_type_by_name[parameter_type.name] = parameter_type
         end

data/lib/cucumber/cucumber_expressions/tree_regexp.rb

@@ -13,13 +13,18 @@ module Cucumber
         last = nil
         escaping = false
         non_capturing_maybe = false
+        char_class = false
 
         @regexp.source.split('').each_with_index do |c, n|
-          if c == '(' && !escaping
+          if c == '[' && !escaping
+            char_class = true
+          elsif c == ']' && !escaping
+            char_class = false
+          elsif c == '(' && !escaping && !char_class
             stack.push(GroupBuilder.new)
             group_start_stack.push(n+1)
             non_capturing_maybe = false
-          elsif c == ')' && !escaping
+          elsif c == ')' && !escaping && !char_class
             gb = stack.pop
             group_start = group_start_stack.pop
             if gb.capturing?

data/spec/capture_warnings.rb

@@ -13,7 +13,7 @@ module CaptureWarnings
     end
 
     if other_warnings.any?
-      puts "#{ other_warnings.count } non-cucumber-expressions warnings detected, set VIEW_OTHER_WARNINGS=true to see them."
+      puts "#{ other_warnings.count } warnings detected, set VIEW_OTHER_WARNINGS=true to see them."
       print_warnings('other', other_warnings) if ENV['VIEW_OTHER_WARNINGS']
     end
 
@@ -23,7 +23,7 @@ module CaptureWarnings
     end
 
     if project_warnings.any?
-      puts "#{ project_warnings.count } cucumber-expressions warnings detected"
+      puts "#{ project_warnings.count } warnings detected"
       print_warnings('cucumber-expressions', project_warnings)
       fail "Please remove all cucumber-expressions warnings."
     end
@@ -35,7 +35,7 @@ module CaptureWarnings
     old_stderr = STDERR.clone
     pipe_r, pipe_w = IO.pipe
     pipe_r.sync    = true
-    error         = String.new
+    error          = String.new
     reader = Thread.new do
       begin
         loop do

data/spec/coverage.rb

@@ -3,4 +3,5 @@ require 'simplecov'
 formatters = [ SimpleCov::Formatter::HTMLFormatter ]
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(*formatters)
+SimpleCov.add_filter 'spec/'
 SimpleCov.start

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -98,7 +98,7 @@ module Cucumber
         expect(types).to eq([Integer, Float])
       end
 
-      it "ignores parameter types with optional capture groups" do
+      it "matches parameter types with optional capture groups" do
         @parameter_type_registry.define_parameter_type(ParameterType.new(
             'optional-flight',
             /(1st flight)?/,
@@ -116,15 +116,57 @@ module Cucumber
             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")
+        expression = @generator.generate_expressions("I reach Stage4: 1st flight-1st hotel")[0]
+        # While you would expect this to be `I reach Stage{int}: {optional-flight}-{optional-hotel}`
+        # the `-1` causes {int} to match just before {optional-hotel}.
+        expect(expression.source).to eq("I reach Stage{int}: {optional-flight}{int}st hotel")
+      end
+
+      it "generates at most 256 expressions" do
+        for i in 0..3
+          @parameter_type_registry.define_parameter_type(ParameterType.new(
+              "my-type-#{i}",
+              /[a-z]/,
+              String,
+              lambda {|s| s},
+              true,
+              false
+          ))
+        end
+        # This would otherwise generate 4^11=419430 expressions and consume just shy of 1.5GB.
+        expressions = @generator.generate_expressions("a simple step")
+        expect(expressions.length).to eq(256)
+      end
+
+      it "prefers expression with longest non empty match" do
+        @parameter_type_registry.define_parameter_type(ParameterType.new(
+            'zero-or-more',
+            /[a-z]*/,
+            String,
+            lambda {|s| s},
+            true,
+            false
+        ))
+        @parameter_type_registry.define_parameter_type(ParameterType.new(
+            'exactly-one',
+            /[a-z]/,
+            String,
+            lambda {|s| s},
+            true,
+            false
+        ))
+
+        expressions = @generator.generate_expressions("a simple step")
+        expect(expressions.length).to eq(2)
+        expect(expressions[0].source).to eq("{exactly-one} {zero-or-more} {zero-or-more}")
+        expect(expressions[1].source).to eq("{zero-or-more} {zero-or-more} {zero-or-more}")
       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)
         expect(generated_expression.source).to eq(expected_expression)
-        
+
         cucumber_expression = CucumberExpression.new(generated_expression.source, @parameter_type_registry)
         match = cucumber_expression.match(text)
         if match.nil?

data/spec/cucumber/cucumber_expressions/cucumber_expression_regexp_spec.rb

@@ -44,6 +44,13 @@ module Cucumber
             /^I have many big(?:ish)? cukes$/
           )
         end
+
+        it "translates parenthesis with alpha unicode" do
+          assert_regexp(
+            "Привет, Мир(ы)!",
+            /^Привет, Мир(?:ы)?!$/
+          )
+        end
       end
     end
   end

data/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -76,6 +76,10 @@ module Cucumber
         expect(match("{float}", ".22")).to eq([0.22])
       end
 
+      it "matches anonymous" do
+        expect(match("{}", "0.22")).to eq(["0.22"])
+      end
+
       '[]()$.|?*+'.split('').each do |char|
         it "does not allow parameter type with #{char}" do
           expect {match("{#{char}string}", "something")}.to raise_error("Illegal character '#{char}' in parameter name {#{char}string}")
@@ -90,6 +94,10 @@ module Cucumber
         expect {match("({int})", "3")}.to raise_error('Parameter types cannot be optional: ({int})')
       end
 
+      it "does allow escaped optional parameter types" do
+        expect(match("\\({int})", "(3)")).to eq([3])
+      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

data/spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb

@@ -154,7 +154,7 @@ module Cucumber
                 /.*/,
                 Color,
                 lambda {|s| Color.new(s)},
-                true,
+                false,
                 false
             ))
           end

data/spec/cucumber/cucumber_expressions/regular_expression_spec.rb

@@ -20,6 +20,10 @@ module Cucumber
         expect( match(/(\d\d)/, "22") ).to eq(["22"])
       end
 
+      it "does not transform anonymous" do
+        expect( match(/(.*)/, "22") ).to eq(["22"])
+      end
+
       it "transforms negative int" do
         expect( match(/(-?\d+)/, "-22") ).to eq([-22])
       end

data/spec/cucumber/cucumber_expressions/tree_regexp_spec.rb

@@ -85,6 +85,14 @@ module Cucumber
         expect(group.value).to eq("hello")
       end
 
+      it('does not consider parenthesis in character class as group') do
+        tr = TreeRegexp.new(/^drawings: ([A-Z_, ()]+)$/)
+        group = tr.match('drawings: ONE, TWO(ABC)')
+        expect(group.value).to eq('drawings: ONE, TWO(ABC)')
+        expect(group.children[0].value).to eq('ONE, TWO(ABC)')
+        expect(group.children.length).to eq(1)
+      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 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.6.2
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - README.md
 - Rakefile
 - cucumber-expressions.gemspec
+- default.mk
 - examples.txt
 - lib/cucumber/cucumber_expressions/argument.rb
 - lib/cucumber/cucumber_expressions/combinatorial_generated_expression_factory.rb
@@ -113,7 +114,12 @@ files:
 homepage: https://github.com/cucumber/cucumber-expressions-ruby#readme
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/cucumber/cucumber/issues
+  changelog_uri: https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/CHANGELOG.md
+  documentation_uri: https://docs.cucumber.io/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
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -130,11 +136,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-6.0.1
+summary: cucumber-expressions-6.6.2
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb