client-api 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02b29aa08f24e7cab407632413b695ff29296ff02280ed37bcfb7582f7c4c42
-  data.tar.gz: 275becbf9891f8958efa1a9aa4a33d86e7308094a3b4370a7d60c3c9fb0acd27
+  metadata.gz: 6dbc0b53689ca77ae651de925fe7c51c36e26a92295e6a71803b9a32627dfaca
+  data.tar.gz: 19f258c46f7587bc2b1b23429e0f0ca47e0660ddbcbc4b9c53eb33d559ccf87e
 SHA512:
-  metadata.gz: 8724c2f11d6635b770c893a7db95da760d8920516c67613449c4af44dcc7146135bd8e50c0d8199ee99b2c1a7b9b1b3dc7c493d06c9dbee57fed85d2d8d0470a
-  data.tar.gz: c945105f129f17a51084b2b648116e5fd134df7842bc0ad8d3a43e038a976ddf425005bf27dfea12cd0a38dc2e0249902cfc6bd2b407a33f8900f20354990865
+  metadata.gz: 4e359917c7003610f039b651eda0a5345e1c8bdd7fadb08ea504d84b7daad7d945da32efee9fa280eeeb5523e8bb79dda0f3c1887fdee2edd55c1a488f7c38e3
+  data.tar.gz: f837b44b36edba5990a7e72b37f193612de313bff0107963384f49d5fbaf90c71e8443435cd7c504b4f2354c67c741bda9a14ed1d4d70eee3358f08d1407f8f8

data/lib/client-api/validator.rb

@@ -18,7 +18,7 @@ module ClientApi
 
       value ||= data[:value]
       operator = data[:operator]
-      type = data[:type] if data[:type] || data[:type] != {} || !data[:type].empty?
+      type ||= data[:type]
 
       case operator
       when '=', '==', 'eql?', 'equal', 'equal?'
@@ -26,9 +26,9 @@ module ClientApi
         expect(value).to eq(@resp), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  didn't match \n[value]: \"#{data[:value]}\"\n"} if value != nil
 
         # datatype validation
-        if (type == 'boolean') || (type == 'bool') && value.nil?
+        if (type == 'boolean') || (type == 'bool')
           expect(%w[TrueClass, FalseClass].any? {|bool| bool.include? @resp.class.to_s}).to eq(true), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
-        elsif (type != nil) && (value != nil)
+        elsif ((type != 'boolean') || (type != 'bool')) && (type != nil)
           expect(datatype(type, value)).to eq(@resp.class), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
         end
 
@@ -37,9 +37,9 @@ module ClientApi
         expect(value).not_to eq(@resp), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  didn't match \n[value]: \"#{data[:value]}\"\n"} if value != nil
 
         # datatype validation
-        if (type == 'boolean') || (type == 'bool') && value.nil?
+        if (type == 'boolean') || (type == 'bool')
           expect(%w[TrueClass, FalseClass].any? {|bool| bool.include? @resp.class.to_s}).not_to eq(true), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
-        elsif (type != nil) && (value != nil)
+        elsif ((type != 'boolean') || (type != 'bool')) && (type != nil)
           expect(datatype(type, value)).not_to eq(@resp.class), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
         end
 
@@ -53,7 +53,29 @@ module ClientApi
         expect(@resp.to_i.public_send(operator, value)).to eq(true), "[key]: \"#{data[:key]}\"".blue + "\n  #{message} \n[value]: \"#{data[:value]}\"\n" if value != nil
 
         # datatype validation
-        expect(datatype(type, value)).to eq(@resp.class), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}  if type != nil
+        expect(datatype(type, value)).to eq(@resp.class), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"} if type != nil
+
+      when 'contains', 'has', 'contains?', 'has?', 'include', 'include?'
+        # value validation
+        expect(@resp.to_s).to include(value.to_s), lambda {"[key]: \"#{data[:key]} => #{@resp}\"".blue + "\n  not contains \n[value]: \"#{data[:value]}\"\n"} if value != nil
+
+        # datatype validation
+        if (type == 'boolean') || (type == 'bool')
+          expect(%w[TrueClass, FalseClass].any? {|bool| bool.include? @resp.class.to_s}).to eq(true), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
+        elsif ((type != 'boolean') || (type != 'bool')) && (type != nil)
+          expect(datatype(type, value)).to eq(@resp.class), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
+        end
+
+      when 'not contains', '!contains', 'not include', '!include'
+        # value validation
+        expect(@resp.to_s).not_to include(value.to_s), lambda {"[key]: \"#{data[:key]} => #{@resp}\"".blue + "\n  should not contain \n[value]: \"#{data[:value]}\"\n"} if value != nil
+
+        # datatype validation
+        if (type == 'boolean') || (type == 'bool')
+          expect(%w[TrueClass, FalseClass].any? {|bool| bool.include? @resp.class.to_s}).not_to eq(true), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
+        elsif ((type != 'boolean') || (type != 'bool')) && (type != nil)
+          expect(datatype(type, value)).not_to eq(@resp.class), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  datatype shouldn't be \n[type]: \"#{data[:type]}\"\n"}
+        end
 
       else
         raise('operator not matching')

data/lib/client-api/version.rb

@@ -1,3 +1,3 @@
 module ClientApi
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client-api
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Prashanth Sams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler