acts_as_scriptural 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64fb01e0e571241d7b4bc21eee9ad4a6f6261fce
-  data.tar.gz: 4a7f618751b72b9f268bfd654f2b742e4884459d
+  metadata.gz: 8933d939f83cae6978c3e39faffc412ba768d858
+  data.tar.gz: 8ca2c6d30c653bf91bfa7ffb2375d76a473c6d8c
 SHA512:
-  metadata.gz: 39846e58da1374cd9bdd9b87521e17f7f23e0eafa721d14c5efc67ae13ec3a18f9f70374b5a77b5beef5fdb531b7d91988423cae2fcd001bc6f2f325c193b0be
-  data.tar.gz: fbadacdc09ddd72751ac6bca1e9f35acdf9ef43b1aa6ced9b4821159809a7ca2cb0237e9ec1aaa92d92b6ba5c1e81ec8ab1aac2bcfd34f48b190b914c10adecc
+  metadata.gz: 191a0d70d2056376d5705cb50b9055b5ecb98be3020a5c83c8854556aa36f852f0e00306412ea58ea152eb2471d514d12c2ea9647626c38a39f14255d4a8b840
+  data.tar.gz: 1c9297b346767f2fcee826a022cad14d171d6040f596318a0675fa3e7eb1d969b28f3cb1bc3a5e708dca204bd3d8477bcc7caa001babbd1ffe23be1864d83dc8

data/lib/acts_as_scriptural/bible.rb

@@ -20,11 +20,14 @@ class ActsAsScriptural::Bible
       chapter_number.between?(1, @indexhash[book_index].num_chapters) 
   end
 
+  def chapters_in_book(book_index)
+    @indexhash[book_index].num_chapters
+  end
+
   private
 
   def import_from_file
-    datadir = Gem.datadir('acts_as_scriptural')
-    File.readlines("#{datadir}/english.txt").each do |line|
+    File.readlines("data/acts_as_scriptural/english.txt").each do |line|
       book_name, book_index, num_chapters = line.chomp.split(',')
       book = ActsAsScriptural::Book.new(book_name, book_index.to_i, num_chapters.to_i)
       @namehash[book_name] = book

data/lib/acts_as_scriptural/parsed_reference.rb

@@ -0,0 +1,5 @@
+class ParsedReference
+
+  attr_accessor :first_book, :last_book, :first_chapter, :last_chapter, :first_book_index, :last_book_index
+
+end

data/lib/acts_as_scriptural/parser.rb

@@ -1,17 +1,57 @@
 class ActsAsScriptural::Parser
+  require 'ostruct'
 
-  def self.book_and_chapters_from_reference(reference)
-    regex = /^\s*([0-9]?\s*[a-zA-Z]+)\.?\s*([0-9]+)(?:\s*(?:-|..)[^0-9]*([0-9]+))?/
-    match = reference.match(regex)
+  def parse_reference(reference)
+    result = ParsedReference.new
+    # this reference needs to have no spaces to be parsed properly;
+    # the matches will contain (if applicable)
+    # match 1: first book name
+    # match 2: first chapter
+    # match 3: second book name (if present)
+    # match 4: last chapter
+    regex = /^([0-9]?[a-zA-Z]+)\.?([0-9]+)(?:-|..)?(?:([0-9]?[a-zA-Z]+)?\.?([0-9]+))?/
+    match = reference.gsub(/\s+/,'').match(regex)
     if match
-      if match[3]
-        chapters = (match[2]..match[3]).to_a
-      else
-        chapters = [ match[2] ]
+      if (match[3].nil? && match[4].nil?)  # only one chapter
+        result.first_book = match[1]
+        result.last_book = match[1]
+        result.first_chapter = match[2].to_i
+        result.last_chapter = match[2].to_i
+      elsif match[3]  # the range must include two books
+        result.first_book = match[1]
+        result.last_book = match[3]
+        result.first_chapter = match[2].to_i
+        result.last_chapter = match[4].to_i
+      else  # just one book in the range
+        result.first_book = match[1]
+        result.last_book = match[1]
+        result.first_chapter = match[2].to_i
+        result.last_chapter = match[4].to_i
       end
-      [ match[1], chapters.map(&:to_i) ]
+        result.first_book_index = ActsAsScriptural::AbbreviationLookup.new.index_number(result.first_book)
+        result.last_book_index = ActsAsScriptural::AbbreviationLookup.new.index_number(result.last_book)
+        result = validate_chapter_ranges(result)
+        result
     else
-      [nil, nil]
+      nil
     end
   end
+
+  def validate_chapter_ranges(result)
+    # doesn't allow nonsensical chapter numbers
+    bible = ActsAsScriptural::Bible.new
+    max_first_book_chapters = bible.chapters_in_book(result.first_book_index)
+    max_last_book_chapters = bible.chapters_in_book(result.last_book_index)
+
+    result.first_chapter = 1 if result.first_chapter < 1
+    result.last_chapter = 1 if result.first_chapter < 1
+    result.first_chapter = max_first_book_chapters if result.first_chapter > max_first_book_chapters
+    result.last_chapter = max_last_book_chapters if result.last_chapter > max_last_book_chapters
+
+    result
+  end
+
+
 end
+
+

data/lib/acts_as_scriptural.rb

@@ -1,15 +1,6 @@
-require_relative "acts_as_scriptural/version"
-require_relative "acts_as_scriptural/book"
-require_relative "acts_as_scriptural/bible"
-require_relative "acts_as_scriptural/parser"
-require_relative "acts_as_scriptural/abbreviation_lookup"
-
-
-
-
 class ActsAsScriptural
 
-  attr_accessor :chapters
+  attr_accessor :chapters, :parsed
 
   def initialize
     @chapters = Array.new
@@ -17,20 +8,29 @@ class ActsAsScriptural
 
   def parse(str)
     references = str.split(',')
-    references.each {|ref| parse_a_reference(ref) }
+    references.each do |ref| 
+      add_chapters(Parser.new.parse_reference(ref))
+    end
     self
   end
 
-  def parse_a_reference(reference)
-    book, chapters = Parser.book_and_chapters_from_reference(reference)
-    add_chapters(book, chapters)
-  end
+  def add_chapters(parsed_reference)
+    for i in parsed_reference.first_book_index..parsed_reference.last_book_index do
 
-  def add_chapters(book, chapters)
-    book_index = lookup.index_number(book)
-    if book_index && chapters
-      chapters.each do |c|
-        @chapters << [book_index, c] if bible.chapter_exists?(book_index, c)
+      if (i == parsed_reference.first_book_index)
+        first_chapter = parsed_reference.first_chapter
+      else
+        first_chapter = 1
+      end
+
+      if (i == parsed_reference.last_book_index)
+        last_chapter = parsed_reference.last_chapter
+      else
+        last_chapter = bible.chapters_in_book(i)
+      end
+
+      for j in first_chapter..last_chapter
+        @chapters << [i, j]
       end
     end
   end
@@ -45,3 +45,9 @@ class ActsAsScriptural
 
 
 end
+
+require_relative "acts_as_scriptural/book"
+require_relative "acts_as_scriptural/bible"
+require_relative "acts_as_scriptural/parser"
+require_relative "acts_as_scriptural/abbreviation_lookup"
+require_relative "acts_as_scriptural/parsed_reference"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_scriptural
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Philip Bradley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Parse multibook, multiverse bible references of the form: Acts 1:1-10;
   Eph 1:5-10; John 12:4'
 email:
@@ -65,8 +79,8 @@ files:
 - lib/acts_as_scriptural/abbreviation_lookup.rb
 - lib/acts_as_scriptural/bible.rb
 - lib/acts_as_scriptural/book.rb
+- lib/acts_as_scriptural/parsed_reference.rb
 - lib/acts_as_scriptural/parser.rb
-- lib/acts_as_scriptural/version.rb
 homepage: ''
 licenses:
 - MIT

data/lib/acts_as_scriptural/version.rb

@@ -1,3 +0,0 @@
-class ActsAsScriptural
-  VERSION = "0.0.1"
-end