json-ld-validate 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94bf8b975edaeefd4bb0226ca8994c7ff06a1a45339567ddba1fca5bccd6eea0
-  data.tar.gz: 23292145af308aeeb80585e061c8576517bdaa505337fac5a185a3d4e22118de
+  metadata.gz: 3b842c8a5568175c193e71d16e26fa41bab31e1bae79143487620096fa890ec4
+  data.tar.gz: 6daf575322e3247089f2f3e4d0ed9fc4b8959accfd5254de9e15261a0320d566
 SHA512:
-  metadata.gz: ae77e588fc9a057f83e92d3697bee755fadeb8f48f5b8fc3847f74aad10393699f46c45463364ad7ef5ad4eafc459cb8896d9e2fb5624a48a91eb8a7974b95b3
-  data.tar.gz: 32465d54a3d390ca5d2efe06d1d24711edc9ed47fa891ae033f4747bbb23e33d897d13cf68510d8357824ad0e0987dfde3ebba235285846ceba0ab4b24f0e642
+  metadata.gz: 3060a4e2e85af2ae2ef40ffb1a20c95c2864ee1ecf51dfeba746034e0c313d2ab51bd462febf4951dc6f8a21a4549fd63fa3c23eb866dc58a1d307d582d03306
+  data.tar.gz: 54fadf3ffd1807c70223c637afe7b81fa4d6adbcdf9060baafe372b7a44b7448f20df13249d36aa2ea1d0746f69167c773217609b3ff31298703ce95c1911006

data/lib/jsonld_validate/validator.rb

@@ -13,27 +13,83 @@ module JsonldValidate
       return false if content.nil?
       return true if content.empty?
 
-      doc
+      build_expanded_doc
+      build_doc
       return false unless errors.empty?
 
-      validates_no_unknown_field
+      find_unknown_fields(content, doc, [])
 
       errors.empty?
     end
 
     private
 
-    def doc
-      @doc ||= JSON::LD::API.compact(JSON::LD::API.expand(content), content['@context'])
+    attr_reader :doc, :expanded_doc
+
+    def build_doc
+      return if expanded_doc.nil?
+
+      @doc = JSON::LD::API.compact(expanded_doc, content['@context'])
+    end
+
+    def build_expanded_doc
+      @expanded_doc = clean_expanded_doc(JSON::LD::API.expand(content))
     rescue JSON::LD::JsonLdError::LoadingDocumentFailed
       @errors << 'failed loading document'
+    rescue JSON::LD::JsonLdError::InvalidLanguageMapValue => e
+      @errors << e.to_s
     end
 
-    def validates_no_unknown_field
-      return if doc.keys.length == content.keys.length
+    def find_unknown_fields(original, compacted, path)
+      return unless original.is_a?(Hash)
+      return report_all_fields(original, path) unless compacted.is_a?(Hash)
+
+      report_unknown_keys(original, compacted, path)
+      recurse_known_keys(original, compacted, path)
+    end
+
+    def report_all_fields(original, path)
+      original.each_key do |key|
+        next if key.start_with?('@')
+
+        errors << "found unknown fields: #{(path + [key]).join('.')}"
+      end
+    end
+
+    def report_unknown_keys(original, compacted, path)
+      (original.keys - compacted.keys).each do |field|
+        errors << "found unknown fields: #{(path + [field]).join('.')}"
+      end
+    end
+
+    def recurse_known_keys(original, compacted, path)
+      (original.keys & compacted.keys).each do |key|
+        recurse_field(original[key], compacted[key], path + [key])
+      end
+    end
+
+    def recurse_field(orig_val, comp_val, path)
+      if orig_val.is_a?(Array)
+        comp_val = [] unless comp_val.is_a?(Array)
+        orig_val.each_with_index do |item, i|
+          find_unknown_fields(item, comp_val[i], path + [i.to_s])
+        end
+      else
+        find_unknown_fields(orig_val, comp_val, path)
+      end
+    end
 
-      unknown_fields = content.keys - doc.keys
-      errors << "found unknown fields: #{unknown_fields.join(', ')}"
+    def clean_expanded_doc(obj)
+      case obj
+      when Array
+        obj.map { |item| clean_expanded_doc(item) }
+      when Hash
+        obj.each_with_object({}) do |(k, v), h|
+          h[k] = clean_expanded_doc(v) unless k.start_with?('_:')
+        end
+      else
+        obj
+      end
     end
   end
 end

data/lib/jsonld_validate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonldValidate
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-ld-validate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Damien MATHIEU