lib/physical/package.rb in physical-0.3.3 vs lib/physical/package.rb in physical-0.4.0

@@ -3,18 +3,18 @@
 module Physical
   class Package
     extend Forwardable
     attr_reader :container, :items, :void_fill_density, :id
 
-    def initialize(id: nil, container: nil, items: [], void_fill_density: Measured::Weight(0, :g), dimensions: nil, weight: nil, properties: {})
+    def initialize(id: nil, container: nil, items: [], void_fill_density: Measured::Density(0, :g_ml), dimensions: nil, weight: nil, properties: {})
       @id = id || SecureRandom.uuid
-      @void_fill_density = Types::Weight[void_fill_density]
+      @void_fill_density = Types::Density[void_fill_density]
       @container = container || Physical::Box.new(dimensions: dimensions || [], weight: weight || Measured::Weight(0, :g), properties: properties)
       @items = Set[*items]
     end
 
-    delegate [:dimensions, :width, :length, :height, :properties] => :container
+    delegate [:dimensions, :width, :length, :height, :properties, :volume] => :container
 
     def <<(item)
       @items.add(item)
     end
     alias_method :add, :<<
@@ -33,9 +33,15 @@
     end
 
     def void_fill_weight
       return Measured::Weight(0, :g) if container.volume.value.infinite?
 
-      Measured::Weight(void_fill_density.value * remaining_volume.value, void_fill_density.unit)
+      Measured::Weight(void_fill_density.convert_to(:g_ml).value * remaining_volume.convert_to(:ml).value, :g)
+    end
+
+    def density
+      return Measured::Density(Float::INFINITY, :g_ml) if container.volume.value.zero?
+      return Measured::Density(0.0, :g_ml) if container.volume.value.infinite?
+      Measured::Density(weight.convert_to(:g).value / container.volume.convert_to(:ml).value, :g_ml)
     end
   end
 end