cucumber-expressions 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49e54c1b2b0772aaa088ae5d7d52c49e2b45732
-  data.tar.gz: 5d9b537bfff91259546e6803b4a8b2b5f6af216e
+  metadata.gz: 24c2a1d775d8a7fafbdf9cca5074618579152749
+  data.tar.gz: d34c1ef714a341bbac1bd33713bd47c20fcb17be
 SHA512:
-  metadata.gz: d1078ba24b2b7608a1e5184804ccbc7addf7eea1999f1caaba16db09d6a141c7098b045953aba2a508e94822a8857e44627454916ccb1e1fa1c06bafb52039e9
-  data.tar.gz: a5bdc4982ee162f674ff3a2f4e5be43e67c45c12e8e9e7ccb67d47de9ed70282b1ccd61d12d49d3ba8d852b713e10fe62b09cd56af8d9a1294efea77edb68e62
+  metadata.gz: 840e2d44209c537e03fdbc27690cbe42093e27875a9377e9817dcddded07cf7418e3ce08cb2d6e8572226aec2b6069d7c3ac70ed50c3504c283686febf3038a2
+  data.tar.gz: 7fb30fab887f84735e7119697831da178cc6bed9f9728434acc21497fc210a0210e0fabda2fe679c2e92fd986403d1dea4451554b5a0217172abac65e107f789

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Cucumber Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Makefile

@@ -1,8 +1,11 @@
-LICENSE: ../../LICENSE
-	cp $< $@
+.PHONY: build
+build:
+	bundle install
+	bundle exec rake
 
 .PHONY: release
 release:
+	bundle install
 	bundle exec rake build release:guard_clean release:rubygem_push
 	version=$$(cat *.gemspec | grep -m 1 ".version *= *" | sed "s/.*= *'\([^']*\)'.*/\1/"); \
 	git tag --annotate v$$version --message "Release $$version"

data/cucumber-expressions.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'cucumber-expressions'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.authors     = ["Aslak Hellesøy"]
   s.description = 'Cucumber Expressions - a simpler alternative to Regular Expressions'
   s.summary     = "cucumber-expressions-#{s.version}"

data/examples.txt

@@ -13,3 +13,7 @@ I have 22 cukes in my belly now
 /I have (-?\d+) cukes? in my (.*) now/
 I have 1 cuke in my belly now
 [1,"belly"]
+---
+/^Something( with an optional argument)?$/
+Something
+[null]

data/lib/cucumber/cucumber_expressions/cucumber_expression_generator.rb

@@ -9,6 +9,7 @@ module Cucumber
       end
 
       def generate_expression(text, typed)
+        argumentNames = []
         transform_matchers = create_transform_matchers(text)
         transforms = []
 
@@ -26,12 +27,14 @@ module Cucumber
           end
 
           if matching_transform_matchers.any?
+            argumentName = "arg#{arg_counter += 1}"
+            argumentNames.push(argumentName)
             matching_transform_matchers = matching_transform_matchers.sort
             best_transform_matcher = matching_transform_matchers[0]
             transforms.push(best_transform_matcher.transform)
 
             expression += text.slice(pos...best_transform_matcher.start)
-            expression += "{arg#{arg_counter += 1}"
+            expression += "{#{argumentName}"
 
             if typed
               expression += ":#{best_transform_matcher.transform.type_name}"
@@ -48,7 +51,7 @@ module Cucumber
         end
 
         expression += text.slice(pos..-1)
-        GeneratedExpression.new(expression, transforms)
+        GeneratedExpression.new(expression, argumentNames, transforms)
       end
 
     private

data/lib/cucumber/cucumber_expressions/generated_expression.rb

@@ -1,10 +1,10 @@
 module Cucumber
   module CucumberExpressions
     class GeneratedExpression
-      attr_reader :source, :transforms
+      attr_reader :source, :argumentNames, :transforms
 
-      def initialize(source, transforms)
-        @source, @transforms = source, transforms
+      def initialize(source, argumentNames, transforms)
+        @source, @argumentNames, @transforms = source, argumentNames, transforms
       end
     end
   end

data/spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb

@@ -20,6 +20,7 @@ module Cucumber
         undefined_step_text = "I have 2 cucumbers and 1.5 tomato"
         generated_expression = generator.generate_expression(undefined_step_text, true)
         expect(generated_expression.source).to eq("I have {arg1:int} cucumbers and {arg2:float} tomato")
+        expect(generated_expression.argumentNames[0]).to eq("arg1")
         expect(generated_expression.transforms[1].type).to eq(Float)
         ### [generate-expression]
       end

data/spec/cucumber/cucumber_expressions/custom_transform_spec.rb

@@ -32,25 +32,25 @@ module Cucumber
       end
 
       describe CucumberExpression do
-        it "converts arguments with expression type" do
+        it "transforms arguments with expression type" do
           expression = CucumberExpression.new("I have a {color:color} ball", [], @transform_lookup)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
-        it "converts arguments with explicit type" do
+        it "transforms arguments with explicit type" do
           expression = CucumberExpression.new("I have a {color} ball", [Color], @transform_lookup)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
-        it "converts arguments using argument name as type" do
+        it "transforms arguments using argument name as type" do
           expression = CucumberExpression.new("I have a {color} ball", [], @transform_lookup)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
-        it "converts arguments with explicit type using constructor directly" do
+        it "transforms arguments with explicit type using constructor directly" do
           expression = CucumberExpression.new("I have a {color} ball", [Color], TransformLookup.new)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))
@@ -58,19 +58,19 @@ module Cucumber
       end
 
       describe RegularExpression do
-        it "converts arguments with expression type" do
+        it "transforms arguments with expression type" do
           expression = RegularExpression.new(/I have a (red|blue|yellow) ball/, [], @transform_lookup)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
-        it "converts arguments with explicit type" do
+        it "transforms arguments with explicit type" do
           expression = RegularExpression.new(/I have a (red|blue|yellow) ball/, ['color'], @transform_lookup)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
-        it "converts arguments with explicit type using constructor directly" do
+        it "transforms arguments with explicit type using constructor directly" do
           expression = RegularExpression.new(/I have a (red|blue|yellow) ball/, [Color], TransformLookup.new)
           transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
           expect( transformed_argument_value ).to eq(Color.new('red'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - Makefile
 - README.md
 - Rakefile
@@ -132,10 +133,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-1.0.1
+summary: cucumber-expressions-1.0.2
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb