taw 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b9a19c55e5617db5db2515ac68aea8ee0b11d79dfc7020c5acb5238e388166
-  data.tar.gz: 52b4fe9f40ee42375290ac0c482f93aa54616d8e261a427fab5881d522bb1381
+  metadata.gz: 364a15751f2a8c3b37feea682f21de9d9c04294eb34d85ac107b50dfc7dde66c
+  data.tar.gz: 664902eedba625517ef65244b895ecf40ca5bb80373a04fb69a6bb28f483c742
 SHA512:
-  metadata.gz: ac42d4fca0c8b983350c9d86fb8c15875dcb49218f7fa72eaacc66c64f057a7aeed39f0d879a57f29b2e083c9c8fae98db5a858e0991d2969f7f59e12ee52c37
-  data.tar.gz: 0e37234d8a401c648cbd3fecc5a2666869389f98eb5566ef4ddb5dad60194b1546774bd1a30e808cbee60679bea9308c2c39f101b4f66e214de4f9c4cd556465
+  metadata.gz: 7a32918bd5062bcfb3611c8478e929bbc436064507f54ea9ed6248218f1a3a2253ab41a54dd13c640adc40e3aa95fb0309f42d5e1c8ce918018276443c618132
+  data.tar.gz: 2a050684f681d2edc17a0e57b7cd075fe71182bcb879cb1e59faa5bde437e0d6c974f37bf854cd224190a061823128aa674f14042ad09766f58953982aefd737

data/.travis.yml

@@ -2,4 +2,6 @@ sudo: false
 language: ruby
 rvm:
   - 2.5.0
-before_install: gem install bundler -v 1.16.1
+  - 2.4.3
+  - 2.3.6
+install: bundle install --jobs=3 --retry=3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taw (1.0.0pre)
+    taw (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,7 +1,9 @@
 # Taw
 
+[![Build Status](https://travis-ci.org/shime/taw.svg?branch=master)](https://travis-ci.org/shime/taw)
+
 **T**ime **A**go in **W**ords helper for non Rails projects.
-No dependencies. No assumptions about your codebase.
+No dependencies. No assumptions about your codebase. Minimalistic, ~80 SLOC.
 
 ## Usage
 
@@ -16,6 +18,12 @@ Taw.time_ago_in_words(Time.now - 63) + " ago"
 
 Taw.time_ago_in_words(Time.now - 60 * 60 * 2 - 63) + " ago"
 # => "2 hours and 1 minute and 3 seconds ago"
+
+Taw.time_ago_in_words(Time.now - 60 * 60 * 26 - 63, approx: 1) + " ago"
+# => "1 day ago"
+
+Taw.time_ago_in_words(Time.now - 60 * 60 * 26 - 63, approx: 2) + " ago"
+# => "1 day and 2 hours ago"
 ```
 
 ## Installation

data/lib/taw.rb

@@ -8,11 +8,15 @@ module Taw
   MONTH_IN_SECONDS = DAY_IN_SECONDS * 30
   YEAR_IN_SECONDS = MONTH_IN_SECONDS * 12
 
-  def self.time_ago_in_words(time)
-    Calculator.new.time_ago_in_words(time)
+  def self.time_ago_in_words(time, opts = {})
+    Calculator.new(opts).time_ago_in_words(time)
   end
 
   class Calculator
+    def initialize(opts)
+      @approx_units = opts[:approx]
+    end
+
     def time_ago_in_words(time)
       self.distance = Time.now - time
       calculate_distance
@@ -30,6 +34,11 @@ module Taw
       :months,
       :years
 
+    def approx_units
+      return @approx_units - 1 if @approx_units
+      -1
+    end
+
     def calculate_distance
       while distance > 0
         if distance < MINUTE_IN_SECONDS
@@ -80,17 +89,17 @@ module Taw
 
     def output_distance
       [
-        ("#{years} #{pluralize(years, "year", "years")}" if years && years > 0),
-        ("#{months} #{pluralize(months, "month", "months")}" if months && months > 0),
-        ("#{weeks} #{pluralize(weeks, "week", "weeks")}" if weeks && weeks > 0),
-        ("#{days} #{pluralize(days, "day", "days")}" if days && days > 0),
-        ("#{hours} #{pluralize(hours, "hour", "hours")}" if hours && hours > 0),
-        ("#{minutes} #{pluralize(minutes, "minute", "minutes")}" if minutes && minutes > 0),
-        ("#{seconds} #{pluralize(seconds, "second", "seconds")}" if seconds && seconds > 0)
-      ].compact.join(" and ")
+        ("#{years} #{pluralize(years, "year")}" if years && years > 0),
+        ("#{months} #{pluralize(months, "month")}" if months && months > 0),
+        ("#{weeks} #{pluralize(weeks, "week")}" if weeks && weeks > 0),
+        ("#{days} #{pluralize(days, "day")}" if days && days > 0),
+        ("#{hours} #{pluralize(hours, "hour")}" if hours && hours > 0),
+        ("#{minutes} #{pluralize(minutes, "minute")}" if minutes && minutes > 0),
+        ("#{seconds} #{pluralize(seconds, "second")}" if seconds && seconds > 0)
+      ].drop_while(&:nil?)[0..approx_units].compact.join(" and ")
     end
 
-    def pluralize(count, singular, plural)
+    def pluralize(count, singular, plural = "#{singular}s")
       count > 1 ? plural : singular
     end
   end

data/lib/taw/version.rb

@@ -1,3 +1,3 @@
 module Taw
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taw
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Hrvoje Šimić
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Time ago in words helper for non Rails projects.