subunit 0.5.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37055bb45fcbc79062342381126b101118521d8a567b27d3a35771774a9acd6
-  data.tar.gz: a4b86b164ccbff2d7cde9918a86edf8caacde4d744764d0260cc403547aa21e8
+  metadata.gz: c7a64793ef4eba6cac4a1531741c33b7fa51aeda34b953aef7d9aa50ec5da41c
+  data.tar.gz: b04dcb7003593336c817eda62f688bfea39ddc202f2ca475bfd7f90773692d80
 SHA512:
-  metadata.gz: 9d4da753cf22b01795e0b8a6b97586d028287285ebb3aaf0c7d35c05c623b99dd4384402537c7a1cb890e786ea6b22ec31ccbcd1fc1a4c93d4763861978162a5
-  data.tar.gz: c059d56a367ca18712cdcae402509fd5770c44d464ada14f035aaabb9d0c272d5e33dd3d88776abee4a56cf92834f40a91e13242af4455bd87d22f155f4d66b7
+  metadata.gz: bd7d5da340137fe3d9f5e486f535df23693e16dfa4988e2e7716549623128bde2c8e17300dd2870cd96636061d007c44181256d952d5fc89022904f76ccc13eb
+  data.tar.gz: 60c40f49bcb37b9dffa884978162eb633823df1f98c396772975aba91f0d1267d1403604df532ffd422832d2d4c74e2399a3b4c9c9dd8c421fea3e7c669a3825

data/lib/subunit.rb

@@ -3,6 +3,10 @@
 # file: subunit.rb
 
 class Subunit
+  
+  def self.seconds(val)
+    new(units={minutes:60, hours:60}, seconds: val)
+  end
 
   attr_reader :to_a, :to_h, :to_i
   
@@ -10,12 +14,15 @@ class Subunit
     
     @debug = false
     
+    @raw_units = raw_units
+    
     if obj.is_a? Array then
       
-      a = obj
+      a = obj[0..-2]
       len = raw_units.to_a.length
-      @to_i = ([0]*(len-1) + a).slice(-(len), len).zip([60, 60, 1])\
+      val = ([0]*(len-1) + a).slice(-(len), len).zip(raw_units.values)\
           .inject(0) {|r,x| r + x.inject(:*) }
+      @to_i = val + obj[-1]
       
     else
       
@@ -26,11 +33,58 @@ class Subunit
     end
   end
   
+  # usage: Subunit.new(units={minutes:60, hours:60}, seconds: 661)\
+  #           .strfunit("%x") #=> 11m 1s
+  #
+  # %x e.g. 11m 1s
+  # %X e.g. 11 minutes 1 second
+  # %c e.g. 00:11:01
+  #
+  def strfunit(s)    
+    
+    s.sub!('%x') do |x|
+      to_h.map {|label, val| val.to_s + label[0]}.join(' ')
+    end
+    
+    s.sub!('%X') do |x|
+      
+      to_h.map do |label, val| 
+        
+        next if val == 0
+        label2 = val > 1 ? label.to_s : label.to_s.sub(/s$/,'')
+        val.to_s + ' ' + label2
+        
+      end.compact.join(' ')
+      
+    end    
+    
+    s.sub!('%c') do |x|
+      
+      a = @raw_units.values.reverse
+      a << a[-1]
+      
+      fmt = a.map {|v| "%0" + v.to_s.length.to_s + "d"}.join(":")
+      fmt % to_a
+    end    
+
+    s
+  end
+  
   def to_s(omit: [], verbose: true)
     
     if not verbose then
-      return self.to_a.reverse.take_while {|x| x > 0}.reverse\
-          .map {|x| "%02d" % x}.join(':') 
+      
+      r =  self.to_a.reverse.take_while {|x| x > 0}.reverse\
+          .map {|x| "%02d" % x}.join(':')
+      
+      if r.length < 2 then
+        return '00:00'
+      elsif r.length == 2      
+        return '00:' + r
+      else
+        return r
+      end
+      
     end
     
     h = @to_h

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subunit
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
   SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu