alinta-cucumber-rest-bdd 0.5.18 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 306b023580a0ac0b19100533e7b4e73d797157c9265927b40f538b742cd0af4a
-  data.tar.gz: 2078787c5b3635af8df6f7f1b18b9623cdf763bd46a2925010062947f95c18f9
+SHA1:
+  metadata.gz: 27c980d29ee35952fbc7bc96f4795dc0af56e31c
+  data.tar.gz: cbe202b5007ade6def21773d8a2bd6ed1ac838a8
 SHA512:
-  metadata.gz: 2e9120ceb72b2398c55a93db9444e6197b2f76ee3b46c9ce0a9d57758691aa939a7607dbec7d8c6eda95afcc6acba440fe87d3415e70fb0589e37992dfdfa870
-  data.tar.gz: 19acc5ff1a069aa7c5621ffc4c2aa8bcbac0b91c67f9f2372aa49ab240668f595ba945e49cc6946b433578361774608ccaf31c514c8c56d067099a520a0f2daa
+  metadata.gz: be9194bbf9479cb44f9b1cd3ee6ebe610fbd23c5ec049d69ee80677245414ee23e7be667cee6d65edbeadcf1275cf34e54ef79de37e638f8e932293b00cd82fb
+  data.tar.gz: 2e7c5f36fa32a8cda7e3dcacf0f132cfc9968c9b23f96e63f73bcf1058a1afaa693db70d9eaf695fc623eb96ce21bd5a7a216aa62b4ab35c75814ffacb596b98

data/lib/cucumber-rest-bdd/steps/response.rb

@@ -17,11 +17,13 @@ Then("the response #{HAVE_ALTERNATION} {field_name} of type {word}") do |field,
     end
 
     type = 'string' if regex.nil?
-    field.validate_value(field.get_value(type), Regexp.new(regex))
+    value = field.get_value(@response, type)
+    field.validate_value(@response, value.to_s, Regexp.new(regex))
 end
 
 Then("the response #{HAVE_ALTERNATION} {field_name} of type {word} that matches {string}") do |field, type, regex|
-    field.validate_value(field.get_value(type), Regexp.new(regex))
+    value = field.get_value(@response, type)
+    field.validate_value(@response, value.to_s, Regexp.new(regex))
 end
 
 Then("the response is a list of/containing {list_has_count} {field_name}") do |list_comparison, item|

data/lib/cucumber-rest-bdd/types.rb

@@ -2,8 +2,8 @@ require 'active_support/inflector'
 
 HAVE_ALTERNATION = "has/have/having/contain/contains/containing/with"
 RESOURCE_NAME_SYNONYM = '\w+\b(?:\s+\w+\b)*?|`[^`]*`'
-FIELD_NAME_SYNONYM = "#{RESOURCE_NAME_SYNONYM}"
-MAXIMAL_FIELD_NAME_SYNONYM = '\w+\b(?:\s+\w+\b)*|`[^`]*`'
+FIELD_NAME_SYNONYM = '\w+\b(?:(?:\s+:)?\s+\w+\b)*?|`[^`]*`'
+MAXIMAL_FIELD_NAME_SYNONYM = '\w+\b(?:(?:\s+:)?\s+\w+\b)*|`[^`]*`'
 
 ParameterType(
     name: 'resource_name',
@@ -48,23 +48,23 @@ class ResponseField
         return "#{get_root_data_key()}#{@fields.join('.')}"
     end
 
-    def get_value(type)
-        return @response.get_as_type to_json_path(), parse_type(type)
+    def get_value(response, type)
+        return response.get_as_type to_json_path(), parse_type(type)
     end
 
-    def validate_value(value, regex)
-        raise %/Expected #{json_path} value '#{value}' to match regex: #{regex}\n#{@response.to_json_s}/ if (regex =~ value).nil?
+    def validate_value(response, value, regex)
+        raise %/Expected #{json_path} value '#{value}' to match regex: #{regex}\n#{response.to_json_s}/ if (regex =~ value).nil?
     end
 end
 
 def parse_type(type)
     replacements = {
-        /^numeric$/i => 'integer',
-        /^int$/i => 'integer',
-        /^long$/i => 'integer',
-        /^number$/i => 'integer',
-        /^decimal$/i => 'float',
-        /^double$/i => 'float',
+        /^numeric$/i => 'numeric',
+        /^int$/i => 'numeric',
+        /^long$/i => 'numeric',
+        /^number$/i => 'numeric',
+        /^decimal$/i => 'numeric',
+        /^double$/i => 'numeric',
         /^bool$/i => 'boolean',
         /^null$/i => 'nil_class',
         /^nil$/i => 'nil_class',
@@ -111,6 +111,7 @@ end
 def get_attributes(hashes)
     attributes = hashes.each_with_object({}) do |row, hash|
       name, value, type = row["attribute"], row["value"], row["type"]
+      value = resolve_functions(value)
       value = resolve(value)
       value.gsub!(/\\n/, "\n")
       type = parse_type(type)
@@ -120,6 +121,19 @@ def get_attributes(hashes)
     end
 end
 
+def resolve_functions(value)
+    value.gsub!(/\[([a-zA-Z0-9_]+)\]/) do |s|
+        s.gsub!(/[\[\]]/, '')
+        case s.downcase
+        when "datetime"
+            Time.now.strftime("%Y%m%d%H%M%S")
+        else
+            raise 'Unrecognised function ' + s + '?'
+        end
+    end
+    value
+end
+
 def add_to_hash(a, n)
     result = nil    
     if (n[0] == '[' && n[-1] == ']') then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alinta-cucumber-rest-bdd
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.19
 platform: ruby
 authors:
 - Harry Bragg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-api
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: BDD Rest API specifics for cucumber