fix(dateParser): support literals inside date format string

'format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g. `"h 'in the morning'"`).

Author: vmlf01

src/helpers/date-parser.js

@@ -251,27 +251,64 @@ angular.module('mgcrea.ngStrap.helpers.dateParser', [])
         return sortedMap;
       }
 
-      function escapeReservedSymbols(text) {
-        return text.replace(/\//g, '[\\/]').replace('/-/g', '[-]').replace(/\./g, '[.]').replace(/\\s/g, '[\\s]');
+      function regExpForFormat(format) {
+        // `format` string can contain literal values.
+        // These need to be escaped by surrounding with
+        // single quotes (e.g. `"h 'in the morning'"`).
+        // In order to output a single quote, escape it - i.e.,
+        // two single quotes in a sequence (e.g. `"h 'o''clock'"`).
+
+        var re = buildDateAbstractRegex(format);
+        return buildDateParseRegex(re);
       }
 
-      function regExpForFormat(format) {
-        var keys = Object.keys(regExpMap), i;
+      function buildDateAbstractRegex(format) {
+        var literalRegex = /('.*?')/;
+        var formatParts = format.split(literalRegex);
+        var dateElements = Object.keys(regExpMap);
+        var dateRegexParts = [];
+
+        angular.forEach(formatParts, function (part) {
+          if (isFormatStringLiteral(part)) {
+            part = removeLiteralEscapeChars(part);
+          }
+          else {
+            // Abstract replaces to avoid collisions
+            for(var i = 0; i < dateElements.length; i++) {
+              part = part.split(dateElements[i]).join('${' + i + '}');
+            }
+          }
+          dateRegexParts.push(part);
+        });
+
+        return dateRegexParts.join('');
+      }
+
+      function isFormatStringLiteral(text) {
+        return text.indexOf('\'') == 0;
+      }
+
+      function removeLiteralEscapeChars(text) {
+        return text.replace(/'/g, '');
+      }
+
+      function buildDateParseRegex(abstractRegex) {
+        var dateElements = Object.keys(regExpMap);
+        var re = abstractRegex;
 
-        var re = format;
-        // Abstract replaces to avoid collisions
-        for(i = 0; i < keys.length; i++) {
-          re = re.split(keys[i]).join('${' + i + '}');
-        }
         // Replace abstracted values
-        for(i = 0; i < keys.length; i++) {
-          re = re.split('${' + i + '}').join('(' + regExpMap[keys[i]] + ')');
+        for(var i = 0; i < dateElements.length; i++) {
+          re = re.split('${' + i + '}').join('(' + regExpMap[dateElements[i]] + ')');
         }
-        format = escapeReservedSymbols(format);
+        re = escapeReservedSymbols(re);
 
         return new RegExp('^' + re + '$', ['i']);
       }
 
+      function escapeReservedSymbols(text) {
+        return text.replace(/\//g, '[\\/]').replace('/-/g', '[-]').replace(/\./g, '[.]').replace(/\\s/g, '[\\s]');
+      }
+
       $dateParser.init();
       return $dateParser;
 

src/helpers/test/date-parser.spec.js

@@ -4,8 +4,6 @@ describe('dateParser', function () {
 
   var $compile, scope, $dateParser, parser, $locale;
 
-  var lorem = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur non velit nulla. Suspendisse sit amet tempus diam. Sed at ultricies neque. Suspendisse id felis a sem placerat ornare. Donec auctor, purus at molestie tempor, arcu enim molestie lacus, ac imperdiet massa urna eu massa. Praesent velit tellus, scelerisque a fermentum ut, ornare in diam. Phasellus egestas molestie feugiat. Vivamus sit amet viverra metus.';
-
   beforeEach(module('mgcrea.ngStrap.helpers.dateParser'));
 
   beforeEach(inject(function (_$rootScope_, _$compile_, _$dateParser_, _$locale_) {
@@ -391,5 +389,24 @@ describe('dateParser', function () {
       ]);
     });
 
+    describe('fullDate format "EEEE, d MMMM y"', function() {
+      beforeEach(function() {
+        parser = $dateParser({ format: "EEEE, d MMMM y" });
+      });
+      generateTestCasesForParsing([
+        {val:'Wednesday, 01 January 2014', expect: new Date(2014,0,1), reason:'full date'}
+      ]);
+    });
+
+    describe('fullDate format "EEEE, d \'de\' MMMM \'de\' y" with literals', function() {
+      beforeEach(function() {
+        parser = $dateParser({ format: "EEEE, d 'de' MMMM 'de' y" });
+      });
+      generateTestCasesForParsing([
+        {val:'Wednesday, 01 de January de 2014', expect: new Date(2014,0,1), reason:'full date with literals'},
+        {val:'Wednesday, 01 January 2014', expect: false, reason:'full date does not include literals'}
+      ]);
+    });
+
   });
 });