timing 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b16375eacb664a9fc429038679b0d073c5696a02b6029bd51e502df688853acd
-  data.tar.gz: df7628ee9e1376f999c733c267b2623bcd9319df9e1443d8d8295036da92c36e
+  metadata.gz: 666ee7049eb29d589431eec63fbf54a6e79a75f4ff418e5a3fa13c54cea11ae5
+  data.tar.gz: 6e32f64a0c6568637090b038f9d0f30ba936925ede0bb6b18c1168c429e38f14
 SHA512:
-  metadata.gz: e53f8ab91e2a795f0c4d271a8303280e48f00d3cb34c8a7133ad893a3386dcb1ef3d0ef03339c47f6dbebbbf166d0cb4867e781ceba7e79dc2eaba585de9cacb
-  data.tar.gz: 994ee3eb9511f14f5603384e0ca537c72aa333c76001efcee98387e99bd36dc39790e72be46b224f1ec3a9fcf907d5ba37757dff96620af2ebdab31e5dcbb836
+  metadata.gz: 0cd864c3df88c5bf92863df0becba24a1dd144797f317d529b2f10cdc880ab4fda53a64f0f664a2c4caf5f62c24419128edefacb75f255c0b2664cbaae26c75a
+  data.tar.gz: 20fb404748aa83b1bdd47e0d6c8e5565336d7c0007acaf885095a898a24208e333f6de3b348a68f15fc812e1a8189f3ab68b5da81fe7feded8eafc3681bc1fac

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://travis-ci.org/gabynaiman/timing.svg?branch=master)](https://travis-ci.org/gabynaiman/timing)
 [![Coverage Status](https://coveralls.io/repos/github/gabynaiman/timing/badge.svg?branch=master)](https://coveralls.io/github/gabynaiman/timing?branch=master)
 [![Code Climate](https://codeclimate.com/github/gabynaiman/timing.svg)](https://codeclimate.com/github/gabynaiman/timing)
-[![Dependency Status](https://gemnasium.com/gabynaiman/timing.svg)](https://gemnasium.com/gabynaiman/timing)
 
 Time utils
 
@@ -70,6 +69,7 @@ Timing::Interval.parse('15m') # => 15m (900.0)
 Timing::Interval.parse('7h')  # => 7h (25200.0)
 Timing::Interval.parse('5d')  # => 5d (432000.0)
 Timing::Interval.parse('2w')  # => 2w (1209600.0)
+Timing::Interval.parse('1m 10s')  # => 1m 10s (70.0)
 
 interval = Timing::Interval.weeks(1)
 interval.to_seconds           # => 604800.0

data/lib/timing/interval.rb

@@ -1,12 +1,12 @@
 module Timing
   class Interval < TransparentProxy
-    
+
     UNITS_NAMES = {
       s: :seconds,
       m: :minutes,
       h: :hours,
       d: :days,
-      w: :weeks 
+      w: :weeks
     }
 
     CONVERSIONS = {
@@ -30,9 +30,13 @@ module Timing
     REGEXP = /^([\d\.]+)([smhdw])$/
 
     def self.parse(expression)
-      match = REGEXP.match expression.strip
-      raise "Invalid interval expression #{expression}" unless match
-      new match.captures[0].to_f * CONVERSIONS[match.captures[1].to_sym]
+      seconds = expression.split(' ').inject(0) do |total, value|
+        match = REGEXP.match value.strip
+        raise "Invalid interval expression #{expression}" unless match
+        total + match.captures[0].to_f * CONVERSIONS[match.captures[1].to_sym]
+      end
+
+      new seconds
     end
 
     def self.between(time_1, time_2)

data/lib/timing/version.rb

@@ -1,3 +1,3 @@
 module Timing
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timing
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -208,8 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Time utils