subunit 0.8.3 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 807d54d4b08e3eedaacc7d9a9970d5cc8ee5c5e18bf75282a49c8ccf9ebcf7f6
-  data.tar.gz: a5e43fca0a05710ce581a25cceb13da735ad7b9e36102bf162a966ac4fcb9dae
+  metadata.gz: 0c676bd895436a156711b39cfa244a46524112df81d678cd6c2f790560f3155f
+  data.tar.gz: 54a45610aa7c71050fe011d6b74fee408f378fc7c00564d0546cbdacba187f12
 SHA512:
-  metadata.gz: a43cd22965a80bbeda08484b5939c4cea4a96e89940f37b14867f15f4a4370b672593c559d8eb57ba3667da1cf8ca11cbfa110f82cce335cf3c786f0631bb1ca
-  data.tar.gz: 3b66e9c0bab9872d7738a896df2fbf7fd7492cc45ed0ac76b9cf12f633788fcd87a6fcc541d0b011bec5122a5aed6c3ff10b694168076ba9ac1dcb7d3d395cc9
+  metadata.gz: 247d4cd835390d9452d31cea931177c3f4b1cf52bd6104460c600d21e5652114b7b6a7447de4d66733956ca93c3a47638cf985ba8b7e58f2cb51ac010bc4b745
+  data.tar.gz: 0605cff7b8f350e8785c82366f365300f72fb70b5a698f6b5361e958fa3c898460d4ded752d6a4cfc751ffa58fe9ad422a8424a638ac8086fc9448dcd275d1de

data/lib/subunit.rb

@@ -3,140 +3,164 @@
 # 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, units: nil)
     new(units={minutes:60, hours:60, days:24}, seconds: val)
   end
 
   # e.g. Subunit.hms_to_seconds('5 minutes and 4 seconds')
-  # => 304   
+  # => 304
   #
   def self.hms_to_seconds(obj)
     new(units={hours:60, minutes:60,seconds: 60, }, obj).to_i
-  end  
+  end
 
   attr_reader :to_a, :to_h, :to_i
-  
+
   def initialize(raw_units={}, obj)
-    
+
     @debug = false
-    
+
     @raw_units = raw_units
-        
+
     accumulate = ->(a) {
-    
+
       len = raw_units.to_a.length
       val = ([0]*(len-1) + a).slice(-(len), len).zip(raw_units.values)\
-          .inject(0) {|r,x| r * x[1] + x[0] }    
+          .inject(0) {|r,x| r * x[1] + x[0] }
     }
-    
+
     if obj.is_a? String
-      
+
       @to_i = accumulate.call obj.split(/\D+/).map(&:to_i)
-          
+
     elsif obj.is_a? Array then
-            
+
       @to_i = accumulate.call obj
-      
+
     else
-      
+
       raw_subunit = obj || 0
       method((raw_units.class.to_s.downcase + '_units').to_sym)\
           .call(raw_units, raw_subunit)
-      
+
     end
   end
-  
+
   # usage: Subunit.new(units={minutes:60, hours:60}, seconds: 661)\
   #           .strfunit("%x") #=> 11m 1s
   #
   # %x e.g. 11m 1s
+  # %xi e.g. 11m
   # %X e.g. 11 minutes 1 second
+  # %Xi e.g. 11 minutes
   # %c e.g. 00:11:01
-  # %s e.g. 11m # returns the 1st most significant value while 
+  # %sc e.g. 11:01 # supresses leading zeros
+  # %s e.g. 11m # returns the 1st most significant value while
   #               ignoring the remainder
   #
-  def strfunit(s)    
-    
-    s.sub!('%x') do |x|
-      to_h.map {|label, val| val.to_s + label[0]}.join(' ')
+  def strfunit(s)
+
+    # The i switch postfixed to the x or X switch will format the output
+    # without seconds unless there are no minutes.
+
+    s.sub!(/%xi?/) do |x|
+
+      h = to_h
+      a = h.to_a
+      a2 = (a.length > 1 and x[-1][/i$/] and h[:seconds]) ? a[0..-2] : a
+      a2.map {|label, val| val.to_s + label[0]}.join(' ')
+
     end
-    
-    s.sub!('%X') do |x|
-      
-      to_h.map do |label, val| 
-        
+
+    s.sub!(/%Xi?/) do |x|
+
+      h = to_h
+      a = h.to_a
+      a2 = (a.length > 1 and x[-1][/i$/] and h[:seconds]) ? a[0..-2] : a
+
+      a2.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    
-    
+
+    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    
-    
+    end
+
+    s.sub!('%sc') 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).gsub(/^(?:00:)+/,'').sub(/^0/,'')
+    end
+
     s.sub!('%s') do |x|
-      label, val = to_h.first 
+      label, val = to_h.first
       val.to_s + label[0]
-    end    
+    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      
+      elsif r.length == 2
         return '00:' + r
       else
         return r
       end
-      
+
     end
-    
+
     h = @to_h
     omit.each {|x| h.delete x}
 
     list = h.to_a
     n = list.find {|_,v| v > 0 }
-    a = list[list.index(n)..-1].map {|x|"%d %s" % x.reverse}        
-        
+    a = list[list.index(n)..-1].map {|x|"%d %s" % x.reverse}
+
     duration = case a.length
 
     when 1
-      a.first  
+      a.first
     when 2
       a.join ' and '
-    else                   
+    else
       "%s and %s" % [a[0..-2].join(', '), a[-1]]
     end
-    
+
     duration.gsub(/(\b1 \w+)s/, '\1')
 
   end
@@ -150,18 +174,18 @@ class Subunit
   def fixnum_subunit(v)
     [v, :remainder]
   end
-  
+
   def integer_subunit(v)
     [v, :remainder]
-  end  
-  
+  end
+
   def hash_units(raw_units={}, u=nil)
-    
+
     val, label = method((u.class.to_s.downcase + '_subunit').to_sym).call(u)
     units = multiply_units(raw_units.values).reverse
     puts 'units: ' + units.inspect if @debug
-    @to_a  = a = scan_units(units, val).map(&:to_i)   
-    
+    @to_a  = a = scan_units(units, val).map(&:to_i)
+
     puts 'a: ' + a.inspect if @debug
     pairs = (raw_units.keys.reverse + [label]).reverse.take(a.length)\
                  .reverse.zip(a).select {|x| x[1] > 0}
@@ -177,8 +201,8 @@ class Subunit
   def multiply_units(x) x.inject([]){|r,x| r + [x.to_i * (r[-1] || 1)]} end
 
   def scan_units(unit_list,raw_subunit)
-    n = unit_list.shift    
-    unit, subunit = [:/,:%].map{|x| raw_subunit.send x, n}  
+    n = unit_list.shift
+    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.8.3
+  version: 0.8.6
 platform: ruby
 authors:
 - James Robertson
@@ -11,34 +11,34 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjExMTMxNTI0WhcN
-  MjEwNjExMTMxNTI0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDYDasD
-  frBDuzdjPpkYhCiMX91fqK5KPRp1SD8Wms+WXaLYTqyK2bWSWarsGVuYmKculwT0
-  Am6q5L99yRPvYJmxNcd42V2+FuYmPtXTwi4aeiV8uuIFHqABp73fv6EYFdIfrRvC
-  Ws0ZH5+xjTbPNoewXWfi6JeXuWiM3aA89g8AX9PHaZY9lNN2cNC77kkxbcmDkwCK
-  H4aOIlbscw85T4L7neA78b01WaNcGr6TnQeUYTrae7viihb3E1CQVWcg/N4e3yMV
-  km1eArbQYCnp4nkRyonsNTlUoWc0tVxF/ilemZBXiMaubNi81CVEIQHHjDVNbfyS
-  +6mFmwKhII55CqyFq+NwqLNgVUVxTnXEFJvKAhjWbnUUmnXgtsk9cHzyMaFl4YOK
-  Fx8RLiXqIREfnNmSg4P5gpYnAcm58UcXoraZiAJUKA6ntU1FIOrShzHj8IqtXvRu
-  FDbS8jAhda67n1gbVUMs2OY/sogmFGVKFO5xVarD35/BtzgfRNQK1wU4Yy8CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOf0mcfDe
-  dXRdAXtTj85vBERBHqUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMzIyMjAyNTUyWhcN
+  MjMwMzIyMjAyNTUyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDDRYH8
+  6rtefR26KsrSUUB5FUPwbzaILyNTP6eYNd3txbsYi8pnPauo61CgQ9uFrSPVWlmf
+  nb5DZOHEsGqwShs2S+n58i8IJB6bYCf0O0/8cvXBfvZ0uJUs+c5i+9FZID52w1Ph
+  AdWA9sa3ZkXM4gfGwZfbtV6HhWNPCz3WujQtslf/YrAaOrctnyQMOAkL3uFx0/hZ
+  PqoZ3zxGxjm1M5c9osWggZVZydIn/V1Lfu+bZRXRNRaHccHQK8sDNVbvJVWE4yw/
+  CSTRAQSV9a4WXi8qRxprtEfrJOHNGM3hiu8ma+E6j8+aJrRuyCILSDkx5brwv/16
+  p/IZr4K6ONpszYeXa4wtOMjR4vAJvYpF8jolzRNYEJZXui0XCrujhEq5HvuDLxuc
+  unQ9Ens+qFoMlTID2eDBgOgbZj1Msa/rj+GsXYglNGiwEmMsIqBTQ2CGs+u8t59L
+  sbMqTAa/4b0E18QQmvEPT1zVNf/wxH/cxYZGQJTTTihducAabi37LD2/1Q8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU4gbHY4s8
+  TUd/umYEir0d+OQYYUEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAhaQ9BCV0ZKQeCdslSmkOLWKzKk6rffiOYUTQaqdv
-  FxLZb7I7ug6uzZdtdb7Y7yGgXes+Z0zR6VhNSwWlpFcHSIznWYJh5e6ET/3lDetk
-  wk204TgTuLDPA3USRS5BKWKi1sdqnWXJVLynJCZPIyV7ilbFKSl77Wa8IwWjyj7g
-  F05N7bMe3g0vECYHFBJJWCfy2d6jcv0/GG0BwEsLf91LwVg5bIAJ481EaWaKseWR
-  PAmD0vI08ssZY68aO08XgHP1JTLDXYeTqMS5BGeFWCkKhjlLnH+pamLB6lTD4ojL
-  uBZU7l7zO3ksoWsWIIp1bhvSZHE5sCaZmOKXPSN4gW065ieajGR0Ccv7k6JZK8pC
-  skCxe0yd2TnDrW5R51ocplcGDzryzTdvzaI4af8OQUWwshF+Ad7x4J7jdyu3WK1B
-  HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
-  SSxk4InmYoY9Cl2GVQ+d9owo
+  BgkqhkiG9w0BAQsFAAOCAYEAkFvP0dx51fJOkit9bSNU+ZDmsGj5yRas5hN3Mpr8
+  zPr58Tek+sPXZZgJOxSSofA6XOoaw/Qf54Zvi12QvlACr8b9sBDh7LvKOJYr7AAx
+  KDnKBVLscp3Lma4jSSz+COLO5NKjyTJzoGNyrVWukcG+Q/od+F4gc9geaWkb4cAN
+  rk6xbh2OkmWKttaPYbfLrTCIJ47yjdPDWHTS1gzD/TGc3GkX/kEWEe3TrI1C0J9d
+  l8CJhRfqnM/Z7z9NgBcBYqEPcH50oZQfj+jPuC/aPCHYH6P6ERPCWxVrwjHdOa9P
+  0LCJ5kn6RqrhzfRKcO1+8c0whliNP+98DluwP+5pdM7HfbSpeArtA9DVf3vn+n+I
+  RpHzYUh8G2ASjUDDp1J7aNqtvJpa6M/a2HcDJJyAMw65Gq+QBaIYS/wOfvX8NJql
+  w3QFiPkdCGAc/OB+os5J5edPeaH3ohMnM+eLfMzu1TAb37QeREb9T3/+gCTv79XF
+  5EfsI7uk1Aib+1DtRwjU8kB0
   -----END CERTIFICATE-----
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -63,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Input a raw unit and it returns the denomination.