circuitdata 0.6.4 → 0.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuitdata
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Andreas Lydersen
@@ -10,64 +10,148 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.2
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.4.1
 description: This gem provides you with functions to work with the CricuitData language.
   Run files against the schema, check their compatibility agains each other compare
   multiple files to find conflicts.
@@ -81,16 +165,25 @@ files:
 - README.md
 - Rakefile
 - lib/circuitdata.rb
-- lib/circuitdata/bk_comparer.rb
-- lib/circuitdata/compatibility_checker.rb
+- lib/circuitdata/bury/bury.rb
 - lib/circuitdata/dereferencer.rb
-- lib/circuitdata/file_comparer.rb
+- lib/circuitdata/exposed_area.rb
+- lib/circuitdata/json_schema.rb
+- lib/circuitdata/json_validator.rb
+- lib/circuitdata/json_validator/json_schema_error_parser.rb
+- lib/circuitdata/material_validator.rb
+- lib/circuitdata/product.rb
+- lib/circuitdata/product_id_validator.rb
 - lib/circuitdata/profile.rb
+- lib/circuitdata/schema.rb
+- lib/circuitdata/schema_files/schema_v1_dereferenced.json
 - lib/circuitdata/schema_files/v1/ottp_circuitdata_schema.json
-- lib/circuitdata/schema_files/v1/ottp_circuitdata_schema_definitions.json
-- lib/circuitdata/schema_files/v1/ottp_circuitdata_skeleton_schema.json
-- lib/circuitdata/schema_files/v1/ottp_schema_definitions.json
-- lib/circuitdata/tools.rb
+- lib/circuitdata/schema_files/v1/ottp_circuitdata_schema_generics.json
+- lib/circuitdata/schema_files/v1/ottp_circuitdata_schema_materials.json
+- lib/circuitdata/schema_files/v1/ottp_circuitdata_schema_products.json
+- lib/circuitdata/schema_files/v1/ottp_circuitdata_schema_profiles_and_capabilities.json
+- lib/circuitdata/summary.rb
+- lib/circuitdata/validator.rb
 - lib/circuitdata/version.rb
 homepage: http://circuitdata.org
 licenses:
@@ -112,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Basic test and comparison of JSON files agains the CircuitData JSON schema

data/lib/circuitdata/bk_comparer.rb

@@ -1,106 +0,0 @@
-def self.compare_files(filehash, validate_origins=false)
-  # Prepare the return
-  ra = {
-      error: false,
-      errormessage: "",
-      summary: {},
-      conflicts: {},
-      product: nil,
-      columns: [],
-      mastercolumn: nil,
-      rows: []
-  }
-
-  #parsedfiles
-  unless filehash.is_a? Hash
-    ra[:error] = true
-    ra[:errormessage] = "You have to feed this function with a hash of names and hashes"
-    return ra
-  end
-
-  # extend the hash that is received
-  nh = {}
-  filehash.each do |fhk, fhv|
-    nh[fhk] = {
-        orig: fhv,
-        parsed: nil,
-        content: nil,
-        has: {}
-    }
-    # READ THE CONTENT
-    ra[:error], ra[:errormessage], nh[fhk][:content] = self.read_json(fhv)
-    ra[:summary] = {} if ra[:error]
-    ra[:conflicts] = {} if ra[:error]
-    return ra if ra[:error]
-    # VALIDATE THE FILES
-    if validate_origins
-      ra[:error], ra[:errormessage], validationserrors = self.validate(nh[fhk][:content])
-      ra[:summary] = {} if ra[:error]
-      ra[:conflicts] = {} if ra[:error]
-      return ra if ra[:error]
-    end
-
-
-    # SET THE PRODUCT NAME
-    nh[fhk][:has][:products], nh[fhk][:has][:stackup], nh[fhk][:has][:profile_default], nh[fhk][:has][:profile_restricted], nh[fhk][:has][:profile_enforced], nh[fhk][:has][:capabilities], nh[fhk][:has][:product] = self.content(nh[fhk][:content])
-    unless nh[fhk][:has][:product].nil?
-      #self.iterate(nh[fhk][:content])
-
-      #root_node = Tree::TreeNode.new("ROOT", "Root Content")
-      #root_node.print_tree
-
-      ra[:product] = nh[fhk][:has][:product] if ra[:product].nil?
-      if nh[fhk][:has][:product] != ra[:product]
-        ra[:error] = true
-        ra[:errormessage] = "Your files contains several different product names"
-        ra[:summary] = {}
-        ra[:conflicts] = {}
-        return ra
-      end
-      ra[:mastercolumn] = fhk if ra[:mastercolumn].nil?
-    end
-
-    # THIS IS WHERE I NEED THINGS TO HAPPEN
-
-  end
-
-  # RETURN IF THERE IS NO PRODUCT
-  if ra[:mastercolumn].nil?
-    ra[:error] = true
-    ra[:errormessage] = "none of the files contains a product"
-    ra[:summary] = {}
-    ra[:conflicts] = {}
-    return ra
-  end
-
-  {
-      current_level: 0,
-      current_key: nil,
-
-  }
-  # Populate the master column
-  #self.iterate(filehash[ra[:mastercolumn].to_sym])
-  #ra[:summary] = productjson[:open_trade_transfer_package][:products][ra[:product]][:printed_circuits_fabrication_data]
-
-  #test = {}
-  #self.save_pair(productjson[:open_trade_transfer_package][:products][ra[:product]][:printed_circuits_fabrication_data], test)
-  #puts test
-  # Populate the product rows
-  #productjson[:open_trade_transfer_package]["products"][ra[:product]]["printed_circuits_fabrication_data"].each do |key, value|
-  #  if value.is_a? Hash
-  #    value.each do |subkey, subvalue|
-  #      ra[:rows][]
-  #end
-
-  # Do comparisons
-  #number = 1
-  #filehash.each do |key, value|
-  #    unless key.to_s == productfile
-  #      #puts self.compatibility_checker( productjson, value, false )
-  #      number += 1
-  #    end
-  #  end
-  #puts JSON.pretty_generate(ra)
-  #puts JSON.pretty_generate(nh)
-  return ra
-end

data/lib/circuitdata/compatibility_checker.rb

@@ -1,160 +0,0 @@
-class Circuitdata::CompatibilityChecker
-  def initialize(product_file, check_file, validate_origins)
-    require 'json'
-    require 'json-schema'
-
-    @product_file = product_file
-    @check_file = check_file
-    @validate_origins = validate_origins
-    # Final hash
-    @fh = {error: false, message: nil, errors: {validation: {}, restricted: {}, enforced: {}, capabilities: {}}}
-  end
-
-  def start_check
-    # Initialize & validate
-    @fh[:error], @fh[:message], product_data = Circuitdata.read_json(@product_file)
-    return @fh if @fh[:error]
-    @fh[:error], @fh[:message], @fh[:errors][:validation] = Circuitdata.validate(product_data)
-    return @fh if @fh[:error]
-    if @check_file.present?
-      @fh[:error], @fh[:message], check_data = Circuitdata.read_json(@check_file)
-      return @fh if @fh[:error]
-      @fh[:error], @fh[:message], @fh[:errors][:validation] = Circuitdata.validate(check_data)
-      return @fh if @fh[:error]
-      f2_types = Circuitdata.get_data_summary(check_data)[1]
-
-      # read the schema
-      schema_path = File.join(File.dirname(__FILE__), 'schema_files/v1/ottp_circuitdata_skeleton_schema.json')
-      schema = JSON.parse(File.read(schema_path), symbolize_names: true)
-      deref_schema = Circuitdata::Dereferencer.dereference(schema, File.dirname(Circuitdata::SCHEMA_FULL_PATH))
-      restricted_schema = enforced_schema = capability_schema = deref_schema
-      # Compare the content
-      perform_comparison(product_data, check_data, restricted_schema, 'restricted') if f2_types.include? 'profile_restricted'
-      perform_comparison(product_data, check_data, enforced_schema, 'enforced') if f2_types.include? 'profile_enforced'
-      perform_comparison(product_data, check_data, capability_schema, 'capabilities') if f2_types.include? 'capabilities'
-    end
-
-    @fh
-  end
-
-  def perform_comparison(product_data, check_data, schema, type)
-
-    docu = Circuitdata::Tools.new()
-    ra = docu.create_structure
-
-    case type
-      when 'restricted'
-        check_hash = check_data.dig(:open_trade_transfer_package, :profiles, :restricted, :printed_circuits_fabrication_data)
-      when 'enforced'
-        check_hash = check_data.dig(:open_trade_transfer_package, :profiles, :enforced, :printed_circuits_fabrication_data)
-      when 'capabilities'
-        check_hash = check_data.dig(:open_trade_transfer_package, :capabilities, :printed_circuits_fabrication_data)
-      else
-        check_hash = {}
-    end
-
-    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
-        unless [:dielectric, :soldermask, :stiffener].include? k.to_sym
-          common_hash[k.to_sym]||= {:type => 'object', :properties => {}}
-          #common_hash[:stackup][:properties][:specified][:properties][k.to_sym] ||= {:type => 'object', :properties => {}}
-        end
-        enum = []
-        required = []
-        case type
-          when 'restricted'
-            case vl1[0].class.name
-            when 'String'
-              vl1.each {|enumvalue| enum << enumvalue.strip}
-              new_hash = {:not => {:anyOf => [{ :enum => enum }]}}
-            when 'Boolean', 'FalseClass', 'TrueClass'
-              vl1.each do |enumvalue|
-                required << kl1.to_s if enumvalue == false
-                enum << enumvalue
-              end
-              new_hash = {:not => {:anyOf => [{ :enum => enum }]}}
-            when 'Numeric', 'Float'
-              if ra.dig(:structured, :elements, k.to_sym, :elements, kl1.to_sym, :enum).nil?
-                new_hash = {:anyOf => [{ :minimum => vl1[0], :maximum => vl1[1] }]}
-              else
-                vl1.each {|enumvalue| enum << enumvalue}
-                new_hash = {:not => {:anyOf => [{ :enum => enum }]}}
-              end
-            end
-          when 'enforced'
-            enum << vl1
-            new_hash = eval("{:enum => #{enum}}")
-          when 'capabilities'
-            case vl1[0].class.name
-            when 'String'
-              vl1.each {|enumvalue| enum << enumvalue.strip}
-              new_hash = {:anyOf => [{ :enum => enum }]}
-            when 'Boolean', 'FalseClass', 'TrueClass'
-              vl1.each do |enumvalue|
-                required << kl1.to_s if enumvalue == true
-                enum << enumvalue
-              end
-              new_hash = {:anyOf => [{ :enum => enum }]}
-            when 'Numeric'
-              vl1.each {|enumvalue| enum << enumvalue.strip}
-              new_hash = {:anyOf => [{ :minimum => vl1[0], :maximum => vl1[1] }]}
-            when 'Integer', 'Float'
-              if vl1.length == 1
-                new_hash = {:anyOf => [{ :minimum => vl1[0], :maximum => vl1[0] }]}
-              elsif vl1.length == 2
-                new_hash = {:anyOf => [{ :minimum => vl1[0], :maximum => vl1[1] }]}
-              else
-                fail StandardError, "Unhandled array length=#{vl1.length} key=#{kl1}"
-              end
-            else
-              fail StandardError, "Unhandled type=#{vl1[1].class.name} key=#{kl1}"
-            end
-        end
-        case k.to_sym
-        when :dielectric
-          schema[:properties][:open_trade_transfer_package][:properties][:custom][:properties][:materials][:properties][:printed_circuits_fabrication_data][:properties][:dielectrics][:items][:properties][kl1.to_sym] = new_hash
-          schema[:properties][:open_trade_transfer_package][:properties][:custom][:properties][:materials][:properties][:printed_circuits_fabrication_data][:properties][:dielectrics][:items][:required] = required
-        when :soldermask
-          schema[:properties][:open_trade_transfer_package][:properties][:custom][:properties][:materials][:properties][:printed_circuits_fabrication_data][:properties][:soldermasks][:items][:properties][kl1.to_sym] = new_hash
-          schema[:properties][:open_trade_transfer_package][:properties][:custom][:properties][:materials][:properties][:printed_circuits_fabrication_data][:properties][:soldermasks][:items][:required] = required
-        when :stiffener
-          schema[:properties][:open_trade_transfer_package][:properties][:custom][:properties][:materials][:properties][:printed_circuits_fabrication_data][:properties][:stiffeners][:items][:properties][kl1.to_sym] = new_hash
-          schema[:properties][:open_trade_transfer_package][:properties][:custom][:properties][:materials][:properties][:printed_circuits_fabrication_data][:properties][:stiffeners][:items][:required] = required
-        else
-          common_hash[k.to_sym][:properties][kl1.to_sym] = new_hash
-          common_hash[k.to_sym][:required] = required
-        end
-        #common_hash[:stackup][:properties][:specified][:properties][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
-    begin
-      validation_errors = JSON::Validator.fully_validate(schema.to_json, product_data, :errors_as_objects => true)
-
-      if validation_errors.any?
-        @fh[:error] = true
-        @fh[:message] = 'The product to check did not meet the requirements'
-
-        validation_errors.each do |error|
-          error_array = []
-          begin
-            error_array << error[:message].match("^(The\\sproperty\\s\\'[\\s\\S]*\\'\\s)([\\s\\S]*)(\\sin\\sschema[\\s\\S]*)$").captures[1]
-          rescue
-            error_array << error[:message]
-          end
-          @fh[:errors][type.to_sym][error[:fragment]] = error_array
-        end
-      end
-    rescue JSON::Schema::ReadFailed
-      @fh[:error] = true
-      @fh[:message] = "Could not read the submitted `#{type}` schema" # enforced_schema
-    rescue JSON::Schema::SchemaError
-      @fh[:error] = true
-      @fh[:message] = "Something was wrong with the submitted `#{type}` schema" # enforced_schema
-    end
-  end
-end