exposing closestWeekday

WebReflection · Aug 27, 2018 · a963829 · a963829
1 parent 585cbda
commit a963829
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/coverage/lcov-report/cjs/index.html b/coverage/lcov-report/cjs/index.html
@@ -77,7 +77,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Aug 27 2018 09:44:45 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Aug 27 2018 10:21:46 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/coverage/lcov-report/cjs/index.js.html b/coverage/lcov-report/cjs/index.js.html
@@ -556,7 +556,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Aug 27 2018 09:44:45 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Aug 27 2018 10:21:46 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html
@@ -77,7 +77,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Aug 27 2018 09:44:45 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon Aug 27 2018 10:21:46 GMT+0200 (CEST)
 </div>
 </div>
 <script src="prettify.js"></script>

diff --git a/holidays/us/index.js b/holidays/us/index.js
@@ -1,20 +1,23 @@
 var utils = require('../utils');
 
+var after = utils.after;
+var closestWeekday = utils.closestWeekday;
+
 module.exports = {
   national: [
-    utils.after('Monday', '01-01'),
+    after('Monday', '01-01'),
     MartinLutherKingJr,
     utils.before('Monday', '05-31'),
-    closeTo('07-04'),
-    utils.after('Monday', '09-01'),
+    closestWeekday('07-04'),
+    after('Monday', '09-01'),
     Thanksgiving,
     '12-25'
   ],
   regional: [
     Presidents,
-    closeTo('04-16'),
+    closestWeekday('04-16'),
     Columbus,
-    closeTo('11-11'),
+    closestWeekday('11-11'),
     dayAfterThanksgiving
   ]
 };
@@ -25,37 +28,26 @@ function dayAfterThanksgiving(Y) {
   return date;
 }
 
-function closeTo(mmdd) {
-  return function (Y) {
-    var date = new Date(Y + '-' + mmdd);
-    if (date.getDay() === 6)
-      date.setDate(date.getDate() - 1);
-    else if (date.getDay() === 0)
-      date.setDate(date.getDate() + 1);
-    return date;
-  };
-}
-
 function Columbus(Y) {
-  var date = utils.after('Monday', '10-01')(Y);
+  var date = after('Monday', '10-01')(Y);
   date.setDate(date.getDate() + 7);
   return date;
 }
 
 function MartinLutherKingJr(Y) {
-  var date = utils.after('Monday', '01-01')(Y);
+  var date = after('Monday', '01-01')(Y);
   date.setDate(date.getDate() + 7 * 2);
   return date;
 }
 
 function Presidents(Y) {
-  var date = utils.after('Monday', '02-01')(Y);
+  var date = after('Monday', '02-01')(Y);
   date.setDate(date.getDate() + 7 * 2);
   return date;
 }
 
 function Thanksgiving(Y) {
-  var date = utils.after('Thursday', '11-01')(Y);
+  var date = after('Thursday', '11-01')(Y);
   date.setDate(date.getDate() + 7 * 3);
   return date;
 }
diff --git a/holidays/utils.js b/holidays/utils.js
@@ -2,6 +2,7 @@ module.exports = {
   after: after,
   ascension: ascension,
   before: before,
+  closestWeekday: closestWeekday,
   corpusChristi: corpusChristi,
   easter: easter,
   pentecost: pentecost,
@@ -22,6 +23,17 @@ function before(day, fn) {
   return _find(day, fn, -1);
 }
 
+function closestWeekday(mmdd) {
+  return function (Y) {
+    var date = new Date(Y + '-' + mmdd);
+    if (date.getDay() === 6)
+      date.setDate(date.getDate() - 1);
+    else if (date.getDay() === 0)
+      date.setDate(date.getDate() + 1);
+    return date;
+  };
+}
+
 function corpusChristi(Y) {
   var date = easter(Y);
   date.setDate(date.getDate() + 7 * 8);