From 42f14de6ab50d0e05f49f038e40b94b686701bf1 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Wed, 15 Jun 2011 19:44:07 +0100
Subject:  * Added Alert#subject to return source when subject unspecified  *
 Added extra arg to acknowledge!  * Alert#all_raised / all_cleared does not
 returned ack'd alerts  * Added sanitising for source/subject  * Catch empty
 alert_group notifications in AlertChanged  * Tidied up alert_group  * Added
 skip bytemark_auth when RACK_ENV is development  * Tidied up logging in
 MauveThread, Timer, UdpServer  * Added extra convenience methods to Time and
 Date  * Moved working/daylight/dead_zone hours into Time

---
 lib/mauve/mauve_time.rb | 210 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 190 insertions(+), 20 deletions(-)

(limited to 'lib/mauve/mauve_time.rb')

diff --git a/lib/mauve/mauve_time.rb b/lib/mauve/mauve_time.rb
index 504e6ae..2251c53 100644
--- a/lib/mauve/mauve_time.rb
+++ b/lib/mauve/mauve_time.rb
@@ -1,34 +1,204 @@
-
+require 'date'
 require 'time'
 
-module Mauve
+class Date
+  def to_mauvetime
+    Mauve::MauveTime.parse(self.to_s)
+  end
+end
 
-  class MauveTime < Time
-      
-    def to_s
-      self.iso8601
+class DateTime
+  def to_mauvetime
+    Mauve::MauveTime.parse(self.to_s)
+  end
+
+  def to_s_relative(*args)
+    self.to_time.to_s_relative(*args)
+  end
+
+  def to_s_human
+    self.to_time.to_s_human
+  end
+
+  def in_x_hours(*args)
+    self.to_s_human(*args)
+  end
+
+end
+
+class Time
+  def to_mauvetime
+    Mauve::MauveTime.at(self.to_i,self.usec)
+  end
+
+  def in_x_hours(n, type="wallclock")
+    t = self.dup
+    #
+    # Do this in minutes rather than hours
+    #
+    n = n.to_i*3600
+  
+    test = case type
+      when "working"
+        "working_hours?"
+      when "daytime"
+        "daytime_hours?"
+      else
+        "wallclock_hours?"
     end
 
-    def to_s_relative(now = MauveTime.now)
-      diff = (self.to_f - now.to_f).to_i
-      case diff
-        when -5184000..-17200 then "in #{-diff/86400} days"
-        when -172799..-3600 then "in #{-diff/3600} hours"
-        when -3599..-300 then "in #{-diff/60} minutes"
-        when -299..-1 then "very soon"
-        when 0..299 then "just now"
-        when 300..3599 then "#{diff/60} minutes ago"
-        when 3600..172799 then "#{diff/3600} hours ago"
-        when 172800..5184000 then "#{diff/86400} days ago"
+    step = 3600
+
+    #
+    # Work out how much time to subtract now
+    #
+    while n >= 0
+      #
+      # If we're currently OK, and we won't be OK after the next step (or
+      # vice-versa) decrease step size, and try again
+      #
+      if (t.__send__(test) != (t+step).__send__(test)) 
+        #
+        # Unless we're on the smallest step, try a smaller one.
+        #
+        unless step == 1
+          step /= 60
+
         else
-          diff > 518400 ?
-            "#{diff/2592000} months ago" :
-            "in #{-diff/2592000} months"
+          n -= step if t.__send__(test)
+          t += step
+
+          #
+          # Set the step size back to an hour
+          #
+          step = 3600
+        end
+
+        next
       end
+
+      #
+      # Decrease the time by the step size if we're currently OK.
+      #
+      n -= step if t.__send__(test)
+      t += step
+    end
+    
+    #
+    # Substract any overshoot.
+    #
+    t += n if n < 0
+
+    t
+  end
+
+  #
+  # The working day is from 8.30am until 17:00
+  #
+  def working_hours?
+    (1..5).include?(self.wday) and ((9..16).include?(self.hour) or  (self.hour == 8 && self.min >= 30))
+  end
+
+  #
+  # The daytime day is 14 hours long
+  #
+  def daytime_hours?
+    (8..21).include?(self.hour)
+  end
+  
+  #
+  # The daytime day is 14 hours long
+  #
+  def wallclock_hours?
+    true
+  end
+  
+  #
+  # In the DEAD ZONE! 
+  #
+  def dead_zone?
+    (3..6).include?(self.hour)
+  end
+    
+  def to_s_relative(now = Time.now)
+    #
+    # Make sure now is the correct class
+    #
+    now now.to_time if now.is_a?(DateTime)
+
+    raise ArgumentError, "now must be a Time" unless now.is_a?(Time)
+
+    diff = (now.to_f - self.to_f).round.to_i.abs
+    n = nil
+
+    if diff < 120
+      n = nil
+    elsif diff < 3600
+      n = diff/60.0
+      unit = "minute"
+    elsif diff < 172800
+      n = diff/3600.0
+      unit = "hour"
+    elsif diff < 5184000 
+      n = diff/86400.0
+      unit = "day"
+    else
+      n = diff/2592000.0
+      unit = "month"
+    end
+
+    unless n.nil?
+      n = n.round.to_i 
+      unit += "s" if n != 1
+    end
+
+    # The FUTURE
+    if self > now
+      return "shortly" if n.nil?
+      "in #{n} #{unit}"
+    else
+      return "just now" if n.nil?
+      "#{n} #{unit}"+" ago"
+    end
+  end
+
+  def to_s_human
+    _now = Time.now
+
+    if _now.strftime("%F") == self.strftime("%F")  
+      self.strftime("%R today")
+
+    # Tomorrow is in 24 hours
+    elsif (_now + 86400).strftime("%F") == self.strftime("%F")
+      self.strftime("%R tomorrow")
+
+    # Yesterday is in 24 ago
+    elsif (_now - 86400).strftime("%F") == self.strftime("%F")
+      self.strftime("%R yesterday")
+
+    # Next week starts in 6 days.
+    elsif self > _now and self < (_now + 86400 * 6)
+      self.strftime("%R on %A")
+
+    else
+      self.strftime("%R on %a %d %b %Y")
+
     end
 
   end
 
 end
 
+module Mauve
+  class MauveTime < Time
+
+    def to_s
+      self.iso8601
+    end
 
+    def to_mauvetime
+      self
+    end
+    
+  end
+end
-- 
cgit v1.2.1