circuitdata 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cee57a28b38b2f4e09b6e27af0140b0d6bfe02287ec8e6452519c7f4106e9d84
-  data.tar.gz: 02ed3d0c396aab1df49448c3ee9f78977ff16c7483384240b94729178068710b
+  metadata.gz: c49e6b15e75ca8c402c0807a9d241ba30cd9dd207c125fe3f1f6ae87da303960
+  data.tar.gz: cd912f52fb9c29398623954865938385f44a20fe0e1135d439d1a99e667c85f3
 SHA512:
-  metadata.gz: acd38a087dcfe90a368ab15d491f272cc00af1b9addc9749723e80cd626e766b5ed01aa92e87df54b38565b25c0ebf73666fd4085f3c8af1f93b7d7a23ddc57a
-  data.tar.gz: 87eb841eb3ab9d350f8e1bc7f7278b450771f278cc9c0713527c16bab3e9097c2c916cfe1e60106e12717b9d26fc00bb9c5f929f9a9a0a4fb09c281c09f84468
+  metadata.gz: 547b8febd516827f0c4c91b4d5849d7f36d0b5683a5ea2bed706c33a882568ad05859a88c049fc788e0a99d90dd37df215f75bdd6c9b9e0bc577a133102804f9
+  data.tar.gz: a052c9c068b168c7316c4763a17bde9d2298c15484a4502f870e292ca4bb51e342d04a12cbdcd668886cd1d4b8b2e89f4dcc01aabb43aad186fb5d757213d20c

data/lib/circuitdata/exposed_area.rb

@@ -5,30 +5,20 @@ module Circuitdata
       @product = product
     end
 
-    def exposed_copper_area
+    def final_finish_total_area
       return nil if board_area.nil?
-      exposed_layer_copper_area+barrel_area
+      layer_final_finish_area+barrel_area
     end
 
     def barrel_area
       return 0 if board_thickness.nil?
-      plated_through_holes.map{ |hole|  sum_holes_area(hole)}.sum
+      plated_holes.map{ |hole|  sum_holes_area(hole)}.sum
     end
 
     private
 
-    def exposed_layer_copper_area
-      coverage = []
-      unless top_final_finish.nil?
-        if top_final_finish[:coverage].is_a? Numeric
-          coverage << top_final_finish[:coverage]
-        end
-      end
-      unless bottom_final_finish.nil?
-        if bottom_final_finish[:coverage].is_a? Numeric
-          coverage << bottom_final_finish[:coverage]
-        end
-      end
+    def layer_final_finish_area
+      coverage = final_finish_layers.map{ |layer| layer[:coverage]}.compact
       coverage.map{ |percent| percent/100.0*board_area}.sum
     end
 
@@ -50,35 +40,32 @@ module Circuitdata
       @product.question_answer([:metrics, :board, :area])
     end
 
-    def plated_through_holes
-      @product.processes
-        .select{|process| process[:function] == "holes"}
-        .select{|process| process[:function_attributes][:plated] == true}
-        .select{|process| process[:function_attributes][:hole_type] == "through"}
-        .select{|process| process[:function_attributes][:number_of_holes].present?}
-        .select{|process| process[:function_attributes][:finished_size].present?}
+    def plated_holes
+      holes.select{ |process| requires_final_finish?(process) }
+        .select{ |process| has_necessary_data?(process) }
     end
 
-    def layers
-      @product.layers
+    def requires_final_finish?(process)
+      process[:function_attributes][:plated] == true &&
+        process[:function_attributes][:covered] == false
+    end
+
+    def has_necessary_data?(process)
+      process[:function_attributes][:number_of_holes].present? &&
+        process[:function_attributes][:finished_size].present?
     end
 
-    def top_final_finish
-      return nil if conductive_final_finish_layers.first.nil?
-      return nil if conductive_final_finish_layers.first[:function] != "final_finish"
-      conductive_final_finish_layers.first
+    def holes
+      @product.processes
+        .select{|process| process[:function] == "holes"}
     end
 
-    def bottom_final_finish
-      return nil if conductive_final_finish_layers.last.nil?
-      return nil if conductive_final_finish_layers.last[:function] != "final_finish"
-      conductive_final_finish_layers.last
+    def layers
+      @product.layers
     end
 
-    # We are using the knowledge that at least one conductive layer must
-    # be present to separate the top and bottom solder masks from each other.
-    def conductive_final_finish_layers
-      layers.select{ |layer| ["conductive", "final_finish"].include?(layer[:function]) }
+    def final_finish_layers
+      layers.select{ |layer| layer[:function] == "final_finish" }
     end
   end
 end

data/lib/circuitdata/product.rb

@@ -90,10 +90,10 @@ module Circuitdata
       product_data.fetch(:metrics, {})
     end
 
-    def exposed_copper
-      exposed_area.exposed_copper_area
+    def final_finish_total_area
+      exposed_area.final_finish_total_area
     end
-    
+
     def product_data_path
       [:open_trade_transfer_package, :products, id.to_sym, :circuitdata]
     end

data/lib/circuitdata/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuitdata
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Andreas Lydersen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema