kj_reading 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21a14ae1e70376ca1cddb99f3bc48d82e1abce33
-  data.tar.gz: 8c69bc09f9e2b447b9c57e0f30d40d41f45fdb4b
+  metadata.gz: 1dddaf6ccb1e9be9127fbaabdb4258062a0d8fde
+  data.tar.gz: f55214a5e36069ca3e8583c87a3b8c640a98cb3a
 SHA512:
-  metadata.gz: 79b811a5356ba694592c141383e4faa527e78759d6d4bdb1b693fcf30530a7b6f2f3aaf51522c0c6fd428fc824e104a8d0c2e5681b404f72684a592349290672
-  data.tar.gz: 58b6317a5b5181b08adb35f7d9142b7e42d110584efcf7d00f97f678cf8c48a9a45f15feec0883c8f365f95d5de26572f817e64fcd48181d847620cd27c1d6f7
+  metadata.gz: 620dfa5f1e2cf91f71cf0c957700ba0f7f3eabd5e8d6fff35cc0761e97f88d972ca5123d6cbf026543aaa4678a42e81a494af77e34da1a5bf775a8ca53a48ba9
+  data.tar.gz: 6eea3f9256a07c74ae39b23f921e439f9e6b22fe72d054e139e64645b78217d93369645547b131eb8424a7c6404ad04e81b951282fc2efa838c5257df66f58c8

data/lib/kj_reading.rb

@@ -11,13 +11,33 @@ class KjReading
 
     bible = Kj::Bible.new
 
-    r = s.match(/(?<book>\w+)\s+(?<chapter>\d+),\s*(?<verses>.*)/)
-    verses = r[:verses] =~ /\.\./ ? \
-      Range.new(*r[:verses].split(/\.\./).map(&:to_i)).to_a : r[:verses]
-    bible.books(r[:book])[0].chapter(r[:chapter]).verses(verses).join(' ')
+    s.strip.lines.map do |line|
+            
+      r = line.match(/(?<book>\w+)\s+(?<chapter>\d+)[,\:]?\s*(?<verses>.*)/)
+      verses = r[:verses] =~ /(?:\.\.|,|-)/ ? Range.new(*r[:verses]\
+                          .split(/(?:\.\.|,|-)/).map(&:to_i)).to_a : r[:verses]
+      
+      "\n" +  bible.books(r[:book])[0].chapter(r[:chapter])\
+          .verses(verses).join(' ') + "\n" + line + "\n"
 
-  end
+    end.join
 
+  end
+  
+  def self.abbrev(s)
+    
+    Kj::Bible.new.books(s)[0].abbreviations
+    
+  end
+  
+  def self.books()
+    
+    h = Kj::Bible.new.books.inject({}) do |r,x|
+      r.merge(x.name.downcase => x.abbreviations.split(','))
+    end
+    
+  end
+  
   def self.check(s)
     Kj::Bible.new.books(s)[0].name
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kj_reading
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   sB6wQxY9xLzIB9fpQFU2y+zLTh80VMYQNuE8eXjXMmSEK9wob9e0IUVSJ0ClxuFh
   xqg=
   -----END CERTIFICATE-----
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kj