subunit 0.2.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59b28aaf42c101bca335b4dd7959a47cc813569e
-  data.tar.gz: 77edd25cabe13cf5b3bd6f7b34545e1e87b1e114
+SHA256:
+  metadata.gz: 6f79f4af50bd21b1fbc2ab5d0f182604abdaccd2d71635a2de7608f0284b30b1
+  data.tar.gz: b0250717312d90e88426144fb0f5d52777302c84a7557784741bf6b0340d26f2
 SHA512:
-  metadata.gz: 9f865a794cb2395acc11d92947f7adf908a45752f8ce1f5861aa1eee2774ad3bdbd3faa895e1ff3ddc4e3c45d2ed0a4ad2310824064458a8329ffb66d4e43e05
-  data.tar.gz: 9fa312bde243b26ced1dd6d7b7f457c253762f1e45a142ef5fdc7885f7b61708b59db62ff77e638604d239c6eda5c71d9c903d26afb2676429386d0b117a94a7
+  metadata.gz: 4ae5c071276ca33df749097b7f0afbf603fd74073fc13063282d4b436be27464f683dc1c5f29081c9eb204274e68980aeb98a5b53534027e41acf59390966387
+  data.tar.gz: 186200ad80cefe4fd019e1c975db08b0461bed1405e49d78a77056cb437cc62866f79e078e42fb7844c3a7de8e32730ea6ad624cf972dc3001608b949fee3fd7

data/lib/subunit.rb

@@ -1,12 +1,52 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
+
 # file: subunit.rb
 
 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
+      len = raw_units.to_a.length
+      @to_i = ([0]*(len-1) + a).slice(-(len), len).zip([60, 60, 1])\
+          .inject(0) {|r,x| r + x.inject(:*) }
+      
+    else
+      
+      raw_subunit = obj || 0
+      method((raw_units.class.to_s.downcase + '_units').to_sym)\
+          .call(raw_units, raw_subunit)
+      
+    end
+  end
+  
+  def to_s(omit: [])
+    
+    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}        
+        
+    duration = case a.length
+
+    when 1
+      a.first  
+    when 2
+      a.join ' and '
+    else                   
+      "%s and %s" % [a[0..-2].join(', '), a[-1]]
+    end
+    
+    duration.gsub(/(\b1 \w+)s/, '\1')
+
   end
 
   private
@@ -24,10 +64,16 @@ class Subunit
   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
-    @to_a = scan_units(units, val).map(&:to_i)
-    @to_h = Hash[(raw_units.keys.reverse + [label]).zip(@to_a)]
+    puts 'units: ' + units.inspect if @debug
+    @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}
+    @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.2.5
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,31 +10,35 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTIyNTExNDQwNVoXDTE3MTIyNTExNDQwNVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN3LWwG+dRPJguokUCPxtB873JyfNUU/sYL96sRbk8xX+V2iLNwKOhupqCkh
-  RtnG4DTjc1fGlaXs9cbukAjyFmjrv1+ZmMyTZebB8rJkD7BL0pj8KQgwWVJ05RYN
-  cZNeoWM85ccdq2yYUzSSKc26x74HSroguaeodo3C6fbb2XGDJnS/Ffx3VR4OVfxl
-  eBna6huFepp4BUnPn0PKqrgva1SXFPkFU3O9tcPB1QCMGC3RejdC9VLclzeJjGNC
-  j3kQYsdFmcO8O9Ns4+iabdIcpWJbEapn493q80VCkI31G/jYzZ9NnP5/lcPDk7BK
-  Zxv87spidXj/RFjOjoTt4wKjpzkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUWTh7hU/yB/3up7nOiIh0dpOzNjEwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAhZz/3Gi0
-  1qrGlu+UUVk7LL3zKSqmldcVZs7Rb8P4Tk1zbqNgrwA2xmTOlmAkeOLSHQ0djjnZ
-  z+V5uNZ2RZ1qe5jnMkR34dkQrQ4aJIHABaMIiXATR+A1xY9bGiwFaoqQdqCXW8D9
-  arSsyB4V/BODb8XG9e0OUYVj2yfJgWPELKXBc7N7EiQ+pxZbCWMVKJplXMspt2vm
-  MktgVQiDwDUH523sDXFcWBOpxGqCTd8Rn9pHeeR5O0TOGv+HhKQwp96/q3BXWJYV
-  jRLTmInXW6D2qCYhnTg1lnKahOHZwk3PSyvv3fUBYiwNQJBumSY95yvIoZpFjRNc
-  UlPQMCJOB3GcUw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjExMTMxNTI0WhcN
+  MjEwNjExMTMxNTI0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDYDasD
+  frBDuzdjPpkYhCiMX91fqK5KPRp1SD8Wms+WXaLYTqyK2bWSWarsGVuYmKculwT0
+  Am6q5L99yRPvYJmxNcd42V2+FuYmPtXTwi4aeiV8uuIFHqABp73fv6EYFdIfrRvC
+  Ws0ZH5+xjTbPNoewXWfi6JeXuWiM3aA89g8AX9PHaZY9lNN2cNC77kkxbcmDkwCK
+  H4aOIlbscw85T4L7neA78b01WaNcGr6TnQeUYTrae7viihb3E1CQVWcg/N4e3yMV
+  km1eArbQYCnp4nkRyonsNTlUoWc0tVxF/ilemZBXiMaubNi81CVEIQHHjDVNbfyS
+  +6mFmwKhII55CqyFq+NwqLNgVUVxTnXEFJvKAhjWbnUUmnXgtsk9cHzyMaFl4YOK
+  Fx8RLiXqIREfnNmSg4P5gpYnAcm58UcXoraZiAJUKA6ntU1FIOrShzHj8IqtXvRu
+  FDbS8jAhda67n1gbVUMs2OY/sogmFGVKFO5xVarD35/BtzgfRNQK1wU4Yy8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOf0mcfDe
+  dXRdAXtTj85vBERBHqUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAhaQ9BCV0ZKQeCdslSmkOLWKzKk6rffiOYUTQaqdv
+  FxLZb7I7ug6uzZdtdb7Y7yGgXes+Z0zR6VhNSwWlpFcHSIznWYJh5e6ET/3lDetk
+  wk204TgTuLDPA3USRS5BKWKi1sdqnWXJVLynJCZPIyV7ilbFKSl77Wa8IwWjyj7g
+  F05N7bMe3g0vECYHFBJJWCfy2d6jcv0/GG0BwEsLf91LwVg5bIAJ481EaWaKseWR
+  PAmD0vI08ssZY68aO08XgHP1JTLDXYeTqMS5BGeFWCkKhjlLnH+pamLB6lTD4ojL
+  uBZU7l7zO3ksoWsWIIp1bhvSZHE5sCaZmOKXPSN4gW065ieajGR0Ccv7k6JZK8pC
+  skCxe0yd2TnDrW5R51ocplcGDzryzTdvzaI4af8OQUWwshF+Ad7x4J7jdyu3WK1B
+  HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
+  SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -60,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: subunit

metadata.gz.sig

@@ -1,4 +1 @@
-ٱ\��?oo�X�	��>�����2�Pw�"�0h�bx��jJ�]�;Ř�1E��P6�
-��׳
��y�(���8�k��
-��v��9�Fg�VK^�'j�}�Wш'��DŽ���]qD��grb��WoA���`U%��'1�<��p���sq�;=��d�>z�^^w���`��F��X��7��\����A�br6s+�Va�����M�ǃr
~rW�xPQ�#pb�e�
-'�r
}5�*XIw�+z
+Q�r1��*���'�)�|����X�������#+d�z�B�:�;YQU�I}����\�Cւf]�E%<���Y��T�m�5�~p}!