cucumber-expressions 4.0.4 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585a2bd12be1402edbd044df4eba75a3facc8ae7
-  data.tar.gz: e2f73a0945067fc0f36aee14c2fd2c8a0a1953cf
+  metadata.gz: 496273cb3a1f1f91726135226ec1d3e8d69eef38
+  data.tar.gz: 7d0b9fe4bb923c498b8202a9a94c4bf62d86bb26
 SHA512:
-  metadata.gz: 107cee1adc2c92cf7fde7b709dc01ae34b316e34ce604adc19232d75ed66d5abfb28be5cf29c96d6e633d34bf38c5650a8626d314a4db0c6064e481622e28923
-  data.tar.gz: caebefb4d97b8abe78c6565a643bb35c6f96175b5169394b46d03b9cfab339512d7167d6df1a0ea4071033a2139a77e88586139ed0868df45ff4275bb768c215
+  metadata.gz: 7f1052d6c856b8d34a6ac44eb2027bf60b3e0f89d0089d3d76f0f58a913de40abe2c97c318142787c291bee3b084a8feda60d5728da5f7ab97230e1e682cb9ab
+  data.tar.gz: 6118073dcf156c9e2a9d580252aade7b371aa5202fb4a5ab7e29332b8ae57fffdd561037002bf7f42269cde1d6cff61986865dd5cf8de86595a96169b051979a

data/cucumber-expressions.gemspec

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

@@ -27,8 +27,10 @@ module Cucumber
         @group, @parameter_type = group, parameter_type
       end
 
-      def value
-        @parameter_type.transform(@group ? @group.values : nil)
+      def value(self_obj=:nil)
+        raise "No self_obj" if self_obj == :nil
+        group_values = @group ? @group.values : nil
+        @parameter_type.transform(self_obj, group_values)
       end
     end
   end

data/lib/cucumber/cucumber_expressions/parameter_type.rb

@@ -34,15 +34,17 @@ module Cucumber
         @regexps = string_array(regexp)
       end
 
-      def transform(group_values)
+      def transform(self_obj, group_values)
         if @transformer.arity == 1
           non_nil_group_values = group_values.compact
           raise CucumberExpressionError.new(
               "Single transformer unexpectedly matched 2 values - \"#{non_nil_group_values[0]}\" and \"${non_nil_group_values[1]}\""
           ) if non_nil_group_values.length >= 2
-          return @transformer.call(non_nil_group_values[0])
+          args = [non_nil_group_values[0]]
+        else
+          args = group_values
         end
-        @transformer.call(*group_values)
+        self_obj.instance_exec(*args, &@transformer)
       end
 
       def <=>(other)

data/spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb

@@ -11,7 +11,7 @@ module Cucumber
         expr = "I have {int} cuke(s)"
         expression = CucumberExpression.new(expr, parameter_registry)
         args = expression.match("I have 7 cukes")
-        expect(args[0].value).to eq(7)
+        expect(args[0].value(nil)).to eq(7)
         ### [capture-match-arguments]
       end
 
@@ -69,13 +69,42 @@ module Cucumber
         expect(CucumberExpression.new(expr, ParameterTypeRegistry.new).source).to eq(expr)
       end
 
+      it "delegates transform to custom object" do
+        parameter_type_registry = ParameterTypeRegistry.new
+        parameter_type_registry.define_parameter_type(
+          ParameterType.new(
+                  'widget',
+                  /\w+/,
+                  Object,
+                  -> (s) {
+                    self.create_widget(s)
+                  },
+                  false,
+                  true
+              )
+        )
+        expression = CucumberExpression.new(
+          'I have a {widget}',
+          parameter_type_registry
+        )
+
+        class World
+          def create_widget(s)
+            "widget:#{s}"
+          end
+        end
+
+        args = expression.match("I have a bolt")
+        expect(args[0].value(World.new)).to eq('widget:bolt')
+      end
+
       describe "escapes special characters" do
         %w(\\ [ ] ^ $ . | ? * +).each do |character|
           it "escapes #{character}" do
             expr = "I have {int} cuke(s) and #{character}"
             expression = CucumberExpression.new(expr, ParameterTypeRegistry.new)
             arg1 = expression.match("I have 800 cukes and #{character}")[0]
-            expect(arg1.value).to eq(800)
+            expect(arg1.value(nil)).to eq(800)
           end
         end
       end
@@ -84,7 +113,7 @@ module Cucumber
         cucumber_expression = CucumberExpression.new(expression, ParameterTypeRegistry.new)
         args = cucumber_expression.match(text)
         return nil if args.nil?
-        args.map {|arg| arg.value}
+        args.map {|arg| arg.value(nil)}
       end
     end
   end

data/spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb

@@ -62,7 +62,7 @@ module Cucumber
       describe CucumberExpression do
         it "matches parameters with custom parameter type" do
           expression = CucumberExpression.new("I have a {color} ball", @parameter_type_registry)
-          transformed_argument_value = expression.match("I have a red ball")[0].value
+          transformed_argument_value = expression.match("I have a red ball")[0].value(nil)
           expect(transformed_argument_value).to eq(Color.new('red'))
         end
 
@@ -82,13 +82,13 @@ module Cucumber
           )
           args = expression.match('A 5 thick line from 10,20,30 to 40,50,60')
 
-          thick = args[0].value
+          thick = args[0].value(nil)
           expect(thick).to eq(5)
 
-          from = args[1].value
+          from = args[1].value(nil)
           expect(from).to eq(Coordinate.new(10, 20, 30))
 
-          to = args[2].value
+          to = args[2].value(nil)
           expect(to).to eq(Coordinate.new(40, 50, 60))
         end
 
@@ -103,7 +103,7 @@ module Cucumber
               false
           ))
           expression = CucumberExpression.new("I have a {color} ball", parameter_type_registry)
-          transformed_argument_value = expression.match("I have a dark red ball")[0].value
+          transformed_argument_value = expression.match("I have a dark red ball")[0].value(nil)
           expect(transformed_argument_value).to eq(Color.new('dark red'))
         end
 
@@ -118,7 +118,7 @@ module Cucumber
           ))
           expression = CucumberExpression.new("I have a {throwing} parameter", @parameter_type_registry)
           args = expression.match("I have a bad parameter")
-          expect {args[0].value}.to raise_error("Can't transform [bad]")
+          expect {args[0].value(nil)}.to raise_error("Can't transform [bad]")
         end
 
         describe "conflicting parameter type" do
@@ -157,11 +157,11 @@ module Cucumber
             ))
 
             css_color = CucumberExpression.new("I have a {css-color} ball", @parameter_type_registry)
-            css_color_value = css_color.match("I have a blue ball")[0].value
+            css_color_value = css_color.match("I have a blue ball")[0].value(nil)
             expect(css_color_value).to eq(CssColor.new("blue"))
 
             color = CucumberExpression.new("I have a {color} ball", @parameter_type_registry)
-            color_value = color.match("I have a blue ball")[0].value
+            color_value = color.match("I have a blue ball")[0].value(nil)
             expect(color_value).to eq(Color.new("blue"))
           end
         end
@@ -170,7 +170,7 @@ module Cucumber
       describe RegularExpression do
         it "matches arguments with custom parameter type" do
           expression = RegularExpression.new(/I have a (red|blue|yellow) ball/, @parameter_type_registry)
-          value = expression.match("I have a red ball")[0].value
+          value = expression.match("I have a red ball")[0].value(nil)
           expect(value).to eq(Color.new('red'))
         end
       end

data/spec/cucumber/cucumber_expressions/expression_examples_spec.rb

@@ -13,7 +13,7 @@ module Cucumber
 
         arguments = expression.match(text)
         return nil if arguments.nil?
-        arguments.map { |arg| arg.value }
+        arguments.map { |arg| arg.value(nil) }
       end
 
       File.open(File.expand_path("../../../../examples.txt", __FILE__), "r:utf-8") do |io|

data/spec/cucumber/cucumber_expressions/regular_expression_spec.rb

@@ -11,8 +11,8 @@ module Cucumber
         expr = /I have (\d+) cukes? in my (\w*) now/
         expression = RegularExpression.new(expr, parameter_type_registry)
         args = expression.match("I have 7 cukes in my belly now")
-        expect( args[0].value ).to eq(7)
-        expect( args[1].value ).to eq("belly")
+        expect( args[0].value(nil) ).to eq(7)
+        expect( args[1].value(nil) ).to eq("belly")
         ### [capture-match-arguments]
       end
 
@@ -62,7 +62,7 @@ module Cucumber
         regular_expression = RegularExpression.new(expression, ParameterTypeRegistry.new)
         arguments = regular_expression.match(text)
         return nil if arguments.nil?
-        arguments.map { |arg| arg.value }
+        arguments.map { |arg| arg.value(nil) }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 5.0.0
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-10 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.4
+summary: cucumber-expressions-5.0.0
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb