codexparser 0.0.2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "This is a Javascript Bible parser and text scanner. It will search through texts and collate all scripture references into an array and parse them into objects, and it will parse passages into objects by book, chapter, verse, and testament. ",
   "main": "index.js",
   "scripts": {

package/src/CodexParser.js

@@ -42,9 +42,9 @@ class CodexParser {
             const chapter = this.found[i].replace(book[0], "").match(this.chapterRegex)
             const passage = {
                 original: this.found[i],
-                book: book[0].charAt(0).toUpperCase() + book[0].slice(1),
-                chapter: chapter[0].replace(":", "").trim(),
-                verses: this.found[i].match(this.verseRegex)[0].replace(":", "").trim(),
+                book: this.bookify(book[0].charAt(0).toUpperCase() + book[0].slice(1)),
+                chapter: chapter[0].replace(/[:.]/, "").trim(),
+                verses: this.found[i].match(this.verseRegex)[0].replace(/[:.]/, "").trim(),
             }
             passage.verses = passage.verses.split(/,/).filter(Boolean)
             passage.testament = this.bible.old.includes(passage.book) ? "old" : "new"
@@ -53,6 +53,22 @@ class CodexParser {
         this.found = []
         return this.passages
     }
+    bookify(book) {
+        let bookified
+        bookified = this.bible.new.find(
+            (b) =>
+                b.charAt(0).toLowerCase() === book.charAt(0).toLowerCase() &&
+                b.toLowerCase().includes(book.toLowerCase())
+        )
+        if (!bookified) {
+            bookified = this.bible.old.find(
+                (b) =>
+                    b.charAt(0).toLowerCase() === book.charAt(0).toLowerCase() &&
+                    b.toLowerCase().includes(book.toLowerCase())
+            )
+        }
+        return bookified
+    }
     //TODO: Need to create a bookfiy function that will convert abbreviated books into full books
     /**
      * Returns the passages stored in the object.

package/src/regex.js

@@ -1,9 +1,9 @@
 const bookRegex =
-    /(?:(?:[gG]en(?:esis)?|[eE]xod(?:us)?|[lL]ev(?:iticus)?|[nN]um(?:bers)?|[dD]eu(?:teronomy)?|[jJ]os(?:hua)?|[jJ]dg(?:es)?|[rR]ut(?:h)?|1 [sS]a(?:muel)?|2 [sS]a(?:muel)?|1 [kK]gs(?:on)?|2 [kK]gs(?:on)?|1 [cC]hr(?:onicles)?|2 [cC]hr(?:onicles)?|[eE]zr(?:a)?|[nN]eh(?:emiah)?|[eE]st(?:her)?|[jJ]ob|[pP]sa(?:lms)?|[pP]ro(?:verbs)?|[eE]cc(?:lesiastes)?|[sS]on(?:g)?|[iI]sa(?:iah)?|[jJ]er(?:emiah)?|[lL]am(?:entations)?|[eE]ze(?:riah)?|[dD]an(?:iel)?|[hH]o(?:sea)?|[jJ]oe(?:l)?|[aA]mo(?:s)?|[oO]ba(?:h)?|[jJ]on(?:ah)?|[mM]i(?:cah)?|[nN]ah(?:um)?|[hH]ab(?:akkuk)?|[zZ]ep(?:haniah)?|[hH]ag(?:gai)?|[zZ]ec(?:hariah)?|[mM]al(?:achi)?|[mM]at(?:thew)?|[mM]ar(?:k)?|[lL]uk(?:e)?|[jJ]oh(?:n)?|[aA]ct(?:s)?|[rR]o(?:m)?(?:ans)?|1 [cC]or(?:inthians)?|2 [cC]or(?:inthians)?|[gG]al(?:atians)?|[eE]ph(?:esians)?|[pP]hi(?:lippians)?|[cC]ol(?:ossians)?|1 [tT]hess(?:alonians)?|2 [tT]hess(?:alonians)?|1 [tT]i(?:mothy)?|2 [tT]i(?:mothy)?|[tT]it(?:us)?|[pP]h(?:ilemon)?|[hH]eb(?:rews)?|[jJ]am(?:es)?|1 [pP]e(?:ter)?|2 [pP]e(?:ter)?|1 [jJ]o(?:n)?|2 [jJ]o(?:n)?|3 [jJ]o(?:n)?|[jJ]ude?|Rev(?:elation)?))/gim
+    /(?:(?:[gG]e(?:[a-zA-Z])?|[eE]x(?:[a-zA-Z])?|[lL]e(?:[a-zA-Z])?|[nN]u(?:[a-zA-Z])?|[dD]e(?:[a-zA-Z])?|[jJ]o(?:[a-zA-Z])?|[jJ]u(?:[a-zA-Z])?|[rR]u(?:[a-zA-Z])?|1 [sS](?:[a-zA-Z])?|2 [sS](?:[a-zA-Z])?|1 [kK](?:[a-zA-Z])?|2 [kK](?:[a-zA-Z])?|1 [cC]hr(?:[a-zA-Z])?|2 [cC]hr(?:[a-zA-Z])?|[eE]z(?:[a-zA-Z])?|[nN]e(?:[a-zA-Z])?|[eE]s(?:[a-zA-Z])?|[jJ](?:[a-zA-Z])?|[pP]s(?:[a-zA-Z])?|[pP]r(?:[a-zA-Z])?|[eE]cc(?:[a-zA-Z])?|[sS]o(?:[a-zA-Z])?|[iI]s(?:[a-zA-Z])?|[jJ]e(?:[a-zA-Z])?|[lL]a(?:[a-zA-Z])?|[eE]z(?:[a-zA-Z])?|[dD](?:[a-zA-Z])?|[hH]o(?:[a-zA-Z])?|[jJ](?:[a-zA-Z])?|[aA](?:[a-zA-Z])?|[oO](?:[a-zA-Z])?|[jJ](?:[a-zA-Z])?|[mM](?:[a-zA-Z])?|[nN](?:[a-zA-Z])?|[hH]a(?:[a-zA-Z])?|[zZ](?:[a-zA-Z])?|[hH]a(?:[a-zA-Z])?|[zZ]e(?:[a-zA-Z])?|[mM]a(?:[a-zA-Z])?|[mM](?:[a-zA-Z])?|[mM](?:[a-zA-Z])?|[lL](?:[a-zA-Z])?|[jJ](?:[a-zA-Z])?|[aA](?:[a-zA-Z])?|[rR](?:[a-zA-Z])?|1 [cC](?:[a-zA-Z])?|2 [cC](?:[a-zA-Z])?|[gG](?:[a-zA-Z])?|[eE](?:[a-zA-Z])?|[pP]h(?:[a-zA-Z])?|[cC](?:[a-zA-Z])?|1 [tT]h(?:[a-zA-Z])?|2 [tT]h(?:[a-zA-Z])?|1 [tT](?:[a-zA-Z])?|2 [tT](?:[a-zA-Z])?|[tT](?:[a-zA-Z])?|[pP]h(?:[a-zA-Z])?|[hH](?:[a-zA-Z])?|[jJ](?:[a-zA-Z])?|1 [pP](?:[a-zA-Z])?|2 [pP](?:[a-zA-Z])?|1 [jJ](?:[a-zA-Z])?|2 [jJ](?:[a-zA-Z])?|3 [jJ](?:[a-zA-Z])?|[jJ](:[a-zA-Z])?|[Rr|Aa](?:[a-zA-Z])?))/gim
 const bookAbbrRegex =
     /(?:(?:[gG]en|[eE]xo|[lL]ev|[nN]um|[dD]eu|[jJ]os|[jJ]dg|[rR]ut|1 [sS]a|2 [sS]a|1 [kK]gs|2 [kK]gs|1 [cC]hr|2 [cC]hr|[eE]zr|[nN]eh|[eE]st|[jJ]ob|[pP]sa|[pP]ro|[eE]cc|[sS]on|[iI]sa|[jJ]er|[lL]am|[eE]ze|[dD]an|[hH]os|[jJ]oe|[aA]mo|[oO]ba|[jJ]on|[mM]ic|[nN]ah|[hH]ab|[zZ]ep|[hH]ag|[zZ]ec|[mM]al|[mM]att|[mM]ar|[lL]uk|[jJ]oh|[aA]ct|[rR]om|1 [cC]or|2 [cC]or|[gG]al|[eE]ph|[pP]hi|[cC]ol|1 [tT]hess|2 [tT]hess|1 [tT]i|2 [tT]i|[tT]it|[pP]hm|[hH]eb|[jJ]am|1 [pP]e|2 [pP]e|1 [jJ]o|2 [jJ]o|3 [jJ]o|[jJ]ud|[rR]ev))/gim
 const chapterRegex = /(?:\s?\d+:?)/g
-const verseRegex = /\b:\s*?(\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?!p|j|k|s|c|t)\b/g
+const verseRegex = /\b[:|.]\s*?(\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?!p|j|k|s|c|t)\b/g
 const scripturesRegex = new RegExp(`(${bookRegex.source})(${chapterRegex.source})?(${verseRegex.source})`, "gm")
 const abbrScripturesRegex = new RegExp(`(${bookAbbrRegex.source})(${chapterRegex.source})?(${verseRegex.source})`, "gm")
 

package/test.js

@@ -3,7 +3,7 @@ const CodexParser = require("./src/CodexParser.js")
 const parser = new CodexParser()
 const text =
     "The passages that we are looking at tonight are found in 1 John 3:16-17, 1 Peter 1:1, and Romans 10:13, 15, 17. Please turn in your Bibles."
-const single = "Revelation 16:8"
-parser.parse(text)
+const single = "Ju 2.9"
+parser.parse(single)
 //parser.parse(single)
 console.log(parser.getPassages())