subunit 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e072b264f9489f8a361bb112ee55674252c390a0cf2baf4089ae6db19ebcd24d
-  data.tar.gz: e31e73f50fcbce96a7b9e81dd214b87c005af891d7b22d32aa33a9944f0aa06c
+  metadata.gz: 91907a5881a1b4f38c855693b78cd72c7ab944edc8370b78922ac261bfdf8165
+  data.tar.gz: b0ecdcfe9761bceb2abfab49fd353e56cc6809590a4047cc26af262bf38ba0d7
 SHA512:
-  metadata.gz: 732e3a771d27ae1228a4885d9778af05da349b788472fa9d15397a368cf5b8d0bb7829eb1bf76a069178bfc0775ae78cf599e0bd217aeec8eb749fd03fa1b56a
-  data.tar.gz: 138e09917e9d2b8679bb915350bab515d26c21e8561d89b1bae9cb951f22e68456cfef9753ad93ac1e116ace828b8e5169d14603df789b3b1f337891cad57fb9
+  metadata.gz: 4a653b499f5d8521dc18c488c804f5506a2120ce2255e2b5cd027dc64ac7b4104f719e9e12bb4d9109c976b3990995ee6a1ed39183f488b5df7d00905e890a68
+  data.tar.gz: 6f4b1109dce2045afdd768478feac71a9990a098e2be27669e4ee3282e1f850e6e3d5d8f5ac3bffbc477867f552ebd61fe14e4b24aa79a5e509cb4c096553ba5

data.tar.gz.sig

@@ -1,2 +1,3 @@
-q����<i֛��z��E�9��ߊ�-Sta8E�����זc�{�����:eB�o�L#�Jce��ҁy���N���߰�h�p3�sj.	f	���7�;�p�n�	�������;����W��;d�"
3��r\�a႑��Ʀڵ٤A��o	�O�^C�9�����P8@�����LyH%9�=o��Wʦ?�c�V��R~�|�L+�x�H�m����洛C��P�K�x��(�ф�pB�����'�.�,0І}*��'׹jg�Y~�k23	��ؼM�������W�!�)8��inc�1���P��D2�)v_�C��1�R�3,�D��
-
+G�|��R�do�&kZ�C��0���g8wM��$���=Sm"F׮:)�
+J�֖0�uXڑ��$�L��o�����8`�Z����C��D��=��1y��M�u��\L6�LN*�_UO9�+�~Z2e-�>˅�5�l9�Z�oGA/�2J�c�c^�ϓZZ���{Fy<���Dᣳ;X�L2�o�&�x��7m<��b���lE��ϋ�Ӯ��=0�߻J��e��g{>o���XӅbc(4Wo���QX�+�?i)!���u�%��Jmm�����l�ʽ���������e=hz��W�c�LI�r�Ќ��
+

data/lib/subunit.rb

@@ -4,13 +4,55 @@
 
 class Subunit
 
-  attr_reader :to_a, :to_h
+  attr_reader :to_a, :to_h, :to_i
   
-  def initialize(raw_units=nil, raw_subunit=0)
-    method((raw_units.class.to_s.downcase + '_units').to_sym).call(raw_units, raw_subunit)
+  def initialize(raw_units={}, obj)
+    
+    @debug = false
+    
+    if obj.is_a? Array then
+      
+      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]
+      
+    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
+  #
+  def strfunit(s)
+    
+    s2 = to_h.map {|label, val| val.to_s + label[0]}.join(' ')
+    s.sub('%x', s2)
+
   end
   
-  def to_s(omit: [])
+  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}
@@ -51,12 +93,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)
@@ -73,3 +116,4 @@ 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.3.0
+  version: 0.6.0
 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-04-27 00:00:00.000000000 Z
+date: 2020-09-05 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: []