circuitdata 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6737f68c923e293cb0a8f34cc823bbd8a8720c86
-  data.tar.gz: b61c1e55d6bc2f5f36ee2888e8a58088d8ce1274
+  metadata.gz: de1c4f538c68286e354093ef876042e3cc143d2f
+  data.tar.gz: f70c19817d410e8315a355e20ac957a3bc2f55e3
 SHA512:
-  metadata.gz: 90dbfb96febaa796148c4cc482ffebc0e86f3d9f7605bce7091f751886c50ceafe01a21d50d3fa36f4c68a24ec65c9252f5d42d5ab8571369bdada961a041128
-  data.tar.gz: efbc9ae9681288f4b8ada2791062cda1c9ff29ee2f0505145a97c9ac3c24431bf0f879fee47ebe0ac0ede169e251a01e57735283bf07c058c63df756ce5087d4
+  metadata.gz: 4de909b65a9d98b88b200b812edb5b61a921766f2f3b7198bcf332c82fcf953d4bd8734d029542a778525c31595ced1c7f6bb5dc248fc6e27726a7f1b468bade
+  data.tar.gz: aa828cbea7219133c8e20c72d9a54f2afdeaa44f21b61a3c27c15477c02485a5ec9c3a6482a1e08219a58ddf059ec25553ffaa57eea213a116dc82c280cdb08b

data/lib/circuitdata.rb

@@ -2,7 +2,7 @@ module Circuitdata
 
 
   def self.content(checksjson)
-    product = false
+    number_of_products = 0
     stackup =  false
     profile_defaults = false
     profile_enforced = false
@@ -11,7 +11,7 @@ module Circuitdata
     if checksjson.has_key? "open_trade_transfer_package"
       if checksjson["open_trade_transfer_package"].has_key? "products"
         if checksjson["open_trade_transfer_package"]["products"].length > 0
-          product = true
+          number_of_products = checksjson["open_trade_transfer_package"]["products"].length
           checksjson["open_trade_transfer_package"]["products"].each do |key, value|
             if checksjson["open_trade_transfer_package"]["products"][key].has_key? "stackup"
               if checksjson["open_trade_transfer_package"]["products"][key]["stackup"].has_key? "specification_level"
@@ -50,7 +50,7 @@ module Circuitdata
         end
       end
     end
-    return product, stackup, profile_defaults, profile_restricted, profile_enforced, capabilities
+    return number_of_products, stackup, profile_defaults, profile_restricted, profile_enforced, capabilities
   end
 
   def self.read_json(content)
@@ -63,7 +63,7 @@ module Circuitdata
     returncontent = nil
     if content.is_a? Hash
       begin
-        returncontent = JSON.parse(content)
+        returncontent = content.to_json
       rescue
         error = true
         message = "Could not convert the Hash into JSON"
@@ -114,7 +114,30 @@ module Circuitdata
       end
     end
     return error, message, validationserrors
+  end
 
+  def self.compare_files(list)
+    # Will presume that the files are validated
+    # Prepare the return
+    ra = {
+      error: false,
+      errormessage: "",
+      summary: {},
+      conflicts: {},
+      files: []
+    }
+    if not list.is_a? Array
+      ra[:error] = true
+      ra[:errormessage] = "You have to feed this function with a list of files or hashes"
+      return ra
+    end
+    list.each do |totest|
+      error, message, returncontent = self.read_json(totest)
+      #puts returncontent
+      ra[:summary] = ra[:summary].merge(returncontent)
+      ra[:files] << totest
+    end
+    return ra
   end
 
   def self.compatibility_checker( productfile, checksfile=nil, validate_origins=true )
@@ -135,7 +158,7 @@ module Circuitdata
       capabilitieserrors: {},
       contains: {
         file1: {
-          product: false,
+          products: 0,
           stackup: false,
           profile_defaults: false,
           profile_enforced: false,
@@ -143,7 +166,7 @@ module Circuitdata
           capabilities: false
         },
         file2: {
-          product: false,
+          products: 0,
           stackup: false,
           profile_defaults: false,
           profile_enforced: false,
@@ -173,9 +196,9 @@ module Circuitdata
     end
 
     # Check against the content
-    returnarray[:contains][:file1][:product], returnarray[:contains][:file1][:stackup], returnarray[:contains][:file1][:profile_defaults], returnarray[:contains][:file1][:profile_restricted], returnarray[:contains][:file1][:profile_enforced], returnarray[:contains][:file1][:capabilities] = self.content(json_productfile)
+    returnarray[:contains][:file1][:products], returnarray[:contains][:file1][:stackup], returnarray[:contains][:file1][:profile_defaults], returnarray[:contains][:file1][:profile_restricted], returnarray[:contains][:file1][:profile_enforced], returnarray[:contains][:file1][:capabilities] = self.content(json_productfile)
     if not checksfile.nil?
-      returnarray[:contains][:file2][:product], returnarray[:contains][:file2][:stackup], returnarray[:contains][:file2][:profile_defaults], returnarray[:contains][:file2][:profile_restricted], returnarray[:contains][:file2][:profile_enforced], returnarray[:contains][:file2][:capabilities] = self.content(json_checksfile)
+      returnarray[:contains][:file2][:products], returnarray[:contains][:file2][:stackup], returnarray[:contains][:file2][:profile_defaults], returnarray[:contains][:file2][:profile_restricted], returnarray[:contains][:file2][:profile_enforced], returnarray[:contains][:file2][:capabilities] = self.content(json_checksfile)
     end
 
     if not checksfile.nil?

data/lib/circuitdata/version.rb

@@ -1,3 +1,3 @@
 module Circuitdata
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuitdata
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Andreas Lydersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema