timing 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f1bcb93afbfa766ddafe4737e0fd197ecc0a5a
-  data.tar.gz: 5d5f5fa1ff92269ec9911be451840fcf7c7f3f8e
+  metadata.gz: 360bd7d8b70b61144022f1ba72527e969bd89825
+  data.tar.gz: 948ef3019b6e63ded7ed4c8e0658ff36b00c26d7
 SHA512:
-  metadata.gz: 6435646102eaa16483a6e2cf3d58fecea34c1019f8814ccbf14da60f2efce6269e85653fb1c9a2189f76464e4e9d363f23a404cb3a90639f9a5b5a092d002eb1
-  data.tar.gz: 23b99900b3ceb825c6e4cefab489f9effc8a5dbf0c4607f8d119b65512f2429978da19bf0bbc5b05dbc0b830b0f9937458d6da72a13f039410e29ccbaa9144dc
+  metadata.gz: 5dd7d1e1340e44e1691ca26ab5ce51fd50bafdc627a45a64d4b7072be7cd2ed30b555d241e7d8e441fb6c73c72496ea569a7f7c125cf938cef5f93e3f248bcb5
+  data.tar.gz: 0ccdcb9ea732e7ed8a7c7e295c20a5f606e25126a9ecae8ae0e9c41d5ef7c85b0afddf7ea598d2ac87cb7a858bdd04e2aaf1baff123a651b3edc75b8a433666a

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/timing.svg)](https://rubygems.org/gems/timing)
 [![Build Status](https://travis-ci.org/gabynaiman/timing.svg?branch=master)](https://travis-ci.org/gabynaiman/timing)
-[![Coverage Status](https://coveralls.io/repos/gabynaiman/timing/badge.svg?branch=master)](https://coveralls.io/r/gabynaiman/timing?branch=master)
+[![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)
 
@@ -77,6 +77,11 @@ interval.to_minutes           # => 10080.0
 interval.to_hours             # => 168.0
 interval.to_days              # => 7.0
 interval.to_weeks             # => 1.0
+
+interval = Timing::Interval.seconds(1299785)
+interval.to_human                     # => 2w 1d 1h 3m 5s
+interval.to_human(biggest_unit: 'd')  # => 15d 1h 3m 5s
+interval.to_human(smallest_unit: 'm') # => 2w 1d 1h 3m
 ```
 
 

data/lib/timing/interval.rb

@@ -17,8 +17,28 @@ module Timing
       w: 60 * 60 * 24 * 7
     }
 
+    MULTIPLIER = {
+      s: 60,
+      m: 60,
+      h: 24,
+      d: 7,
+      w: 1
+    }
+
+    UNITS = UNITS_NAMES.map(&:first)
+
     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]
+    end
+
+    def self.between(time_1, time_2)
+      new (time_1 - time_2).round
+    end
+
     def initialize(seconds)
       raise ArgumentError, "#{seconds} is not a number" unless seconds.is_a? Numeric
       super seconds.abs
@@ -47,24 +67,38 @@ module Timing
     end
 
     def to_s
-      integer = CONVERSIONS.map { |u,f| [to_f / f, "#{to_i / f}#{u}"] }
-                           .sort_by { |v,t| v }
-                           .detect { |v,t| v == v.to_i }
-      integer ? integer[1] : "#{to_seconds}s"
+      representations = UNITS.map.with_index do |unit, i|
+        representation = to_representation(unit, false, false)
+        [representation, "#{representation.to_i}#{unit}"]
+      end
+      pair = representations.reverse.detect{ |value,representation| value == value.to_i }
+      pair && pair[1] || "#{to_seconds}s"
+    end
+
+    def to_human(options={})
+      biggest_unit = options.fetch(:biggest_unit, :w)
+      smallest_unit = options.fetch(:smallest_unit, :s)
+      last_index = UNITS.index(biggest_unit.to_sym)
+      first_index = UNITS.index(smallest_unit.to_sym)
+      units = UNITS[first_index..last_index]
+      representations = units.map.with_index do |unit, i|
+        acumulate = (i != last_index - first_index)
+        representation = to_representation(unit, acumulate)
+        [representation, "#{representation}#{unit}"]
+      end
+      representations.select{ |(value, string)| value > 0 }.map(&:last).reverse.join(' ')
     end
 
     def inspect
       "#{to_s} (#{to_seconds})"
     end
 
-    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]
-    end
+    protected
 
-    def self.between(time_1, time_2)
-      new (time_1 - time_2).round
+    def to_representation(unit, acumulate=false, truncate=true)
+      value = to_f / CONVERSIONS[unit]
+      value = value % MULTIPLIER[unit] if acumulate
+      truncate ? value.truncate : value
     end
 
   end

data/lib/timing/version.rb

@@ -1,3 +1,3 @@
 module Timing
-  VERSION = '0.0.11'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timing
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop