cucumber-expressions 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882d05ea05136cc6af4f3bc4ef6bccfe42531645
-  data.tar.gz: 42c7abf6782587c48aa8e264598637a459bbdc86
+  metadata.gz: c8c5e8a795eb6fea91f46e61cc01985a8af0572d
+  data.tar.gz: 92fa95001cddb0f9d931a02602c0e2d793678d53
 SHA512:
-  metadata.gz: 598ce9757f1518d1e9eae317a3f9718efb6339001fa36a5dea1e03fd690f44abd34524652f7b195c271c8b5128082676ffbd2dfef8b2a9aa2ee4bc6cd71ba3c7
-  data.tar.gz: 38121b06c1d4ca408a28f407cb0ae3b0f47de3464fe20128de05667ab34fdd93b5f369dbb2d24b26b4f9f742a93744e1dbccbb0d930478c8de3633b305fa8891
+  metadata.gz: 7baf62e65277d441049bce8133cc50a6b44a48027cdf53a921b14006cac39358b45ba838890d43d1b1f7ec0edd8a74197e32b2979bfe8885bc5c4b1c963f0c12
+  data.tar.gz: 44b4dd881b1b7d8649f185b4f60a31ecf91f4ff1ccf6b7934ecd9d1b143200bf0c2ee74f4913c3f4ea308457943ffbacf02d3bfede92dca31746cc698e522749

data/cucumber-expressions.gemspec

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

@@ -1,10 +1,14 @@
 module Cucumber
   module CucumberExpressions
     class Argument
-      attr_reader :offset, :value, :transformed_value
+      attr_reader :offset, :value
 
-      def initialize(offset, value, transformed_value)
-        @offset, @value, @transformed_value = offset, value, transformed_value
+      def initialize(offset, value, parameter)
+        @offset, @value, @parameter = offset, value, parameter
+      end
+
+      def transformed_value
+        @parameter.transform(@value)
       end
     end
   end

data/lib/cucumber/cucumber_expressions/argument_builder.rb

@@ -9,8 +9,7 @@ module Cucumber
         (1...m.length).map do |index|
           value = m[index]
           parameter = parameters[index-1]
-          transformed_value = parameter.transform(value)
-          Argument.new(m.offset(index)[0], value, transformed_value)
+          Argument.new(m.offset(index)[0], value, parameter)
         end
       end
     end

data/lib/cucumber/cucumber_expressions/parameter_registry.rb

@@ -3,8 +3,8 @@ require 'cucumber/cucumber_expressions/parameter'
 module Cucumber
   module CucumberExpressions
     class ParameterRegistry
-      INTEGER_REGEXPS = ['-?\d+', '\d+']
-      FLOATING_POINT_REGEXPS = ['-?\d*\.?\d+']
+      INTEGER_REGEXPS = [/-?\d+/, /\d+/]
+      FLOAT_REGEXPS = [/-?\d*\.?\d+/]
 
       def initialize
         @parameters_by_type_name = {}
@@ -12,7 +12,7 @@ module Cucumber
         @parameters_by_class = {}
 
         add_parameter(Parameter.new('int', Integer, INTEGER_REGEXPS, lambda {|s| s.to_i}))
-        add_parameter(Parameter.new('float', Float, FLOATING_POINT_REGEXPS, lambda {|s| s.to_f}))
+        add_parameter(Parameter.new('float', Float, FLOAT_REGEXPS, lambda {|s| s.to_f}))
       end
 
       def lookup_by_type(type)

data/spec/cucumber/cucumber_expressions/custom_parameter_spec.rb

@@ -20,66 +20,79 @@ module Cucumber
 
     describe "Custom parameter" do
       before do
-        @parameter_registry = ParameterRegistry.new
         ### [add-color-parameter]
-        @parameter_registry.add_parameter(Parameter.new(
+        parameter_registry = ParameterRegistry.new
+        parameter_registry.add_parameter(Parameter.new(
           'color',
           Color,
           [/red|blue|yellow/, /(?:dark|light) (?:red|blue|yellow)/],
           lambda { |s| Color.new(s) }
         ))
         ### [add-color-parameter]
+        @parameter_registry = parameter_registry
       end
 
       describe CucumberExpression do
         it "matches typed parameters" do
           expression = CucumberExpression.new("I have a {color} ball", [], @parameter_registry)
-          parametered_argument_value = expression.match("I have a red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('red'))
+          transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
         it "matches typed parameters with optional group" do
           expression = CucumberExpression.new("I have a {color} ball", [], @parameter_registry)
-          parametered_argument_value = expression.match("I have a dark red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('dark red'))
+          transformed_argument_value = expression.match("I have a dark red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('dark red'))
         end
 
         it "matches untyped parameters with explicit type" do
           expression = CucumberExpression.new("I have a {color} ball", [Color], @parameter_registry)
-          parametered_argument_value = expression.match("I have a red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('red'))
+          transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
         it "matches untyped parameters with same name as type" do
           expression = CucumberExpression.new("I have a {color} ball", [], @parameter_registry)
-          parametered_argument_value = expression.match("I have a red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('red'))
+          transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
         it "matches parameters with explicit type that isn't registered" do
           expression = CucumberExpression.new("I have a {color} ball", [Color], ParameterRegistry.new)
-          parametered_argument_value = expression.match("I have a red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('red'))
+          transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('red'))
+        end
+
+        it("defers transformation until queried from argument") do
+          @parameter_registry.add_parameter(Parameter.new(
+              'throwing',
+              String,
+              /bad/,
+              lambda { |s| raise "Can't transform [#{s}]" }
+          ))
+          expression = CucumberExpression.new("I have a {throwing} parameter", [], @parameter_registry)
+          args = expression.match("I have a bad parameter")
+          expect { args[0].transformed_value }.to raise_error("Can't transform [bad]")
         end
       end
 
       describe RegularExpression do
         it "matches parameters with explicit constructor" do
           expression = RegularExpression.new(/I have a (red|blue|yellow) ball/, [Color], @parameter_registry)
-          parametered_argument_value = expression.match("I have a red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('red'))
+          transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
         it "matches parameters without explicit constructor" do
           expression = RegularExpression.new(/I have a (red|blue|yellow) ball/, [], @parameter_registry)
-          parametered_argument_value = expression.match("I have a red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('red'))
+          transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('red'))
         end
 
         it "matches parameters with explicit type that isn't registered" do
           expression = RegularExpression.new(/I have a (red|blue|yellow) ball/, [Color], ParameterRegistry.new)
-          parametered_argument_value = expression.match("I have a red ball")[0].transformed_value
-          expect( parametered_argument_value ).to eq(Color.new('red'))
+          transformed_argument_value = expression.match("I have a red ball")[0].transformed_value
+          expect( transformed_argument_value ).to eq(Color.new('red'))
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-expressions
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -122,7 +122,7 @@ rubyforge_project:
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: cucumber-expressions-2.0.0
+summary: cucumber-expressions-2.0.1
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb