kj 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 391f9d2ad20e44f0ca583f941d20bcbed1adf68a
-  data.tar.gz: f0af5e6cf11e617365526ec12a7f6087f7544d58
+  metadata.gz: 8a9f1ae7069ea9589316a04b3fdab9c7ebc66330
+  data.tar.gz: 9409e75e89768a71a76229b561737ab40f3ab44b
 SHA512:
-  metadata.gz: 64cd538cfc96c9e165247ac12cc3f96d20bd14ecbfc2b4a4f16aeae1b26e557d28aa0d48faa1ca21130d053fed422879d26074c54757a4490067c503d3d363c6
-  data.tar.gz: 589de22bcea83755b32fb17a4a80f9658d7684686ef791180372544c1c93301ed0cc8be5b5dab51f713c720f12d8b7f0ce7c497435c2e549b0bfa82697b153cd
+  metadata.gz: 2be24a33435f0329e246eee2d01334e8e2ecdb0934e6fedade4fb7704f1e1f21d4502043e559abe9d12468e478be90976ea5a301365d0e9ee1eda16eb98f4a5a
+  data.tar.gz: ad8b9ae4438462a8da3133d74fe3cb6f7ccc391ec221b131e47d9b610bd8815e9d63d1ee84f95d6f3267ef5c75b0023947f5fbbc9b165c1e6ffd6d2b05f717fe

data/README.md

@@ -67,6 +67,7 @@ puts verse.text
 verse.next # returns the next Verse
 verse.prev # returns the previous Verse
 ```
+## Other Stuff
 ### Random
 ```ruby
 bible.random_book #returns a random Kj::Book
@@ -82,6 +83,13 @@ verse = bible.percent(0.5)
 puts verse.title
  => "Psalms 103:1" 
 ```
+### Pages
+```ruby
+# Locate Verse objects for a particular page (1-1609)
+verses = bible.page(777)
+puts verses.first.title
+ => "Psalms 22:26" 
+```
 ### Exceptions
 Kj will raise a Kj::Iniquity when it can't find what you're looking for.  
 ```

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/kj.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: kj 0.0.14 ruby lib
+# stub: kj 0.0.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kj"
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["David John"]
-  s.date = "2015-08-09"
+  s.date = "2015-08-11"
   s.description = "kj is a simple rubygem for accessing the King James Bible.  It uses an embedded sqlite data store."
   s.email = "djohn@arch-no.org"
   s.extra_rdoc_files = [

data/lib/kj.rb

@@ -30,6 +30,14 @@ module Kj
       Verse.at(percent)
     end
 
+    def page(page)
+      Verse.page(page)
+    end
+
+    def self.page_count
+      Verse.page_count
+    end
+
   end
 
 end

data/lib/kj/verse.rb

@@ -22,8 +22,8 @@ module Kj
     end
 
     def self.random
-      verse = Db.query("SELECT id, chapter_id, number FROM verses WHERE id = ?", [rand(1..count)], true)
-      new(id: verse['id'], chapter_id: verse['chapter_id'], number: verse['number'])
+      verse = Db.query("SELECT id, chapter_id, number, page FROM verses WHERE id = ?", [rand(1..count)], true)
+      new(id: verse['id'], chapter_id: verse['chapter_id'], number: verse['number'], page: verse['page'])
     end
 
     def self.percent(decimal)
@@ -34,8 +34,17 @@ module Kj
       else
         verse_id = (count * decimal).round
       end
-      verse = Db.query("SELECT id, chapter_id, number FROM verses WHERE id = ?", [verse_id], true)
-      new(id: verse['id'], chapter_id: verse['chapter_id'], number: verse['number'])
+      verse = Db.query("SELECT id, chapter_id, number, page FROM verses WHERE id = ?", [verse_id], true)
+      new(id: verse['id'], chapter_id: verse['chapter_id'], number: verse['number'], page: verse['page'])
+    end
+
+    def self.page_count
+      1609
+    end
+
+    def self.page(page)
+      verses = Db.query("SELECT id, chapter_id, number, page FROM verses WHERE page = ?", [page])
+      verses.map{|verse| new(id: verse['id'], chapter_id: verse['chapter_id'], number: verse['number'], page: verse['page'])}
     end
 
     def chapter
@@ -63,31 +72,38 @@ module Kj
 
     def next
       @next ||= begin
-        v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [id +  1], true)
-        self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
+        v = Db.query("SELECT id, chapter_id, text, number, page FROM verses WHERE id = ?", [id +  1], true)
+        self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'], page: v['page'])
         rescue Kj::Iniquity
-          v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [1], true)
-          self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
+          v = Db.query("SELECT id, chapter_id, text, number, page FROM verses WHERE id = ?", [1], true)
+          self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'], page: v['page'])
       end
     end
 
     def prev
       @prev ||= begin
-        v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [id - 1], true)
-        self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
+        v = Db.query("SELECT id, chapter_id, text, number, page FROM verses WHERE id = ?", [id - 1], true)
+        self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'], page: v['page'])
         rescue Kj::Iniquity
-          v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [self.class.count], true)
-          self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
+          v = Db.query("SELECT id, chapter_id, text, number, page FROM verses WHERE id = ?", [self.class.count], true)
+          self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'], page: v['page'])
       end
     end
 
     def text
       @text ||= begin
-        verse = Db.query("SELECT chapter_id, text FROM verses WHERE id = ?", [id], true)
+        verse = Db.query("SELECT text FROM verses WHERE id = ?", [id], true)
         verse['text']
       end
     end
 
+    def page
+      @page ||= begin
+        verse = Db.query("SELECT page FROM verses WHERE id = ?", [id], true)
+        verse['page']
+      end
+    end
+
   end
 
 end

data/spec/verse_spec.rb

@@ -48,6 +48,12 @@ describe "Kj" do
       end
     end
 
+    describe '.page' do
+      it 'returns the verses for the page' do
+        expect(Kj::Verse.page(1).length).to eq(21)
+      end
+    end
+
   end
 
 end

data/vendor/import.rb

@@ -21,23 +21,32 @@ csv.each do |row| # build books table
 end
 
 current_book_id, current_book_name, current_chapter_id, current_chapter_number = nil, nil, nil, nil # import chapters, verses
+current_page, current_word_count = 0, 0
 File.readlines(File.join(path.parent.to_s, 'kjb.txt')).each do |line| #obtained from https://getbible.net/Bibles
   parts = line.split('||')
   book_name = parts[0]
   chapter_number = parts[1].to_i
   verse_number = parts[2].to_i
   verse_text = parts[3].chomp
+  current_word_count += verse_text.split.length
+
   if current_book_name != book_name
     current_book_name = book_name
     current_chapter_number = nil
+    current_word_count = 0
+    current_page += 1
     current_book_id = db.get_first_row("SELECT id FROM books WHERE name = ?", [book_name])['id']
+  elsif current_word_count > 485
+    current_word_count = 0
+    current_page += 1
   end
+
   if current_chapter_number != chapter_number
     current_chapter_number = chapter_number
     db.execute("INSERT INTO chapters(number, book_id) VALUES (?, ?)", [chapter_number, current_book_id])
     current_chapter_id = db.last_insert_row_id
   end
-  db.execute("INSERT INTO verses(text, number, chapter_id) VALUES (?, ?, ?)", [verse_text, verse_number, current_chapter_id])
+  db.execute("INSERT INTO verses(text, number, chapter_id, page) VALUES (?, ?, ?, ?)", [verse_text, verse_number, current_chapter_id, current_page])
 end
 
 db.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kj
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - David John
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3