local_time 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d42dfef630d09374cd897d5a842566191ff07cd
-  data.tar.gz: 671f048d37ba09ade8df1e01dd8c4bb36f5ccfab
+  metadata.gz: 9acb2cdc9393fe73fbf0b341bbc360187555a519
+  data.tar.gz: 01f0b7122ec7242de2354153318c2cf118e34573
 SHA512:
-  metadata.gz: 6209af737d470ff029db6233ca5f30e6840e8e74c40db30aca1a8ad9a592dbd705ea2159ff16eb37118946dee8d6f6db1fbfd69d6f129d30b9aab1c3f3a93b18
-  data.tar.gz: 26786c11ec81af062927263f55e5f4103532dbdc871d535e0e272a5c95b8a94f6e8979d165154330c3bc2cc0b93ac202f4202546f04258012e75b82d4c1d8ce1
+  metadata.gz: 20a08a3c22c744cc148b198a9e7129f57e129a28fd79ff80b270e30db834b8a6dba2aeaf7ac28a6314a3936fac3c18601f7a451409e12e6f805d0c985073a92d
+  data.tar.gz: 6b3da2da805d8661c07a3462a40eb706d529c9a7a2b69365d6e92af0773f6a9927db2d7a6f855220d6fb8986936dcd4df4f641e35775f06587401ea32cd20a84

data/README.md

@@ -96,8 +96,9 @@ Preset time and date formats that vary with age. The available types are `date`,
 
 * `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"
+* `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.
+* `weekday-or-date` Displays the weekday if it occurs within a week or the date if not. "Yesterday" or "Apr 11"
 
 #### Installation
 
@@ -126,6 +127,10 @@ The included JavaScript does not depend on any frameworks or libraries, and list
 
 #### Version History
 
+**1.0.1** (December 3, 2014)
+
+* Added `weekday-or-date` option [Chew Choon Keat]
+
 **1.0.0** (April 12, 2014)
 
 * Added `local_relative_time` helper with several built in types

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

@@ -221,6 +221,8 @@ document.addEventListener "DOMContentLoaded", ->
           relativeTimeOrDate time
         when "weekday"
           relativeWeekday(time) ? ""
+        when "weekday-or-date"
+          relativeWeekday(time) ? relativeDate(time)
 
 run = ->
   event = document.createEvent "Events"

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_time
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Javan Makhmali
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   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: 
@@ -45,11 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
 - app/assets/javascripts/local_time.js.coffee
 - app/helpers/local_time_helper.rb
 - lib/local_time.rb
-- MIT-LICENSE
-- README.md
 - test/helpers/local_time_helper_test.rb
 - test/javascripts/local_time/index.js.coffee
 - test/javascripts/local_time/local_time_test.js.coffee
@@ -75,17 +75,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine for cache-friendly, client-side local time