kj 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9f1ae7069ea9589316a04b3fdab9c7ebc66330
-  data.tar.gz: 9409e75e89768a71a76229b561737ab40f3ab44b
+  metadata.gz: b3c0f88d0a65cd67a819c6ede12a1295bfb061cf
+  data.tar.gz: 599c01ca8ad113d4662d1e3b4ab586f300dfe052
 SHA512:
-  metadata.gz: 2be24a33435f0329e246eee2d01334e8e2ecdb0934e6fedade4fb7704f1e1f21d4502043e559abe9d12468e478be90976ea5a301365d0e9ee1eda16eb98f4a5a
-  data.tar.gz: ad8b9ae4438462a8da3133d74fe3cb6f7ccc391ec221b131e47d9b610bd8815e9d63d1ee84f95d6f3267ef5c75b0023947f5fbbc9b165c1e6ffd6d2b05f717fe
+  metadata.gz: 717f461db4ca1b6c2ba3669f6582a93ed0cebad2bd4e21eaddbffe75a516e16760407123268576d2df5e38ecb2ff5a08e7d4e2baa4a624217a5c429d7d75e5b4
+  data.tar.gz: 35c4d11ad62a43379cde54204acbd8ab7a2b17fabb9a45638f0d39e885c8f0befd34c4968ecd262815f3ded82a77d12af52c1c06bac212a8cb88390e0b46ce09

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

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.15 ruby lib
+# stub: kj 0.0.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kj"
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   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-11"
+  s.date = "2015-08-23"
   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/book.rb

@@ -4,7 +4,7 @@ module Kj
 
   class Book < Base
 
-    attr_accessor :id, :name, :permalink
+    attr_accessor :id, :name, :permalink, :abbreviations
 
     def initialize(args)
       args.each do |k,v|
@@ -34,15 +34,15 @@ module Kj
       numbers = names_or_numbers.uniq.select{|n| n.is_a?(Integer)}
       names = (names_or_numbers - numbers).uniq.map{|name| name.to_s.downcase}
       results = []
-      results << Db.query("SELECT id, name, permalink FROM books WHERE id IN (#{numbers.join(',')})") if numbers.any?
-      names.each{ |name| results << Db.query("SELECT id, name FROM books WHERE abbreviations LIKE ? OR permalink = ?", ["%#{name.to_s}%", name.to_s]) }
-      results.flatten.map!{|book| new(id: book['id'], name: book['name'], permalink: book['permalink'])}.uniq.sort!{ |a,b| a.id <=> b.id }
+      results << Db.query("SELECT id, name, permalink, abbreviations FROM books WHERE id IN (#{numbers.join(',')})") if numbers.any?
+      names.each{ |name| results << Db.query("SELECT id, name, permalink, abbreviations FROM books WHERE abbreviations LIKE ? OR permalink = ?", ["%#{name.to_s}%", name.to_s]) }
+      results.flatten.map!{|book| new(id: book['id'], name: book['name'], permalink: book['permalink'], abbreviations: book['abbreviations'])}.uniq.sort!{ |a,b| a.id <=> b.id }
     end
 
     def self.all
       @all ||= begin
-        books = Db.query("SELECT id, name, permalink FROM books")
-        books.map{ |book| new(id: book['id'], name: book['name'], permalink: book['permalink']) }
+        books = Db.query("SELECT id, name, permalink, abbreviations FROM books")
+        books.map{ |book| new(id: book['id'], name: book['name'], permalink: book['permalink'], abbreviations: book['abbreviations']) }
       end
     end
 

data/lib/kj/chapter.rb

@@ -73,12 +73,12 @@ module Kj
     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_id: id, number: verse['number'])}
+          results = Db.query("SELECT id, number, page FROM verses WHERE chapter_id = ?", [id])
+          results.map{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter_id: id, number: verse['number'], page: verse['page'])}
         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_id: id, number: verse['number'])}.sort!{ |a,b| a.id <=> b.id }
+        results = Db.query("SELECT id, number, page 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'], page: verse['page'])}.sort!{ |a,b| a.id <=> b.id }
       end
     end
 

data/lib/kj/verse.rb

@@ -4,7 +4,7 @@ module Kj
 
   class Verse < Base
 
-    attr_accessor :id, :chapter_id, :number
+    attr_accessor :id, :chapter_id, :number, :page
     attr_writer :chapter
 
     def initialize(args)

metadata

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