describe_time 0.0.2 → 0.0.3

data/lib/describe_time.rb

@@ -1,13 +1,33 @@
 module DescribeTime
-  def self.describe_time(the_time = Time.now, current_time = Time.now)
-    if current_time - the_time < 0
-      puts "Time in the future"
+  def self.time_or_date(tm = Time.now, now = Time.now, time_fmt = '%H:%M', date_fmt = '%Y-%m-%d')
+    if tm.year == now.year && tm.yday == now.yday then
+      tm.strftime(time_fmt)
     else
-      if current_time - the_time < 5
-        puts "Seconds ago"
-      else
-        puts the_time
-      end
+      tm.strftime(date_fmt)
+    end
+  end
+
+  def self.approximate(the_time = Time.now, current_time = Time.now)
+    ts = current_time - the_time
+
+    if ts < 0
+      "time in the future"
+    elsif ts < 5        # <- Five seconds
+      "a few seconds ago"
+    elsif ts < 60       # <- One minute
+      "less than a minute ago"
+    elsif ts < 180      # <- Three minutes
+      "a few minutes ago"
+    elsif ts < 60 * 60  # <- One hour
+      "%d minutes ago" % (ts / 60).to_i
+    elsif ts < 2*60*60  # <- Two hours
+      "one hour and %d minutes ago" % ((ts - 60*60) / 60).to_i
+    elsif ts < 48*60*60 # <- Two days (48 hours)
+      "%d hours ago" % (ts / 60*60).to_i
+    elsif ts < 2*7*24*60*60 # <- Two weeks (14 days)
+      "%d days ago" % (ts / 24*60*60).to_i
+    else
+      "%d weeks ago" % (ts / 7*24*60*60).to_i
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: describe_time
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jonatan Magnusson
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Format date and time as readable strings