subunit 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91907a5881a1b4f38c855693b78cd72c7ab944edc8370b78922ac261bfdf8165
-  data.tar.gz: b0ecdcfe9761bceb2abfab49fd353e56cc6809590a4047cc26af262bf38ba0d7
+  metadata.gz: 4466d231e3c336adf393301ac33736362e1ba2996bfa0a42f2ca56be949ffbff
+  data.tar.gz: daff11e883761163e31f79d431f91ad1ad10790f613359a0aa593a29da82a57a
 SHA512:
-  metadata.gz: 4a653b499f5d8521dc18c488c804f5506a2120ce2255e2b5cd027dc64ac7b4104f719e9e12bb4d9109c976b3990995ee6a1ed39183f488b5df7d00905e890a68
-  data.tar.gz: 6f4b1109dce2045afdd768478feac71a9990a098e2be27669e4ee3282e1f850e6e3d5d8f5ac3bffbc477867f552ebd61fe14e4b24aa79a5e509cb4c096553ba5
+  metadata.gz: cd3f645fc57ea4badfbc121d02ba36edc240b063bebb468804dfe5a451b9d6abf084b3c59cc346302fad9e2fbda381aa82831f677789ac6c8bfd99b305dbf9fd
+  data.tar.gz: 2fefff70fc6f6144c2f4fc5c0c691bd354ce42f770478ad8c8c93e8860175d833021900fc2b84ef6a363bd45eda21ef8dd4d4bb9b4fa83632425609d8f0e69db

data/lib/subunit.rb

@@ -2,7 +2,23 @@
 
 # file: subunit.rb
 
+module SubunitFracture
+  
+  refine Integer do
+    
+    def strfunit(s)
+      Subunit.seconds(self).strfunit(s)
+    end
+    
+  end
+  
+end
+
 class Subunit
+  
+  def self.seconds(val)
+    new(units={minutes:60, hours:60}, seconds: val)
+  end
 
   attr_reader :to_a, :to_h, :to_i
   
@@ -10,13 +26,24 @@ class Subunit
     
     @debug = false
     
-    if obj.is_a? Array then
-      
+    @raw_units = raw_units
+    
+    
+    accumulate = ->(obj) {
       a = obj[0..-2]
       len = raw_units.to_a.length
       val = ([0]*(len-1) + a).slice(-(len), len).zip(raw_units.values)\
           .inject(0) {|r,x| r + x.inject(:*) }
-      @to_i = val + obj[-1]
+      val + obj[-1]      
+    }
+    
+    if obj.is_a? String
+      
+      @to_i = accumulate.call obj.split(' ').map(&:to_i)
+          
+    elsif obj.is_a? Array then
+            
+      @to_i = accumulate.call obj
       
     else
       
@@ -30,11 +57,38 @@ class Subunit
   # usage: Subunit.new(units={minutes:60, hours:60}, seconds: 661)\
   #           .strfunit("%x") #=> 11m 1s
   #
-  def strfunit(s)
+  # %x e.g. 11m 1s
+  # %X e.g. 11 minutes 1 second
+  # %c e.g. 00:11:01
+  #
+  def strfunit(s)    
     
-    s2 = to_h.map {|label, val| val.to_s + label[0]}.join(' ')
-    s.sub('%x', s2)
+    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)
@@ -116,4 +170,3 @@ class Subunit
     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.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
   SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2020-09-05 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu