kj 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8646289fa93bc6e79b9b35c4f448e4215ed5c516
-  data.tar.gz: 406b32c6cb397a96e920876af847d56930a6b0d6
+  metadata.gz: c9f7e20fd8120d77b7da0104ce83206f4627ab00
+  data.tar.gz: 67a04df2abcac361048384c5d8bc56cfbba0fb01
 SHA512:
-  metadata.gz: 48d726842ba6f5b742a302f84af6e974a5f3d58f5f8651dd93c06df023bc215dd9b7871c10036bd47c8fa644c4a049098711fc68e1fc3b099130339916788ee6
-  data.tar.gz: 01c36c2cd4fc52a2a4ca164983034bccc3ff961557243cd21d1be8cc3f4680045125a6febdf65d29a7516f8cac56b110516dac1ccd4819e7b25a0a32a4b7b4bb
+  metadata.gz: fa98bb1dece5005f647cd6bbfbc2a6507b2bc2d7ab90ac8d2b6c51b685060c1e493bd348643e89d339f3e7b6f264d13e6307baa7f9cf7d39663ea4a1818fd5f4
+  data.tar.gz: dc51ac981ca416633ee45e4760fb78d566b1945d9dcc1f2b8ba76404bebd6417adc63cb7b48c3f270310c952467bbb7034a7c2390dcf211b42d4945b689898e3

data/Rakefile

@@ -21,6 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{kj is a simple rubygem for accessing the King James Bible.  It uses an embedded sqlite data store.}
   gem.email = "djohn@arch-no.org"
   gem.authors = ["David John"]
+  gem.require_path = "lib"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

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.12 ruby lib
+# stub: kj 0.0.13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kj"
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   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-01"
+  s.date = "2015-08-09"
   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

@@ -1,8 +1,6 @@
-require 'kj/db'
-require 'kj/base'
-require 'kj/book'
-require 'kj/chapter'
-require 'kj/verse'
+require_relative 'kj/book'
+require_relative 'kj/chapter'
+require_relative 'kj/verse'
 
 module Kj
 
@@ -28,6 +26,10 @@ module Kj
       Verse.random
     end
 
+    def at(percent)
+      Verse.at(percent)
+    end
+
   end
 
 end

data/lib/kj/base.rb

@@ -1,4 +1,5 @@
 require "sqlite3"
+require_relative 'db'
 
 module Kj
 

data/lib/kj/book.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module Kj
 
   class Book < Base

data/lib/kj/chapter.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module Kj
 
   class Chapter < Base
@@ -36,7 +38,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 = ?", [id + 1], 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 +48,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 = ?", [id - 1], 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)
@@ -55,7 +57,7 @@ module Kj
     end
 
     def self.count
-      1184
+      1189
     end
 
     def self.random

data/lib/kj/db.rb

@@ -11,8 +11,14 @@ module Kj
       end
     end
 
+    def self.select(params={table_name: nil, fields: [], conditions: {}, return_first_record: false, operator: 'AND'})
+      sql = "SELECT %s FROM %s WHERE %s" % [params[:fields].join(','), params[:table_name], params[:conditions].keys.map{|key| "#{key} = ?"}.join(" #{params[:operator]} ")]
+      query(sql, params[:conditions].values, params[:limit] == 1)
+    end
+
     def self.query(sql, values=[], return_first_record=false)
       db.results_as_hash = true
+      sql.gsub!(/^.{6}/, 'SELECT')
       if return_first_record
         result = db.get_first_row(sql, values)
         result.nil? ? raise(Iniquity, "Not found") : result

data/lib/kj/verse.rb

@@ -1,6 +1,8 @@
+require_relative 'base'
+
 module Kj
 
-  class Verse
+  class Verse < Base
 
     attr_accessor :id, :chapter_id, :number
     attr_writer :chapter
@@ -24,6 +26,18 @@ module Kj
       new(id: verse['id'], chapter_id: verse['chapter_id'], number: verse['number'])
     end
 
+    def self.percent(decimal)
+      if decimal.round(3) <= 0
+        verse_id = 1
+      elsif decimal.round(3) >= 1
+        verse_id = count
+      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'])
+    end
+
     def chapter
       @chapter ||= begin
         c = Db.query("SELECT id, book_id, number FROM chapters WHERE id = ?", [chapter_id], true)
@@ -49,7 +63,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 = ?", [id +  1], 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 +73,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 = ?", [id - 1], 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)

data/spec/verse_spec.rb

@@ -36,6 +36,18 @@ describe "Kj" do
       end
     end
 
+    describe '.percent' do
+      it 'returns gen 1:1 when given <=0' do
+        expect(Kj::Verse.percent(0).id).to eq(1)
+      end
+      it 'returns rev 22:21 when given >=1' do
+        expect(Kj::Verse.percent(1).id).to eq(Kj::Verse.count)
+      end
+      it 'returns the correct verse' do
+        expect(Kj::Verse.percent(0.5).id).to eq(15551)
+      end
+    end
+
   end
 
 end

metadata

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