datey 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab3c2439b0aed6242f6fb27a7629c592d426d081
-  data.tar.gz: bd46309c4ad4fa17ef2dd06bf4b84d4a1d67eb02
+  metadata.gz: 4c021b138f9ffc9f5120511ea6475344f9d5a857
+  data.tar.gz: 9104ed36edc2508bf3528273e6351df06a2b8081
 SHA512:
-  metadata.gz: 6eb8ef6d1d567d3544b1a311374f3645181733cd6e3d80af84ea0904dc898750ce213e314d0122b245bc80254397745ed8532eff1da03fa61e97f8912ced997f
-  data.tar.gz: 94e6799a6490352c57c836073ea6f1b01b7c7b3a8e431fdfde48e30c0e6bc211fa021e7fc10bd3692351a4b83469b44fd96187514dd0029115a2a20cc6cea1da
+  metadata.gz: 27a9baed1791e3ff02905d3556372bb1fe1e1ffdf399ccbf90ee1d60a4f0da7e000a853bdf64d4cb8d8db024a9a8b37140c34daf78373751df02e051510d396a
+  data.tar.gz: 8c7a17904134ec19e0d9eda890386c4fae44a44a5d59b4de3b25f3bce688200163d17e9d16fcc292d5942af34156d4c42bdf7ea9f70dc8cdcf3942bae0636bc4

data/lib/datey.rb

@@ -3,8 +3,8 @@ require 'datey/interrogator'
 
 module Datey
   
-  def self.format(date)
-    Formatter.new(date)
+  def self.format(date, context = :past)
+    Formatter.new(date, context)
   end
   
   def self.interrogate(date)

data/lib/datey/formatter.rb

@@ -4,15 +4,16 @@ require 'datey/interrogator'
 module Datey
   class Formatter
 
-    def initialize(time)
+    def initialize(time, context = :past)
       @time = time
+      @context = context
     end
     
     #
     # Return the date and time
     #
     def date_and_time
-      "#{date} at #{time}"
+      @time.is_a?(Time) ? "#{date} at #{time}" : date
     end
     
     # 
@@ -36,11 +37,15 @@ module Datey
         "Yesterday"
       elsif interrogator.tomorrow?
         "Tomorrow"
-      elsif interrogator.last_x_days?(7)
-        "Last #{name_of_day}"
-      elsif interrogator.next_x_days?(6)
+      elsif @context == :future && interrogator.next_x_days?(6)
+        name_of_day
+      elsif @context == :future && interrogator.next_week?
+        "Next #{name_of_day}"
+      elsif @context == :past && interrogator.last_x_days?(6)
         name_of_day
-      elsif interrogator.next_week?
+      elsif @context == :past && interrogator.last_x_days?(12)
+        "Last #{name_of_day}"
+      elsif @context == :past && interrogator.next_x_days?(6)
         "Next #{name_of_day}"
       else
         string = "#{name_of_day} #{day_of_month} #{name_of_month}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datey
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for formatting & interrogating dates & times
 email: