momentjs-rails 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788e8f0c378d64f7f40aae1e04f5de7fab3c1685
-  data.tar.gz: 572ec979e2915e8329a84690369118eb7760fe15
+  metadata.gz: e72db56d51cf7e5fe91b467a0b6bfd71734b004e
+  data.tar.gz: e9160df8b82151849bb7f782d9cbbf1ad57d645d
 SHA512:
-  metadata.gz: 09363f5b9f8fd522e9dd507bfc1f88a2f3da3d2ccf1ff9e0edf4561f8d5eded8578c1f96f5286666acc91d8db709bc15a63dfcd2884002ee7747234dce752de0
-  data.tar.gz: 7b05e42bf3cb91d45c06e299038ec473c6293aed453fa5ad370391a40f17fe0d3ab4c9e4117693e45f8bba5e5246a414f7c57dccd138d2ad1f0c73945c5794fe
+  metadata.gz: e578afd22ba49caff9d23d185be3945645f209c57c591c328966bfa0a2c24a76810ce90fa4412080ba4f7b93b37e416cf4d832c62ca0baa0b30f0758fa21fcec
+  data.tar.gz: 2a12778ba0838e3ee1293f49995fbaa0daeefd79514038725d26e7f6fc1e4f7b7b3a163e0f7559d9b1f49de8915a699dd754620ceed39bbd1e993b3e2d6974e6

data/README.md

@@ -24,7 +24,7 @@ If you want to include a localization file, also add the following directive:
 
 ## Versioning
 
-momentjs-rails 2.0.0.1 == Moment.js 2.0.0
+momentjs-rails 2.2.1 == Moment.js 2.2.1
 
 Every attempt is made to mirror the currently shipping Momentum.js version number wherever possible.
 The major, minor, and patch version numbers will always represent the Momentum.js version. Should a gem

data/news.md

@@ -1,3 +1,6 @@
+### Version 2.2.1 (2013-09-19)
+- Updated to Moment.js to 2.2.1
+
 ### Version 2.1.0 (2013-07-20)
 - Updated to Moment.js to 2.1.0
 - Updated localization files using compressed versions (ready for browser)

data/test/dummy/log/test.log

@@ -1,145 +1,20 @@
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:04:06 -0400
-Compiled moment.js  (0ms)  (pid 43125)
-Served asset /moment.js - 200 OK (14ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:04:06 -0400
-Compiled moment/fr.js  (0ms)  (pid 43125)
-Served asset /moment/fr.js - 200 OK (96ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:05:04 -0400
-Served asset /moment.js - 200 OK (25ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:05:04 -0400
-Served asset /moment/fr.js - 200 OK (2ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:05:17 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/momentmotherfucker/fr.js" for 127.0.0.1 at 2013-03-16 16:05:17 -0400
-Served asset /momentmotherfucker/fr.js - 404 Not Found (1ms)
-Started GET "/assets/moments.js" for 127.0.0.1 at 2013-03-16 16:05:53 -0400
-Served asset /moments.js - 404 Not Found (1ms)
-Started GET "/assets/moment/rfr.js" for 127.0.0.1 at 2013-03-16 16:05:53 -0400
-Served asset /moment/rfr.js - 404 Not Found (1ms)
-Started GET "/assets/moments.js" for 127.0.0.1 at 2013-03-16 16:06:02 -0400
-Served asset /moments.js - 404 Not Found (1ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:06:02 -0400
-Served asset /moment/fr.js - 200 OK (2ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:06:22 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:06:22 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:07:08 -0400
-Served asset /moment.js - 200 OK (3ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:07:08 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:08:10 -0400
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:08:10 -0400
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:08:17 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:08:17 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:08:51 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:08:51 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:08:57 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:08:57 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:09:13 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:09:13 -0400
-Served asset /moment/fr.js - 200 OK (2ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:09:49 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:09:49 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:10:05 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:10:05 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:11:18 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:11:18 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:12:28 -0400
-Served asset /moment.js - 200 OK (16ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:12:28 -0400
-Served asset /moment/fr.js - 200 OK (10ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:12:47 -0400
-Served asset /moment.js - 200 OK (1ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:12:47 -0400
-Served asset /moment/fr.js - 200 OK (11ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:14:04 -0400
-Served asset /moment.js - 200 OK (1ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:14:04 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:15:39 -0400
-Served asset /moment.js - 200 OK (1ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:15:39 -0400
-Served asset /moment/fr.js - 200 OK (12ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:37:24 -0400
-Served asset /moment.js - 200 OK (14ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:37:24 -0400
-Served asset /moment/fr.js - 200 OK (11ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:37:32 -0400
-Served asset /moment.js - 200 OK (1ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:37:32 -0400
-Served asset /moment/fr.js - 200 OK (12ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:44:51 -0400
-Served asset /moment.js - 200 OK (46ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:44:52 -0400
-Served asset /moment/fr.js - 200 OK (12ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:44:52 -0400
+Started GET "/assets/moment.js" for 127.0.0.1 at 2013-09-19 11:00:54 -0400
+Compiled moment.js  (0ms)  (pid 11385)
+Served asset /moment.js - 200 OK (6ms)
+Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-09-19 11:00:54 -0400
+Compiled moment/fr.js  (0ms)  (pid 11385)
+Served asset /moment/fr.js - 200 OK (23ms)
+Started GET "/assets/moment.js" for 127.0.0.1 at 2013-09-19 11:00:54 -0400
 Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:45:09 -0400
-Served asset /moment.js - 200 OK (1ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:45:09 -0400
-Served asset /moment/fr.js - 200 OK (11ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:45:09 -0400
-Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:47:53 -0400
-Compiled moment.js  (0ms)  (pid 62815)
-Served asset /moment.js - 200 OK (18ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:47:53 -0400
-Compiled moment/fr.js  (0ms)  (pid 62815)
-Served asset /moment/fr.js - 200 OK (18ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:47:53 -0400
-Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:48:16 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:48:16 -0400
+Started GET "/assets/moment.js" for 127.0.0.1 at 2013-09-19 11:01:37 -0400
+Served asset /moment.js - 200 OK (11ms)
+Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-09-19 11:01:37 -0400
 Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:48:16 -0400
-Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:50:40 -0400
-Compiled moment.js  (10ms)  (pid 64044)
-Served asset /moment.js - 200 OK (40ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:50:40 -0400
-Served asset /moment/fr.js - 200 OK (2ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:50:40 -0400
-Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:50:53 -0400
-Compiled moment.js  (11ms)  (pid 64218)
-Served asset /moment.js - 200 OK (16ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-03-16 16:50:53 -0400
-Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-03-16 16:50:53 -0400
-Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-06-06 21:49:55 -0400
-Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-06-06 21:49:55 -0400
-Compiled moment/fr.js  (0ms)  (pid 73048)
-Served asset /moment/fr.js - 200 OK (28ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-06-06 21:49:55 -0400
-Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-07-20 10:00:25 -0400
-Compiled moment.js  (0ms)  (pid 5373)
-Served asset /moment.js - 200 OK (75ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-07-20 10:00:25 -0400
-Compiled moment/fr.js  (0ms)  (pid 5373)
-Served asset /moment/fr.js - 200 OK (96ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-07-20 10:00:25 -0400
+Started GET "/assets/moment.js" for 127.0.0.1 at 2013-09-19 11:01:37 -0400
 Served asset /moment.js - 200 OK (0ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-07-20 10:01:19 -0400
+Started GET "/assets/moment.js" for 127.0.0.1 at 2013-09-19 11:02:11 -0400
 Served asset /moment.js - 200 OK (2ms)
-Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-07-20 10:01:19 -0400
+Started GET "/assets/moment/fr.js" for 127.0.0.1 at 2013-09-19 11:02:11 -0400
 Served asset /moment/fr.js - 200 OK (1ms)
-Started GET "/assets/moment.js" for 127.0.0.1 at 2013-07-20 10:01:19 -0400
+Started GET "/assets/moment.js" for 127.0.0.1 at 2013-09-19 11:02:11 -0400
 Served asset /moment.js - 200 OK (0ms)

data/test/integration/navigation_test.rb

@@ -8,7 +8,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
 
   test 'momentjs response is for the expected version' do
     get 'assets/moment.js'
-    assert_match(/VERSION = "2\.1\.0"/, @response.body)
+    assert_match(/VERSION = "2\.2\.1"/, @response.body)
   end
 
   test 'can access momentjs translation' do

data/vendor/assets/javascripts/moment.js

@@ -1,8 +1,8 @@
-// moment.js
-// version : 2.1.0
-// author : Tim Wood
-// license : MIT
-// momentjs.com
+//! moment.js
+//! version : 2.2.1
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
 
 (function (undefined) {
 
@@ -11,7 +11,7 @@
     ************************************/
 
     var moment,
-        VERSION = "2.1.0",
+        VERSION = "2.2.1",
         round = Math.round, i,
         // internal storage for language config files
         languages = {},
@@ -21,7 +21,7 @@
 
         // ASP.NET json date format regex
         aspNetJsonRegex = /^\/?Date\((\-?\d+)/i,
-        aspNetTimeSpanJsonRegex = /(\-)?(\d*)?\.?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/,
+        aspNetTimeSpanJsonRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/,
 
         // format tokens
         formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,
@@ -73,6 +73,7 @@
             h : 'hour',
             d : 'day',
             w : 'week',
+            W : 'isoweek',
             M : 'month',
             y : 'year'
         },
@@ -257,18 +258,18 @@
         this._input = duration;
 
         // representation for dateAddRemove
-        this._milliseconds = milliseconds +
+        this._milliseconds = +milliseconds +
             seconds * 1e3 + // 1000
             minutes * 6e4 + // 1000 * 60
             hours * 36e5; // 1000 * 60 * 60
         // Because of dateAddRemove treats 24 hours as different from a
         // day when working around DST, we need to store them separately
-        this._days = days +
+        this._days = +days +
             weeks * 7;
         // It is impossible translate months into days without knowing
         // which months you are are talking about, so we have to store
         // it separately.
-        this._months = months +
+        this._months = +months +
             years * 12;
 
         this._data = {};
@@ -315,8 +316,7 @@
             days = duration._days,
             months = duration._months,
             minutes,
-            hours,
-            currentDate;
+            hours;
 
         if (milliseconds) {
             mom._d.setTime(+mom._d + milliseconds * isAdding);
@@ -371,7 +371,8 @@
     ************************************/
 
 
-    Language.prototype = {
+    extend(Language.prototype, {
+
         set : function (config) {
             var prop, i;
             for (i in config) {
@@ -404,7 +405,7 @@
             for (i = 0; i < 12; i++) {
                 // make the regex if we don't have it already
                 if (!this._monthsParse[i]) {
-                    mom = moment([2000, i]);
+                    mom = moment.utc([2000, i]);
                     regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
                     this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
                 }
@@ -470,7 +471,9 @@
         },
 
         isPM : function (input) {
-            return ((input + '').toLowerCase()[0] === 'p');
+            // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+            // Using charAt should be more compatible.
+            return ((input + '').toLowerCase().charAt(0) === 'p');
         },
 
         _meridiemParse : /[ap]\.?m?\.?/i,
@@ -541,7 +544,7 @@
             dow : 0, // Sunday is the first day of the week.
             doy : 6  // The week that contains Jan 1st is the first week of the year.
         }
-    };
+    });
 
     // Loads a language definition into the `languages` cache.  The function
     // takes a key and optionally values.  If not in the browser and no values
@@ -556,6 +559,11 @@
         return languages[key];
     }
 
+    // Remove a language from the `languages` cache. Mostly useful in tests.
+    function unloadLang(key) {
+        delete languages[key];
+    }
+
     // Determines which language definition to use and returns it.
     //
     // With no parameters, it will return the global language.  If you
@@ -574,7 +582,7 @@
                 return moment.fn._lang;
             }
         }
-        return languages[key];
+        return languages[key] || moment.fn._lang;
     }
 
 
@@ -612,21 +620,29 @@
 
     // format date using native date object
     function formatMoment(m, format) {
+
+        format = expandFormat(format, m.lang());
+
+        if (!formatFunctions[format]) {
+            formatFunctions[format] = makeFormatFunction(format);
+        }
+
+        return formatFunctions[format](m);
+    }
+
+    function expandFormat(format, lang) {
         var i = 5;
 
         function replaceLongDateFormatTokens(input) {
-            return m.lang().longDateFormat(input) || input;
+            return lang.longDateFormat(input) || input;
         }
 
-        while (i-- && localFormattingTokens.test(format)) {
+        while (i-- && (localFormattingTokens.lastIndex = 0,
+                    localFormattingTokens.test(format))) {
             format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
         }
 
-        if (!formatFunctions[format]) {
-            formatFunctions[format] = makeFormatFunction(format);
-        }
-
-        return formatFunctions[format](m);
+        return format;
     }
 
 
@@ -701,7 +717,9 @@
         // MONTH
         case 'M' : // fall through to MM
         case 'MM' :
-            datePartArray[1] = (input == null) ? 0 : ~~input - 1;
+            if (input != null) {
+                datePartArray[1] = ~~input - 1;
+            }
             break;
         case 'MMM' : // fall through to MMMM
         case 'MMMM' :
@@ -714,11 +732,17 @@
             }
             break;
         // DAY OF MONTH
-        case 'D' : // fall through to DDDD
-        case 'DD' : // fall through to DDDD
+        case 'D' : // fall through to DD
+        case 'DD' :
+            if (input != null) {
+                datePartArray[2] = ~~input;
+            }
+            break;
+        // DAY OF YEAR
         case 'DDD' : // fall through to DDDD
         case 'DDDD' :
             if (input != null) {
+                datePartArray[1] = 0;
                 datePartArray[2] = ~~input;
             }
             break;
@@ -781,13 +805,24 @@
     // note: all values past the year are optional and will default to the lowest possible value.
     // [year, month, day , hour, minute, second, millisecond]
     function dateFromArray(config) {
-        var i, date, input = [];
+        var i, date, input = [], currentDate;
 
         if (config._d) {
             return;
         }
 
-        for (i = 0; i < 7; i++) {
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        currentDate = currentDateArray(config);
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
+
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
             config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
         }
 
@@ -808,12 +843,47 @@
         config._d = date;
     }
 
+    function dateFromObject(config) {
+        var o = config._i;
+
+        if (config._d) {
+            return;
+        }
+
+        config._a = [
+            o.years || o.year || o.y,
+            o.months || o.month || o.M,
+            o.days || o.day || o.d,
+            o.hours || o.hour || o.h,
+            o.minutes || o.minute || o.m,
+            o.seconds || o.second || o.s,
+            o.milliseconds || o.millisecond || o.ms
+        ];
+
+        dateFromArray(config);
+    }
+
+    function currentDateArray(config) {
+        var now = new Date();
+        if (config._useUTC) {
+            return [
+                now.getUTCFullYear(),
+                now.getUTCMonth(),
+                now.getUTCDate()
+            ];
+        } else {
+            return [now.getFullYear(), now.getMonth(), now.getDate()];
+        }
+    }
+
     // date from string and format string
     function makeDateFromStringAndFormat(config) {
         // This array is used to make a Date, either with `new Date` or `Date.UTC`
-        var tokens = config._f.match(formattingTokens),
-            string = config._i,
-            i, parsedInput;
+        var lang = getLangDefinition(config._l),
+            string = '' + config._i,
+            i, parsedInput, tokens;
+
+        tokens = expandFormat(config._f, lang).match(formattingTokens);
 
         config._a = [];
 
@@ -915,8 +985,12 @@
         } else if (isArray(input)) {
             config._a = input.slice(0);
             dateFromArray(config);
+        } else if (input instanceof Date) {
+            config._d = new Date(+input);
+        } else if (typeof(input) === 'object') {
+            dateFromObject(config);
         } else {
-            config._d = input instanceof Date ? new Date(+input) : new Date(input);
+            config._d = new Date(input);
         }
     }
 
@@ -1037,7 +1111,7 @@
             _l : lang,
             _i : input,
             _f : format
-        });
+        }).utc();
     };
 
     // creating with unix timestamp (in seconds)
@@ -1098,8 +1172,13 @@
         if (!key) {
             return moment.fn._lang._abbr;
         }
+        key = key.toLowerCase();
+        key = key.replace('_', '-');
         if (values) {
             loadLang(key, values);
+        } else if (values === null) {
+            unloadLang(key);
+            key = 'en';
         } else if (!languages[key]) {
             getLangDefinition(key);
         }
@@ -1130,7 +1209,7 @@
     ************************************/
 
 
-    moment.fn = Moment.prototype = {
+    extend(moment.fn = Moment.prototype, {
 
         clone : function () {
             return moment(this);
@@ -1180,6 +1259,14 @@
             return !!this._isValid;
         },
 
+        invalidAt: function () {
+            var i, arr1 = this._a, arr2 = (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray();
+            for (i = 6; i >= 0 && arr1[i] === arr2[i]; --i) {
+                // empty loop body
+            }
+            return i;
+        },
+
         utc : function () {
             return this.zone(0);
         },
@@ -1262,7 +1349,7 @@
         },
 
         calendar : function () {
-            var diff = this.diff(moment().startOf('day'), 'days', true),
+            var diff = this.diff(moment().zone(this.zone()).startOf('day'), 'days', true),
                 format = diff < -6 ? 'sameElse' :
                 diff < -1 ? 'lastWeek' :
                 diff < 0 ? 'lastDay' :
@@ -1299,8 +1386,7 @@
 
         month : function (input) {
             var utc = this._isUTC ? 'UTC' : '',
-                dayOfMonth,
-                daysInMonth;
+                dayOfMonth;
 
             if (input != null) {
                 if (typeof input === 'string') {
@@ -1334,6 +1420,7 @@
                 this.date(1);
                 /* falls through */
             case 'week':
+            case 'isoweek':
             case 'day':
                 this.hours(0);
                 /* falls through */
@@ -1351,13 +1438,16 @@
             // weeks are a special case
             if (units === 'week') {
                 this.weekday(0);
+            } else if (units === 'isoweek') {
+                this.isoWeekday(1);
             }
 
             return this;
         },
 
         endOf: function (units) {
-            return this.startOf(units).add(units, 1).subtract('ms', 1);
+            units = normalizeUnits(units);
+            return this.startOf(units).add((units === 'isoweek' ? 'week' : units), 1).subtract('ms', 1);
         },
 
         isAfter: function (input, units) {
@@ -1413,6 +1503,17 @@
             return this._isUTC ? "Coordinated Universal Time" : "";
         },
 
+        hasAlignedHourOffset : function (input) {
+            if (!input) {
+                input = 0;
+            }
+            else {
+                input = moment(input).zone();
+            }
+
+            return (this.zone() - input) % 60 === 0;
+        },
+
         daysInMonth : function () {
             return moment.utc([this.year(), this.month() + 1, 0]).date();
         },
@@ -1454,6 +1555,16 @@
             return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
         },
 
+        get : function (units) {
+            units = normalizeUnits(units);
+            return this[units.toLowerCase()]();
+        },
+
+        set : function (units, value) {
+            units = normalizeUnits(units);
+            this[units.toLowerCase()](value);
+        },
+
         // If passed a language key, it will set the language for this
         // instance.  Otherwise, it will return the language configuration
         // variables for this instance.
@@ -1465,7 +1576,7 @@
                 return this;
             }
         }
-    };
+    });
 
     // helper for adding shortcuts
     function makeGetterAndSetter(name, key) {
@@ -1503,7 +1614,8 @@
     ************************************/
 
 
-    moment.duration.fn = Duration.prototype = {
+    extend(moment.duration.fn = Duration.prototype, {
+
         _bubble : function () {
             var milliseconds = this._milliseconds,
                 days = this._days,
@@ -1592,7 +1704,7 @@
         },
 
         lang : moment.fn.lang
-    };
+    });
 
     function makeDurationGetter(name) {
         moment.duration.fn[name] = function () {
@@ -1636,6 +1748,7 @@
         }
     });
 
+    /* EMBED_LANGUAGES */
 
     /************************************
         Exposing Moment