subunit 0.5.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f79f4af50bd21b1fbc2ab5d0f182604abdaccd2d71635a2de7608f0284b30b1
-  data.tar.gz: b0250717312d90e88426144fb0f5d52777302c84a7557784741bf6b0340d26f2
+  metadata.gz: 46d3455f6cae815078d18a8de397a9a1cf925bd34f181aa976a22b2ba5743d03
+  data.tar.gz: 933130e619d182c682dde2eb7861b7d319dac05fd60d872587206be3e8ada74b
 SHA512:
-  metadata.gz: 4ae5c071276ca33df749097b7f0afbf603fd74073fc13063282d4b436be27464f683dc1c5f29081c9eb204274e68980aeb98a5b53534027e41acf59390966387
-  data.tar.gz: 186200ad80cefe4fd019e1c975db08b0461bed1405e49d78a77056cb437cc62866f79e078e42fb7844c3a7de8e32730ea6ad624cf972dc3001608b949fee3fd7
+  metadata.gz: badb4355119049ad42ed3fa49b1c38e5c2f3c002d53972988b911e074e43760bace58e02d06c8aa793d57dadb6ac73dade62ac4b2b438fd444aa54b7b647549e
+  data.tar.gz: '0628dc8e18fb2b9fcc9b55028760d67f286e97789973055d913a32ef769de8d0f035abfa957671c2ab3c0072d6290b88bee04432326d3125820a5cd397539eed'

data/lib/subunit.rb

@@ -10,12 +10,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,7 +29,59 @@ class Subunit
     end
   end
   
-  def to_s(omit: [])
+  # 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
+      
+      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
     omit.each {|x| h.delete x}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subunit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
   SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu
@@ -63,9 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: subunit
+summary: Input a raw unit and it returns the denomination.
 test_files: []

metadata.gz.sig

@@ -1 +1,5 @@
-Q�r1��*���'�)�|����X�������#+d�z�B�:�;YQU�I}����\�Cւf]�E%<���Y��T�m�5�~p}!
+��9Y	���X�~�����M�t�՞c��O$o}��" ܞ��{q����0��K�N]ȽE���;8�_��_ݴ���_��Y!�{�W���΍X9���_ϝFuƁ�
�6���\\!ďkv�@����r�iG����O^W�2`>>'G��ٚ0������U�y�C���=>.y�:�W��?��GJe����<����a�%��k�_p�N�ai*�g����,L��ye��z��-l
+$_�
+�`���0
+��{��
+y��ζ��ֹ�Ch�߉������Ս3e�q
��,c7]��Kq��E�J��M�$�aԽ