circuitdata 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1f26f00a6e37eddbd191f4c07e20cd6549403d
-  data.tar.gz: 22e2442da385848cb8836ede71d6f747bf8f8cf9
+  metadata.gz: bcf321b8a7e8598d02416139e9c123515d6c2ab6
+  data.tar.gz: 6ebd5b1f5db47775a316ccdb8504ea415e726a9d
 SHA512:
-  metadata.gz: 2c98b789d6a3299aa7494eefcf0b291be7aa7769015006d9984748f1c8ba39a282fe0ad997913dcb89e89a1f75fa231eac27d242a15ca7e07f8af619e65d16d0
-  data.tar.gz: 8996afcb18cd0c8cd8d26c08dd53f637f12f0dd3932b37a414a1ccfae9915ae2e2d00545cf0598317e4411c371e0f8ff4562887ee17e65f6a9d6586906223870
+  metadata.gz: 9b4290b6fcf5f8cdf725f2ef2130699be3c57ba06aae883062c6bf969042ed96b60b1f8556fec7f64848f0d2ada9dc81b39cf61b2bc9ef81bd53ca06e571a232
+  data.tar.gz: 1b27bb2cb683881085ff3edccc53035c4cf21f9ab242573e86e16d0180547a57f6cae468c3bc47e439ebcaddb32796d9267c4d95e0a787c07e810920822eb2af

data/lib/circuitdata.rb

@@ -13,7 +13,7 @@ module Circuitdata
     types << 'capabilities' unless wrapper&.dig(:capabilities).nil?
 
     products = wrapper&.dig(:products)
-    product_names = products.nil? ? [] : products.keys# this will return all the product names
+    product_names = products.nil? ? [] : products.keys # this will return all the product names
     types << 'product' if product_names.any?
     # loop through the products
     products.each do |k, v|
@@ -101,20 +101,9 @@ module Circuitdata
     profile_default = File.join(File.dirname(__FILE__), '../test/test_data/testfile-profile-default.json')
     capabilities = File.join(File.dirname(__FILE__), '../test/test_data/testfile-capability.json')
 
-    # TEST WITH NON SCHEMA COMPATIBLE JSON
-    # puts 'testing validation with non schema compatible json'
-    # puts Circuitdata.compatibility_checker(fail_product)
-    # puts "\n"
-
-    # TEST THE COMPATIBILITY CHECKER FUNCTION FIRST:
-    puts "\nTesting compatibility_checker: - the capabilities"
-    puts Circuitdata.compatibility_checker(product1, capabilities)
-    puts "\n"
-
     # THEN TEST THE COMPARE FILES:
     puts "Testing file comparison"
-    # file_hash = {product1: product1, product2: product2, restricted: profile_restricted, enforced: profile_enforced, default: profile_default, capability: capabilities}
-    file_hash = {product1: product1, product2: product2, restricted: profile_restricted, enforced: profile_enforced, default: profile_default}
+    file_hash = {product1: product1, product2: product2, restricted: profile_restricted, enforced: profile_enforced, default: profile_default, capability: capabilities}
     Circuitdata.compare_files(file_hash, true)
   end
 end

data/lib/circuitdata/compatibility_checker.rb

@@ -45,12 +45,10 @@ class Circuitdata::CompatibilityChecker
       else
         check_hash = {}
     end
-    # binding.pry
 
+    common_hash = schema.dig(:properties, :open_trade_transfer_package, :properties, :products, :patternProperties, :'^(?!generic$).*', :properties, :printed_circuits_fabrication_data, :properties)
     check_hash.each do |k, v|
       v.each do |kl1, vl1| # level 1
-        common_hash = schema.dig(:properties, :open_trade_transfer_package, :properties, :products, :patternProperties, :'^(?!generic$).*', :properties, :printed_circuits_fabrication_data, :properties)
-        # binding.pry
         common_hash[k.to_sym]||= {:type => 'object', :properties => {}}
         common_hash[:stackup][:properties][:specified][:properties][k.to_sym] ||= {:type => 'object', :properties => {}}
 
@@ -75,7 +73,7 @@ class Circuitdata::CompatibilityChecker
                   new_hash = eval("{:enum => #{enum}}")
               end
             end
-          when 'Numeric' # This is a normal string
+          when 'Numeric', 'Float' # This is a normal string
             case type
               when 'restricted'
                 new_hash = {:not => {:allOf => [{:minimum => vl1.to_f},{:maximum => vl1.to_f}]}}
@@ -86,6 +84,8 @@ class Circuitdata::CompatibilityChecker
         common_hash[k.to_sym][:properties][kl1.to_sym] = new_hash
         common_hash[:stackup][:properties][:specified][:properties][k.to_sym][:properties][kl1.to_sym] = new_hash
       end if v.is_a? Hash
+
+      common_hash[k.to_sym][:additionalProperties] = false if (v.is_a?(Hash) && type == 'capabilities')
     end
 
     # perform validations
@@ -96,8 +96,6 @@ class Circuitdata::CompatibilityChecker
         @fh[:error] = true
         @fh[:message] = 'The product to check did not meet the requirements'
 
-        # format the errors well here
-
         validation_errors.each do |error|
           error_array = []
           begin

data/lib/circuitdata/file_comparer.rb

@@ -8,7 +8,7 @@ class Circuitdata::FileComparer
     @default_column = nil
     @master_column = nil
     # Final hash
-    @fh = {error: false, message: nil, conflict: false, product_name: nil, columns: nil, master_column: nil, rows: nil}
+    @fh = {error: false, message: nil, conflict: false, product_name: nil, columns: nil, rows: nil}
   end
 
   def compare
@@ -56,9 +56,11 @@ class Circuitdata::FileComparer
         end
         # Initialize the rows format - for all default profile items
         @default_column, file_v = @nh.select{|k, v| v[:types].include?("profile_defaults")}.first # this should only be a single file
-        data = file_v[:data]
-        product_hash = data.dig(:open_trade_transfer_package, :profiles, :defaults, :printed_circuits_fabrication_data)
-        init_row_format(product_hash)
+        if @default_column.present?
+          data = file_v[:data]
+          product_hash = data.dig(:open_trade_transfer_package, :profiles, :defaults, :printed_circuits_fabrication_data)
+          init_row_format(product_hash)
+        end
       end
 
       # populate the @rows
@@ -95,6 +97,7 @@ class Circuitdata::FileComparer
 
   def process_row_hash(action)
     @rows.each do |k, v| # product elements level
+
       if v.is_a?(Hash)
         v.each do |kl1, vl1| # specification level
           value, conflict, conflicts_with, conflict_message = [], false, [], []
@@ -102,16 +105,16 @@ class Circuitdata::FileComparer
             conflicts = @nh.dig(kl2, :conflicts, @master_column)
             case action
               when 'populate'
-                check = conflicts.any? && conflicts.dig(:rows, k, kl1).present?
+                conflict = conflicts.dig(:rows, k, kl1)
+                check = conflicts.any? && conflict.present?
                 vl2[:value] = @nh.dig(kl2, :data, :open_trade_transfer_package, :products, @fh[:product_name].to_sym, :printed_circuits_fabrication_data, k, kl1)
                 vl2[:conflict] = check unless vl2[:conflict] # update only when the status is false
-                vl2[:conflicts_with] = check ? vl2[:conflicts_with] << @master_column : []
-                vl2[:conflict_message] = check ? vl2[:conflict_message] + conflicts&.dig(:rows, k, kl1) : []
-
+                vl2[:conflicts_with] = check ? ((vl2[:conflicts_with] || []) << @master_column).uniq : vl2[:conflicts_with] || []
+                vl2[:conflict_message] = check ? ((vl2[:conflict_message] || []) + conflict).uniq : vl2[:conflict_message] || []
                 # update master_column conflicts with
                 if check
                   master_row = @rows.dig(k, kl1, @master_column)
-                  master_row[:conflicts_with] = master_row[:conflicts_with] + conflicts.dig(:master_conflicts)
+                  master_row[:conflicts_with] = (master_row[:conflicts_with] + conflicts.dig(:master_conflicts)).uniq
                   master_row[:conflict] = true
                   master_row[:conflict_message] = (master_row[:conflict_message] + vl2[:conflict_message]).uniq
                 end
@@ -212,15 +215,45 @@ class Circuitdata::FileComparer
         errors.each do |k, v|
           folders_stack = k.split('/')
           folder, spec = folders_stack[5], folders_stack[6]
-          summary[:rows][folder.to_sym] ||= {}
-          spec_message = summary[:rows][folder.to_sym][spec.to_sym] || []
-          summary[:rows][folder.to_sym][spec.to_sym] = spec_message+v
+          if folder.nil?
+            get_other_conflicts(summary[:rows], v, 'l1')
+          else
+            summary[:rows][folder.to_sym] ||= {}
+            if spec.nil?
+              get_other_conflicts(summary[:rows][folder.to_sym], v, 'l2')
+            else
+              summary[:rows][folder.to_sym][spec.to_sym] ||= []
+              summary[:rows][folder.to_sym][spec.to_sym] = summary[:rows][folder.to_sym][spec.to_sym] + v
+            end
+          end
         end if errors.any?
       end
     end
     summary
   end
 
+  def get_other_conflicts(hash, v, level)
+    hash[:not_allowed] ||= []
+    hash[:messages] ||= []
+    not_allowed, messages = [], []
+    if v.is_a? Array
+      # get items that are not allowed
+      msg = v.select{|e| e.include?('contains additional properties [')}.first
+      not_allowed = eval(msg[/properties(.*?)outside/m, 1]) rescue []
+      messages << "#{not_allowed.to_sentence} are not allowed" if not_allowed.any?
+      # get other conflicts
+      messages = messages + v.select{|e| !e.include?('contains additional properties [')}
+    end
+    if not_allowed.any? && level == 'l2'
+      not_allowed.each do |spec|
+        hash[spec.to_sym] ||= []
+        hash[spec.to_sym] = hash[spec.to_sym] << "#{spec} is not a allowed element"
+      end
+    end
+    hash[:not_allowed] = (hash[:not_allowed] + not_allowed).uniq
+    hash[:messages] = (hash[:messages] + messages).uniq
+  end
+
   def get_l1_hash(columns)
     l1_hash = {}
     columns.each{|c| l1_hash[c]={} }

data/lib/circuitdata/version.rb

@@ -1,3 +1,3 @@
 module Circuitdata
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

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