general_units 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba43bb6e8b19eba9b18fccc0c5d40fdebbc26c31
-  data.tar.gz: dee3ce3ab9873f719d6e4fc09707ef3a89d99562
+  metadata.gz: 0b587736e5f764d47a5633f38ae9e871078a9d2d
+  data.tar.gz: 91594f7393deb805d8a15ffbdeddaeaded832e18
 SHA512:
-  metadata.gz: 6229d7a83ac3f0f58fc7177d3461323849ae609e4178121c1cadd9df72a86511e81c22a8d41cb85b0725cc5559cc311d81e66935776c0d4773e781b9c08c6e26
-  data.tar.gz: c8d68aec598958c1633f5b64b56124050c889d72ad80deaed48453e2c6dd21300907ba512bd0eabfa58862a0843a8ceb2d0349185feecdc757ffdc28e96eb842
+  metadata.gz: 4ec7e49bc0fb3bf97304216b650fbb1f23db262ca31475db84be92448b116e2d9e033be3a3002e3ab176dc9d715d5cdf30a79cb112614c321bad755de23eb98c
+  data.tar.gz: f75851118b3fcbbeda331e3999d2a6d205984ffd6fac174ea65512f4ce84eb552078055c9f729323c7399e6213ca6f0b9bf060085437096a2537417f98e708dc

data/lib/general_units/derivatives/box.rb

@@ -8,7 +8,7 @@ module GeneralUnits
   
     attr_reader *VALUES, :unit
   
-    delegate :to_f, :to => :amount
+    delegate :to_f, :to => :volume
     delegate :hash, :to => :attributes
   
     def initialize(length = 0, width = 0, height = 0, unit)
@@ -23,10 +23,18 @@ module GeneralUnits
     def values
       VALUES.map {|v| self.send(v)}
     end
-  
+    
     def amount
+      values.sum
+    end
+  
+    def volume
       length * width * height
     end
+    
+    def has_space?
+      length > 0 && width > 0 && height > 0
+    end
   
     def convert_to(unit)
       Box.new(*values.map {|v| v.convert_to(unit).amount}, unit)
@@ -42,7 +50,7 @@ module GeneralUnits
     
     def accommodates?(*boxes)
       boxes.map! {|box| validate_capacity(box)}
-      boxes.sum(&:amount) < amount && includes?(Box.new(boxes.map(&:length).max, boxes.map(&:width).max, boxes.map(&:height).max, unit))
+      boxes.sum(&:volume) < volume && includes?(Box.new(boxes.map(&:length).max, boxes.map(&:width).max, boxes.map(&:height).max, unit))
     end
   
     def same_size?(other_object)
@@ -64,6 +72,8 @@ module GeneralUnits
     def ==(other_object)
       other_object = validate_capacity(other_object)
       length == other_object.length && width == other_object.width && height == other_object.height
+    rescue
+      false
     end
 
     def eql?(other_object)
@@ -72,45 +82,45 @@ module GeneralUnits
 
     def <=>(other_object)
       other_object = validate_capacity_or_length(other_object)
-      amount <=> case other_object
+      volume <=> case other_object
       when Length then other_object
-      when Box then other_object.amount
+      when Box then other_object.volume
       end
     end
 
     def >(other_object)
       other_object = validate_capacity_or_length(other_object)
-      amount > case other_object
+      volume > case other_object
       when Length then other_object
-      when Box then other_object.amount
+      when Box then other_object.volume
       end
     end
  
     def <(other_object)
       other_object = validate_capacity_or_length(other_object)
-      amount < case other_object
+      volume < case other_object
       when Length then other_object
-      when Box then other_object.amount
+      when Box then other_object.volume
       end
     end
   
     def >=(other_object)
       other_object = validate_capacity_or_length(other_object)
-      amount >= case other_object
+      volume >= case other_object
       when Length then other_object
-      when Box then other_object.amount
+      when Box then other_object.volume
       end
     end
  
     def <=(other_object)
       other_object = validate_capacity_or_length(other_object)
-      amount <= case other_object
+      volume <= case other_object
       when Length then other_object
-      when Box then other_object.amount
+      when Box then other_object.volume
       end
     end
 
-    delegate :positive?, :negative?, :to => :amount
+    delegate :positive?, :negative?, :to => :volume
   
     def +(other_object)
       other_object = validate_capacity_or_length(other_object)
@@ -144,7 +154,7 @@ module GeneralUnits
       end
     end
   
-    delegate :div, :divmod, :modulo, :%, :remainder, :abs, :zero?, :nonzero?, :coerce, :to => :amount
+    delegate :div, :divmod, :modulo, :%, :remainder, :abs, :zero?, :nonzero?, :coerce, :to => :volume
   
     ### ARITHMETICS END ###
   

data/lib/general_units/units/length.rb

@@ -56,7 +56,7 @@ module GeneralUnits
     end
 
     def to_s(round = nil)
-      "#{to_f.round(round||2)}"
+      "#{to_f.divmod(1).last == 0 ? to_f.round(0) : to_f.round(round||2)}"
     end
     
     def formatted(round = nil)

data/lib/general_units/units/weight.rb

@@ -55,7 +55,7 @@ module GeneralUnits
     end
 
     def to_s(round = nil)
-      "#{to_f.round(round||2)}"
+      "#{to_f.divmod(1).last == 0 ? to_f.round(0) : to_f.round(round||2)}"
     end
     
     def formatted(round = nil)

data/lib/general_units/version.rb

@@ -1,3 +1,3 @@
 module GeneralUnits
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: general_units
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n