json of abbreviations, parse passage

.eslintrc.js

@@ -19,6 +19,12 @@ module.exports = {
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
 
-    "quotes": ["error", "double", { "allowTemplateLiterals": true }]
+    "quotes": ["error", "double", { "allowTemplateLiterals": true }],
+
+    "space-before-function-paren": ["error", "never"],
+
+    "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1 }],
+
+    "padded-blocks": 0
   }
 }

src/App.vue

@@ -12,13 +12,15 @@
 
 <script>
 import $ from "jquery"
+import { parsePassage } from "./utils/abbreviation.js"
 import PassageText from "./components/PassageText.vue"
 import PassageAudio from "./components/PassageAudio.vue"
 
 export default {
-  data () {
+  data() {
     return {
       passage: "",
+      parsedPassage: "",
       audioSrc: null,
       loading: true,
       passageHtml: ""
@@ -29,15 +31,19 @@ export default {
     passageAudio: PassageAudio
   },
   methods: {
-    getPassage () {
+    getPassage() {
       this.loadingText = true
 
-      var audioSrc = this.passage ? `http://audio.esvbible.org/hw/hq/${this.passage}.mp3` : null
-      var textUrl = `http://still-shelf-63211.herokuapp.com/http://www.esvapi.org/v2/rest/passageQuery?key=IP&passage=${this.passage}`
+      this.parsedPassage = parsePassage(this.passage)
+      console.log(this.parsedPassage)
+
+      var audioSrc = this.passage ? `http://audio.esvbible.org/hw/hq/${this.parsedPassage}.mp3` : null
+      var textUrl = `http://still-shelf-63211.herokuapp.com/http://www.esvapi.org/v2/rest/passageQuery?key=IP&passage=${this.parsedPassage}`
 
       $.ajax({
         url: textUrl,
         success: (data) => {
+          this.parsedPassage = ""
           this.passageHtml = data
           this.audioSrc = audioSrc
           this.loading = false

src/components/PassageAudio.vue

@@ -8,21 +8,21 @@
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       player: null
     }
   },
   props: ["src"],
-  updated () {
+  updated() {
     const audio = document.getElementById("audio")
     audio.load()
   },
-  created () {
-    window.onkeydown = function (e) {
+  created() {
+    window.onkeydown = function(e) {
       return !(e.keyCode === 32 && e.target.tagName !== "INPUT")
     }
-    window.onkeyup = function (e) {
+    window.onkeyup = function(e) {
       if (e.keyCode === 32 && e.target.tagName !== "INPUT") {
         this.audio.paused ? this.audio.play() : this.audio.pause()
       }

src/components/PassageText.vue

@@ -7,7 +7,7 @@
 <script>
 import $ from "jquery"
 
-$.strRemove = function (theTarget, theString) {
+$.strRemove = function(theTarget, theString) {
   return $("<div/>").append(
     $(theTarget, theString).remove().end()
   ).html()
@@ -16,7 +16,7 @@ $.strRemove = function (theTarget, theString) {
 export default {
   props: ["passageHtml"],
   computed: {
-    formattedPassage () {
+    formattedPassage() {
       let html = this.passageHtml
 
       html = $.strRemove("object", html)

src/utils/abbreviation.js

@@ -0,0 +1,85 @@
+import $ from "jquery"
+
+const abbreviations = {
+  "Genesis": ["Gen", "Ge", "Gn"],
+  "Exodus": ["Exo", "Ex", "Exod"],
+  "Leviticus": ["Lev", "Le", "Lv"],
+  "Numbers": ["Num", "Nu", "Nm", "Nb"],
+  "Deuteronomy": ["Deut", "Dt"],
+  "Joshua": ["Josh", "Jos", "Jsh"],
+  "Judges": ["Judg", "Jdg", "Jg", "Jdgs"],
+  "Ruth": ["Rth", "Ru"],
+  "1 Samuel": ["1 Sam", "1 Sa", "1Samuel", "1S", "I Sa", "1 Sm", "1Sa", "I Sam", "1Sam", "I Samuel", "1st Samuel", "First Samuel"],
+  "2 Samuel": ["2 Sam", "2 Sa", "2S", "II Sa", "2 Sm", "2Sa", "II Sam", "2Sam", "II Samuel", "2Samuel", "2nd Samuel", "Second Samuel"],
+  "1 Kings": ["1 Kgs", "1 Ki", "1K", "I Kgs", "1Kgs", "I Ki", "1Ki", "I Kings", "1Kings", "1st Kgs", "1st Kings", "First Kings", "First Kgs", "1Kin"],
+  "2 Kings": ["2 Kgs", "2 Ki", "2K", "II Kgs", "2Kgs", "II Ki", "2Ki", "II Kings", "2Kings", "2nd Kgs", "2nd Kings", "Second Kings", "Second Kgs", "2Kin"],
+  "1 Chronicles": ["1 Chron", "1 Ch", "I Ch", "1Ch", "1 Chr", "I Chr", "1Chr", "I Chron", "1Chron", "I Chronicles", "1Chronicles", "1st Chronicles", "First Chronicles"],
+  "2 Chronicles": ["2 Chron", "2 Ch", "II Ch", "2Ch", "II Chr", "2Chr", "II Chron", "2Chron", "II Chronicles", "2Chronicles", "2nd Chronicles", "Second Chronicles"],
+  "Ezra": ["Ezra", "Ezr"],
+  "Nehemiah": ["Neh", "Ne"],
+  "Esther": ["Esth", "Es"],
+  "Job": ["Jb"],
+  "Psalm": ["Pslm", "Ps", "Psalms", "Psa", "Psm", "Pss"],
+  "Proverbs": ["Prov", "Pr", "Prv"],
+  "Ecclesiastes": ["Eccles", "Ec", "Ecc"],
+  "Song of Solomon": ["Song", "So", "Song of Songs", "SOS"],
+  "Isaiah": ["Isa", "Is"],
+  "Jeremiah": ["Jer", "Je", "Jr"],
+  "Lamentations": ["Lam", "La"],
+  "Ezekiel": ["Ezek", "Eze", "Ezk"],
+  "Daniel": ["Dan", "Da", "Dn"],
+  "Hosea": ["Hos", "Ho"],
+  "Joel": ["Joe", "Jl"],
+  "Amos": ["Amos", "Am"],
+  "Obadiah": ["Obad", "Ob"],
+  "Jonah": ["Jnh", "Jon"],
+  "Micah": ["Mic"],
+  "Nahum": ["Nah", "Na"],
+  "Habakkuk": ["Hab"],
+  "Zephaniah": ["Zeph", "Zep", "Zp"],
+  "Haggai": ["Hag", "Hg"],
+  "Zechariah": ["Zech", "Zec", "Zc"],
+  "Malachi": ["Mal", "Ml"],
+  "Matthew": ["Matt", "Mt"],
+  "Mark": ["Mrk", "Mk", "Mr"],
+  "Luke": ["Luk", "Lk"],
+  "John": ["Jn", "Jhn"],
+  "Acts": ["Acts", "Ac"],
+  "Romans": ["Rom", "Ro", "Rm"],
+  "1 Corinthians": ["1 Cor", "1 Co", "I Co", "1Co", "I Cor", "1Cor", "I Corinthians", "1Corinthians", "1st Corinthians", "First Corinthians"],
+  "2 Corinthians": ["2 Cor", "2 Co", "II Co", "2Co", "II Cor", "2Cor", "II Corinthians", "2Corinthians", "2nd Corinthians", "Second Corinthians"],
+  "Galatians": ["Gal", "Ga"],
+  "Ephesians": ["Ephes", "Eph"],
+  "Philippians": ["Phil", "Php"],
+  "Colossians": ["Col"],
+  "1 Thessalonians": ["1 Thess", "1 Th", "I Th", "1Th", "I Thes", "1Thes", "I Thess", "1Thess", "I Thessalonians", "1Thessalonians", "1st Thessalonians", "First Thessalonians"],
+  "2 Thessalonians": ["2 Thess", "2 Th", "II Th", "2Th", "II Thes", "2Thes", "II Thess", "2Thess", "II Thessalonians", "2Thessalonians", "2nd Thessalonians", "Second Thessalonians"],
+  "1 Timothy": ["1 Tim", "1 Ti", "I Ti", "1Ti", "I Tim", "1Tim", "I Timothy", "1Timothy", "1st Timothy", "First Timothy"],
+  "2 Timothy": ["2 Tim", "2 Ti", "II Ti", "2Ti", "II Tim", "2Tim", "II Timothy", "2Timothy", "2nd Timothy", "Second Timothy"],
+  "Titus": ["Titus", "Tit"],
+  "Philemon": ["Philem", "Phm"],
+  "Hebrews": ["Heb"],
+  "James": ["Jas", "Jm"],
+  "1 Peter": ["1 Pet", "1 Pe", "I Pe", "1Pe", "I Pet", "1Pet", "I Pt", "1 Pt", "1Pt", "I Peter", "1Peter", "1st Peter", "First Peter"],
+  "2 Peter": ["2 Pet", "2 Pe", "II Pe", "2Pe", "II Pet", "2Pet", "II Pt", "2 Pt", "2Pt", "II Peter", "2Peter", "2nd Peter", "Second Peter"],
+  "1 John": ["1 John", "1 Jn", "I Jn", "1Jn", "I Jo", "1Jo", "I Joh", "1Joh", "I Jhn", "1 Jhn", "1Jhn", "I John", "1John", "1st John", "First John"],
+  "2 John": ["2 John", "2 Jn", "II Jn", "2Jn", "II Jo", "2Jo", "II Joh", "2Joh", "II Jhn", "2 Jhn", "2Jhn", "II John", "2John", "2nd John", "Second John"],
+  "3 John": ["3 John", "3 Jn", "III Jn", "3Jn", "III Jo", "3Jo", "III Joh", "3Joh", "III Jhn", "3 Jhn", "3Jhn", "III John", "3John", "3rd John", "Third John"],
+  "Jude": ["Jud"],
+  "Revelation": ["Rev", "Re", "The Revelation"]
+}
+
+export const parsePassage = (passage) => {
+  let parsedPassage
+
+  $.each(abbreviations, (key, value) => {
+    let current = parsedPassage || passage
+
+    let abrvs = value.join("|")
+    let matcher = new RegExp(`\\b(${[key, abrvs].join("|")})`, "ig")
+
+    parsedPassage = current.replace(matcher, key)
+  })
+
+  return parsedPassage
+}