datey 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c021b138f9ffc9f5120511ea6475344f9d5a857
-  data.tar.gz: 9104ed36edc2508bf3528273e6351df06a2b8081
+  metadata.gz: 945c401e07ea2b21c51056482e42e2aaa47c4d51
+  data.tar.gz: cc7b40742f06334ca2fac9f892d965b839c58c63
 SHA512:
-  metadata.gz: 27a9baed1791e3ff02905d3556372bb1fe1e1ffdf399ccbf90ee1d60a4f0da7e000a853bdf64d4cb8d8db024a9a8b37140c34daf78373751df02e051510d396a
-  data.tar.gz: 8c7a17904134ec19e0d9eda890386c4fae44a44a5d59b4de3b25f3bce688200163d17e9d16fcc292d5942af34156d4c42bdf7ea9f70dc8cdcf3942bae0636bc4
+  metadata.gz: 8eb14d6c0edb6765b8810deb82ced3873911cd357678dfdb2242a944ca7af1cc7016f31c694db1dac3b7749dc5e1401fcda9a1192cbb479e5db9282259fd4029
+  data.tar.gz: 56ed4a11fcb83f1a4185b05075394f71344101b4d8aa425d0e210c040c06bd631ceb7e28cbe76d94077ee21bbb256b13983b5f856419def5fa6425d0d031190f

data/lib/datey/formatter.rb

@@ -8,52 +8,59 @@ module Datey
       @time = time
       @context = context
     end
-    
+
     #
     # Return the date and time
     #
-    def date_and_time
-      @time.is_a?(Time) ? "#{date} at #{time}" : date
+    def date_and_time(options = {})
+      @time.is_a?(Time) ? "#{date(options)} at #{time(options)}" : date(options = {})
     end
-    
-    # 
+
+    #
     # Return the time nicely
     #
-    def time
+    def time(options = {})
       if @time.is_a?(Time)
         @time.strftime("%l#{@time.min > 0 ? ":%M" : ''}%P").strip
       else
         nil
       end
     end
-    
+
     #
     # Return the formatted date (no time)
     #
-    def date
+    def date(options = {})
+      non_relative_prefix = options[:non_relative_prefix] || "on "
       if interrogator.today?
-        "Today"
+        result = "today"
       elsif interrogator.yesterday?
-        "Yesterday"
+        result = "yesterday"
       elsif interrogator.tomorrow?
-        "Tomorrow"
+        result = "tomorrow"
       elsif @context == :future && interrogator.next_x_days?(6)
-        name_of_day
+        result = non_relative_prefix + name_of_day
       elsif @context == :future && interrogator.next_week?
-        "Next #{name_of_day}"
+        result = "next #{name_of_day}"
       elsif @context == :past && interrogator.last_x_days?(6)
-        name_of_day
+        result = non_relative_prefix + name_of_day
       elsif @context == :past && interrogator.last_x_days?(12)
-        "Last #{name_of_day}"
+        result = "last #{name_of_day}"
       elsif @context == :past && interrogator.next_x_days?(6)
-        "Next #{name_of_day}"
+        result = "next #{name_of_day}"
       else
-        string = "#{name_of_day} #{day_of_month} #{name_of_month}"
-        string += " #{@time.year}" if include_year_in_dates?
-        string
+        result = non_relative_prefix + "#{name_of_day} #{day_of_month} #{name_of_month}"
+        result += " #{@time.year}" if include_year_in_dates?
+        result
       end
+
+      unless options[:capitalize] == false
+        result[0] = result[0].upcase
+      end
+
+      result
     end
-    
+
     #
     # Return the day of the month ordinalized
     #
@@ -66,45 +73,45 @@ module Datey
       end
       "#{@time.day}#{ordinal}"
     end
-    
+
     #
     # Return the name of the day
     #
     def name_of_day(style = :full)
       @time.strftime(style == :full ? "%A" : "%a")
     end
-    
+
     #
     # Return the name of the month
     #
     def name_of_month(style = :full)
       @time.strftime(style == :full ? "%B" : "%b")
     end
-    
+
     private
-    
+
     #
     # Return an interrogator object for the date we're formatting
     #
     def interrogator
       @interrogator ||= Interrogator.new(@time.to_date)
     end
-    
+
     #
     # Should years be included in dates?
     #
     def include_year_in_dates?
       if @time.year != Date.today.year
-        # If the year was in the past, always include the year 
+        # If the year was in the past, always include the year
         return true
       end
-      
+
       if @time.year == Date.today.year && @time.month < (Date.today.month - 4)
         # If the year is this year, include if it happened more than 6 months
         # ago.
         return true
       end
     end
-    
+
   end
-end
+end

metadata

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