cskit 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3ab45f7e14fce23d015c99e0803c25134914aca
-  data.tar.gz: d502b886c3249ab8f658aaf063522fb6fea3141a
+SHA256:
+  metadata.gz: 9109df8cb0edfb82c26f8a1c152c4929728a778f0d952ab56d405da50efb9f93
+  data.tar.gz: 95f7b20939b42f0c276c80e3346eb156adadc03f5bf058174b7413e53dab7b2c
 SHA512:
-  metadata.gz: 4d5871ae93e6a57bb2eb925048e5c93bcaf8fafe6f5c5db169fd1600bd17cfa1f8c0f738f4113c87516055625b18c789ea674bd2ec6fc3e391534e0dcd048c92
-  data.tar.gz: c34db65a0bffe46df8779291fe1beefcbcc0287ba7936677a34d72b4cc9de07353b6cb3ffe3a1582a3e94fce92264af255f90e4b98d6bb714ef9fae0ef797150
+  metadata.gz: 94fcfe19d32b76cdf046f9627d74417f7a8870771530f8848c7f924dd80ffe3b518893458da85ccedc6524422fb14929e5283ec75b6b28e915cb89af19190ab3
+  data.tar.gz: fa8b8b7a0cf3b577eaa3cb54f8ad4dd665240ec06945d514c2f0723c6f506072ac503c80b3cb96406fbe5500f367bd7786ff1885916e1dd85b1afe19c313a5d0

data/lib/cskit/parsers/parser.rb

@@ -37,10 +37,7 @@ module CSKit
       attr_reader :citation_text, :token_stream, :current
 
       def eos?
-        token_stream.peek
-        false
-      rescue StopIteration
-        true
+        current.type == :eos
       end
 
       def eos_token
@@ -54,13 +51,13 @@ module CSKit
         end
 
         if eos?
-          if current.type == :eos
-            raise(ParserError, 'Unexpected end of input')
-          else
+          raise(ParserError, 'Unexpected end of input')
+        else
+          begin
+            @current = token_stream.next
+          rescue StopIteration
             @current = eos_token
           end
-        else
-          @current = token_stream.next
         end
       end
     end

data/lib/cskit/version.rb

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

data/spec/parsers/bible/bible_parser_spec.rb

@@ -63,6 +63,22 @@ describe BibleParser do
     end
   end
 
+  context 'single chapter, multiple verses' do
+    let(:citation_text) { 'I Corinthians 13:4-5, 13' }
+
+    it 'parses correctly' do
+      expect(parser.parse.to_hash).to eq({
+        book: 'I Corinthians', chapters: [{
+          chapter_number: 13, verses: [{
+            start: 4, finish: 5, starter: nil, terminator: nil
+          }, {
+            start: 13, finish: 13, starter: nil, terminator: nil
+          }]
+        }]
+      })
+    end
+  end
+
   context 'single chapter, verse range, starter fragment' do
     let(:citation_text) { 'Genesis 1:1-5 God' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cskit
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Christian Science citation library for Ruby.