local_time 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 508731c2caa5d18aece1d61aa62fea93a39eaeeb
-  data.tar.gz: e0f58da60da529a8ad4daa7304eb696a9e3ff963
+  metadata.gz: e386d2a684296b0e7489cc13bee76a7df4495474
+  data.tar.gz: 1167fdacc381765bc7ef5cf31499e9c46c23083c
 SHA512:
-  metadata.gz: 82c365b1b4c213fbfeb4a7e897472fd4ce993d0ae23fcda3ac41b5288b63e9e5c821a9509b1acca8f46fd37106609be64301324347cba4ffb1bddcbb4688f660
-  data.tar.gz: 5751bf6dd16e8f0de883ce99772c6314a996c3411483c2909e9dd46d79c0b18a4efbb527ac1e2e43cf872fa67e8651419e250381c4a0303552e62061c37dd01a
+  metadata.gz: f66918a56f5cb8c3be57c99537a1d054f7a10a6bedf2a309c320da407025e1f2b9b1f3410c60e5f532e3ffacc378bf65183b705253bdbd8d08e7023c741483c2
+  data.tar.gz: 954b8526c0846718f9bfe0e81eb1660a02399cf76cf9e5cb056bdc492e38abd0c13feb2c22ba09d93c6969457354f25c1cbf1752e34c3b3888f2b6362afd2221

data/README.md

@@ -127,6 +127,11 @@ The included JavaScript does not depend on any frameworks or libraries, and list
 
 #### Version History
 
+**1.0.3**
+
+* Improve `%Z` time zone parsing
+* Use [Blade](https://github.com/javan/blade) runner for JavaScript tests
+
 **1.0.2** (February 3, 2015)
 
 * Fix displaying future relative dates [Cezary Baginski]
@@ -156,3 +161,9 @@ The included JavaScript does not depend on any frameworks or libraries, and list
 **0.1.0** (November 29, 2013)
 
 * Initial release.
+
+---
+
+[![Build Status](https://travis-ci.org/basecamp/local_time.svg?branch=master)](https://travis-ci.org/basecamp/local_time)
+
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/basecamp_local_time.svg)](https://saucelabs.com/u/basecamp_local_time)

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

@@ -21,6 +21,25 @@ months   = "January February March April May June July August September October
 
 pad = (num) -> ('0' + num).slice -2
 
+parseTimeZone = (time) ->
+  string = time.toString()
+  # Sun Aug 30 2015 10:22:57 GMT-0400 (NAME)
+  if name = string.match(/\(([\w\s]+)\)$/)?[1]
+    if /\s/.test(name)
+      # Sun Aug 30 2015 10:22:57 GMT-0400 (Eastern Daylight Time)
+      name.match(/\b(\w)/g).join("")
+    else
+      # Sun Aug 30 2015 10:22:57 GMT-0400 (EDT)
+      name
+  # Sun Aug 30 10:22:57 EDT 2015
+  else if name = string.match(/(\w{3,4})\s\d{4}$/)?[1]
+    name
+  # "Sun Aug 30 10:22:57 UTC-0400 2015"
+  else if name = string.match(/(UTC[\+\-]\d+)/)?[1]
+    name
+  else
+    ""
+
 strftime = (time, formatString) ->
   day    = time.getDay()
   date   = time.getDate()
@@ -51,7 +70,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] ? ''
+      when 'Z' then parseTimeZone(time)
 
 
 class CalendarDate

data/test/javascripts/fixtures/body.html

@@ -0,0 +1,8 @@
+<time id="one" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="2013-11-12T12:13:00Z"></time>
+<time id="two" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="2013-01-02T02:04:00Z"></time>
+<time id="past" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="1805-05-15T01:01:00Z"></time>
+<time id="future" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="3333-02-14T23:55:00Z"></time>
+
+<time id="date" data-format="%B %e, %Y" data-local="time" datetime="2013-11-12T12:13:00Z"></time>
+
+<time id="ago"></time>

data/test/javascripts/{local_time → src}/strftime_test.js.coffee

@@ -44,5 +44,4 @@ for day in [0..30] by 6
           run()
 
           text = getText el
-          ok /^\w{3,4}$/.test(text), "#{text} doesn't look like a timezone"
-
+          ok /^(\w{3,4}|UTC[\+\-]\d+)$/.test(text), "'#{text}' doesn't look like a timezone. System date: '#{new Date}'"

data/test/javascripts/{local_time/index.js.coffee → src/test.js.coffee}

@@ -1,7 +1,5 @@
-#= require vendor/qunit
-#= require vendor/moment
-#= require vendor/sinon-timers
-#= require local_time
+#= require moment
+#= require sinon-timers
 
 #= require_self
 #= require_directory .

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_time
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Javan Makhmali
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -53,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: blade
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: blade-sauce_labs_plugin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: 
 email: javan@basecamp.com
 executables: []
@@ -65,19 +93,15 @@ files:
 - app/helpers/local_time_helper.rb
 - lib/local_time.rb
 - test/helpers/local_time_helper_test.rb
-- test/javascripts/local_time/index.js.coffee
-- test/javascripts/local_time/local_time_test.js.coffee
-- test/javascripts/local_time/page_events_test.js.coffee
-- test/javascripts/local_time/public_api_test.js.coffee
-- test/javascripts/local_time/relative_date_test.js.coffee
-- test/javascripts/local_time/strftime_test.js.coffee
-- test/javascripts/local_time/time_ago_test.js.coffee
-- test/javascripts/runner/config.ru
-- test/javascripts/runner/index.html
+- test/javascripts/fixtures/body.html
+- test/javascripts/src/local_time_test.js.coffee
+- test/javascripts/src/page_events_test.js.coffee
+- test/javascripts/src/public_api_test.js.coffee
+- test/javascripts/src/relative_date_test.js.coffee
+- test/javascripts/src/strftime_test.js.coffee
+- test/javascripts/src/test.js.coffee
+- test/javascripts/src/time_ago_test.js.coffee
 - test/javascripts/vendor/moment.js
-- test/javascripts/vendor/qunit.css
-- test/javascripts/vendor/qunit.js
-- test/javascripts/vendor/run-qunit.coffee
 - test/javascripts/vendor/sinon-timers.js
 homepage: 
 licenses:
@@ -99,23 +123,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Rails engine for cache-friendly, client-side local time
 test_files:
 - test/helpers/local_time_helper_test.rb
-- test/javascripts/local_time/index.js.coffee
-- test/javascripts/local_time/local_time_test.js.coffee
-- test/javascripts/local_time/page_events_test.js.coffee
-- test/javascripts/local_time/public_api_test.js.coffee
-- test/javascripts/local_time/relative_date_test.js.coffee
-- test/javascripts/local_time/strftime_test.js.coffee
-- test/javascripts/local_time/time_ago_test.js.coffee
-- test/javascripts/runner/config.ru
-- test/javascripts/runner/index.html
+- test/javascripts/fixtures/body.html
+- test/javascripts/src/local_time_test.js.coffee
+- test/javascripts/src/page_events_test.js.coffee
+- test/javascripts/src/public_api_test.js.coffee
+- test/javascripts/src/relative_date_test.js.coffee
+- test/javascripts/src/strftime_test.js.coffee
+- test/javascripts/src/test.js.coffee
+- test/javascripts/src/time_ago_test.js.coffee
 - test/javascripts/vendor/moment.js
-- test/javascripts/vendor/qunit.css
-- test/javascripts/vendor/qunit.js
-- test/javascripts/vendor/run-qunit.coffee
 - test/javascripts/vendor/sinon-timers.js

data/test/javascripts/runner/config.ru

@@ -1,19 +0,0 @@
-require 'sprockets'
-require 'coffee-rails'
-
-Root = File.expand_path("../../../..", __FILE__)
-
-Assets = Sprockets::Environment.new(Root) do |env|
-  env.append_path "app/assets/javascripts"
-  env.append_path "test/javascripts"
-end
-
-map "/css" do
-  run Assets
-end
-
-map "/js" do
-  run Assets
-end
-
-map("/") { run Rack::File.new("#{Root}/test/javascripts/runner") }

data/test/javascripts/runner/index.html

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <link rel="stylesheet" href="/css/vendor/qunit.css">
-  <script type="text/javascript" src="/js/local_time/index.js"></script>
-</head>
-<body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture"></div>
-
-  <time id="one" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="2013-11-12T12:13:00Z"></time>
-  <time id="two" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="2013-01-02T02:04:00Z"></time>
-  <time id="past" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="1805-05-15T01:01:00Z"></time>
-  <time id="future" data-format="%B %e, %Y %l:%M%P" data-local="time" datetime="3333-02-14T23:55:00Z"></time>
-
-  <time id="date" data-format="%B %e, %Y" data-local="time" datetime="2013-11-12T12:13:00Z"></time>
-
-  <time id="ago"></time>
-</html>

data/test/javascripts/vendor/qunit.css

@@ -1,244 +0,0 @@
-/**
- * QUnit v1.12.0 - A JavaScript Unit Testing Framework
- *
- * http://qunitjs.com
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-/** Font Family and Sizes */
-
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
-  font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
-}
-
-#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
-#qunit-tests { font-size: smaller; }
-
-
-/** Resets */
-
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
-  margin: 0;
-  padding: 0;
-}
-
-
-/** Header */
-
-#qunit-header {
-  padding: 0.5em 0 0.5em 1em;
-
-  color: #8699a4;
-  background-color: #0d3349;
-
-  font-size: 1.5em;
-  line-height: 1em;
-  font-weight: normal;
-
-  border-radius: 5px 5px 0 0;
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-top-right-radius: 5px;
-  -webkit-border-top-left-radius: 5px;
-}
-
-#qunit-header a {
-  text-decoration: none;
-  color: #c2ccd1;
-}
-
-#qunit-header a:hover,
-#qunit-header a:focus {
-  color: #fff;
-}
-
-#qunit-testrunner-toolbar label {
-  display: inline-block;
-  padding: 0 .5em 0 .1em;
-}
-
-#qunit-banner {
-  height: 5px;
-}
-
-#qunit-testrunner-toolbar {
-  padding: 0.5em 0 0.5em 2em;
-  color: #5E740B;
-  background-color: #eee;
-  overflow: hidden;
-}
-
-#qunit-userAgent {
-  padding: 0.5em 0 0.5em 2.5em;
-  background-color: #2b81af;
-  color: #fff;
-  text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
-}
-
-#qunit-modulefilter-container {
-  float: right;
-}
-
-/** Tests: Pass/Fail */
-
-#qunit-tests {
-  list-style-position: inside;
-}
-
-#qunit-tests li {
-  padding: 0.4em 0.5em 0.4em 2.5em;
-  border-bottom: 1px solid #fff;
-  list-style-position: inside;
-}
-
-#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
-  display: none;
-}
-
-#qunit-tests li strong {
-  cursor: pointer;
-}
-
-#qunit-tests li a {
-  padding: 0.5em;
-  color: #c2ccd1;
-  text-decoration: none;
-}
-#qunit-tests li a:hover,
-#qunit-tests li a:focus {
-  color: #000;
-}
-
-#qunit-tests li .runtime {
-  float: right;
-  font-size: smaller;
-}
-
-.qunit-assert-list {
-  margin-top: 0.5em;
-  padding: 0.5em;
-
-  background-color: #fff;
-
-  border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-}
-
-.qunit-collapsed {
-  display: none;
-}
-
-#qunit-tests table {
-  border-collapse: collapse;
-  margin-top: .2em;
-}
-
-#qunit-tests th {
-  text-align: right;
-  vertical-align: top;
-  padding: 0 .5em 0 0;
-}
-
-#qunit-tests td {
-  vertical-align: top;
-}
-
-#qunit-tests pre {
-  margin: 0;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-#qunit-tests del {
-  background-color: #e0f2be;
-  color: #374e0c;
-  text-decoration: none;
-}
-
-#qunit-tests ins {
-  background-color: #ffcaca;
-  color: #500;
-  text-decoration: none;
-}
-
-/*** Test Counts */
-
-#qunit-tests b.counts                       { color: black; }
-#qunit-tests b.passed                       { color: #5E740B; }
-#qunit-tests b.failed                       { color: #710909; }
-
-#qunit-tests li li {
-  padding: 5px;
-  background-color: #fff;
-  border-bottom: none;
-  list-style-position: inside;
-}
-
-/*** Passing Styles */
-
-#qunit-tests li li.pass {
-  color: #3c510c;
-  background-color: #fff;
-  border-left: 10px solid #C6E746;
-}
-
-#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
-#qunit-tests .pass .test-name               { color: #366097; }
-
-#qunit-tests .pass .test-actual,
-#qunit-tests .pass .test-expected           { color: #999999; }
-
-#qunit-banner.qunit-pass                    { background-color: #C6E746; }
-
-/*** Failing Styles */
-
-#qunit-tests li li.fail {
-  color: #710909;
-  background-color: #fff;
-  border-left: 10px solid #EE5757;
-  white-space: pre;
-}
-
-#qunit-tests > li:last-child {
-  border-radius: 0 0 5px 5px;
-  -moz-border-radius: 0 0 5px 5px;
-  -webkit-border-bottom-right-radius: 5px;
-  -webkit-border-bottom-left-radius: 5px;
-}
-
-#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
-#qunit-tests .fail .test-name,
-#qunit-tests .fail .module-name             { color: #000000; }
-
-#qunit-tests .fail .test-actual             { color: #EE5757; }
-#qunit-tests .fail .test-expected           { color: green;   }
-
-#qunit-banner.qunit-fail                    { background-color: #EE5757; }
-
-
-/** Result */
-
-#qunit-testresult {
-  padding: 0.5em 0.5em 0.5em 2.5em;
-
-  color: #2b81af;
-  background-color: #D2E0E6;
-
-  border-bottom: 1px solid white;
-}
-#qunit-testresult .module-name {
-  font-weight: bold;
-}
-
-/** Fixture */
-
-#qunit-fixture {
-  position: absolute;
-  top: -10000px;
-  left: -10000px;
-  width: 1000px;
-  height: 1000px;
-}