local_time 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0bfe22e485d89d3b8b8ef64db29d82d4d4f518c
-  data.tar.gz: 7d662d650e07542e16b13b98315ce589992bf397
+  metadata.gz: 0d42dfef630d09374cd897d5a842566191ff07cd
+  data.tar.gz: 671f048d37ba09ade8df1e01dd8c4bb36f5ccfab
 SHA512:
-  metadata.gz: 840814649a2e4c03f7b8b9592ff696c7d5b7516a088a270fe2bdb4fb96e1a29221d455c31bbc31fdaa2a2dc0a38fe3718144c4c2dfe8ced9cbbc1d7ee76f425b
-  data.tar.gz: 2ed6f4bd924c469c23fd1134a53e4818ac1f5de1fd9cf9060859726bb47429176a8e5421f07c48d18303502c288ea38ccf74fff70ce55134f2e6b8fc110d23a4
+  metadata.gz: 6209af737d470ff029db6233ca5f30e6840e8e74c40db30aca1a8ad9a592dbd705ea2159ff16eb37118946dee8d6f6db1fbfd69d6f129d30b9aab1c3f3a93b18
+  data.tar.gz: 26786c11ec81af062927263f55e5f4103532dbdc871d535e0e272a5c95b8a94f6e8979d165154330c3bc2cc0b93ac202f4202546f04258012e75b82d4c1d8ce1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Javan Makhmali
+Copyright 2014 Javan Makhmali, Basecamp
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,16 +1,19 @@
-Local Time is a Rails engine with helpers and JavaScript for displaying times and dates to users in their local time. The helpers render a `<time>` element in UTC and the JavaScript swoops in to convert and format. Because the `<time>` element is only rendered in one timezone, it is ideal for caching.
+Local Time is a Rails engine with helpers and JavaScript for displaying times and dates to users in their local time. The helpers render a `<time>` element and the JavaScript swoops in to convert and format. The helper output is ideal for caching since it's always in UTC time.
 
 ---
 
 ####Example
 
-Assuming the time zone is EST and `Time.now` is `2013-11-27 18:43:22 -0500`:
+```ruby
+> comment.created_at
+"Wed, 27 Nov 2013 18:43:22 EST -0500"
+```
 
 ```erb
-<%= local_time(Time.now) # index.html.erb %>
+<%= local_time(comment.created_at) %>
 ```
 
-Renders in UTC time:
+Renders:
 
 ```html
 <time data-format="%B %e, %Y %l:%M%P"
@@ -18,12 +21,13 @@ Renders in UTC time:
       datetime="2013-11-27T23:43:22Z">November 27, 2013 11:43pm</time>
 ```
 
-Then immediately converts to local time and strftime formats with JavaScript:
+When the DOM loads, the content is immediately replaced with a local, formatted time:
 
 ```html
 <time data-format="%B %e, %Y %l:%M%P"
       data-local="time"
       datetime="2013-11-27T23:43:22Z"
+      title="November 27, 2013 6:43pm EDT"
       data-localized="true">November 27, 2013 6:43pm</time>
 ```
 
@@ -32,14 +36,36 @@ Then immediately converts to local time and strftime formats with JavaScript:
 #### Time and date helpers
 
 ```erb
-Pass a time and an optional strftime format (default format shown here)
-<%= local_time(time, format: '%B %e, %Y %l:%M%P') %>
+<%= local_time(time) %>
+```
+
+Format with a strftime string (default format shown here)
+
+```erb
+<%= local_time(time, '%B %e, %Y %l:%M%P') %>
+```
+
+Alias for `local_time` with a month-formatted default
 
-Alias for local_time with a month-formatted default
-<%= local_date(time, format: '%B %e, %Y') %>
+```erb
+<%= local_date(time, '%B %e, %Y') %>
 ```
 
-Note: The included strftime JavaScript implementation is not 100% complete. It supports the following directives: `%a %A %b %B %c %d %e %H %I %l %m %M %p %P %S %w %y %Y`
+To set attributes on the time tag, pass a hash as the second argument with a `:format` key and your attributes.
+
+```erb
+<%= local_time(time, format: '%B %e, %Y %l:%M%P', class: 'my-time') %>
+```
+
+To use a strftime format already defined in your app, pass a symbol as the format.
+
+```erb
+<%= local_time(date, :long) %>
+```
+
+`I18n.t("time.formats.#{format}")`, `I18n.t("date.formats.#{format}")`, `Time::DATE_FORMATS[format]`, and `Date::DATE_FORMATS[format]` will be scanned (in that order) for your format.
+
+Note: The included strftime JavaScript implementation is not 100% complete. It supports the following directives: `%a %A %b %B %c %d %e %H %I %l %m %M %p %P %S %w %y %Y %Z`
 
 #### Time ago helper
 
@@ -47,7 +73,9 @@ Note: The included strftime JavaScript implementation is not 100% complete. It s
 <%= local_time_ago(time) %>
 ```
 
-Displays the relative amount of time passed. With age, the descriptions transition from specific quantities to general dates. The `<time>` elements are updated every 60 seconds. Examples (in quotes):
+Displays the relative amount of time passed. With age, the descriptions transition from {quantity of seconds, minutes, or hours} to {date + time} to {date}. The `<time>` elements are updated every 60 seconds.
+
+Examples (in quotes):
 
 * Recent: "a second ago", "32 seconds ago", "an hour ago", "14 hours ago"
 * Yesterday: "yesterday at 5:22pm"
@@ -55,6 +83,22 @@ Displays the relative amount of time passed. With age, the descriptions transiti
 * This year: "on Nov 17"
 * Last year: "on Jan 31, 2012"
 
+#### Relative time helper
+
+Preset time and date formats that vary with age. The available types are `date`, `time-ago`, `time-or-date`, and `weekday`. Like the `local_time` helper, `:type` can be passed a string or in an options hash.
+
+```erb
+<%= local_relative_time(time, 'weekday') %>
+<%= local_relative_time(time, type: 'time-or-date') %>
+```
+
+**Available `:type` options**
+
+* `date` Inlcudes the year unless it's current. "Apr 11" or "Apr 11, 2013"
+* `time-ago` See above. `local_time_ago` calls `local_relative_time` with this `:type` option.
+* `time-or-date` Displays the time if it's todday. Displays time otherwise. "3:26pm" or "Apr 11"
+* `weekday` Displays "Today", "Yesterday", or the weekday (e.g. Wednesday) if the time is within a week of today.
+
 #### Installation
 
 1. Add `gem 'local_time'` to your Gemfile.
@@ -65,8 +109,41 @@ Displays the relative amount of time passed. With age, the descriptions transiti
 
 The included JavaScript does not depend on any frameworks or libraries, and listens for a `DOMContentLoaded` event to run initially. It also listens on `document` for `page:update` if you're using Turbolinks and `ajaxSuccess` if you're using jQuery. This should catch most cases where new `<time>` elements have been added to the DOM and process them automatically. If you're adding new elements in another context, trigger `time:elapse` to process them.
 
+#### JavaScript API
+
+`relativeDate`, `relativeTimeAgo`, `relativeTimeOrDate`, `relativeWeekday`, `run`, and `strftime` methods are available on the global `LocalTime` object.
+
+```js
+> LocalTime.relativeTimeAgo(new Date(new Date - 60 * 1000 * 5))
+"5 minutes ago"
+
+// Process <time> tags. Equivalent to dispatching a "time:elapse" Event.
+> LocalTime.run()
+
+> LocalTime.strftime(new Date, "%B %e, %Y %l:%M%P")
+"February 9, 2014 12:55pm"
+```
+
 #### Version History
 
+**1.0.0** (April 12, 2014)
+
+* Added `local_relative_time` helper with several built in types
+* Allow `:format` (and `:type`) option as a bare string or value in hash
+* Added `relativeDate`, `relativeTimeOrDate`, `relativeWeekday` and `run` to the API
+* Dropped ineffective `popstate` event listener
+* Now in use at [Basecamp](https://basecamp.com/)
+
+**0.3.0** (February 9, 2014)
+
+* Allow :format option lookup in I18n or DATE_FORMATS hashes [Paul Dobbins]
+* Expose public API to JavaScript helpers
+
+**0.2.0** (December 10, 2013)
+
+* Prefer `textContent` over `innerText` for Firefox compatibility
+* Added `options` argument to `local_time_ago` helper
+
 **0.1.0** (November 29, 2013)
 
 * Initial release.

data/app/assets/javascripts/local_time.js.coffee

@@ -30,7 +30,7 @@ strftime = (time, formatString) ->
   minute = time.getMinutes()
   second = time.getSeconds()
 
-  formatString.replace /%([%aAbBcdeHIlmMpPSwyY])/g, ([match, modifier]) ->
+  formatString.replace /%([%aAbBcdeHIlmMpPSwyYZ])/g, ([match, modifier]) ->
     switch modifier
       when '%' then '%'
       when 'a' then weekdays[day].slice 0, 3
@@ -51,6 +51,7 @@ strftime = (time, formatString) ->
       when 'w' then day
       when 'y' then pad year % 100
       when 'Y' then year
+      when 'Z' then time.toString().match(/\((\w+)\)$/)?[1] ? ''
 
 
 class CalendarDate
@@ -67,6 +68,16 @@ class CalendarDate
     @year = @date.getUTCFullYear()
     @month = @date.getUTCMonth() + 1
     @day = @date.getUTCDate()
+    @value = @date.getTime()
+
+  equals: (calendarDate) ->
+    calendarDate?.value is @value
+
+  is: (calendarDate) ->
+    @equals calendarDate
+
+  isToday: ->
+    @is @constructor.today()
 
   occursOnSameYearAs: (date) ->
     @year is date?.year
@@ -82,10 +93,7 @@ class CalendarDate
     @constructor.today().daysSince @
 
 
-class RelativeTimeAgo
-  @generate: (date) ->
-    new this(date).toString()
-
+class RelativeTime
   constructor: (@date) ->
     @calendarDate = CalendarDate.fromDate @date
 
@@ -103,6 +111,12 @@ class RelativeTimeAgo
     else
       "on #{@formatDate()}"
 
+  toTimeOrDateString: ->
+    if @calendarDate.isToday()
+      @formatTime()
+    else
+      @formatDate()
+
   timeElapsed: ->
     ms  = new Date().getTime() - @date.getTime()
     sec = Math.round ms  / 1000
@@ -146,6 +160,19 @@ class RelativeTimeAgo
   formatTime: ->
     strftime @date, '%l:%M%P'
 
+relativeDate = (date) ->
+  new RelativeTime(date).formatDate()
+
+relativeTimeAgo = (date) ->
+  new RelativeTime(date).toString()
+
+relativeTimeOrDate = (date) ->
+  new RelativeTime(date).toTimeOrDateString()
+
+relativeWeekday = (date) ->
+  if day = new RelativeTime(date).relativeWeekday()
+    day.charAt(0).toUpperCase() + day.substring(1)
+
 
 domLoaded = false
 
@@ -157,10 +184,6 @@ update = (callback) ->
   if Turbolinks?.supported
     document.addEventListener "page:update", callback
   else
-    setTimeout ->
-      window.addEventListener "popstate", callback
-    , 1
-
     jQuery?(document).on "ajaxSuccess", (event, xhr) ->
       callback() if jQuery.trim xhr.responseText
 
@@ -171,6 +194,7 @@ process = (selector, callback) ->
 
 document.addEventListener "DOMContentLoaded", ->
   domLoaded = true
+  textProperty = if "textContent" of document.body then "textContent" else "innerText"
 
   process "time[data-local]:not([data-localized])", (element) ->
     datetime = element.getAttribute "datetime"
@@ -180,16 +204,30 @@ document.addEventListener "DOMContentLoaded", ->
     time = new Date Date.parse datetime
     return if isNaN time
 
-    element.innerText =
+    unless element.hasAttribute("title")
+      element.setAttribute "title", strftime(time, "%B %e, %Y at %l:%M%P %Z")
+
+    element[textProperty] =
       switch local
+        when "date"
+          element.setAttribute "data-localized", true
+          relativeDate time
         when "time"
           element.setAttribute "data-localized", true
           strftime time, format
         when "time-ago"
-          RelativeTimeAgo.generate time
+          relativeTimeAgo time
+        when "time-or-date"
+          relativeTimeOrDate time
+        when "weekday"
+          relativeWeekday(time) ? ""
+
+run = ->
+  event = document.createEvent "Events"
+  event.initEvent "time:elapse", true, true
+  document.dispatchEvent event
+
+setInterval run, 60 * 1000
 
-  setInterval ->
-    event = document.createEvent "Events"
-    event.initEvent "time:elapse", true, true
-    document.dispatchEvent event
-  , 60 * 1000
+# Public API
+@LocalTime = {relativeDate, relativeTimeAgo, relativeTimeOrDate, relativeWeekday, run, strftime}

data/app/helpers/local_time_helper.rb

@@ -1,7 +1,11 @@
 module LocalTimeHelper
-  def local_time(time, options = {})
-    time   = utc_time(time)
-    format = options.delete(:format).presence || '%B %e, %Y %l:%M%P'
+  DEFAULT_FORMAT = '%B %e, %Y %l:%M%P'
+
+  def local_time(time, options = nil)
+    time = utc_time(time)
+
+    options, format = extract_options_and_value(options, :format)
+    format = find_time_format(format)
 
     options[:data] ||= {}
     options[:data].merge! local: :time, format: format
@@ -9,14 +13,26 @@ module LocalTimeHelper
     time_tag time, time.strftime(format), options
   end
 
-  def local_date(time, options = {})
-    options.reverse_merge! format: '%B %e, %Y'
+  def local_date(time, options = nil)
+    options, format = extract_options_and_value(options, :format)
+    options[:format] = format || '%B %e, %Y'
     local_time time, options
   end
 
-  def local_time_ago(time)
+  def local_relative_time(time, options = nil)
     time = utc_time(time)
-    time_tag time, time.strftime('%B %e, %Y %l:%M%P'), data: { local: 'time-ago' }
+    options, type = extract_options_and_value(options, :type)
+
+    options[:data] ||= {}
+    options[:data].merge! local: type
+
+    time_tag time, time.strftime(DEFAULT_FORMAT), options
+  end
+
+  def local_time_ago(time, options = nil)
+    options, type = extract_options_and_value(options, :type)
+    options[:type] = 'time-ago'
+    local_relative_time time, options
   end
 
   def utc_time(time_or_date)
@@ -26,4 +42,31 @@ module LocalTimeHelper
       time_or_date.to_time.utc
     end
   end
+
+  private
+    def find_time_format(format)
+      if format.is_a?(Symbol)
+        if (i18n_format = I18n.t("time.formats.#{format}", default: [:"date.formats.#{format}", ''])).present?
+          i18n_format
+        elsif (date_format = Time::DATE_FORMATS[format] || Date::DATE_FORMATS[format])
+          date_format.is_a?(Proc) ? DEFAULT_FORMAT : date_format
+        else
+          DEFAULT_FORMAT
+        end
+      else
+        format.presence || DEFAULT_FORMAT
+      end
+    end
+
+    def extract_options_and_value(options, value_key = nil)
+      case options
+      when Hash
+        value = options.delete(value_key)
+        [ options, value ]
+      when NilClass
+        [ {} ]
+      else
+        [ {}, options ]
+      end
+    end
 end

data/test/helpers/local_time_helper_test.rb

@@ -1,16 +1,30 @@
 require_relative '../../app/helpers/local_time_helper'
 require 'active_support/all'
 require 'action_view'
+
 require 'minitest/autorun'
+begin
+  # 2.0.0
+  class TestCase < MiniTest::Test; end
+rescue NameError
+  # 1.9.3
+  class TestCase < MiniTest::Unit::TestCase; end
+end
 
+I18n.enforce_available_locales = false
 
-class LocalTimeHelperTest < Minitest::Test
+class LocalTimeHelperTest < TestCase
   include ActionView::Helpers::DateHelper, ActionView::Helpers::TagHelper
   include LocalTimeHelper
 
   def setup
     @original_zone = Time.zone
     Time.zone = ActiveSupport::TimeZone["Central Time (US & Canada)"]
+    I18n.backend.store_translations(:en, {
+      time: { formats: { simple_time: "%b %e" } },
+      date: { formats: { simple_date: "%b %e" } } })
+    Time::DATE_FORMATS[:time_formats_simple_time] = '%b %e'
+    Date::DATE_FORMATS[:date_formats_simple_date] = '%b %e'
 
     @date = "2013-11-21"
     @time = Time.zone.parse(@date)
@@ -45,6 +59,32 @@ class LocalTimeHelperTest < Minitest::Test
     assert_equal expected, local_time(@time, format: '%b %e')
   end
 
+  def test_local_time_with_format_as_string
+    expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
+    assert_equal expected, local_time(@time, '%b %e')
+  end
+
+  def test_local_time_with_i18n_format
+    expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
+    assert_equal expected, local_time(@time, format: :simple_time)
+  end
+
+  def test_local_time_with_date_formats_format
+    expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
+    assert_equal expected, local_time(@time, format: :time_formats_simple_time)
+  end
+
+  def test_local_time_with_missing_i18n_and_date_formats_format
+    expected = %Q(<time data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="#{@time_js}">November 21, 2013  6:00am</time>)
+    assert_equal expected, local_time(@time, format: :missing_format)
+  end
+
+  def test_local_time_with_date_formats_proc_format
+    Time::DATE_FORMATS[:proc] = proc { |time| "nope" }
+    expected = %Q(<time data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="#{@time_js}">November 21, 2013  6:00am</time>)
+    assert_equal expected, local_time(@time, format: :proc)
+  end
+
   def test_local_time_with_options
     expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}" style="display:none">Nov 21</time>)
     assert_equal expected, local_time(@time, format: '%b %e', style: 'display:none')
@@ -58,11 +98,46 @@ class LocalTimeHelperTest < Minitest::Test
 
   def test_local_date_with_format
     expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
-    assert_equal expected, local_date(@time, format: '%b %e')
+    assert_equal expected, local_date(@time.to_date, format: '%b %e')
+  end
+
+  def test_local_date_with_format_as_string
+    expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
+    assert_equal expected, local_date(@time.to_date, '%b %e')
+  end
+
+  def test_local_date_with_i18n_format
+    expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
+    assert_equal expected, local_date(@time.to_date, format: :simple_date)
+  end
+
+  def test_local_date_with_date_formats_format
+    expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
+    assert_equal expected, local_date(@time.to_date, format: :date_formats_simple_date)
+  end
+
+  def test_local_date_with_missing_i18n_and_date_formats_format
+    expected = %Q(<time data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="#{@time_js}">November 21, 2013  6:00am</time>)
+    assert_equal expected, local_date(@time.to_date, format: :missing_date_format)
   end
 
   def test_local_time_ago
     expected = %Q(<time data-local="time-ago" datetime="#{@time_js}">November 21, 2013  6:00am</time>)
     assert_equal expected, local_time_ago(@time)
   end
+
+  def test_local_time_ago_with_options
+    expected = %Q(<time class="date-time" data-local="time-ago" datetime="#{@time_js}">November 21, 2013  6:00am</time>)
+    assert_equal expected, local_time_ago(@time, class: "date-time")
+  end
+
+  def test_relative_time
+    expected = %Q(<time data-local="time-or-date" datetime="#{@time_js}">November 21, 2013  6:00am</time>)
+    assert_equal expected, local_relative_time(@time, type: "time-or-date")
+  end
+
+  def test_local_time_ago_with_type_as_string
+    expected = %Q(<time data-local="time-or-date" datetime="#{@time_js}">November 21, 2013  6:00am</time>)
+    assert_equal expected, local_relative_time(@time, "time-or-date")
+  end
 end

data/test/javascripts/local_time/index.js.coffee

@@ -0,0 +1,36 @@
+#= require vendor/qunit
+#= require vendor/moment
+#= require vendor/sinon-timers
+#= require local_time
+
+#= require_self
+#= require_directory .
+
+@addTimeEl = ({format, type, datetime} = {}) ->
+  format ?= "%Y"
+  type ?= "time"
+  datetime ?= "2013-11-12T12:13:00Z"
+
+  el = document.createElement "time"
+  el.setAttribute "data-local", type
+  el.setAttribute "data-format", format
+  el.setAttribute "datetime", datetime
+  document.body.appendChild el
+  el
+
+@setText = (el, text) ->
+  textProperty = if "textContent" of el then "textContent" else "innerText"
+  el[textProperty] = text
+
+@getText = (el) ->
+  # innerHTML works in all browsers so using it ensures we're
+  # reading the text content, not a potentially arbitrary property.
+  el.innerHTML
+
+@triggerEvent = (name, el = document) ->
+  event = document.createEvent "Events"
+  event.initEvent name, true, true
+  el.dispatchEvent event
+
+@run = ->
+  triggerEvent "time:elapse"

data/test/javascripts/{unit → local_time}/local_time_test.js.coffee

@@ -8,10 +8,10 @@ test "date", ->
   assertLocalized "date", "date"
 
 test "unparseable time", ->
-  el = addTimeEl "%Y", ":("
-  el.innerText = "2013"
+  el = addTimeEl format: "%Y", datetime: ":("
+  setText el, "2013"
   run()
-  equal el.innerText, "2013"
+  equal getText(el), "2013"
 
 
 assertLocalized = (id, type = "time") ->
@@ -26,7 +26,7 @@ assertLocalized = (id, type = "time") ->
   el = document.getElementById id
 
   ok datetime = el.getAttribute "datetime"
-  ok local = el.innerText
+  ok local = getText el
 
   datetimeParsed = moment datetime
   localParsed = moment local, momentFormat

data/test/javascripts/{unit → local_time}/page_events_test.js.coffee

@@ -3,28 +3,23 @@ module "page events"
 test "document DOMContentLoaded", ->
   el = addTimeEl()
   triggerEvent "DOMContentLoaded"
-  ok el.innerText
+  ok getText el
 
 test "document time:elapse", ->
   el = addTimeEl()
   triggerEvent "time:elapse"
-  ok el.innerText
-
-test "window popstate", ->
-  el = addTimeEl()
-  triggerEvent "popstate", window
-  ok el.innerText
+  ok getText el
 
 test "document page:update with Turbolinks on", ->
   el = addTimeEl()
   triggerEvent "page:update"
-  ok not el.innerText
+  ok not getText el
 
   original = window.Turbolinks
   window.Turbolinks = { supported: true }
 
   triggerEvent "DOMContentLoaded"
   triggerEvent "page:update"
-  ok el.innerText
+  ok getText el
 
   window.Turbolinks = original

data/test/javascripts/local_time/public_api_test.js.coffee

@@ -0,0 +1,11 @@
+module "public API"
+
+for name, method of @LocalTime when name isnt "strftime"
+  do (name, method) ->
+    test "##{name}", ->
+      ok method(new Date())
+
+{strftime} = @LocalTime
+
+test "#strftime", =>
+  ok strftime(new Date(), "%Y")

data/test/javascripts/local_time/relative_date_test.js.coffee

@@ -0,0 +1,65 @@
+module "relative date"
+
+test "this year", ->
+  now = moment()
+  el = addTimeEl type: "date", datetime: now.toISOString()
+  run()
+
+  equal getText(el), now.format("MMM D")
+
+test "last year", ->
+  before = moment().subtract("years", 1).subtract("days", 1)
+  el = addTimeEl type: "date", datetime: before.toISOString()
+  run()
+
+  equal getText(el), before.format("MMM D, YYYY")
+
+
+module "relative time or date"
+
+
+test "today", ->
+  now = moment()
+  el = addTimeEl type: "time-or-date", datetime: now.toISOString()
+  run()
+
+  equal getText(el), now.format("h:mma")
+
+test "before today", ->
+  before = moment().subtract("days", 1)
+  el = addTimeEl type: "time-or-date", datetime: before.toISOString()
+  run()
+
+  equal getText(el), before.format("MMM D")
+
+
+module "relative weekday"
+
+
+test "today", ->
+  now = moment()
+  el = addTimeEl type: "weekday", datetime: now.toISOString()
+  run()
+
+  equal getText(el), "Today"
+
+test "yesterday", ->
+  yesterday = moment().subtract("days", 1)
+  el = addTimeEl type: "weekday", datetime: yesterday.toISOString()
+  run()
+
+  equal getText(el), "Yesterday"
+
+test "this week", ->
+  recent = moment().subtract("days", 3)
+  el = addTimeEl type: "weekday", datetime: recent.toISOString()
+  run()
+
+  equal getText(el), recent.format("dddd")
+
+test "before this week", ->
+  before = moment().subtract("days", 8)
+  el = addTimeEl type: "weekday", datetime: before.toISOString()
+  run()
+
+  equal getText(el), ""