kj 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9150375f958394cb6014150236a97941f0f56dbe
-  data.tar.gz: cd485a7f4ae1af7e57febb98ad6557ee69ab95bf
+  metadata.gz: 6e5bc05975546bb303db5a1ac35e77f3ebc7cf59
+  data.tar.gz: 7d5bd62505d4160365820c4b4152caed2a55104d
 SHA512:
-  metadata.gz: d0fd0e6cdbdfb8ff790ae32651729cdbe8f9f0cfd21643de627760c5f7773153b3cfe0d5d8b82342a043e5ae508c6320e17abbfd381382ec87c8bc77d32bec0f
-  data.tar.gz: f724b846ac612afe694e296b6477f1772fa8241323b7f2c5cc4059c11746affa54ce1782c58aec680aeb9d67772e17c85388f07e54fb9827ef15f4c39753a2f8
+  metadata.gz: 97f03d719439a09f9a9adf0ff58adae73a049b89a21f85b0d4d41d2389e80d05d4ca3f98d6aab5b8005a708485c05139ad45c6af8e76bf5e3306117fb877506c
+  data.tar.gz: 9c1005077d0161b3424525a6e4d841ec2877163b3a62179402f3101d625c7bdbcc5771bcee759b0a081f5252edff976af6b3f3eac8d724ddfb570b4b0120a1ac

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

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.10 ruby lib
+# stub: kj 0.0.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kj"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   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-07-22"
+  s.date = "2015-07-26"
   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 = [
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/billguy/kj"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.8"
+  s.rubygems_version = "2.4.6"
   s.summary = "kj is a simple rubygem for accessing the King James Bible"
 
   if s.respond_to? :specification_version then

data/lib/kj/book.rb

@@ -53,19 +53,19 @@ module Kj
     end
 
     def chapter(number)
-      chapter = Db.query("SELECT id FROM chapters WHERE book_id = ? AND number = ?", [@id, number], true)
-      Chapter.new(id: chapter['id'], book: self, number: number)
+      chapter = Db.query("SELECT id FROM chapters WHERE book_id = ? AND number = ?", [id, number], true)
+      Chapter.new(id: chapter['id'], book_id: id, number: number)
     end
 
     def chapters(*numbers)
       if numbers.empty?
         @chapters ||= begin
-          results = Db.query("SELECT id, number FROM chapters WHERE book_id = ?", [@id])
-          results.map{|chapter| Chapter.new(id: chapter['id'], book: self, number: chapter['number'])}
+          results = Db.query("SELECT id, number FROM chapters WHERE book_id = ?", [id])
+          results.map{|chapter| Chapter.new(id: chapter['id'], book_id: id, number: chapter['number'])}
         end
       else
-        results = Db.query("SELECT id, number FROM chapters WHERE book_id = #{@id} AND number IN (#{numbers.flatten.join(',')})")
-        results.map{|chapter| Chapter.new(id: chapter['id'], book: self, number: chapter['number'])}.sort!{ |a,b| a.id <=> b.id }
+        results = Db.query("SELECT id, number FROM chapters WHERE book_id = #{id} AND number IN (#{numbers.flatten.join(',')})")
+        results.map{|chapter| Chapter.new(id: chapter['id'], book_id: id, number: chapter['number'])}.sort!{ |a,b| a.id <=> b.id }
       end
     end
 

data/lib/kj/chapter.rb

@@ -17,7 +17,7 @@ module Kj
 
     def book
       @book ||= begin
-        b = Db.query("SELECT id, name, permalink FROM books WHERE id = ?", [@book_id], true)
+        b = Db.query("SELECT id, name, permalink FROM books WHERE id = ?", [book_id], true)
         Book.new(id: b['id'], name: b['name'], permalink: b['permalink'])
       end
     end
@@ -36,7 +36,7 @@ module Kj
 
     def next
       @next ||= begin
-        c = Db.query("SELECT id, book_id, number FROM chapters WHERE id > ? order by id asc limit 1", [@id], true)
+        c = Db.query("SELECT id, book_id, number FROM chapters WHERE id > ? order by id asc limit 1", [id], true)
         self.class.new(id: c['id'], book_id: c['book_id'], number: c['number'])
         rescue Kj::Iniquity
           c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [1], true)
@@ -46,7 +46,7 @@ module Kj
 
     def prev
       @prev ||= begin
-        c = Db.query("SELECT id, book_id, number FROM chapters WHERE id < ? order by id desc limit 1", [@id], true)
+        c = Db.query("SELECT id, book_id, number FROM chapters WHERE id < ? order by id desc limit 1", [id], true)
         self.class.new(id: c['id'], book_id: c['book_id'], number: c['number'])
         rescue Kj::Iniquity
           c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [self.class.count], true)
@@ -64,19 +64,19 @@ module Kj
     end
 
     def verse(verse_number)
-      verse = Db.query("SELECT id FROM verses WHERE chapter_id = ? AND number = ?", [@id, verse_number], true)
-      Verse.new(id: verse['id'], book_name: book_name, chapter: self, number: verse_number)
+      verse = Db.query("SELECT id FROM verses WHERE chapter_id = ? AND number = ?", [id, verse_number], true)
+      Verse.new(id: verse['id'], book_name: book_name, chapter_id: id, number: verse_number)
     end
 
     def verses(*numbers)
       if numbers.empty?
         @verses ||= begin
-          results = Db.query("SELECT id, number FROM verses WHERE chapter_id = ?", [@id])
-          results.map{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter: self, number: verse['number'])}
+          results = Db.query("SELECT id, number FROM verses WHERE chapter_id = ?", [id])
+          results.map{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter_id: id, number: verse['number'])}
         end
       else
-        results = Db.query("SELECT id, number FROM verses WHERE chapter_id = #{@id} AND number IN (#{numbers.flatten.join(',')})")
-        results.map!{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter: self, number: verse['number'])}.sort!{ |a,b| a.id <=> b.id }
+        results = Db.query("SELECT id, number FROM verses WHERE chapter_id = #{id} AND number IN (#{numbers.flatten.join(',')})")
+        results.map!{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter_id: id, number: verse['number'])}.sort!{ |a,b| a.id <=> b.id }
       end
     end
 

data/lib/kj/verse.rb

@@ -26,7 +26,7 @@ module Kj
 
     def chapter
       @chapter ||= begin
-        c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [@chapter_id], true)
+        c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [chapter_id], true)
         Chapter.new(id: c['id'], book_id: c['book_id'], number: c['number'])
       end
     end
@@ -49,7 +49,7 @@ module Kj
 
     def next
       @next ||= begin
-        v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id > ? order by id asc limit 1", [@id], true)
+        v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id > ? order by id asc limit 1", [id], true)
         self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
         rescue Kj::Iniquity
           v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [1], true)
@@ -59,7 +59,7 @@ module Kj
 
     def prev
       @prev ||= begin
-        v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id < ? order by id desc limit 1", [@id], true)
+        v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id < ? order by id desc limit 1", [id], true)
         self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
         rescue Kj::Iniquity
           v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [self.class.count], true)
@@ -69,7 +69,7 @@ module Kj
 
     def text
       @text ||= begin
-        verse = Db.query("SELECT chapter_id, text FROM verses WHERE id = ?", [@id], true)
+        verse = Db.query("SELECT chapter_id, text FROM verses WHERE id = ?", [id], true)
         verse['text']
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kj
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - David John
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: kj is a simple rubygem for accessing the King James Bible