local_time 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9acb2cdc9393fe73fbf0b341bbc360187555a519
-  data.tar.gz: 01f0b7122ec7242de2354153318c2cf118e34573
+  metadata.gz: 508731c2caa5d18aece1d61aa62fea93a39eaeeb
+  data.tar.gz: e0f58da60da529a8ad4daa7304eb696a9e3ff963
 SHA512:
-  metadata.gz: 20a08a3c22c744cc148b198a9e7129f57e129a28fd79ff80b270e30db834b8a6dba2aeaf7ac28a6314a3936fac3c18601f7a451409e12e6f805d0c985073a92d
-  data.tar.gz: 6b3da2da805d8661c07a3462a40eb706d529c9a7a2b69365d6e92af0773f6a9927db2d7a6f855220d6fb8986936dcd4df4f641e35775f06587401ea32cd20a84
+  metadata.gz: 82c365b1b4c213fbfeb4a7e897472fd4ce993d0ae23fcda3ac41b5288b63e9e5c821a9509b1acca8f46fd37106609be64301324347cba4ffb1bddcbb4688f660
+  data.tar.gz: 5751bf6dd16e8f0de883ce99772c6314a996c3411483c2909e9dd46d79c0b18a4efbb527ac1e2e43cf872fa67e8651419e250381c4a0303552e62061c37dd01a

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Javan Makhmali, Basecamp
+Copyright 2015 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

@@ -94,7 +94,7 @@ Preset time and date formats that vary with age. The available types are `date`,
 
 **Available `:type` options**
 
-* `date` Inlcudes the year unless it's current. "Apr 11" or "Apr 11, 2013"
+* `date` Includes 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 occurs today or the date if not. "3:26pm" or "Apr 11"
 * `weekday` Displays "Today", "Yesterday", or the weekday (e.g. Wednesday) if the time is within a week of today.
@@ -127,6 +127,10 @@ The included JavaScript does not depend on any frameworks or libraries, and list
 
 #### Version History
 
+**1.0.2** (February 3, 2015)
+
+* Fix displaying future relative dates [Cezary Baginski]
+
 **1.0.1** (December 3, 2014)
 
 * Added `weekday-or-date` option [Chew Choon Keat]

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

@@ -141,16 +141,13 @@ class RelativeTime
       null
 
   relativeWeekday: ->
-    daysPassed = @calendarDate.daysPassed()
-
-    if daysPassed > 6
-      null
-    else if daysPassed is 0
-      "today"
-    else if daysPassed is 1
-      "yesterday"
-    else
-      strftime @date, "%A"
+    switch @calendarDate.daysPassed()
+      when 0
+        "today"
+      when 1
+        "yesterday"
+      when 2,3,4,5,6
+        strftime @date, "%A"
 
   formatDate: ->
     format = "%b %e"

data/test/helpers/local_time_helper_test.rb

@@ -1,6 +1,7 @@
 require_relative '../../app/helpers/local_time_helper'
 require 'active_support/all'
 require 'action_view'
+require 'rails-dom-testing'
 
 require 'minitest/autorun'
 begin
@@ -15,6 +16,8 @@ I18n.enforce_available_locales = false
 
 class LocalTimeHelperTest < TestCase
   include ActionView::Helpers::DateHelper, ActionView::Helpers::TagHelper
+  include Rails::Dom::Testing::Assertions::DomAssertions
+
   include LocalTimeHelper
 
   def setup
@@ -51,93 +54,93 @@ class LocalTimeHelperTest < TestCase
 
   def test_local_time
     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)
+    assert_dom_equal expected, local_time(@time)
   end
 
   def test_local_time_with_format
     expected = %Q(<time data-format="%b %e" data-local="time" datetime="#{@time_js}">Nov 21</time>)
-    assert_equal expected, local_time(@time, format: '%b %e')
+    assert_dom_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')
+    assert_dom_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)
+    assert_dom_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)
+    assert_dom_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)
+    assert_dom_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)
+    assert_dom_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')
+    assert_dom_equal expected, local_time(@time, format: '%b %e', style: 'display:none')
   end
 
   def test_local_date
     expected = %Q(<time data-format="%B %e, %Y" data-local="time" datetime="#{@time_js}">November 21, 2013</time>)
-    assert_equal expected, local_date(@time)
-    assert_equal expected, local_date(@time.to_date)
+    assert_dom_equal expected, local_date(@time)
+    assert_dom_equal expected, local_date(@time.to_date)
   end
 
   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.to_date, format: '%b %e')
+    assert_dom_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')
+    assert_dom_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)
+    assert_dom_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)
+    assert_dom_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)
+    assert_dom_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)
+    assert_dom_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")
+    assert_dom_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")
+    assert_dom_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")
+    assert_dom_equal expected, local_relative_time(@time, "time-or-date")
   end
 end

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

@@ -34,11 +34,14 @@ test "this year", ->
   date = moment().subtract("days", 7).format "MMM D"
   assertTimeAgo "on #{date}", "days", 7
   clock.restore()
-  
+
 test "last year", ->
   date = moment().subtract("days", 366).format "MMM D, YYYY"
   assertTimeAgo "on #{date}", "days", 366
 
+test "next year", ->
+  date = moment().add("days", 366).format "MMM D, YYYY"
+  assertTimeAgo "on #{date}", "days", -366
 
 assertTimeAgo = (string, unit, amount) ->
   el = document.getElementById "ago"

data/test/javascripts/runner/config.ru

@@ -16,4 +16,4 @@ map "/js" do
   run Assets
 end
 
-map("/") { run Rack::File.new("#{Root}/test/javascripts/runner/index.html") }
+map("/") { run Rack::File.new("#{Root}/test/javascripts/runner") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_time
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Javan Makhmali
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-dom-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: javan@basecamp.com
 executables: []