cucumber-expressions 5.0.12 → 5.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea398357223ad8b15e08a3c66821af289a60c175
-  data.tar.gz: 6d4cfdf4cb89c2272673ff6c95310964031273c7
+  metadata.gz: e37bfd25d2fa6ce81bb76f2a0e4b155b23d7c243
+  data.tar.gz: a843eb27ff496f5744bb8fc9b7ff2993640a029a
 SHA512:
-  metadata.gz: 2f045c24da07f978651d62e2b7a8bf729c439d5170e0074fefb42c7a8801e25b0d07b4baa91cc4b79f088a7852b615980541cf28fd5a8e9fbf78689404c4535f
-  data.tar.gz: 68f8e6cd42e31f3e4132332ef1a114de435d9b678db4d1459c44452150a2b1d84c80497920b6933a7b3a6edb3294ebdede54369eff0611c67d037c14ceab207a
+  metadata.gz: 7a9c2d12d144a509ff625e72c67cf1b1e2504a2ecab38086f85aa019150e59437ee06807efb5d65c398f7314c52f1677cb7429d75ff442316c043c0d0987d4f3
+  data.tar.gz: 8a9e6c44e79d1c713ff2dac7b6b5a2327001615df1ae4e8a356dcc682b7ac71a06629a9f0f5ac5f8d6f053380c5223657eb60ae007a3c0668bdc2a08f30996e4

data/cucumber-expressions.gemspec

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

@@ -3,24 +3,18 @@ require 'cucumber/cucumber_expressions/group_builder'
 module Cucumber
   module CucumberExpressions
     class TreeRegexp
-      REGEXP_CHARS = ['#', '$', '(', ')', '*', '+', '.', '?', '[', '\\', '^', '{', '|']
-
       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
         escaping = false
         non_capturing_maybe = false
+
         @regexp.source.split('').each_with_index do |c, n|
-          if escaping && regexp_char?(c)
-            escaping = false
-          elsif c == '\\'
-            escaping = true
-          elsif c == '(' && !escaping
+          if c == '(' && !escaping
             stack.push(GroupBuilder.new)
             group_start_stack.push(n+1)
             non_capturing_maybe = false
@@ -40,15 +34,13 @@ module Cucumber
             stack.last.set_non_capturing!
             non_capturing_maybe = false
           end
+
+          escaping = c == '\\' && !escaping
           last = c
         end
         @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

@@ -65,6 +65,12 @@ module Cucumber
         expect(group.children.length).to eq(1)
       end
 
+      it 'works with digit and word' do
+        tr = TreeRegexp.new(/^(\d) (\w+)$/)
+        group = tr.match("2 you")
+        expect(group.children.length).to eq(2)
+      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.12
+  version: 5.0.13
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-21 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.12
+summary: cucumber-expressions-5.0.13
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb