scriptura 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca9e6019ef5c673caa81c0091b1e9367f021edc
-  data.tar.gz: 8f4bf8c9d1e39d13356639421c26f2716f9d5908
+  metadata.gz: f0044ece919fa1f8adacbf9692fc1466bb5467d8
+  data.tar.gz: f96700adfc6c802c81bed1ba6fdf1e6b6c90a6cf
 SHA512:
-  metadata.gz: 0b5217b85c0d71de9d02b437fcae979206a52f8cecbc045a7c2341e9786423f9f76b850649a566d6618930bad4e0c9ebe456f7bdefb98a9e5085a92de9c3c4b4
-  data.tar.gz: dbd2018a3af992250bb36c0671365ad6cec21d269e7f9ce51aa8641f067eda8215b79d08d15d66c4e6fa3e65416665c482e39b7c2b05d91a2e02c40d975889f2
+  metadata.gz: 034c0937de8ffcf99bbe5a96d73533f540f74150d1e79fb997f23bd01373d80325847b49f5f57291cb7aa1f355b0ec60b3aedf83d0d05888e729b60cc884e126
+  data.tar.gz: 9c833b5ecad6d4ee8bbe1434c0598e907b7f24f1316e7e565252515b304e85333a57a7cf9eaaeb7f27b9826b231e7e70452629cd1827cf586fc4385875d7ec4b

data/lib/scriptura/scripture.rb

@@ -2,6 +2,9 @@ require 'yaml'
 
 module Scriptura
   module Scripture
+    HOME_PATH = File.realpath(File.join(File.dirname(__FILE__), '..', '..'))
+    METADATA_FILE = File.join(HOME_PATH, 'lib', 'scriptura', 'metadata.yml')
+
     def self.old_testament_books
       books = []
       (1..39).each do |book_number|
@@ -27,9 +30,7 @@ module Scriptura
     end
 
     def self.metadata
-      @metadata ||= begin
-        YAML.load_file('lib/scriptura/metadata.yml')
-      end
+      @metadata ||= YAML.load_file(METADATA_FILE)
     end
 
     def self.find_book_hash attribute, value

data/lib/scriptura/scripture_book.rb

@@ -13,13 +13,13 @@ module Scriptura
 
     def self.find_by_name(name)
       hash = Scripture.find_book_hash(:name, name)
-      fail "Book by the name #{name} was not found! Check if there was a spelling error.. or try initializing it with a book number" if hash.nil?
+      fail DoesNotExist, "Book by the name #{name} was not found! Check if there was a spelling error.. or try initializing it with a book number" if hash.nil?
       new(hash['number'])
     end
 
     def self.find(string_id)
       hash = Scripture.find_book_hash(:string_id, string_id)
-      fail "Book by the string_id #{string_id} was not found! Check if there was a spelling error.. or try initializing it with a book number" if hash.nil?
+      fail DoesNotExist, "Book by the string_id #{string_id} was not found! Check if there was a spelling error.. or try initializing it with a book number" if hash.nil?
       new(hash['number'])
     end
 

data/lib/scriptura/scripture_verse.rb

@@ -8,13 +8,8 @@ module Scriptura
     alias_method :number, :verse_number
 
     def initialize(*args)
-      case
-      when args.count == 1 && args[0].is_a?(Fixnum)
-        fail ArgumentError, 'normalized value of scripture verse cannot be converted to an integer' unless args[0].respond_to?(:to_i)
-        book_number, chapter_number, verse_number = de_normalize(args[0])
-      when args.count == 3
-        book_number, chapter_number, verse_number = args
-      end
+      book_number, chapter_number, verse_number = extract_arguments(args)
+
       @scripture_chapter = ScriptureChapter.new(book_number, chapter_number)
       @scripture_book = @scripture_chapter.scripture_book
       fail ArgumentError, 'verse number cannot be converted to an integer' unless verse_number.respond_to?(:to_i)
@@ -39,6 +34,18 @@ module Scriptura
 
     private
 
+    def extract_arguments args
+      case args.count
+      when 1
+        fail ArgumentError, 'normalized value of scripture verse cannot be converted to an integer' unless args[0].respond_to?(:to_i)
+        book_number, chapter_number, verse_number = de_normalize(args[0].to_i)
+      when 3
+        book_number, chapter_number, verse_number = args
+      else
+        fail ArgumentError, 'wrong number of arguments! The arguments should either be one normalized value for the verse or 3 separate book, chapter, verse numbers'
+      end
+    end
+
     def de_normalize(number)
       quotient, verse_number = number.divmod(1000)
       book_number, chapter_number = quotient.divmod(1000)

data/lib/scriptura/version.rb

@@ -1,5 +1,5 @@
 module Scriptura
   module Version
-    STRING = '0.0.3'
+    STRING = '0.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scriptura
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gagan Awhad