subunit 0.7.0 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc45950417e19ac0a19525e892afae96c9bdfd000e13ecd5638e19cf210a564
-  data.tar.gz: 8332af06d795048f2736f31a11c5ffecf59dbe7a8005a2ed7751e9b5b4037725
+  metadata.gz: 55e24efd3496c6090f8b887857fbefd3dc2a76f4a61fb4a8c3a6f19490bfa153
+  data.tar.gz: fd0af0f6e4fd910898141aa6c7bc13049cd2cd728ba4a9e19a5ab5a8cf9bf558
 SHA512:
-  metadata.gz: 407ad2ccc1947d1adc2f32c98a606bda8d453be2bc18217b48a09ee9ac6010568db36e54577069188ad4ac319f17cf336ca60d691e524efd55f2c4e8eff92b72
-  data.tar.gz: 3360ae777ff80f1f7f81735be7321dea7bc7542c8903467c6427cd4dcbaf168dfc8c01453100fe55db6e385ff7a8717f2f0cf2f3073aaf562e4d148376b83dfb
+  metadata.gz: 9c2ff98f077a42af3dffc3788961f99bd98fb6643c5987f472e640094a485c138a8a4065a0832c98f27fd4b578d3e0972f1c5ae44a019014471e5cb2ef8e5bc1
+  data.tar.gz: 9ea37778dd9fe8cf32278572a70d4d188ee9b59a460e5e8139bc2e2ff28a13a8055d71d79a7205738c2504fdf595e76ab29c5825f7b749db392a30dedd8a784b

data/lib/subunit.rb

@@ -2,12 +2,31 @@
 
 # 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)
+  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   
+  #
+  def self.hms_to_seconds(obj)
+    new(units={hours:60, minutes:60,seconds: 60, }, obj).to_i
+  end  
+
   attr_reader :to_a, :to_h, :to_i
   
   def initialize(raw_units={}, obj)
@@ -15,14 +34,21 @@ class Subunit
     @debug = false
     
     @raw_units = raw_units
+        
+    accumulate = ->(a) {
     
-    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]
+          .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
       
@@ -37,18 +63,32 @@ class Subunit
   #           .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 
+  #               ignoring the remainder
   #
   def strfunit(s)    
     
-    s.sub!('%x') do |x|
-      to_h.map {|label, val| val.to_s + label[0]}.join(' ')
+    # 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|
+      
+      a = to_h.to_a
+      a2 = (a.length > 1 and x[-1][/i$/]) ? a[0..-2] : a
+      a2.map {|label, val| val.to_s + label[0]}.join(' ')
+      
     end
     
-    s.sub!('%X') do |x|
+    s.sub!(/%Xi?/) do |x|
+
+      a = to_h.to_a
+      a2 = (a.length > 1 and x[-1][/i$/]) ? a[0..-2] : a      
       
-      to_h.map do |label, val| 
+      a2.map do |label, val| 
         
         next if val == 0
         label2 = val > 1 ? label.to_s : label.to_s.sub(/s$/,'')
@@ -66,6 +106,11 @@ class Subunit
       fmt = a.map {|v| "%0" + v.to_s.length.to_s + "d"}.join(":")
       fmt % to_a
     end    
+    
+    s.sub!('%s') do |x|
+      label, val = to_h.first 
+      val.to_s + label[0]
+    end    
 
     s
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subunit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
   SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu
@@ -63,7 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Input a raw unit and it returns the denomination.