pericope 0.5.3 → 0.5.4

data/lib/pericope.rb

@@ -229,6 +229,10 @@ class Pericope
     chapter_verse_counts[id]
   end
   
+  def self.get_max_chapter(book)
+    book_chapter_counts[book - 1]
+  end
+  
   
   
 private
@@ -277,24 +281,30 @@ private
     get_id(book, chapter, verse)
   end
   
-  def self.get_id(book, chapter, verse) #, constrain_verse=false)
-    book = book.to_i
-    book = 1 if book < 1
-    book = 66 if book > 66
-    
-    max = book_chapter_counts[book-1]
-    chapter = chapter.to_i
-    chapter = 1 if chapter < 1
-    chapter = max if chapter > max
-    
-    # max = constrain_verse ? get_max_verse(book, chapter) : 999
-    # max = 999
-    max = get_max_verse(book, chapter)
-    verse = verse.to_i
-    verse = 1 if verse < 1
-    verse = max if verse > max
+  def self.to_valid_book(book)
+    coerce_to_range(book, 1..66)
+  end
+  
+  def self.to_valid_chapter(book, chapter)
+    coerce_to_range(chapter, 1..get_max_chapter(book))
+  end
+  
+  def self.to_valid_verse(book, chapter, verse)
+    coerce_to_range(verse, 1..get_max_verse(book, chapter))
+  end
+  
+  def self.coerce_to_range(number, range)
+    return range.begin if number < range.begin
+    return range.end if number > range.end
+    number
+  end
+  
+  def self.get_id(book, chapter, verse)
+    book = to_valid_book(book)
+    chapter = to_valid_chapter(book, chapter)
+    verse = to_valid_verse(book, chapter, verse)
     
-    return (book * 1000000) + (chapter * 1000) + verse;
+    (book * 1000000) + (chapter * 1000) + verse
   end
   
   def self.get_book(id)
@@ -383,32 +393,42 @@ private
     ranges.map do |range|
       range = range.split('-') # parse the low end of a verse range and the high end separately
       range << range[0] if (range.length < 2) # treat 12:4 as 12:4-12:4
-      lower_chapter_verse = range[0].split(':').map {|n| n.to_i} # parse "3:28" to [3,28]
-      upper_chapter_verse = range[1].split(':').map {|n| n.to_i} # parse "3:28" to [3,28]
+      lower_chapter_verse = range[0].split(':').map(&:to_i) # parse "3:28" to [3,28]
+      upper_chapter_verse = range[1].split(':').map(&:to_i) # parse "3:28" to [3,28]
       
       # make sure the low end of the range and the high end of the range
       # are composed of arrays with two appropriate values: [chapter, verse]
       chapter_range = false
       if lower_chapter_verse.length < 2
-        if recent_chapter        
+        if recent_chapter
           lower_chapter_verse.unshift recent_chapter # e.g. parsing 11 in 12:1-8,11 => remember that 12 is the chapter
         else
+          lower_chapter_verse[0] = Pericope.to_valid_chapter(book, lower_chapter_verse[0])
           lower_chapter_verse << 1 # no verse specified; this is a range of chapters, start with verse 1
           chapter_range = true
         end
+      else
+        lower_chapter_verse[0] = Pericope.to_valid_chapter(book, lower_chapter_verse[0])
       end
+      lower_chapter_verse[1] = Pericope.to_valid_verse(book, *lower_chapter_verse)
+      
       if upper_chapter_verse.length < 2
         if chapter_range
+          upper_chapter_verse[0] = Pericope.to_valid_chapter(book, upper_chapter_verse[0])
           upper_chapter_verse << Pericope.get_max_verse(book, upper_chapter_verse[0]) # this is a range of chapters, end with the last verse
         else
           upper_chapter_verse.unshift lower_chapter_verse[0] # e.g. parsing 8 in 12:1-8 => remember that 12 is the chapter
         end
+      else
+        upper_chapter_verse[0] = Pericope.to_valid_chapter(book, upper_chapter_verse[0])
       end
+      upper_chapter_verse[1] = Pericope.to_valid_verse(book, *upper_chapter_verse)
+      
       recent_chapter = upper_chapter_verse[0] # remember the last chapter
       
       Range.new(
-        Pericope.get_id(book, lower_chapter_verse[0], lower_chapter_verse[1]),
-        Pericope.get_id(book, upper_chapter_verse[0], upper_chapter_verse[1]))
+        Pericope.get_id(book, *lower_chapter_verse),
+        Pericope.get_id(book, *upper_chapter_verse))
     end
   end
   

data/lib/pericope/version.rb

@@ -1,3 +1,3 @@
 class Pericope
-  VERSION = "0.5.3" unless defined?(::Pericope::Version)
+  VERSION = "0.5.4" unless defined?(::Pericope::Version)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pericope
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - bob.lailfamily@gmail.com