circuitdata 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8724ff5c75a67cdf1ee25bf8d4d56fc7cd53a0e
-  data.tar.gz: 5374354ed564f33acd76d2ec2dc9c70df7615b4f
+  metadata.gz: c722d677313d0c1212c654764e69496766c3afe3
+  data.tar.gz: ff759d59645c447bf16a7201a8f2b4ae973850c0
 SHA512:
-  metadata.gz: e8368602779f984cbdd08e724f521c1239f36a2832868b38e24970bb721963b019199f41ea875189c4d12e424afadf26032832250ca7048e07971a422a3447b1
-  data.tar.gz: 0980b9365a3c2435ac6762436b124f312d337ef6778a7ad3aa52226534460e21420fdfb83acd94ee1d25f64992f962355f88afadc2158f3db4465d5694319382
+  metadata.gz: 0aaf62b7010faa06a2dad0972d429d84672e4c72527cdeb6f79ee79b0aa5c0aed6b44ed4e535f3dc6d1fdf940f575a1ffa9642df67e2ba4d6456fdcb24fb7d3a
+  data.tar.gz: 5c496657b8e001bab99a5b9918b44e4dd95cdc8972fd6f926827ffe2c43473e3df1d7886f7403f5ef4d744353f9e178a81fdf4485bd8d4f3e56ea24e22b066b1

data/lib/circuitdata.rb

@@ -16,18 +16,20 @@ module Circuitdata
       capabilitieserrors: {},
     }
 
-    # Check to see if the URIs are correct on the received files
-    if not File.exist?(productfile)
-      returnarray[:error] = true
-      returnarray[:errormessage] = "Could not access the file to test"
-      return returnarray
-    end
-    if not checksfile.nil?
-      if not File.exist?(checksfile)
+    unless productfile.is_a? Hash
+      # Check to see if the URIs are correct on the received files
+      if not File.exist?(productfile)
         returnarray[:error] = true
-        returnarray[:errormessage] = "Could not access the file to check agains (profile or capability)"
+        returnarray[:errormessage] = "Could not access the file to test"
         return returnarray
       end
+      if not checksfile.nil?
+        if not File.exist?(checksfile)
+          returnarray[:error] = true
+          returnarray[:errormessage] = "Could not access the file to check agains (profile or capability)"
+          return returnarray
+        end
+      end
     end
 
     # Validate the original files against the CircuitData schema
@@ -38,7 +40,11 @@ module Circuitdata
         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]
-          scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema\\sfile[\\s\\S]*)$").captures
+          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
       end
@@ -49,7 +55,11 @@ module Circuitdata
           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]
-            scrap, keep, scrap2 = valerror[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema\\sfile[\\s\\S]*)$").captures
+            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

data/lib/circuitdata/version.rb

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

metadata

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