cucumber-expressions 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f078db7f6aa1421bebcd4ab1dd9706637a253f0
-  data.tar.gz: 8c2b581f749dbf37abf0fa8f05026bd5b9396bb2
+  metadata.gz: 585a2bd12be1402edbd044df4eba75a3facc8ae7
+  data.tar.gz: e2f73a0945067fc0f36aee14c2fd2c8a0a1953cf
 SHA512:
-  metadata.gz: 21c2dd0bc60847678a08db4bce0a0d61a6c00544b889e212b3dddba44a285ddf8446cfb38fedd41169be9c3b0e7bc1589f7175eb39a3803240ecac598ebc3995
-  data.tar.gz: 5e0988875e133251cb0b0aae14cbd7b0da4ae8f3384e7cda7451de6da906206953342f1ffdc850e15215a2aeaf3be4d403c30e2b67d4c938bf6a6b1a393a1766
+  metadata.gz: 107cee1adc2c92cf7fde7b709dc01ae34b316e34ce604adc19232d75ed66d5abfb28be5cf29c96d6e633d34bf38c5650a8626d314a4db0c6064e481622e28923
+  data.tar.gz: caebefb4d97b8abe78c6565a643bb35c6f96175b5169394b46d03b9cfab339512d7167d6df1a0ea4071033a2139a77e88586139ed0868df45ff4275bb768c215

data/.rsync

@@ -1,2 +1,3 @@
 ../../LICENSE LICENSE
+../../.travis/ruby/.travis.yml .travis.yml
 ../examples.txt examples.txt

data/.travis.yml

@@ -1,10 +1,15 @@
+# Please update /.travis/ruby/.travis.yml in the cucumber/cucumber monorepo
+# and sync:
+#
+#     source scripts/functions.sh && rsync_files
+#
 language: ruby
 
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
-  - jruby-9.1.7.0
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8
+  - jruby-9.1.13.0
 
 notifications:
   webhooks:

data/cucumber-expressions.gemspec

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

@@ -51,7 +51,7 @@ module Cucumber
 
             parameter_type_combinations.push(parameter_types)
 
-            expression_template += text.slice(pos...best_parameter_type_matcher.start)
+            expression_template += escape_for_sprintf(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 += text.slice(pos..-1)
+        expression_template += escape_for_sprintf(text.slice(pos..-1))
 
         CombinatorialGeneratedExpressionFactory.new(
           expression_template,
@@ -94,6 +94,9 @@ module Cucumber
         result
       end
 
+      def escape_for_sprintf(s)
+        s.gsub(/%/, '%%')
+      end
     end
   end
 end

data/lib/cucumber/cucumber_expressions/group_builder.rb

@@ -3,6 +3,8 @@ require 'cucumber/cucumber_expressions/group'
 module Cucumber
   module CucumberExpressions
     class GroupBuilder
+      attr_accessor :source
+
       def initialize
         @group_builders = []
         @capturing = true
@@ -31,6 +33,10 @@ module Cucumber
           group_builder.add(child)
         end
       end
+
+      def children
+        @group_builders
+      end
     end
   end
 end

data/lib/cucumber/cucumber_expressions/regular_expression.rb

@@ -5,7 +5,6 @@ require 'cucumber/cucumber_expressions/tree_regexp'
 module Cucumber
   module CucumberExpressions
     class RegularExpression
-      CAPTURE_GROUP_PATTERN = /\((?!\?:)([^(]+)\)/
 
       def initialize(expression_regexp, parameter_type_registry)
         @expression_regexp = expression_regexp
@@ -14,30 +13,20 @@ module Cucumber
       end
 
       def match(text)
-        parameter_types = []
-
-        match_offset = 0
-
-        loop do
-          match = CAPTURE_GROUP_PATTERN.match(@expression_regexp.source, match_offset)
-          break if match.nil?
-          match_offset = match.offset(0)[1]
-
-          parameter_type_regexp = match[1]
-
-          parameter_type = @parameter_type_registry.lookup_by_regexp(parameter_type_regexp, @expression_regexp, text)
-          if parameter_type.nil?
-            parameter_type = ParameterType.new(
-                parameter_type_regexp,
-                parameter_type_regexp,
-                String,
-                lambda {|s| s},
-                false,
-                false
-            )
-          end
-
-          parameter_types.push(parameter_type)
+        parameter_types = @tree_regexp.group_builder.children.map do |group_builder|
+          parameter_type_regexp = group_builder.source
+          @parameter_type_registry.lookup_by_regexp(
+            parameter_type_regexp,
+            @expression_regexp,
+            text
+          ) || ParameterType.new(
+            parameter_type_regexp,
+            parameter_type_regexp,
+            String,
+            lambda {|s| s},
+            false,
+            false
+          )
         end
 
         Argument.build(@tree_regexp, text, parameter_types)

data/lib/cucumber/cucumber_expressions/tree_regexp.rb

@@ -3,21 +3,25 @@ require 'cucumber/cucumber_expressions/group_builder'
 module Cucumber
   module CucumberExpressions
     class TreeRegexp
-      attr_reader :regexp
+      attr_reader :regexp, :group_builder
 
       def initialize(regexp)
         @regexp = regexp.is_a?(Regexp) ? regexp : Regexp.new(regexp)
 
         stack = [GroupBuilder.new]
+        group_start_stack = []
         last = nil
         non_capturing_maybe = false
-        @regexp.source.split('').each do |c|
+        @regexp.source.split('').each_with_index do |c, n|
           if c == '(' && last != '\\'
             stack.push(GroupBuilder.new)
+            group_start_stack.push(n+1)
             non_capturing_maybe = false
           elsif c == ')' && last != '\\'
             gb = stack.pop
+            group_start = group_start_stack.pop
             if gb.capturing?
+              gb.source = @regexp.source[group_start...n]
               stack.last.add(gb)
             else
               gb.move_children_to(stack.last)

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -40,6 +40,12 @@ module Cucumber
             'I like "bangers" and \'mash\'')
       end
 
+      it "generates expression for strings with % sign" do
+        assert_expression(
+            "I am {int}% foobar", ["int"],
+            'I am 20% foobar')
+      end
+
       it "generates expression for just int" do
         assert_expression(
           "{int}", ["int"],

data/spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb

@@ -48,12 +48,12 @@ module Cucumber
         parameter_registry = ParameterTypeRegistry.new
         ### [add-color-parameter-type]
         parameter_registry.define_parameter_type(ParameterType.new(
-            'color',
-            /red|blue|yellow/,
-            Color,
-            lambda {|s| Color.new(s)},
-            true,
-            false
+            'color',                   # name
+            /red|blue|yellow/,         # regexp
+            Color,                     # type
+            lambda {|s| Color.new(s)}, # transform
+            true,                      # use_for_snippets
+            false                      # prefer_for_regexp_match
         ))
         ### [add-color-parameter-type]
         @parameter_type_registry = parameter_registry

data/spec/cucumber/cucumber_expressions/regular_expression_spec.rb

@@ -47,6 +47,10 @@ module Cucumber
         ).to eq(["I", "can", 1, "slide"])
       end
 
+      it "works with escaped parenthesis" do
+        expect( match(/Across the line\(s\)/, 'Across the line(s)') ).to eq([])
+      end
+
       it "exposes source and regexp" do
         regexp = /I have (\d+) cukes? in my (\+) now/
         expression = RegularExpression.new(regexp, ParameterTypeRegistry.new)

data/spec/cucumber/cucumber_expressions/tree_regexp_spec.rb

@@ -3,6 +3,11 @@ require 'cucumber/cucumber_expressions/tree_regexp'
 module Cucumber
   module CucumberExpressions
     describe TreeRegexp do
+      it 'exposes group source' do
+        tr = TreeRegexp.new(/(a(?:b)?)(c)/)
+        expect(tr.group_builder.children.map{|gb| gb.source}).to eq(['a(?:b)?', 'c'])
+      end
+
       it 'builds tree' do
         tr = TreeRegexp.new(/(a(?:b)?)(c)/)
         group = tr.match('ac')
@@ -57,4 +62,4 @@ module Cucumber
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,7 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-4.0.3
+summary: cucumber-expressions-4.0.4
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb