cucumber-expressions 5.0.17 → 5.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3821d0679b7cfc185225a5760088bbff31d2b5b7a09badabe586eddc5068dbc6
-  data.tar.gz: 270433a81d721c4e2c25cbe68e0a211f0c9074bbcc85c15e6b96f211ebb62c10
+  metadata.gz: d661edfcc1203904d6471736027ab45c6036ec6a4015347ca190a7397b9a18f0
+  data.tar.gz: 5aefbf1fbc78226c404a23b39131e966bcdac8f621711ab6b3b9997d23f4bd1f
 SHA512:
-  metadata.gz: 14fa6a516bff4c1d48d0646fbd6234f6c28ed109983db31ddbf33d07d2bad21b0193a344f9edcd9805bc67217d57658c87fda343a4bc6b17f6ca82ef0546de27
-  data.tar.gz: 317ab01474a740676f9dcb81a65dec0d7db38e001dcdfbe1587eac907561d162152b35864bcff11cacf08bd1b5db97a08ee7ad7e5944a51c53296192b3a9e9f8
+  metadata.gz: 727ad5c75d452c0ad4b549045cbb2cfc15dc4cd5bc8e0b34333dd4d176969cac8960b780ce452927bca5c81cfdba7e2faff31c3ca0d7c21ac56688ced0b4e981
+  data.tar.gz: 6e1a3dc1fe998cd396278f48a0fcd410e2bbe5b8e6eb35a43aea857c70f74391dda987106b4b7b13b40da0f512f2eb5b165897cf20dafb64e9c60c5db28833d5

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+PLEASE DO NOT CREATE ISSUES IN THIS REPO.
+THIS REPO IS A READ-ONLY MIRROR.
+
+Create your issue in the Cucumber monorepo instead:
+https://github.com/cucumber/cucumber/issues

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+PLEASE DO NOT CREATE PULL REAUESTS IN THIS REPO.
+THIS REPO IS A READ-ONLY MIRROR.
+
+Create your pull request in the Cucumber monorepo instead:
+https://github.com/cucumber/cucumber/pulls

data/.rsync

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

data/.subrepo

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

data/.travis.yml

@@ -7,10 +7,10 @@ sudo: false
 language: ruby
 
 rvm:
-  - "2.5.0"
-  - "2.4.3"
-  - "2.3.6"
-  - "2.2.9"
-  - "jruby-9.1.13.0"
+  - "2.5.1"
+  - "2.4.4"
+  - "2.3.7"
+  - "2.2.10"
+  - "jruby-9.1.17.0"
 
 script: make default

data/cucumber-expressions.gemspec

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

@@ -55,7 +55,10 @@ module Cucumber
 
       def process_alternation(expression)
         expression.gsub(ALTERNATIVE_NON_WHITESPACE_TEXT_REGEXP) do
-          "(?:#{$1}#{$2.tr('/', '|')})"
+          # replace \/ with /
+          # replace / with |
+          replacement = $&.tr('/', '|').gsub(/\\\|/, '/')
+          "(?:#{replacement})"
         end
       end
 

data/lib/cucumber/cucumber_expressions/cucumber_expression_generator.rb

@@ -98,6 +98,7 @@ module Cucumber
         s.gsub(/%/, '%%')
         .gsub(/\(/, '\\(')
         .gsub(/\{/, '\\{')
+        .gsub(/\//, '\\/')
       end
     end
   end

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -41,6 +41,12 @@ module Cucumber
           "{iii}")
       end
 
+      it "generates expression with escaped slashes" do
+        assert_expression(
+          "The {int}\\/{int}\\/{int} hey", ["int", "int2", "int3"],
+          "The 1814/05/17 hey")
+      end
+
       it "generates expression for int float arg" do
         assert_expression(
           "I have {int} cukes and {float} euro", ["int", "float"],
@@ -53,7 +59,7 @@ module Cucumber
             'I like "bangers" and \'mash\'')
       end
 
-      it "generates expression for strings with % sign" do
+      it "generates expression with % sign" do
         assert_expression(
             "I am {int}% foobar", ["int"],
             'I am 20% foobar')
@@ -121,6 +127,9 @@ module Cucumber
         
         cucumber_expression = CucumberExpression.new(generated_expression.source, @parameter_type_registry)
         match = cucumber_expression.match(text)
+        if match.nil?
+          raise "Expected text '#{text}' to match generated expression '#{generated_expression.source}'"
+        end
         expect(match.length).to eq(expected_argument_names.length)
       end
     end

data/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -59,6 +59,10 @@ module Cucumber
         expect(match('three \\(exceptionally) {string} mice', 'three (exceptionally) "blind" mice')).to eq(['blind'])
       end
 
+      it "matches escaped slash" do
+        expect(match("12\\/2020", "12/2020")).to eq([])
+      end
+
       it "matches int" do
         expect(match("{int}", "22")).to eq([22])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 5.0.17
+  version: 5.0.18
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".rspec"
 - ".rsync"
+- ".subrepo"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -131,7 +134,7 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-5.0.17
+summary: cucumber-expressions-5.0.18
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb