kj 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e6e12bb9a7c3c42861ed1ee51803ac1d59dbb87
-  data.tar.gz: 055fdbbba8d2160bc7b429aa97fcc16388004bc5
+  metadata.gz: d9683cdffefc0ebcfc4f8721ef60e0260d3fcfaf
+  data.tar.gz: 56d48e534011a1a3904ae86c6bf4338363074761
 SHA512:
-  metadata.gz: d5821fdc3e2385bfb2501541aefb90721323e3d327dcd1ecce8b11770ba4349215cfcea714bc476865f9966dbfce9cade52db3bb864fe51791ec18731681efbd
-  data.tar.gz: cfb38ab333bec01f7f41e89bcd718dda9bd14ab9401a43ff10ce3a9df7f544fce2bab2ae67c82b5d82d47d9fbfcffdfd36946e08cf84f84181a5265a74ef796c
+  metadata.gz: ec9aa8b1ee6fe44b71583c9ed1d2d56c18c2cdf139464951cd1fe59eb919ad7f0386bbd09dfb23ce95a594416e0dcb05cf67dcd59ccd1c06c0238cad51913095
+  data.tar.gz: ad64557b1b09a325e0d1186e23e3b7a2c41597fa26a72292a2501dc11bbfcc34958b7527f19d975d17c4c76f25f5d8ce0a327b6bc5a9102726c2052a02f7f5b1

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

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.4 ruby lib
+# stub: kj 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kj"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   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-13"
+  s.date = "2015-07-21"
   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 = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "db/kjb.db",
     "kj.gemspec",
     "lib/kj.rb",
+    "lib/kj/base.rb",
     "lib/kj/book.rb",
     "lib/kj/chapter.rb",
     "lib/kj/db.rb",

data/lib/kj.rb

@@ -1,35 +1,30 @@
-require "sqlite3"
-require 'kj/db'
-require 'kj/book'
+require_relative 'kj/base'
+require_relative 'kj/book'
+require_relative 'kj/chapter'
+require_relative 'kj/verse'
 
 module Kj
 
   class Bible
 
     def book(name_or_number)
-      if name_or_number.is_a?(Integer)
-        book = Db.query("SELECT id, name FROM books WHERE id = ?", [name_or_number], true)
-      else
-        book = Db.query("SELECT id, name FROM books WHERE name = ? OR abbreviations LIKE ?", [name_or_number.to_s.downcase, "%#{name_or_number.to_s}%"], true)
-      end
-      Book.new(id: book['id'], name: book['name'])
+      Book.from_name_or_number(name_or_number)
     end
 
     def books(*names_or_numbers)
-      if names_or_numbers.empty?
-        @books = begin
-          results = Db.query("SELECT id, name FROM books")
-          results.map{ |book| Book.new(id: book['id'], name: book['name']) }
-        end
-      else
-        names_or_numbers.flatten!
-        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 FROM books WHERE id IN (#{numbers.join(',')})") if numbers.any?
-        names.each{ |name| results << Db.query("SELECT id, name FROM books WHERE abbreviations LIKE ?", ["%#{name.to_s}%"]) }
-        results.flatten.map!{|book| Book.new(id: book['id'], name: book['name'])}.uniq.sort!{ |a,b| a.id <=> b.id }
-      end
+      names_or_numbers.empty? ? Book.all : Book.from_names_or_numbers(names_or_numbers)
+    end
+
+    def random_book
+      Book.random
+    end
+
+    def random_chapter
+      Chapter.random
+    end
+
+    def random_verse
+      Verse.random
     end
 
   end

data/lib/kj/base.rb

@@ -0,0 +1,10 @@
+require "sqlite3"
+require 'kj/db'
+
+module Kj
+
+  class Base
+
+  end
+
+end

data/lib/kj/book.rb

@@ -1,10 +1,8 @@
-require_relative 'chapter'
-
 module Kj
 
-  class Book
+  class Book < Base
 
-    attr_reader :id, :name
+    attr_accessor :id, :name
 
     def initialize(args)
       args.each do |k,v|
@@ -20,20 +18,54 @@ module Kj
       name
     end
 
+    def self.from_name_or_number(name_or_number)
+      if name_or_number.is_a?(Integer)
+        book = Db.query("SELECT id, name FROM books WHERE id = ?", [name_or_number], true)
+      else
+        book = Db.query("SELECT id, name FROM books WHERE name = ? OR abbreviations LIKE ?", [name_or_number.to_s.downcase, "%#{name_or_number.to_s}%"], true)
+      end
+      new(id: book['id'], name: book['name'])
+    end
+
+    def self.from_names_or_numbers(names_or_numbers)
+      names_or_numbers.flatten!
+      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 FROM books WHERE id IN (#{numbers.join(',')})") if numbers.any?
+      names.each{ |name| results << Db.query("SELECT id, name FROM books WHERE abbreviations LIKE ?", ["%#{name.to_s}%"]) }
+      results.flatten.map!{|book| new(id: book['id'], name: book['name'])}.uniq.sort!{ |a,b| a.id <=> b.id }
+    end
+
+    def self.all
+      @all ||= begin
+        books = Db.query("SELECT id, name FROM books")
+        books.map{ |book| new(id: book['id'], name: book['name']) }
+      end
+    end
+
+    def self.count
+      66
+    end
+
+    def self.random
+      from_name_or_number(rand(1..count))
+    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_id: @id, book_name: name, number: number)
+      Chapter.new(id: chapter['id'], book: self, 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_id: @id, book_name: name, number: chapter['number'])}
+          results.map{|chapter| Chapter.new(id: chapter['id'], book: self, 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_id: @id, book_name: name, number: chapter['number'])}.sort!{ |a,b| a.id <=> b.id }
+        results.map{|chapter| Chapter.new(id: chapter['id'], book: self, number: chapter['number'])}.sort!{ |a,b| a.id <=> b.id }
       end
     end
 

data/lib/kj/chapter.rb

@@ -1,10 +1,9 @@
-require_relative 'verse'
-
 module Kj
 
-  class Chapter
+  class Chapter < Base
 
-    attr_reader :id, :book_id, :book_name, :number
+    attr_accessor :id, :book_id, :number
+    attr_writer :book
 
     def initialize(args)
       args.each do |k,v|
@@ -16,24 +15,44 @@ module Kj
       "#{book_name} #{number}"
     end
 
+    def book
+      @book ||= begin
+        b = Db.query("SELECT id, name FROM books WHERE id = ?", [@book_id], true)
+        Book.new(id: b['id'], name: b['name'])
+      end
+    end
+
+    def book_name
+      book.name
+    end
+
     def to_s
       title
     end
 
+    def self.count
+      1184
+    end
+
+    def self.random
+      chapter = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [rand(1..count)], true)
+      new(id: chapter['id'], book_id: chapter['book_id'], number: chapter['number'])
+    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_id: @id, chapter_number: @number, number: verse_number)
+      Verse.new(id: verse['id'], book_name: book_name, chapter: self, 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_id: @id, chapter_number: number, number: verse['number'])}
+          results.map{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter: self, 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_id: @id, chapter_number: number, number: verse['number'])}.sort!{ |a,b| a.id <=> b.id }
+        results.map!{|verse| Verse.new(id: verse['id'], book_name: book_name, chapter: self, number: verse['number'])}.sort!{ |a,b| a.id <=> b.id }
       end
     end
 

data/lib/kj/verse.rb

@@ -2,7 +2,8 @@ module Kj
 
   class Verse
 
-    attr_reader :id, :book_name, :chapter_id, :chapter_number, :number
+    attr_accessor :id, :chapter_id, :number
+    attr_writer :chapter
 
     def initialize(args)
       args.each do |k,v|
@@ -14,6 +15,30 @@ module Kj
       "#{book_name} #{chapter_number}:#{number}"
     end
 
+    def self.count
+      31102
+    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'])
+    end
+
+    def chapter
+      @chapter ||= begin
+        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
+
+    def chapter_number
+      chapter.number
+    end
+
+    def book_name
+      chapter.book_name
+    end
+
     def to_s
       text
     end

data/spec/kj_spec.rb

@@ -22,6 +22,24 @@ describe "Kj" do
         expect(bible.book(:genesis)).to be_kind_of(Kj::Book)
       end
     end
+
+    describe "#random_book" do
+      it 'returns a Book' do
+        expect(bible.random_book).to be_kind_of(Kj::Book)
+      end
+    end
+
+    describe "#random_chapter" do
+      it 'returns a Chapter' do
+        expect(bible.random_chapter).to be_kind_of(Kj::Chapter)
+      end
+    end
+
+    describe "#random_verse" do
+      it 'returns a Verse' do
+        expect(bible.random_verse).to be_kind_of(Kj::Verse)
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kj
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - David John
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -86,6 +86,7 @@ files:
 - db/kjb.db
 - kj.gemspec
 - lib/kj.rb
+- lib/kj/base.rb
 - lib/kj/book.rb
 - lib/kj/chapter.rb
 - lib/kj/db.rb