Fixed issues with UTC times being reset and timezone abbreviations.

(#582)

Author: andrewplummer

lib/date.js

@@ -18,7 +18,7 @@ var LOCALE_ARRAY_FIELDS = [
 ];
 
 // Regex for stripping Timezone Abbreviations
-var TIMEZONE_ABBREVIATION_REG = /(\w{3})[()\s\d]*$/;
+var TIMEZONE_ABBREVIATION_REG = /\(([-+]\d{2,4}|\w{3,5})\)$/;
 
 // One minute in milliseconds
 var MINUTES = 60 * 1000;
@@ -903,8 +903,16 @@ function getTimeDistanceForUnit(d1, d2, unit) {
     num = trunc(num / unit.multiplier);
   }
   // For higher order with potential ambiguity, use the numeric calculation
-  // as a starting point, then iterate until we pass the target date.
+  // as a starting point, then iterate until we pass the target date. Decrement
+  // starting point by 1 to prevent overshooting the date due to inconsistencies
+  // in ambiguous units numerically. For example, calculating the number of days
+  // from the beginning of the year to August 5th at 11:59:59 by doing a simple
+  // d2 - d1 will produce different results depending on whether or not a
+  // timezone shift was encountered due to DST, however that should not have an
+  // effect on our calculation here, so subtract by 1 to ensure that the
+  // starting point has not already overshot our target date.
   if (unit.ambiguous) {
+    num -= 1;
     d1 = cloneDate(d1);
     if (num) {
       advanceDate(d1, unit.name, num);
@@ -1499,11 +1507,6 @@ function getExtendedDate(contextDate, d, opt, forceClone) {
     } else if (relative) {
       updateDate(date, set, false, 1);
     } else {
-      if (_utc(date)) {
-        // UTC times can traverse into other days or even months,
-        // so preemtively reset the time here to prevent this.
-        resetTime(date);
-      }
       updateDate(date, set, true, 0, getOwn(options, 'prefer'), weekdayDir);
     }
     fireCallbacks();

test/suite/helpers/common.js

@@ -48,6 +48,10 @@ testGetPrivateProp = function(obj, name) {
   return obj[testGetPrivatePropKey(name)];
 }
 
+testGetStringified = function(obj) {
+  return typeof obj === 'object' && typeof JSON !== 'undefined' ? JSON.stringify(obj) : obj;
+}
+
 testClone = function (obj) {
   if (obj == null || typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean') {
     return obj;

test/suite/helpers/date.js

@@ -51,8 +51,9 @@ getRelativeDate = function(year, month, day, hours, minutes, seconds, millisecon
 
   // Relative dates that have no more specificity than months only walk
   // the bounds of months, they can't traverse into a new month if the
-  // target month doesn't have the same number of days.
-  if(day === undefined && month !== undefined) {
+  // target month doesn't have the same number of days. Note including
+  // explicitly passed 0 for days as well.
+  if(!day && month !== undefined) {
     setDate = Math.min(setDate, testGetDaysInMonth(setYear, setMonth));
     if (setDate !== d.getDate()) {
       d.setDate(setDate);
@@ -116,6 +117,11 @@ testIsUTC = function(d) {
   return testGetPrivateProp(d, 'utc');
 }
 
+testSetUTC = function(d) {
+  d.setTime(d.getTime() + d.getTimezoneOffset() * 60 * 1000);
+  return d;
+}
+
 testGetWeekday = function(weekday, weekOffset, hours, minutes, seconds, milliseconds) {
   var d = new Date();
   if(weekOffset) d.setDate(d.getDate() + (weekOffset * 7));
@@ -139,8 +145,8 @@ testGetEndOfRelativeMonth = function(month) {
 
 testGetWeekdayInMonth = function(month, weekday, weekOffset, hours, minutes, seconds, milliseconds) {
   var d = new Date(), offset;
-  d.setMonth(month);
   d.setDate(1);
+  d.setMonth(month);
   offset = weekday - d.getDay();
   if (offset < 0) {
     offset += 7;
@@ -253,20 +259,26 @@ testSetLocale = function(code) {
   return Sugar.Date.setLocale(code);
 }
 
-assertDateParsed = function(obj) {
-  var d, arg, msg;
-  if (arguments.length === 3) {
-    arg = arguments[1];
-    d   = arguments[2];
-  } else {
-    d = arguments[1];
+assertDateParsed = function(d) {
+  var opt, msg, expected, args = arguments;
+  switch (args.length) {
+    case 2:
+      expected = args[1];
+      break;
+    case 3:
+      opt      = args[1];
+      expected = args[2];
+      break;
+    case 4:
+      opt      = args[1];
+      expected = args[2];
+      msg      = args[3];
+      break;
   }
-  if (typeof obj === 'object' && typeof JSON !== 'undefined') {
-    msg = JSON.stringify(obj);
-  } else {
-    msg = obj;
+  if (!msg) {
+    msg = testGetStringified(d);
   }
-  equal(testCreateDate(obj, arg), d, msg);
+  equal(testCreateDate(d, opt), expected, msg);
 }
 
 assertDateNotParsed = function(str, message) {

test/tests/date.js

@@ -201,6 +201,9 @@ namespace('Date', function () {
     assertDateParsed('this week tuesday at 5pm', { future: true }, testGetWeekday(2, 0, 17));
     assertDateParsed('today at 5pm', { future: true }, new Date(now.getFullYear(), now.getMonth(), now.getDate(), 17));
 
+    // Issue #582 "now" with "fromUTC"
+    assertDateParsed('now', { fromUTC: true }, new Date(), 'now with fromUTC');
+
   });
 
   group('Create | Simple', function() {
@@ -1917,7 +1920,7 @@ namespace('Date', function () {
     raisesError(function(){ run(d, 'format', ['{foo}']); }, 'unknown ldml token raises error', TypeError);
 
     // Not all environments provide that so just make sure it returns the abbreviation or nothing.
-    equal(/\w{3}|^$/.test(run(d, 'format', ['{z}'])), true, 'Timezone abbreviation');
+    equal(/[-+]\d{2,4}|\w{3,5}|^$/.test(run(d, 'format', ['{z}'])), true, 'Timezone abbreviation');
 
     test(new Date('January 4, 2010'), ['{D}'], '4', 'Day of the year');
     test(new Date('January 4, 2010'), ['{DDD}'], '004', 'Day of the year padded');
@@ -2065,7 +2068,8 @@ namespace('Date', function () {
     raisesError(function(){ run(d, 'format', ['%foo']); }, 'unknown strf token raises error', TypeError);
 
     equal(/[+-]\d{4}/.test(run(d, 'format', ['%z'])), true, 'Timezone offset');
-    equal(/\w{3}/.test(run(d, 'format', ['%Z'])), true, 'Timezone abbreviation');
+    equal(/[-+]\d{2,4}|\w{3,5}|^$/.test(run(d, 'format', ['%Z'])), true, 'Timezone abbreviation');
+    equal(/[-+]\d{2,4}|\w{3,5}|^$/.test(run(d, 'format', ['{z}'])), true, 'Timezone abbreviation');
 
     test(new Date('January 1, 2010'), ['%c', 'en-GB'], 'Fri 1 Jan 2010 0:00', 'Preferred stamp | UK');
 

test/tests/range/date.js

@@ -367,10 +367,14 @@ namespace('Date Ranges', function () {
     equal(getRange(new Date(2001, 0), new Date(2004, 0)).years(), 3, '5 year range');
     equal(getRange(new Date(2001, 0), new Date(2001, 2)).months(), 2, 'January to March in months');
     equal(getRange(new Date(2001, 0), new Date(2001, 2)).days(), 59, 'January to March in days');
-    equal(getRange(new Date(2001, 0), new Date(2001, 2)).hours(), 1416, 'January to March in hours');
-    equal(getRange(new Date(2001, 0), new Date(2001, 2)).minutes(), 84960, 'January to March in minutes');
-    equal(getRange(new Date(2001, 0), new Date(2001, 2)).seconds(), 5097600, 'January to March in seconds');
-    equal(getRange(new Date(2001, 0), new Date(2001, 2)).milliseconds(), 5097600000, 'January to March in ms');
+
+    var range = getRange(new Date(2001, 0), new Date(2001, 2))
+    var tzShift = (range.end.getTimezoneOffset() - range.start.getTimezoneOffset());
+
+    equal(range.hours(), 1416 + tzShift / 60, 'January to March in hours');
+    equal(range.minutes(), 84960 + tzShift, 'January to March in minutes');
+    equal(range.seconds(), 5097600 + tzShift * 60, 'January to March in seconds');
+    equal(range.milliseconds(), 5097600000 + tzShift * 60 * 1000, 'January to March in ms');
 
     equal(getRange(1, 2001).seconds(), 2, 'Number ranges are taken as milliseconds');
     equal(getRange('a', 'f').seconds(), NaN, 'String ranges return NaN for date units');