subunit 0.8.0 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4466d231e3c336adf393301ac33736362e1ba2996bfa0a42f2ca56be949ffbff
-  data.tar.gz: daff11e883761163e31f79d431f91ad1ad10790f613359a0aa593a29da82a57a
+  metadata.gz: 2e76018bbc5927b0645dc9b7b35df35041719bbcac77e078306edd8f00a83f04
+  data.tar.gz: 68057c6ef69c1cf21d554502f8c9055da642729614dadd3d2418f7fa8c55af51
 SHA512:
-  metadata.gz: cd3f645fc57ea4badfbc121d02ba36edc240b063bebb468804dfe5a451b9d6abf084b3c59cc346302fad9e2fbda381aa82831f677789ac6c8bfd99b305dbf9fd
-  data.tar.gz: 2fefff70fc6f6144c2f4fc5c0c691bd354ce42f770478ad8c8c93e8860175d833021900fc2b84ef6a363bd45eda21ef8dd4d4bb9b4fa83632425609d8f0e69db
+  metadata.gz: c322cef743c9ab764bd35158e68867cf5879e254427aad7351a2f3a0e222effc4a9597637f22f69250df7d058e4ad8e2ab42b74218a98db8e47d47da71433fe3
+  data.tar.gz: '09affcc2c6235d9bd29a03441b6bf64298a3aa7a46062b3a47753302a0f7d1088fec5d6c73c186e232181447dafeb6da1a1bb296303c109197aca89f9074a568'

data/lib/subunit.rb

@@ -16,10 +16,17 @@ 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)
@@ -27,19 +34,17 @@ class Subunit
     @debug = false
     
     @raw_units = raw_units
+        
+    accumulate = ->(a) {
     
-    
-    accumulate = ->(obj) {
-      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(:*) }
-      val + obj[-1]      
+          .inject(0) {|r,x| r * x[1] + x[0] }    
     }
     
     if obj.is_a? String
       
-      @to_i = accumulate.call obj.split(' ').map(&:to_i)
+      @to_i = accumulate.call obj.split(/\D+/).map(&:to_i)
           
     elsif obj.is_a? Array then
             
@@ -58,18 +63,34 @@ 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|
+      
+      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|
+    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
       
-      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$/,'')
@@ -87,6 +108,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
@@ -170,3 +196,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.8.0
+  version: 0.8.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
   SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2020-10-08 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.