cskit 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2a9550e46d7df48af95443aa4bd70b8a6d9f51
-  data.tar.gz: 2c74a6f0feefde08a17af8ba7e7113e9bb97e5fa
+  metadata.gz: 3ac84566cea888ff9477e3bb701a61baf499aeee
+  data.tar.gz: a9475fd9c7387d8d822f6b48f7e4a18356ff0a12
 SHA512:
-  metadata.gz: fa92477f03276a97d9e77964b5eb2b9ea295870d810c97037166e31a091d2fbd808227325949febebdd4efef5894344d127bb3639fbb6fd237f806fec49cba73
-  data.tar.gz: eaad5970540813c5a6f489fa60668b15476bed1ae281d092d46898bb8a29e22766d687c400d5b2b67d0b55bbd27d4886d6b199105a98cd455319df83b8fb486e
+  metadata.gz: 623a052e6de8426972d65aab3034a40682710fb1e7ab592b56dafb8f10322bc99252e0158975c8f8364a40ccee273564fd7af852641326e932e55a3a82a63446
+  data.tar.gz: ce82b6aa1e550181d6c95ec10f72b62c3aba2a9f9ee0ffef27b34e77cfcdb808d6d71318169f4ef1814cfa69fbfa382413adb2716ca6d540d450decfba85e1cb

data/History.txt

@@ -11,3 +11,7 @@
 * Parser rewrite.
 * Add parser tests.
 * General cleanup.
+
+== 1.1.1
+
+* Fix bible parser to handle books like "II Chronicles" and "Song of Solomon".

data/lib/cskit/parsers/bible/bible_parser.rb

@@ -91,7 +91,7 @@ module CSKit
         end
 
         def book
-          current.value.tap { next_token(:text) }
+          current.value.tap { next_token(:book, :sos, :text) }
         end
 
         def chapter_list

data/lib/cskit/parsers/bible/bible_tokenizer.rb

@@ -6,6 +6,8 @@ module CSKit
 
       class BibleTokenizer < CSKit::Parsers::Tokenizer
         PATTERNS = {
+          book:        /\Ai{1,3}\s+[^\s\(\);:,]+/i,
+          sos:         /\Asong\s+of\s+solomon/i,
           left_paren:  /\A\(/,
           right_paren: /\A\)/,
           dash:        /\A-/,

data/lib/cskit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module CSKit
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/parsers/bible/bible_parser_spec.rb

@@ -21,6 +21,34 @@ describe BibleParser do
     end
   end
 
+  context 'single chapter, single verse, numbered book name' do
+    let(:citation_text) { 'II Chronicles 1:1' }
+
+    it 'parses correctly' do
+      expect(parser.parse.to_hash).to eq({
+        book: 'II Chronicles', chapters: [{
+          chapter_number: 1, verses: [{
+            start: 1, finish: 1, starter: nil, terminator: nil
+          }]
+        }]
+      })
+    end
+  end
+
+  context 'single chapter, single verse, Song of Solomon' do
+    let(:citation_text) { 'Song of Solomon 1:1' }
+
+    it 'parses correctly' do
+      expect(parser.parse.to_hash).to eq({
+        book: 'Song of Solomon', chapters: [{
+          chapter_number: 1, verses: [{
+            start: 1, finish: 1, starter: nil, terminator: nil
+          }]
+        }]
+      })
+    end
+  end
+
   context 'single chapter, verse range' do
     let(:citation_text) { 'Genesis 1:1-5' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cskit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json