circuitdata 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c722d677313d0c1212c654764e69496766c3afe3
-  data.tar.gz: ff759d59645c447bf16a7201a8f2b4ae973850c0
+  metadata.gz: 632b6dce93cc547fc056096f00efcc01f79bbab3
+  data.tar.gz: fa0edc6a62b0099464d26f46ccb6b071d459a50f
 SHA512:
-  metadata.gz: 0aaf62b7010faa06a2dad0972d429d84672e4c72527cdeb6f79ee79b0aa5c0aed6b44ed4e535f3dc6d1fdf940f575a1ffa9642df67e2ba4d6456fdcb24fb7d3a
-  data.tar.gz: 5c496657b8e001bab99a5b9918b44e4dd95cdc8972fd6f926827ffe2c43473e3df1d7886f7403f5ef4d744353f9e178a81fdf4485bd8d4f3e56ea24e22b066b1
+  metadata.gz: c641c9e7691ffe865cc3e2f7640d9d4d97e4d08094c41f34e6a668b2f10fa64ad745fee64b3e66733fbd4b71ce6e8d0b3b4a601d01f22251ff06bc1c58b55c0f
+  data.tar.gz: 95407595a7864527031ba43e056e5e415e6e52fb6ceed2d86a967a38198fddf37974b60ae6cafadb1885ca566bc7b5045a9894b47681a2170d4bd3ef6b8ceb00

data/lib/circuitdata.rb

@@ -23,6 +23,8 @@ module Circuitdata
         returnarray[:errormessage] = "Could not access the file to test"
         return returnarray
       end
+    end
+    unless checksfile.is_a? Hash
       if not checksfile.nil?
         if not File.exist?(checksfile)
           returnarray[:error] = true
@@ -34,26 +36,23 @@ module Circuitdata
 
     # Validate the original files against the CircuitData schema
     if validate_origins
-      prod = JSON::Validator.fully_validate($jsonschema_v1, productfile, :errors_as_objects => true)
-      if prod.count > 0
+      $error = false
+      begin
+        prod = JSON::Validator.fully_validate($jsonschema_v1, productfile, :errors_as_objects => true)
+      rescue JSON::Schema::ReadFailed
+        $errors = true
         returnarray[:error] = true
-        returnarray[:errormessage] = "Could not validate the product file against the CircuitData json schema"
-        prod.each do |valerror|
-          returnarray[:validationserrors][valerror[:fragment]] = [] unless returnarray[:validationserrors].has_key? valerror[:fragment]
-          begin
-            scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema\\sfile[\\s\\S]*)$").captures
-          rescue
-            keep = valerror[:message]
-          end
-          returnarray[:validationserrors][valerror[:fragment]] << keep
-        end
+        returnarray[:errormessage] = "Could not read the schema #{$jsonschema_v1}"
+      rescue JSON::Schema::SchemaError
+        $errors = true
+        returnarray[:error] = true
+        returnarray[:errormessage] = "Something was wrong with the schema #{$jsonschema_v1}"
       end
-      if not checksfile.nil?
-        checks = JSON::Validator.fully_validate($jsonschema_v1, checksfile, :errors_as_objects => true)
-        if checks.count > 0
+      unless $errors
+        if prod.count > 0
           returnarray[:error] = true
-          returnarray[:errormessage] = "Could not validate the file to check agains (profile or capability) against the CircuitData json schema"
-          checks.each do |valerror|
+          returnarray[:errormessage] = "Could not validate the product file against the CircuitData json schema"
+          prod.each do |valerror|
             returnarray[:validationserrors][valerror[:fragment]] = [] unless returnarray[:validationserrors].has_key? valerror[:fragment]
             begin
               scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema\\sfile[\\s\\S]*)$").captures
@@ -62,7 +61,36 @@ module Circuitdata
             end
             returnarray[:validationserrors][valerror[:fragment]] << keep
           end
-          return returnarray
+        end
+      end
+      if not checksfile.nil?
+        $error = false
+        begin
+          checks = JSON::Validator.fully_validate($jsonschema_v1, checksfile, :errors_as_objects => true)
+        rescue JSON::Schema::ReadFailed
+          $errors = true
+          returnarray[:error] = true
+          returnarray[:errormessage] = "Could not read the schema #{$jsonschema_v1}"
+        rescue JSON::Schema::SchemaError
+          $errors = true
+          returnarray[:error] = true
+          returnarray[:errormessage] = "Something was wrong with the schema #{$jsonschema_v1}"
+        end
+        unless $errors
+          if checks.count > 0
+            returnarray[:error] = true
+            returnarray[:errormessage] = "Could not validate the file to check agains (profile or capability) against the CircuitData json schema"
+            checks.each do |valerror|
+              returnarray[:validationserrors][valerror[:fragment]] = [] unless returnarray[:validationserrors].has_key? valerror[:fragment]
+              begin
+                scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema\\sfile[\\s\\S]*)$").captures
+              rescue
+                keep = valerror[:message]
+              end
+              returnarray[:validationserrors][valerror[:fragment]] << keep
+            end
+            return returnarray
+          end
         end
       end
     end
@@ -228,18 +256,31 @@ module Circuitdata
 
       # Test enforced
       if $has_enforced
-        enforcedvalidate = JSON::Validator.fully_validate(enforcedschema.to_json, productfile, :errors_as_objects => true)
-        if enforcedvalidate.count > 0
+        $error = false
+        begin
+          enforcedvalidate = JSON::Validator.fully_validate(enforcedschema.to_json, productfile, :errors_as_objects => true)
+        rescue JSON::Schema::ReadFailed
+          $errors = true
           returnarray[:error] = true
-          returnarray[:errormessage] = "The product to check did not meet the requirements"
-          enforcedvalidate.each do |valerror|
-            returnarray[:enforcederrors][valerror[:fragment]] = [] unless returnarray[:enforcederrors].has_key? valerror[:fragment]
-            begin
-              scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema[\\s\\S]*)$").captures
-            rescue
-              keep = valerror[:message]
+          returnarray[:errormessage] = "Could not read the schema #{$jsonschema_v1}"
+        rescue JSON::Schema::SchemaError
+          $errors = true
+          returnarray[:error] = true
+          returnarray[:errormessage] = "Something was wrong with the schema #{$jsonschema_v1}"
+        end
+        unless $errors
+          if enforcedvalidate.count > 0
+            returnarray[:error] = true
+            returnarray[:errormessage] = "The product to check did not meet the requirements"
+            enforcedvalidate.each do |valerror|
+              returnarray[:enforcederrors][valerror[:fragment]] = [] unless returnarray[:enforcederrors].has_key? valerror[:fragment]
+              begin
+                scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema[\\s\\S]*)$").captures
+              rescue
+                keep = valerror[:message]
+              end
+              returnarray[:enforcederrors][valerror[:fragment]] << keep
             end
-            returnarray[:enforcederrors][valerror[:fragment]] << keep
           end
         end
       end
@@ -247,36 +288,62 @@ module Circuitdata
 
       # Test restricted
       if $has_restrictions
-        restrictedvalidate = JSON::Validator.fully_validate(restrictedschema.to_json, productfile, :errors_as_objects => true)
-        if restrictedvalidate.count > 0
+        $error = false
+        begin
+          restrictedvalidate = JSON::Validator.fully_validate(restrictedschema.to_json, productfile, :errors_as_objects => true)
+        rescue JSON::Schema::ReadFailed
+          $errors = true
           returnarray[:error] = true
-          returnarray[:errormessage] = "The product to check did not meet the requirements"
-          restrictedvalidate.each do |valerror|
-            returnarray[:restrictederrors][valerror[:fragment]] = [] unless returnarray[:restrictederrors].has_key? valerror[:fragment]
-            begin
-              scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema[\\s\\S]*)$").captures
-            rescue
-              keep = valerror[:message]
+          returnarray[:errormessage] = "Could not read the schema #{$jsonschema_v1}"
+        rescue JSON::Schema::SchemaError
+          $errors = true
+          returnarray[:error] = true
+          returnarray[:errormessage] = "Something was wrong with the schema #{$jsonschema_v1}"
+        end
+        unless $errors
+          if restrictedvalidate.count > 0
+            returnarray[:error] = true
+            returnarray[:errormessage] = "The product to check did not meet the requirements"
+            restrictedvalidate.each do |valerror|
+              returnarray[:restrictederrors][valerror[:fragment]] = [] unless returnarray[:restrictederrors].has_key? valerror[:fragment]
+              begin
+                scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema[\\s\\S]*)$").captures
+              rescue
+                keep = valerror[:message]
+              end
+              returnarray[:restrictederrors][valerror[:fragment]] << keep
             end
-            returnarray[:restrictederrors][valerror[:fragment]] << keep
           end
         end
       end
 
       # Test capabilites
       if $has_capabilities
-        capabilitiesvalidate = JSON::Validator.fully_validate(capabilityschema.to_json, productfile, :errors_as_objects => true)
-        if capabilitiesvalidate.count > 0
+        $error = false
+        begin
+          capabilitiesvalidate = JSON::Validator.fully_validate(capabilityschema.to_json, productfile, :errors_as_objects => true)
+        rescue JSON::Schema::ReadFailed
+          $errors = true
           returnarray[:error] = true
-          returnarray[:errormessage] = "The product to check did not meet the requirements"
-          capabilitiesvalidate.each do |valerror|
-            returnarray[:capabilitieserrors][valerror[:fragment]] = [] unless returnarray[:capabilitieserrors].has_key? valerror[:fragment]
-            begin
-              scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema[\\s\\S]*)$").captures
-            rescue
-              keep = valerror[:message]
+          returnarray[:errormessage] = "Could not read the schema #{$jsonschema_v1}"
+        rescue JSON::Schema::SchemaError
+          $errors = true
+          returnarray[:error] = true
+          returnarray[:errormessage] = "Something was wrong with the schema #{$jsonschema_v1}"
+        end
+        unless $errors
+          if capabilitiesvalidate.count > 0
+            returnarray[:error] = true
+            returnarray[:errormessage] = "The product to check did not meet the requirements"
+            capabilitiesvalidate.each do |valerror|
+              returnarray[:capabilitieserrors][valerror[:fragment]] = [] unless returnarray[:capabilitieserrors].has_key? valerror[:fragment]
+              begin
+                scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema[\\s\\S]*)$").captures
+              rescue
+                keep = valerror[:message]
+              end
+              returnarray[:capabilitieserrors][valerror[:fragment]] << keep
             end
-            returnarray[:capabilitieserrors][valerror[:fragment]] << keep
           end
         end
       end

data/lib/circuitdata/version.rb

@@ -1,3 +1,3 @@
 module Circuitdata
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuitdata
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Andreas Lydersen