cucumber-expressions 5.0.7 → 5.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce3cee42bca0d0e46a628cf803bf9796c7393bde
-  data.tar.gz: f3281f04ae598bd88757a549a45eb2c8c49e0d13
+  metadata.gz: 50ebfcf2cfdb4abd82cbb5249315229fb737aad6
+  data.tar.gz: bc852a832a6723d2bd3d49fbcf9b2bd1cc88f8a0
 SHA512:
-  metadata.gz: c3b16ec6e58b229a0bb279b6e143ab3dc956368181416b7a475bb514c15d7218ae71dfa5ec96bc625f482acca513a4d4b416e03f9dc4b7d1b9b5ad50978dcfa6
-  data.tar.gz: 749162eb6dad223dc5a7a7af679a4ec99b5bfa77334a59cba573a5972e0797281220507fb1b07883d361c934d527e23af1beee3a2e5f31b1c8617eebae152ff5
+  metadata.gz: 6770cad378c2a1661e6dd9f645fd38d7e0ba1e7cfc388f50613570a1bd0433b02601552831207e4c3b2ceff504d58ad0baf95ab41711f9f5dfeb041b7f8d9b4a
+  data.tar.gz: 2610566bef43fae42a66c1290538a8ca868b061b3ac9218266607921c3feea5a3406bc04601786e2c987558630b127fb0e522a620e9fb6a7d5f53909897d02f4

data/cucumber-expressions.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'cucumber-expressions'
-  s.version     = '5.0.7'
+  s.version     = '5.0.10'
   s.authors     = ["Aslak Hellesøy"]
   s.description = 'Cucumber Expressions - a simpler alternative to Regular Expressions'
   s.summary     = "cucumber-expressions-#{s.version}"
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake',      '~> 12.3'
-  s.add_development_dependency 'rspec',     '~> 3.5'
+  s.add_development_dependency 'rspec',     '~> 3.7'
 
   # For coverage reports
   s.add_development_dependency 'coveralls'

data/lib/cucumber/cucumber_expressions/tree_regexp.rb

@@ -3,6 +3,8 @@ require 'cucumber/cucumber_expressions/group_builder'
 module Cucumber
   module CucumberExpressions
     class TreeRegexp
+      REGEXP_CHARS = ['#', '$', '(', ')', '*', '+', '.', '?', '[', '\\', '^', '{', '|']
+
       attr_reader :regexp, :group_builder
 
       def initialize(regexp)
@@ -11,13 +13,18 @@ module Cucumber
         stack = [GroupBuilder.new]
         group_start_stack = []
         last = nil
+        escaping = false
         non_capturing_maybe = false
         @regexp.source.split('').each_with_index do |c, n|
-          if c == '(' && last != '\\'
+          if escaping && regexp_char?(c)
+            escaping = false
+          elsif c == '\\'
+            escaping = true
+          elsif c == '(' && !escaping
             stack.push(GroupBuilder.new)
             group_start_stack.push(n+1)
             non_capturing_maybe = false
-          elsif c == ')' && last != '\\'
+          elsif c == ')' && !escaping
             gb = stack.pop
             group_start = group_start_stack.pop
             if gb.capturing?
@@ -38,6 +45,10 @@ module Cucumber
         @group_builder = stack.pop
       end
 
+      def regexp_char?(c)
+        REGEXP_CHARS.include?(c)
+      end
+
       def match(s)
         match = @regexp.match(s)
         return nil if match.nil?

data/spec/cucumber/cucumber_expressions/tree_regexp_spec.rb

@@ -53,6 +53,12 @@ module Cucumber
         expect(group.children.length).to eq(3)
       end
 
+      it 'works with escaped backslash' do
+        tr = TreeRegexp.new(/foo\\(bar|baz)/)
+        group = tr.match("foo\\bar")
+        expect(group.children.length).to eq(1)
+      end
+
       it 'captures non capturing groups with capturing groups inside' do
         tr = TreeRegexp.new(/the stdout(?: from "(.*?)")?/)
         group = tr.match("the stdout")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.0.10
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-5.0.7
+summary: cucumber-expressions-5.0.10
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb