subunit 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e124b6fa840730ee3a5ce10b514202efcfd344bfa5c4215385bf498399f82a'
-  data.tar.gz: c7c7e94887df01e5933fe190d60f38509537da53425ebd3ca593c87c1304ee1b
+  metadata.gz: dd028dea596b0b1c66609dfa8b77c2daa11276d89ad376341152e01be886c642
+  data.tar.gz: 072c31bc3ac9aee1273a19f585b9b757d069d2fe4c365d513110f10998e8b342
 SHA512:
-  metadata.gz: 842c22b63b01ef9a54af26a0eb1b65b888a15660ccad1aecaed356a7eca51a465ddaa992f46b80c38a5bbeb11e137f9cfa38eaa90fbda9afce56c93341d3968c
-  data.tar.gz: 4f423aac15f8155b763fcd9124726baa4343e40216d17673afe61670c9f171d73a337ed9ee534b670c7ac107b9b09fa37251b70b8550f52ce8dffce2bde5bd02
+  metadata.gz: 715c798c7d3f207060705728fb7e802e2184bc40ee3902d3bc2601214144f8ba27b839b9474b100a5fd5f956d6bdfb2399d48fb6b6e0936fcd798504fb9fb227
+  data.tar.gz: adc7cfebc9b1e1eca8cf334d44d0137e09a675e43532e1293553581609fc8b6f6d4129b60b1a5f32cd4b9baa1796bdcb1c272b26be961c7718c42495e0ac38db

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-�Fl� ���V���;�R
h��hZ_�])	��w�GLЎ�m�'A����]��'92���f����)����i4��MF���l_�?G^�X���A���]R��h����v�2_�G�3����Sc��8��)��Q��(f
-w%R�t�ǻ�}j�/���J�O��6���Ô��[E���fb>Q��Ku�`�
�������KP�-JޚLi$�Ma	0��D>Qf}k�p��va�hN��6v"�yH*J�5@����O?RKG��:�Gnq{-#ێ�̱e�'�k���
+�,p���4+�F
+N��&�˸���S�=Ɣv0�4P��R��9�{�ڑa=9�9��2��V��!��N�6qE`��܌�#sZ(j���}���q��?C��Mz�S6D���H�KI����ٝ�e���P'��<^����@�����)P��

data/lib/subunit.rb

@@ -6,14 +6,17 @@ class Subunit
 
   attr_reader :to_a, :to_h, :to_i
   
-  def initialize(raw_units=nil, obj)
+  def initialize(raw_units={}, obj)
+    
+    @debug = false
     
     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
       
@@ -24,7 +27,49 @@ 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
+  #
+  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
+  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}
@@ -65,12 +110,13 @@ class Subunit
     
     val, label = method((u.class.to_s.downcase + '_subunit').to_sym).call(u)
     units = multiply_units(raw_units.values).reverse
-    @to_a  = a = scan_units(units, val).map(&:to_i).reverse\
-        .take_while {|x| x != 0}.reverse
+    puts 'units: ' + units.inspect if @debug
+    @to_a  = a = scan_units(units, val).map(&:to_i)   
     
-    puts 'a: ' + a.inspect
-    @to_h = Hash[(raw_units.keys.reverse + [label]).reverse.take(a.length)\
-                 .reverse.zip(a)]
+    puts 'a: ' + a.inspect if @debug
+    pairs = (raw_units.keys.reverse + [label]).reverse.take(a.length)\
+                 .reverse.zip(a).select {|x| x[1] > 0}
+    @to_h = Hash[pairs]
   end
 
   def array_units(raw_units=[], u=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subunit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNDI3MjM0ODI3WhcN
-  MjAwNDI2MjM0ODI3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCmly8w
-  nwnaeuxVjbw+3wcyGZWeHd3Z7aZmeoRZQR4NHdmkpc0K27epD/UzGDjtDE+EEocz
-  k9mx6tphpxZgKAZrsmVPLvidQ/sGa2RnbihsXBJrPgNLLONh+6jD5hMIYgah9T4w
-  qeGiC4O6S+m4W66ISTVqxB2cUWBnsBb/54P5NwvvBAW7/JRRNeRMRKMgmTcAcTKn
-  UQkGwUeLwUuTP3W6GsimQIBy+U4cmhH4jAlrS6eblKgrn3L9900TjdX+UPLMD7YN
-  GZ8Ju7LnUerYsMtIG9mQNBurWNha1eoxwgshy4wyqZmALqf97KyBFiFUMDL5C98T
-  pjJQatMMRHE68PeNyH1VQiYqoM6WIJ/l5tIvK3tyBDevwc+M/ZeMz+MQ5MNYbRqa
-  SHvAB5GErCVy8vTmdr5AgyrZAOuZgp4N8g0BGbCKswyb9nSfjtKzz49F3xjZBCIz
-  t+JqHb+27kpsVGjnRBBxePz3G6kN0r+xjYmVTw3z54lVkd1ZkXS3iMNpI28CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUqD2uZD/n
-  hNsUWtYl8NVrrdIwjkswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjExMTMxNTI0WhcN
+  MjEwNjExMTMxNTI0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDYDasD
+  frBDuzdjPpkYhCiMX91fqK5KPRp1SD8Wms+WXaLYTqyK2bWSWarsGVuYmKculwT0
+  Am6q5L99yRPvYJmxNcd42V2+FuYmPtXTwi4aeiV8uuIFHqABp73fv6EYFdIfrRvC
+  Ws0ZH5+xjTbPNoewXWfi6JeXuWiM3aA89g8AX9PHaZY9lNN2cNC77kkxbcmDkwCK
+  H4aOIlbscw85T4L7neA78b01WaNcGr6TnQeUYTrae7viihb3E1CQVWcg/N4e3yMV
+  km1eArbQYCnp4nkRyonsNTlUoWc0tVxF/ilemZBXiMaubNi81CVEIQHHjDVNbfyS
+  +6mFmwKhII55CqyFq+NwqLNgVUVxTnXEFJvKAhjWbnUUmnXgtsk9cHzyMaFl4YOK
+  Fx8RLiXqIREfnNmSg4P5gpYnAcm58UcXoraZiAJUKA6ntU1FIOrShzHj8IqtXvRu
+  FDbS8jAhda67n1gbVUMs2OY/sogmFGVKFO5xVarD35/BtzgfRNQK1wU4Yy8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOf0mcfDe
+  dXRdAXtTj85vBERBHqUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAIo0lK1UpmDF+a9y4oLHlYCUkHNRfkHNmA0Wkvx+U
-  Ml/F2fyaF6ExNEwFZ9XZ+FWThdVRZpkuu9hunyZrCJrpgs4o3M8OOtDd1tcGFwsj
-  3IwuYidg/sretOxbhpcQKR93w2p92u+MinU/apW4jejXh5F8xUbhrnxPve2uV6fV
-  aSmtdmLGgm4SOirBdHXO9zawBHJ8GHuz602+50HI59ZsiCxZAuptwZ8j4eqhVPYl
-  CzN7nh5QS4r112EFcMPdsxOaHHAdQydNs376B1qaJFDTojpT5m/sfFtGx5ocbnwH
-  bPVa0pPkosjZkV6ukvwlB8QihsgQwghL+a6KGU3QX6TrxWqVXhtUvLoKn/Q50WkX
-  0zZl4P6AtMjsjyockIUHpjLWfwqyoFZ9ESVTuDx3+A+CLO0YlCNfgP7Xh1ekFXzq
-  uGMIl8BnWCNm49x3eEN3MwPmBFKRKxYN/IIRsudfZiknlmLh52qBTQhzRuYAxgGQ
-  fvWjyxD+tAUHP6u1I7g+su4C
+  BgkqhkiG9w0BAQsFAAOCAYEAhaQ9BCV0ZKQeCdslSmkOLWKzKk6rffiOYUTQaqdv
+  FxLZb7I7ug6uzZdtdb7Y7yGgXes+Z0zR6VhNSwWlpFcHSIznWYJh5e6ET/3lDetk
+  wk204TgTuLDPA3USRS5BKWKi1sdqnWXJVLynJCZPIyV7ilbFKSl77Wa8IwWjyj7g
+  F05N7bMe3g0vECYHFBJJWCfy2d6jcv0/GG0BwEsLf91LwVg5bIAJ481EaWaKseWR
+  PAmD0vI08ssZY68aO08XgHP1JTLDXYeTqMS5BGeFWCkKhjlLnH+pamLB6lTD4ojL
+  uBZU7l7zO3ksoWsWIIp1bhvSZHE5sCaZmOKXPSN4gW065ieajGR0Ccv7k6JZK8pC
+  skCxe0yd2TnDrW5R51ocplcGDzryzTdvzaI4af8OQUWwshF+Ad7x4J7jdyu3WK1B
+  HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
+  SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu
@@ -63,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: subunit
+summary: Input a raw unit and it returns the denomination.
 test_files: []