subunit 0.1.4 → 0.2.0

data/lib/subunit.rb

@@ -3,30 +3,20 @@
 
 class Subunit
 
-  def initialize(raw_units=[], subunit=0)
-    units = multiply_units(raw_units.clone).reverse
-    @a = scan_units(units, subunit)    
+  def initialize(raw_units=[], raw_subunit=0)
+    units = multiply_units(raw_units).reverse
+    @a = scan_units(units, raw_subunit)    
   end
 
-  def to_a()
-    @a.map{|x| x >= 1 ? x : 0}
-  end
+  def to_a() @a.map{|x| x >= 1 ? x.to_i : 0} end
 
   private
 
-  def multiply_units(x)
-    if x.length > 1 then
-      y, k = x.shift 2
-      r = y.to_i * k.to_i
-      [r] + multiply_units([r] + x)
-    else
-      []
-    end
-  end
+  def multiply_units(x) x.inject([]){|r,x| r + [x * (r[-1] || 1)]} end
 
-  def scan_units(unit_list,seconds)
+  def scan_units(unit_list,raw_subunit)
     n = unit_list.shift    
-    unit, subunit = [:/,:%].map{|x| seconds.send x, n}  
+    unit, subunit = [:/,:%].map{|x| raw_subunit.send x, n}  
     unit_list.length > 0 ? [unit] + scan_units(unit_list, subunit) : [unit, subunit]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: subunit
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 +01:00
+date: 2010-06-13 00:00:00 +01:00
 default_executable: 
 dependencies: []