epitools 0.5.42 → 0.5.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e79467768b0f577f8f5abc4759c803db80c09ef
-  data.tar.gz: 3f7dd61e9c7e55ebfa7229f96ebc33eb3e3d7b00
+  metadata.gz: 18aedb7dadd9b9a8cdfe9b619d228dc250ff2c0b
+  data.tar.gz: 41feba1a86b88e3f0790151ef815e5f1c1ebf680
 SHA512:
-  metadata.gz: 062d1d28880dc3912788142ec6d9b8e83be4690bb371940c82b68fd8c71986a3b9a14476f2e204b1370e30c42ba82985ea5771b32e97ad10a1a767b8474ec734
-  data.tar.gz: 09e27bd437b0dc4a7a1ae64a6c87972251aa10def9b2e34d2a5283e885a95a058a3d7afe711c16db90068a6e98f7d7ea9826a535455763f1f9a70f479ac6343f
+  metadata.gz: abf447f70c70e0b79f3b949a1faca4569f45325244dce43fffd1c139d94ff31c03151aec3368a6b18b8e528dec558572db31bc0385a993589297063fd7f6bf4f
+  data.tar.gz: 55c84b31bb1f3182ea56354649036df86add2c3d72c4a80aba726f8db7ee4ad01692fb523dd80d353fe3a0d10c0652f8b5a941f64f22cc642ead7a567a32e439

data/VERSION

@@ -1 +1 @@
-0.5.42
+0.5.43

data/lib/epitools/core_ext/numbers.rb

@@ -168,6 +168,25 @@ class Numeric
 
   alias_method :human_size, :human_bytes
 
+  #
+  # Convert seconds to hours:minutes:seconds (hours is dropped if it's zero)
+  #
+  def to_hms
+    seconds = self
+
+    days, seconds    = seconds.divmod(86400)
+    hours, seconds   = seconds.divmod(3600)
+    minutes, seconds = seconds.divmod(60)
+    seconds, frac    = seconds.divmod(1)
+
+    result = "%0.2d:%0.2d" % [minutes,seconds]
+    result = ("%0.2d:" % hours) + result   if hours > 0 or days > 0
+    result = ("%0.2d:" % days)  + result   if days > 0
+    result += ("." + frac.round(2).to_s.split(".").last[0..1]) if frac > 0
+
+    result
+  end
+
 end
 
 
@@ -252,23 +271,6 @@ class Integer
   end
   alias_method :fibonacci, :fib
 
-  #
-  # Convert seconds to hours:minutes:seconds (hours is dropped if it's zero)
-  #
-  def to_hms
-    seconds = self
-
-    days, seconds    = seconds.divmod(86400)
-    hours, seconds   = seconds.divmod(3600)
-    minutes, seconds = seconds.divmod(60)
-
-    result = "%0.2d:%0.2d" % [minutes,seconds]
-    result = ("%0.2d:" % hours) + result   if hours > 0 or days > 0
-    result = ("%0.2d:" % days) + result    if days > 0
-
-    result
-  end
-
 end
 
 #

data/lib/epitools/core_ext/string.rb

@@ -336,11 +336,15 @@ class String
   end
   
   #
-  # Converts time duration strings (mm:ss, hh:mm:ss, or dd:hh:mm:ss) to seconds.
+  # Converts time duration strings (mm:ss, mm:ss.dd, hh:mm:ss, or dd:hh:mm:ss) to seconds.
   # (The reverse of Integer#to_hms)
   #
   def from_hms
-    nums = split(':').map(&:to_i)
+    nums = split(':')
+
+    nums[-1] = nums[-1].to_f if nums[-1] =~ /\d+\.\d+/ # convert fractional seconds to a float
+    nums.map! { |n| n.is_a?(String) ? n.to_i : n } # convert the rest to integers
+
     nums_and_units = nums.reverse.zip %w[seconds minutes hours days]
     nums_and_units.map { |num, units| num.send(units) }.sum
   end

data/spec/core_ext_spec.rb

@@ -764,6 +764,13 @@ end
 describe "to_hms and from_hms" do
   60.to_hms.should == "01:00"
   60.to_hms.from_hms.should == 60
+
+  60.1.to_hms.should == "01:00.1"
+  60.1.to_hms.from_hms.should == 60.1
+
+  60.15.to_hms.should == "01:00.15"
+  60.2892.to_hms.should == "01:00.29"
+
   "1:20:33".from_hms.to_hms.should == "01:20:33"
   "5:01:20:33".from_hms.to_hms.should == "05:01:20:33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.42
+  version: 0.5.43
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec