client-api 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fabf3cf2a480ef4bb48c510cd50a54ad04a09cac8d71cd59f57afeac68d6562c
-  data.tar.gz: 482d29669281bdbde074ae5ba876c013a356dada5221cd05e7c827eec2296a87
+  metadata.gz: 46af95811a5c97fa979f9db48ca3823245458fb92c2a68985d7f97df8d13da4b
+  data.tar.gz: a123355edfe6259438b07f7c3f39aa6587f85347633c41ac44494e3585588221
 SHA512:
-  metadata.gz: 37972ed3b0c07bbdb65aa92ce4fc3963474928b388cb3c978690ccf4ba32c38a0d4e3828fa53fe069cc873bc8ca35508046bd200e85e77b88b5631c572cffd68
-  data.tar.gz: 58daf94fb27e444771549734eb8c8baf550782f9df1b6383439eb260ed898a82fdeed6db33af3e0cee1f9ad212db11b41eb6be741ad120c468e2a1001618e9ae
+  metadata.gz: 21cd18b3c769375f019df20bec21807a37d083d091c6a53aa942a98a5b8ff91f12c313690abe9447e45ce4f6b42da80d554dd573c48d3dc61e1a95b340253847
+  data.tar.gz: c89d2fb15dd961443ae9cb02d3811f4fb84f4dadb1801ed4257f300d4d5581f67b425a3e692bb8104ffb8ad26ba046fa4000f6b092261f5b1941e260b979a7a5

data/lib/client-api/validator.rb

@@ -9,6 +9,10 @@ module ClientApi
       raise('"key": ""'.green + ' field is missing'.red) if data[:key].nil?
       raise('Need at least one field to validate'.green) if data[:value].nil? && data[:type].nil? && data[:size].nil? && data[:empty].nil? && data[:has_key].nil?
 
+      data.keys.map do |val|
+        raise "invalid key: " + "#{val}".green unless [:key, :operator, :value, :type, :size, :has_key, :empty].include? val
+      end
+
       value ||= data[:value]
       operator ||= (data[:operator] || '==').downcase
       type ||= data[:type]
@@ -26,21 +30,25 @@ module ClientApi
         @err_method = @err_method << method
 
         begin
-          if method.is_a? Integer
-            raise %[key: ]+ %[#{@err_method.join('->')}].green + %[ does not exist! please check the key once again].red if ((@resp.class != Array) || (method.to_i >= @resp.count)) && data[:has_key].nil?
-          else
-            raise %[key: ]+ %[#{@err_method.join('->')}].green + %[ does not exist! please check the key once again].red if !@resp.include?(method) && data[:has_key].nil?
+          if (method.is_a? Integer) && (has_key != nil)
+            @valid_key = false
+          elsif (!method.is_a? Integer) && (has_key != nil)
+            @valid_key = @resp.has_key? method
+          elsif (method.is_a? Integer) && has_key.nil?
+            raise %[key: ]+ %[#{@err_method.join('->')}].green + %[ does not exist! please check the key once again].red if ((@resp.class != Array) || (method.to_i >= @resp.count))
+          elsif (method.is_a? String) && has_key.nil?
+            raise %[key: ]+ %[#{@err_method.join('->')}].green + %[ does not exist! please check the key once again].red if !@resp.include?(method)
           end
           @resp = @resp.send(:[], method)
         rescue NoMethodError
-          raise %[key: ]+ %[#{@err_method.join('->')}].green + %[ does not exist! please check the key once again].red if data[:has_key].nil?
+          raise %[key: ]+ %[#{@err_method.join('->')}].green + %[ does not exist! please check the key once again].red if has_key.nil?
         end
       end
 
       case operator
       when '=', '==', 'eql', 'eql?', 'equal', 'equal?'
         # has key validation
-        validate_key(has_key, data) if has_key != nil
+        validate_key(@valid_key, has_key, data) if has_key != nil
 
         # value validation
         expect(value).to eq(@resp), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  didn't match \n[value]: \"#{data[:value]}\"\n"} if value != nil
@@ -60,7 +68,7 @@ module ClientApi
 
       when '!', '!=', '!eql', '!eql?', 'not eql', 'not equal', '!equal?'
         # has key validation
-        validate_key(has_key, data) if has_key != nil
+        validate_key(@valid_key, has_key, data) if has_key != nil
 
         # value validation
         expect(value).not_to eq(@resp), lambda {"[key]: \"#{data[:key]}\"".blue + "\n  didn't match \n[value]: \"#{data[:value]}\"\n"} if value != nil
@@ -93,7 +101,7 @@ module ClientApi
         message = 'is not lesser than' if operator == '<' || operator == 'less than' || operator == 'lesser than'
 
         # has key validation
-        validate_key(has_key, data) if has_key != nil
+        validate_key(@valid_key, has_key, data) if has_key != nil
 
         # value validation
         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
@@ -117,7 +125,7 @@ module ClientApi
 
       when 'contains', 'has', 'contains?', 'has?', 'include', 'include?'
         # has key validation
-        validate_key(has_key, data) if has_key != nil
+        validate_key(@valid_key, has_key, data) if has_key != nil
 
         # 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
@@ -145,7 +153,7 @@ module ClientApi
 
       when 'not contains', '!contains', 'not include', '!include'
         # has key validation
-        validate_key(has_key, data) if has_key != nil
+        validate_key(@valid_key, has_key, data) if has_key != nil
 
         # 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
@@ -230,21 +238,14 @@ module ClientApi
     end
   end
 
-  def validate_key(has_key, data)
-    case has_key
+  def validate_key(valid_key, has_key, data)
+    case valid_key
     when true
-      begin
-        expect(@resp.nil?).to eq(false), lambda {"[key]: \"#{data[:key]}\"".blue + "\n does not exist"+"\n"}
-      rescue NoMethodError
-        raise "[key]: \"#{data[:key]}\"".blue + "\n does not exist"+"\n"
-      end
-
+      expect(valid_key).to eq(true), lambda {"[key]: \"#{data[:key]}\"".blue + "\n does not exist"+"\n"} if has_key == true
+      expect(valid_key).to eq(false), lambda {"[key]: \"#{data[:key]}\"".blue + "\n does exist"+"\n"} if has_key == false
     when false
-      begin
-        expect(@resp.nil?).to eq(true), lambda {"[key]: \"#{data[:key]}\"".blue + "\n does exist"+"\n"}
-      rescue NoMethodError
-        true
-      end
+      expect(@resp.nil?).to eq(false), lambda {"[key]: \"#{data[:key]}\"".blue + "\n does not exist"+"\n"} if has_key == true
+      expect(@resp.nil?).to eq(true), lambda {"[key]: \"#{data[:key]}\"".blue + "\n does exist"+"\n"} if has_key == false
     end
   end
 

data/lib/client-api/version.rb

@@ -1,3 +1,3 @@
 module ClientApi
-  VERSION = "0.3.5".freeze
+  VERSION = "0.3.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client-api
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Prashanth Sams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler