circuitdata 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49e6b15e75ca8c402c0807a9d241ba30cd9dd207c125fe3f1f6ae87da303960
-  data.tar.gz: cd912f52fb9c29398623954865938385f44a20fe0e1135d439d1a99e667c85f3
+  metadata.gz: e70e5e3c4070c9ebe96c6aa365547551226bc5cb5e4c3c9f37ad95422dbb3aff
+  data.tar.gz: 12f7b26c99c0ff549cea2c05f2ea197f5190bb3752f9b625b1336fb39d690b64
 SHA512:
-  metadata.gz: 547b8febd516827f0c4c91b4d5849d7f36d0b5683a5ea2bed706c33a882568ad05859a88c049fc788e0a99d90dd37df215f75bdd6c9b9e0bc577a133102804f9
-  data.tar.gz: a052c9c068b168c7316c4763a17bde9d2298c15484a4502f870e292ca4bb51e342d04a12cbdcd668886cd1d4b8b2e89f4dcc01aabb43aad186fb5d757213d20c
+  metadata.gz: e4dda4f6ba82769c6c0050a63587d971f41eeb4b3fe508e0c954775cdc1326241fa3648afad01feb5a7ae60dc269d7118274f5d394108cf01b4c1f9c23700329
+  data.tar.gz: 0f6c9336a9b67492bdce5a9a1ba6602abb8e2ac3b211038476186f418628f7c4a90c45a94a96efb2b9151631a3be99dee5a55eb5ca84ba8741f18ae9f81703d5

data/lib/circuitdata.rb

@@ -17,8 +17,8 @@ module Circuitdata
   require_relative "./circuitdata/exposed_area"
   require_relative "./circuitdata/summary"
 
-  SCHEMA_BASE_PATH = File.join(__dir__, "circuitdata/schema_files/v1")
-  SCHEMA_FULL_PATH = File.join(SCHEMA_BASE_PATH, "..", "schema_v1_dereferenced.json")
+  SCHEMA_BASE_PATH = File.join(__dir__, "circuitdata/schema_files/current")
+  SCHEMA_FULL_PATH = File.join(SCHEMA_BASE_PATH, "..", "schema_current_dereferenced.json")
   DEFINITIONS_FULL_PATH = File.join(
     SCHEMA_BASE_PATH, "ottp_circuitdata_schema_definitions.json"
   )

data/lib/circuitdata/schema_files/{v1 → current}/ottp_circuitdata_schema_products.json

@@ -574,11 +574,7 @@
         "properties": {
           "size_x": { "type": "number", "uom": "mm" },
           "size_y": { "type": "number", "uom": "mm" },
-          "area": { "type": "number", "uom": "mm" },
-          "breakaway_method": {
-            "type": "string",
-            "enum": ["routing", "punching"]
-          },
+          "area": { "type": "number", "uom": "mm2" },
           "thickness": { "type": "number", "uom": "mm" }
         }
       },
@@ -607,7 +603,7 @@
             "type": "array",
             "items": {
               "type": "string",
-              "enum": ["routing", "scoring", "punching", "v_cut", "v_grove", "jump_scoring"]
+              "enum": ["routing", "scoring", "punching", "jump_scoring"]
             }
           },
           "mouse_bites": { "type": "boolean" },
@@ -688,7 +684,7 @@
             "type": "array",
             "items": {
               "type": "string",
-              "enum": ["ul", "c_ul", "rohs", "ul94", "iec_61249-2-21", "esa", "itar", "dfars", "mil_prf_55110", "mil_prf_50884", "mil_prf_31032", "as9100", "nadcap", "rw_en45545_2_2013", "rw_nf_f_16_101", "rw_uni_cei_11170_3", "rw_nfpa_130"]
+              "enum": ["ul94", "c_ul", "rohs", "iec_61249-2-21", "esa", "itar", "dfars", "mil_prf_55110", "mil_prf_50884", "mil_prf_31032", "as9100", "nadcap", "rw_en45545_2_2013", "rw_nf_f_16_101", "rw_uni_cei_11170_3", "rw_nfpa_130"]
             }
           },
           "ipc_6010_class": {
@@ -728,7 +724,11 @@
             "type": "string",
             "enum": ["1", "2", "3"]
           },
-          "ipc_6018": { "type": "boolean" }
+          "ipc_6018": { "type": "boolean" },
+          "ipc_a600_class": {
+            "type": "string",
+            "enum": ["1", "2", "3"]
+          }
         }
       },
       "testing": {

data/lib/circuitdata/schema_files/{schema_v1_dereferenced.json → schema_current_dereferenced.json}

@@ -1290,14 +1290,7 @@
                             },
                             "area": {
                               "type": "number",
-                              "uom": "mm"
-                            },
-                            "breakaway_method": {
-                              "type": "string",
-                              "enum": [
-                                "routing",
-                                "punching"
-                              ]
+                              "uom": "mm2"
                             },
                             "thickness": {
                               "type": "number",
@@ -1374,8 +1367,6 @@
                                   "routing",
                                   "scoring",
                                   "punching",
-                                  "v_cut",
-                                  "v_grove",
                                   "jump_scoring"
                                 ]
                               }
@@ -1512,10 +1503,9 @@
                               "items": {
                                 "type": "string",
                                 "enum": [
-                                  "ul",
+                                  "ul94",
                                   "c_ul",
                                   "rohs",
-                                  "ul94",
                                   "iec_61249-2-21",
                                   "esa",
                                   "itar",
@@ -1586,6 +1576,14 @@
                             },
                             "ipc_6018": {
                               "type": "boolean"
+                            },
+                            "ipc_a600_class": {
+                              "type": "string",
+                              "enum": [
+                                "1",
+                                "2",
+                                "3"
+                              ]
                             }
                           }
                         },

data/lib/circuitdata/summary.rb

@@ -1,78 +1,52 @@
-require 'bigdecimal'
+require "bigdecimal"
+
 module Circuitdata
   class Summary
-
-    SUMMARY_FIELDS = [
-        :base_materials,
-        :number_of_conductive_layers,
-        :board_outline,
-        :final_thickness,
-        :minimum_track,
-        :minimum_spacing,
-        :min_through_hole_size,
-        :max_aspect_ratio
-    ]
-
     def initialize(product)
       @product = product
     end
 
-    def data
-      d = {}
-      SUMMARY_FIELDS.each do |key|
-        d[key] = send(key)
-      end
-      d
-    end
-
-    private
-
-    # helper functions
     def conductive_layers
       layers_with_function("conductive")
     end
 
     def board_area
-      # try adding up all sections
-      sizes = @product.sections.map{|section| section[:mm2]}
-      sizes.compact.inject(0, :+)
+      sizes = @product.sections.map { |section| section[:mm2] }
+      sizes.compact.sum
     end
 
     def layers_with_function(func)
-      @product.layers.select{ |layer| layer[:function] == func}
+      @product.layers.select { |layer| layer[:function] == func }
     end
 
-    # mapping
     def base_materials
       dielectrics = layers_with_function("dielectric")
       return nil if dielectrics.length == 0
-      flexes = dielectrics.map{|d| d.dig(:flexible)}.compact.uniq
-      return "Flexible" if flexes === [true]
-      return "Rigid" if flexes === [false]
+
+      flexes = dielectrics.map { |d| d.dig(:flexible) }.compact.uniq
+      return "Flexible" if flexes == [true]
+      return "Rigid" if flexes == [false]
       return "Rigid Flex" if flexes.length == 2
       return "Unknown" # dielectric is present, but does not have flex info.
     end
 
-    # Return number of conductive layers
     def number_of_conductive_layers
-      if conductive_layers.length > 0
-        return conductive_layers.length
-      end
+      conductive_layers.length
     end
 
     def minimum_track
-      conductive_layers.map { |layer| layer.dig(:layer_attributes, :minimum_track_width)}.compact.min
+      conductive_layers.map { |layer| layer.dig(:layer_attributes, :minimum_track_width) }.compact.min
     end
 
     def minimum_spacing
-      conductive_layers.map { |layer| layer.dig(:layer_attributes, :minimum_spacing_width)}.compact.min
+      conductive_layers.map { |layer| layer.dig(:layer_attributes, :minimum_spacing_width) }.compact.min
     end
 
     def board_outline
       array = @product.metrics.fetch(:board, {})
       size_x = array[:size_x]
       size_y = array[:size_y]
-      return size_x.to_s+" x "+size_y.to_s+" mm" if size_x && size_y
+      return size_x.to_s + " x " + size_y.to_s + " mm" if size_x && size_y
     end
 
     def final_thickness
@@ -80,16 +54,15 @@ module Circuitdata
     end
 
     def min_through_hole_size
-      @product.processes.map{ |process| process.dig(:function_attributes,:finished_size)}.compact.min
+      @product.processes.select { |process| process.dig(:function_attributes, :hole_type) == "through" }
+        .map { |process| process.dig(:function_attributes, :finished_size) }.compact.min
     end
 
     def max_aspect_ratio
-      if final_thickness
-        if min_through_hole_size
-          th = BigDecimal(min_through_hole_size.to_s)/1000.0
-          ft = BigDecimal(final_thickness.to_s)
-          return (ft/th).truncate(2).to_s.to_f
-        end
+      if final_thickness && min_through_hole_size
+        th = BigDecimal(min_through_hole_size.to_s) / 1000.0
+        ft = BigDecimal(final_thickness.to_s)
+        return (ft / th).truncate(2).to_s.to_f
       end
     end
   end

data/lib/circuitdata/version.rb

@@ -1,4 +1,4 @@
 module Circuitdata
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
   SCHEMA_VERSION = 1.0
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuitdata
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Andreas Lydersen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -176,12 +176,12 @@ files:
 - 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_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/schema_files/current/ottp_circuitdata_schema.json
+- lib/circuitdata/schema_files/current/ottp_circuitdata_schema_generics.json
+- lib/circuitdata/schema_files/current/ottp_circuitdata_schema_materials.json
+- lib/circuitdata/schema_files/current/ottp_circuitdata_schema_products.json
+- lib/circuitdata/schema_files/current/ottp_circuitdata_schema_profiles_and_capabilities.json
+- lib/circuitdata/schema_files/schema_current_dereferenced.json
 - lib/circuitdata/summary.rb
 - lib/circuitdata/validator.rb
 - lib/circuitdata/version.rb
@@ -204,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Basic test and comparison of JSON files agains the CircuitData JSON schema