More reorganization

davidmerfield · Oct 17, 2019 · 152a9b8 · 152a9b8
1 parent fa37f46
commit 152a9b8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/app/build/prepare/parseDate.js → app/build/prepare/dateStamp/fromMetadata.js b/app/build/prepare/parseDate.js → app/build/prepare/dateStamp/fromMetadata.js
@@ -5,7 +5,7 @@ var formatList = {
   "YYYY/M/D": formats("YMD")
 };
 
-function parseDate(dateString, userFormat) {
+function fromMetadata(dateString, userFormat) {
   if (userFormat === undefined || formatList[userFormat] === undefined) {
     console.log(
       userFormat + " userformat has not been passed. Please do this!"
@@ -88,4 +88,4 @@ function formats(dateFormat) {
   return list;
 }
 
-module.exports = parseDate;
+module.exports = fromMetadata;
diff --git a/app/build/prepare/dateFromFileName.js → app/build/prepare/dateStamp/fromPath.js b/app/build/prepare/dateFromFileName.js → app/build/prepare/dateStamp/fromPath.js
@@ -1,6 +1,6 @@
 var moment = require("moment");
 
-function dateFromFileName(path) {
+function fromPath (path) {
   var created, parsed, fileName, tokens;
   var year, month, day;
   var hour, minute, second;
@@ -155,7 +155,7 @@ function pad(number) {
   function check(str, date, fileName) {
     // console.log();
     // console.log(str)
-    var res = dateFromFileName(str);
+    var res = fromPath(str);
 
     try {
       if (date === false) {
@@ -232,4 +232,4 @@ function pad(number) {
   check("2013-01-31-100-322-1-4.jpg", 1359590400000, "100-322-1-4.jpg");
 })();
 
-module.exports = dateFromFileName;
+module.exports = fromPath;
diff --git a/app/build/prepare/dateStamp.js → app/build/prepare/dateStamp/index.js b/app/build/prepare/dateStamp.js → app/build/prepare/dateStamp/index.js
@@ -2,8 +2,8 @@ var helper = require("helper");
 var ensure = helper.ensure;
 var debug = require("debug")("blot:build:dateStamp");
 
-var dateFromFileName = require("./dateFromFileName");
-var parseDate = require("./parseDate");
+var fromPath = require("./fromPath");
+var fromMetadata = require("./fromMetadata");
 var type = helper.type;
 
 var moment = require("moment");
@@ -49,15 +49,15 @@ module.exports = function(blog, path, metadata) {
   // field in the entry's metadata,
   // try and parse a timestamp from it.
   if (date && dateStamp === undefined)
-    dateStamp = validate(parseDate(date, dateFormat));
+    dateStamp = validate(fromMetadata(date, dateFormat));
 
   debug("Blog:", blog.id, "dateStamp #3", dateStamp);
 
   // The user didn't specify a valid
   // date in the entry's metadata. Try
   // and extract one from the file's path
   if (dateStamp === undefined) {
-    dateStamp = validate(dateFromFileName(path).created);
+    dateStamp = validate(fromPath(path).created);
   }
 
   debug("Blog:", blog.id, "dateStamp #4", dateStamp);

diff --git a/app/build/prepare/tests/date-metadata.js → ...d/prepare/dateStamp/tests/fromMetadata.js b/app/build/prepare/tests/date-metadata.js → ...d/prepare/dateStamp/tests/fromMetadata.js
@@ -1,5 +1,5 @@
 var moment = require("moment");
-var parseDate = require('../parseDate');
+var fromMetadata = require('../fromMetadata');
 
 // Blot parses dates according to the 'dateFormat' of the blog.
 // This allows Blot to determine what 5.1.2019 means: either
@@ -50,7 +50,7 @@ describe("date metadata", function() {
     supportedByAllFormats[result].forEach(function(metadata) {
       Object.keys(supportedBySpecficFormat).forEach(function(format) {
         it('parses "' + metadata + '" using date format ' + format, function() {
-          expect(moment.utc(parseDate(metadata, format)).format()).toEqual(
+          expect(moment.utc(fromMetadata(metadata, format)).format()).toEqual(
             result
           );
         });
@@ -64,7 +64,7 @@ describe("date metadata", function() {
     Object.keys(supportedBySpecficFormat[format]).forEach(function(result) {
       supportedBySpecficFormat[format][result].forEach(function(metadata) {
         it('parses "' + metadata + '" using date format ' + format, function() {
-          expect(moment.utc(parseDate(metadata, format)).format()).toEqual(
+          expect(moment.utc(fromMetadata(metadata, format)).format()).toEqual(
             result
           );
         });

diff --git a/app/build/prepare/title.js b/app/build/prepare/title.js
@@ -1,6 +1,6 @@
 var helper = require("helper");
 var firstSentence = helper.firstSentence;
-var titlify = require('../../prepare/titlify');
+var titlify = require('./titlify');
 
 function tidy(str) {
   return str

diff --git a/app/build/prepare/titlify.js b/app/build/prepare/titlify.js
@@ -1,9 +1,9 @@
 var basename = require("path").basename;
-var dateFromFileName = require("./dateFromFileName");
+var fromPath = require("./dateStamp/fromPath");
 
 function titlify(path) {
   var name, nameWithoutExtension, title;
-  var hasDate = dateFromFileName(path);
+  var hasDate = fromPath(path);
 
   // Otherwise basename doesn't work right?
   if (path[0] !== "/") path = "/" + path;