bible_ref 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b605a11d97398a0fdcbcffc5428d473a665cc4
-  data.tar.gz: 3cf70fdc28474f749365aef71ddb059ee2794348
+  metadata.gz: 213debdfa6129fcf1c65a3bf73edbd3c3ef292f2
+  data.tar.gz: c24156b69b44ce13dabab5faa27901827f0a6ad1
 SHA512:
-  metadata.gz: 0d80a0bff0cc8d4f07f1323d8162c690b767c4cf90a5a6aef8fdf5f43681442505e4216cc28423a66f03c1183a41ef9cf2009f26bb4d9ef05b04f09f2f876196
-  data.tar.gz: 852239f8bd36937df9c042005ea3406da5db441f5db3e3c9bf08e44b3c9ab549d11fad7a80fe654c483ecf38e0e395b9fb70b24245ad3895e925c7dede1d4954
+  metadata.gz: 7af61011348f2cb1b71766676efcb184d40825324960f3ffb1e88299d4dd41c4b6f2af0e2a5069ad6dea5dd34a7289ec5cf7325f0f2b281232528f1e349a57e8
+  data.tar.gz: 238a21999e3d73cfa83969e8689368cd268f97bbcfe74e5025538082bfd18be2e866f50496af11a888131a8623696cc93d1b6da83938554f7db8b885ce1c6124

data/lib/bible_ref/parser.rb

@@ -4,14 +4,22 @@ module BibleRef
   class Parser < Parslet::Parser
     rule(:refs) do
       (
-        (ref_range | ref) >>
-        (
-          separator >>
-          (ref_range | verse_range | ref | verse)
-        ).repeat
+        chapter_range | chapter_and_verse_range
       ).as(:refs)
     end
 
+    rule(:chapter_range) do
+      chapter >> (separator >> chapter).repeat
+    end
+
+    rule(:chapter_and_verse_range) do
+      (ref_range | ref | chapter) >>
+      (
+        separator >>
+        (ref_range | verse_range | ref | verse)
+      ).repeat
+    end
+
     rule(:ref_range)   { (ref.as(:from) >> str("-") >> (ref | verse).as(:to)).as(:range) }
     rule(:verse_range) { (verse.as(:from) >> str("-") >> verse.as(:to)).as(:range) }
 

data/lib/bible_ref/version.rb

@@ -1,3 +1,3 @@
 module BibleRef
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bible_ref
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet