kj 0.0.10 → 0.0.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/kj.gemspec +4 -4
- data/lib/kj/book.rb +6 -6
- data/lib/kj/chapter.rb +9 -9
- data/lib/kj/verse.rb +4 -4
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6e5bc05975546bb303db5a1ac35e77f3ebc7cf59
|
4
|
+
data.tar.gz: 7d5bd62505d4160365820c4b4152caed2a55104d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 97f03d719439a09f9a9adf0ff58adae73a049b89a21f85b0d4d41d2389e80d05d4ca3f98d6aab5b8005a708485c05139ad45c6af8e76bf5e3306117fb877506c
|
7
|
+
data.tar.gz: 9c1005077d0161b3424525a6e4d841ec2877163b3a62179402f3101d625c7bdbcc5771bcee759b0a081f5252edff976af6b3f3eac8d724ddfb570b4b0120a1ac
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.0.
|
1
|
+
0.0.11
|
data/kj.gemspec
CHANGED
@@ -2,16 +2,16 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: kj 0.0.
|
5
|
+
# stub: kj 0.0.11 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "kj"
|
9
|
-
s.version = "0.0.
|
9
|
+
s.version = "0.0.11"
|
10
10
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib"]
|
13
13
|
s.authors = ["David John"]
|
14
|
-
s.date = "2015-07-
|
14
|
+
s.date = "2015-07-26"
|
15
15
|
s.description = "kj is a simple rubygem for accessing the King James Bible. It uses an embedded sqlite data store."
|
16
16
|
s.email = "djohn@arch-no.org"
|
17
17
|
s.extra_rdoc_files = [
|
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
|
|
47
47
|
]
|
48
48
|
s.homepage = "http://github.com/billguy/kj"
|
49
49
|
s.licenses = ["MIT"]
|
50
|
-
s.rubygems_version = "2.4.
|
50
|
+
s.rubygems_version = "2.4.6"
|
51
51
|
s.summary = "kj is a simple rubygem for accessing the King James Bible"
|
52
52
|
|
53
53
|
if s.respond_to? :specification_version then
|
data/lib/kj/book.rb
CHANGED
@@ -53,19 +53,19 @@ module Kj
|
|
53
53
|
end
|
54
54
|
|
55
55
|
def chapter(number)
|
56
|
-
chapter = Db.query("SELECT id FROM chapters WHERE book_id = ? AND number = ?", [
|
57
|
-
Chapter.new(id: chapter['id'],
|
56
|
+
chapter = Db.query("SELECT id FROM chapters WHERE book_id = ? AND number = ?", [id, number], true)
|
57
|
+
Chapter.new(id: chapter['id'], book_id: id, number: number)
|
58
58
|
end
|
59
59
|
|
60
60
|
def chapters(*numbers)
|
61
61
|
if numbers.empty?
|
62
62
|
@chapters ||= begin
|
63
|
-
results = Db.query("SELECT id, number FROM chapters WHERE book_id = ?", [
|
64
|
-
results.map{|chapter| Chapter.new(id: chapter['id'],
|
63
|
+
results = Db.query("SELECT id, number FROM chapters WHERE book_id = ?", [id])
|
64
|
+
results.map{|chapter| Chapter.new(id: chapter['id'], book_id: id, number: chapter['number'])}
|
65
65
|
end
|
66
66
|
else
|
67
|
-
results = Db.query("SELECT id, number FROM chapters WHERE book_id = #{
|
68
|
-
results.map{|chapter| Chapter.new(id: chapter['id'],
|
67
|
+
results = Db.query("SELECT id, number FROM chapters WHERE book_id = #{id} AND number IN (#{numbers.flatten.join(',')})")
|
68
|
+
results.map{|chapter| Chapter.new(id: chapter['id'], book_id: id, number: chapter['number'])}.sort!{ |a,b| a.id <=> b.id }
|
69
69
|
end
|
70
70
|
end
|
71
71
|
|
data/lib/kj/chapter.rb
CHANGED
@@ -17,7 +17,7 @@ module Kj
|
|
17
17
|
|
18
18
|
def book
|
19
19
|
@book ||= begin
|
20
|
-
b = Db.query("SELECT id, name, permalink FROM books WHERE id = ?", [
|
20
|
+
b = Db.query("SELECT id, name, permalink FROM books WHERE id = ?", [book_id], true)
|
21
21
|
Book.new(id: b['id'], name: b['name'], permalink: b['permalink'])
|
22
22
|
end
|
23
23
|
end
|
@@ -36,7 +36,7 @@ module Kj
|
|
36
36
|
|
37
37
|
def next
|
38
38
|
@next ||= begin
|
39
|
-
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id > ? order by id asc limit 1", [
|
39
|
+
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id > ? order by id asc limit 1", [id], true)
|
40
40
|
self.class.new(id: c['id'], book_id: c['book_id'], number: c['number'])
|
41
41
|
rescue Kj::Iniquity
|
42
42
|
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [1], true)
|
@@ -46,7 +46,7 @@ module Kj
|
|
46
46
|
|
47
47
|
def prev
|
48
48
|
@prev ||= begin
|
49
|
-
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id < ? order by id desc limit 1", [
|
49
|
+
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id < ? order by id desc limit 1", [id], true)
|
50
50
|
self.class.new(id: c['id'], book_id: c['book_id'], number: c['number'])
|
51
51
|
rescue Kj::Iniquity
|
52
52
|
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [self.class.count], true)
|
@@ -64,19 +64,19 @@ module Kj
|
|
64
64
|
end
|
65
65
|
|
66
66
|
def verse(verse_number)
|
67
|
-
verse = Db.query("SELECT id FROM verses WHERE chapter_id = ? AND number = ?", [
|
68
|
-
Verse.new(id: verse['id'], book_name: book_name,
|
67
|
+
verse = Db.query("SELECT id FROM verses WHERE chapter_id = ? AND number = ?", [id, verse_number], true)
|
68
|
+
Verse.new(id: verse['id'], book_name: book_name, chapter_id: id, number: verse_number)
|
69
69
|
end
|
70
70
|
|
71
71
|
def verses(*numbers)
|
72
72
|
if numbers.empty?
|
73
73
|
@verses ||= begin
|
74
|
-
results = Db.query("SELECT id, number FROM verses WHERE chapter_id = ?", [
|
75
|
-
results.map{|verse| Verse.new(id: verse['id'], book_name: book_name,
|
74
|
+
results = Db.query("SELECT id, number FROM verses WHERE chapter_id = ?", [id])
|
75
|
+
results.map{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter_id: id, number: verse['number'])}
|
76
76
|
end
|
77
77
|
else
|
78
|
-
results = Db.query("SELECT id, number FROM verses WHERE chapter_id = #{
|
79
|
-
results.map!{|verse| Verse.new(id: verse['id'], book_name: book_name,
|
78
|
+
results = Db.query("SELECT id, number FROM verses WHERE chapter_id = #{id} AND number IN (#{numbers.flatten.join(',')})")
|
79
|
+
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 }
|
80
80
|
end
|
81
81
|
end
|
82
82
|
|
data/lib/kj/verse.rb
CHANGED
@@ -26,7 +26,7 @@ module Kj
|
|
26
26
|
|
27
27
|
def chapter
|
28
28
|
@chapter ||= begin
|
29
|
-
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [
|
29
|
+
c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [chapter_id], true)
|
30
30
|
Chapter.new(id: c['id'], book_id: c['book_id'], number: c['number'])
|
31
31
|
end
|
32
32
|
end
|
@@ -49,7 +49,7 @@ module Kj
|
|
49
49
|
|
50
50
|
def next
|
51
51
|
@next ||= begin
|
52
|
-
v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id > ? order by id asc limit 1", [
|
52
|
+
v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id > ? order by id asc limit 1", [id], true)
|
53
53
|
self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
|
54
54
|
rescue Kj::Iniquity
|
55
55
|
v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [1], true)
|
@@ -59,7 +59,7 @@ module Kj
|
|
59
59
|
|
60
60
|
def prev
|
61
61
|
@prev ||= begin
|
62
|
-
v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id < ? order by id desc limit 1", [
|
62
|
+
v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id < ? order by id desc limit 1", [id], true)
|
63
63
|
self.class.new(id: v['id'], chapter_id: v['chapter_id'], text: v['text'], number: v['number'])
|
64
64
|
rescue Kj::Iniquity
|
65
65
|
v = Db.query("SELECT id, chapter_id, text, number FROM verses WHERE id = ?", [self.class.count], true)
|
@@ -69,7 +69,7 @@ module Kj
|
|
69
69
|
|
70
70
|
def text
|
71
71
|
@text ||= begin
|
72
|
-
verse = Db.query("SELECT chapter_id, text FROM verses WHERE id = ?", [
|
72
|
+
verse = Db.query("SELECT chapter_id, text FROM verses WHERE id = ?", [id], true)
|
73
73
|
verse['text']
|
74
74
|
end
|
75
75
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David John
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-07-
|
11
|
+
date: 2015-07-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sqlite3
|
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
120
120
|
version: '0'
|
121
121
|
requirements: []
|
122
122
|
rubyforge_project:
|
123
|
-
rubygems_version: 2.4.
|
123
|
+
rubygems_version: 2.4.6
|
124
124
|
signing_key:
|
125
125
|
specification_version: 4
|
126
126
|
summary: kj is a simple rubygem for accessing the King James Bible
|