rest-json-validator 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161e085b2b258feae48399013b72a21daf2dac1b
-  data.tar.gz: 43564c0f528e0575730e40c7187874298140cb1d
+  metadata.gz: 89d6c21b73964870660f4228ceb411960176b2ac
+  data.tar.gz: 30474fa342e95e240cd18f33005f174f2fc618fc
 SHA512:
-  metadata.gz: 9f8dbe289fbe9f756988f2d248b3c7ab88c5d8da7c755ba9908ccc45d1e8d81690b0b1f97bd25b9b7e6b6868b70769ded0829d616d9e223c34fb24cd2aaa6a42
-  data.tar.gz: 3359873f8a54e0d8260b5b30ebecfe8ea9db9495a6a619bffa75b0a6230e86a5c9d2197881b5bcf7e2de32d8515c635d5c475eb68e528e0c1f1f2ffd05660d6d
+  metadata.gz: ce86e2a7ee16a1985f0b2f810ac2e0381b5e4b72aec8afa778fa4c9d02466abcec5a70451c19b178ae6d342a2b26806d9e43da4f7edd9fda62abcb113f40ac3f
+  data.tar.gz: 21d7aa6c59625fe52ed3dbb2b91d95ad0c42fcbd5c30ecdfa69d8bf970fd8df9a59085a8991846ed1e60690251a2b06bedfb70a63b2ff96e39217323bfc05910

data/lib/rest-json-validator.rb

@@ -53,7 +53,7 @@ module RestJsonValidator
     def find_id(json)
       id = nil
       if json.nil?
-        puts "Trying to find id in a nil object (expected a json structure)"
+        puts "Warning: Trying to find id in a nil object (expected a actual_json structure)"
       elsif json.has_key? 'id'
         id = json['id']
       elsif json.has_key? 'programId'
@@ -64,31 +64,32 @@ module RestJsonValidator
       id
     end
 
-    def run_field_validators(json, api, level)
-       if is_sub_composite_checker?(api)
-         send(api[:sub_composite_checker], json, find_id(json), 'vetikke')
+    def run_field_validators(actual_json, specification, level)
+       if is_sub_composite_checker?(specification)
+         send(specification[:sub_composite_checker], actual_json, find_id(actual_json), 'vetikke')
        else
-      api.keys.each do |api_key|
-        api_element = api[api_key]
-        id          = find_id(json)
+      specification.keys.each do |api_key|
+        api_element = specification[api_key]
+        id          = find_id(actual_json)
         if is_field_validator?(api_element, api_key)
-          send(api_element, json[api_key], id, api_key)
+          send(api_element, actual_json[api_key], id, api_key)
         elsif is_composite_checker?(api_element)
-          send(api_element[:composite_checker], json[api_key], id, api_key)
+          send(api_element[:composite_checker], actual_json[api_key], id, api_key)
         end
       end
        end
     end
 
-    def validate_json(json, api, level)
-      key_diff(json, api, level)
-      run_field_validators(json, api, level)
+    def validate_json(actual_json, specification, level)
+      # puts "son: #{actual_json} api: #{api} level: #{level}"
+      key_diff(actual_json, specification, level)
+      run_field_validators(actual_json, specification, level)
     end
 
-    def depth_validate_array(json, api, level, content_checker=nil)
-      send(content_checker.intern, json, @media_id, level) unless content_checker.nil?
-      json.each do |json_element|
-        validate_json_api_compliance(json_element, api, level)
+    def depth_validate_array(actual_json, specification, level, content_checker=nil)
+      send(content_checker.intern, actual_json, @media_id, level) unless content_checker.nil?
+      actual_json.each do |json_element|
+        validate_json_api_compliance(json_element, specification, level)
       end
     end
 
@@ -102,26 +103,26 @@ module RestJsonValidator
       end
     end
 
-    def validate_json_api_compliance(json, api, level=0)
-      return unless [Hash, Array].include? api.class
+    def validate_json_api_compliance(actual_json, specification, level=0)
+      return unless [Hash, Array].include? specification.class
       level += 1
-      if json.class == Array
-        depth_validate_array(json, api[0][:data], level, api[0][:content_checker])
-      elsif json.class == Hash
-        depth_validate_hash(json, api, level)
+      if actual_json.class == Array
+        depth_validate_array(actual_json, specification[0][:data], level, specification[0][:content_checker])
+      elsif actual_json.class == Hash
+        depth_validate_hash(actual_json, specification, level)
       end
     end
 
-    def key_diff(json, api, level)
+    def key_diff(actual_json, specification, level)
       optionals = []
-      if api.respond_to?(:has_key?)
-        optionals = api.has_key?(:optionals) ? api[:optionals].keys : []
+      if specification.respond_to?(:has_key?)
+        optionals = specification.has_key?(:optionals) ? specification[:optionals].keys : []
       end
-      api_keys = api.keys
+      api_keys = specification.keys
       api_keys.delete(:composite_checker)
       api_keys.delete(:sub_composite_checker)
       api_keys.delete(:optionals)
-      json_keys = json.keys
+      json_keys = actual_json.keys
       diff      = []
       if api_keys.sort != json_keys.sort
         extra_api = api_keys - json_keys
@@ -129,9 +130,9 @@ module RestJsonValidator
         if extra_json.length == 0 and (extra_api - optionals).length == 0
           return
         else
-          diff << 'api - json: '
+          diff << 'specification - actual_json: '
           diff << api_keys - json_keys
-          diff << 'json - api: '
+          diff << 'actual_json - specification: '
           diff << json_keys - api_keys
           message = ("Nivå #{level}-feil\n(#{@stack.join('.')})\nfor #{@url}\ndiff: #{diff}\n")
           notify message: message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-json-validator
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - John Åsmund Westberg, Aril Spetalen, Magnus de Laval, Dagfinn Olsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: dagfinno@gmail.com
@@ -27,19 +27,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: ''
 test_files: []
-has_rdoc: