numeric_with_unit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a9e3bf253a2b7b59618f970d6c3dbdd22ff33b7
-  data.tar.gz: 13adf31a8364d7ffa4e88c283ba0b67738c114e9
+  metadata.gz: d291b9eeb33681e615cf968e9ebf04564dea470b
+  data.tar.gz: cfbd75a22e7f4ed618127772d481a18582461c13
 SHA512:
-  metadata.gz: 5938fcabeb8013050901f66e98888a78a02ab65fb175b3341747e91913044b570efe5c3d18a36683a388ab341b05877759200824e269b26bbe78e744e932434f
-  data.tar.gz: 1154f4a257116d39df130e411e9c3021bbb4519ec851d76d345f43405cf3a5345d1ad7680e4d0d4b9d9e4123a2e9f4f06e1c36e5e1a04c7fa1cc1fd2e4be1f04
+  metadata.gz: 596b5e89d9161c75f00e49fb392cbaa8ec2d7ab272b174443671d28e5b3c961dc68dc8fd822b335a4adc4c62457cc370c235b6a4d4c587640617726bda0797b3
+  data.tar.gz: ca6f084096c236d63b2e327dc11795dc30d0043704ec8b752b7729ab4fcd80beab44db11d3a1d8c502b9535b56e9c4205926d36eaf8aee3da5d48ee55f195e8c

data/lib/numeric_with_unit/unit.rb

@@ -109,24 +109,25 @@ class NumericWithUnit
     def self.derive
       derivation = Hash.new(0)
       yield(derivation)
-
       return Unit.new if derivation.empty?
-
-      dimension = Hash.new(0)
-
-      h = derivation.sort_by{|u,v| u.symbol}.sort_by{|u,v| v} # ←どうしよう
+      derivation.delete_if{|k,v| k.symbol.nil?}
       
-      syms_pos = h.select{|u,v| v > 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}
-      syms_neg = h.select{|u,v| v < 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}
+      # constructing symbol
+      h = derivation.reject{|k,v| k.symbol.empty?}.sort_by{|u,v| u.symbol}.sort_by{|u,v| v}
+      syms_pos = h.select{|u,v| v > 0}.map{|u,v| u.symbol + (v.abs>1 ? v.abs.to_s : '')}
+      syms_neg = h.select{|u,v| v < 0}.map{|u,v| u.symbol + (v.abs>1 ? v.abs.to_s : '')}
       symbol = syms_pos.join('.')
       symbol += '/' + (syms_neg.size==1 ? "#{syms_neg.first}" : "(#{syms_neg.join('.')})") unless syms_neg.empty?
       
+      # constructing dimension
+      dimension = Hash.new(0)
       derivation.each do |u,v|
         u.dimension.each do |d,i|
           dimension[d] += i*v
         end
       end
-
+      
+      # constructing from_si proc
       from_si = derivation.map{|u,v|
         prc = if v > 0
           ->(x){u.from_si(x)}
@@ -140,6 +141,7 @@ class NumericWithUnit
         ->(x){memo[prc[x]]}
       }
       
+      # constructing to_si proc
       to_si = derivation.map{|u,v|
         prc = if v > 0
           ->(x){u.to_si(x)}
@@ -152,7 +154,8 @@ class NumericWithUnit
       }.reduce{|memo, prc|
         ->(x){memo[prc[x]]}
       }
-
+      
+      # deriving new unit
       self.new(derivation){|config|
         config.symbol = symbol
         config.dimension = dimension

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numeric_with_unit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - diaphragm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies: []
 description: This gem provide NumericWithUnit class to calculate numeric with unit
   of measurement.