kj 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a7e36e78238c50d8ae07e49691437f92f4f490a
-  data.tar.gz: 9a7ceef2b2edfd66f5505d96d04a7307eb9fbe78
+  metadata.gz: 42a1e80beefbcf7e559c40b5ba4248e677029cbb
+  data.tar.gz: c2daad390ff7d1f156524ca772186c4d969f16ca
 SHA512:
-  metadata.gz: fde7f9b0e54aafacb78c6f49b77379d39b258d4b2059133bad8d609754dd2138d00d23f8bef11b06097a870ba836c368918cfbb959733ace5592b96540d0ac95
-  data.tar.gz: 9538435fb181ca6421de82f003dd920669df46a4db2fd6403135a5afbf42faa73e969e718c9b37b6869b98fce44da3766b59eed9fcd0ed10a0822a9df69085cb
+  metadata.gz: fec0b308a60ae96bc89c5a0a9794e6aad0d8db73fcee80bc9e05d3bd7219ce520f8f2e870a042f4cada2d78a91fbad438f7e4440462060ab71965c4cd7b4d96c
+  data.tar.gz: 7857cef3003d19c876a48ed59ae92336d7a14bf8b14da2e71f0493124ae66492fa945fbb6bbade058f822534003bf4216af7f9669acca5a180ffc5222b70dc14

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/kj.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: kj 0.0.7 ruby lib
+# stub: kj 0.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kj"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -43,8 +43,7 @@ Gem::Specification.new do |s|
     "spec/verse_spec.rb",
     "vendor/README.md",
     "vendor/books.csv",
-    "vendor/import.rb",
-    "vendor/parameterize.rb"
+    "vendor/import.rb"
   ]
   s.homepage = "http://github.com/billguy/kj"
   s.licenses = ["MIT"]

data/lib/kj.rb

@@ -1,3 +1,4 @@
+require 'kj/db'
 require 'kj/base'
 require 'kj/book'
 require 'kj/chapter'

data/lib/kj/base.rb

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

data/lib/kj/book.rb

@@ -2,7 +2,7 @@ module Kj
 
   class Book < Base
 
-    attr_accessor :id, :name
+    attr_accessor :id, :name, :permalink
 
     def initialize(args)
       args.each do |k,v|
@@ -20,11 +20,11 @@ module Kj
 
     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)
+        book = Db.query("SELECT id, name, permalink 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)
+        book = Db.query("SELECT id, name, permalink FROM books WHERE name = ? OR abbreviations LIKE ? OR permalink = ?", [name_or_number.to_s.downcase, "%#{name_or_number.to_s}%", name_or_number.to_s], true)
       end
-      new(id: book['id'], name: book['name'])
+      new(id: book['id'], name: book['name'], permalink: book['permalink'])
     end
 
     def self.from_names_or_numbers(names_or_numbers)
@@ -32,15 +32,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 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 }
+      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 }
     end
 
     def self.all
       @all ||= begin
-        books = Db.query("SELECT id, name FROM books")
-        books.map{ |book| new(id: book['id'], name: book['name']) }
+        books = Db.query("SELECT id, name, permalink FROM books")
+        books.map{ |book| new(id: book['id'], name: book['name'], permalink: book['permalink']) }
       end
     end
 

data/vendor/import.rb

@@ -1,7 +1,6 @@
 require 'csv'
 require "sqlite3"
 require "pathname"
-require_relative "parameterize"
 
 path = Pathname(File.absolute_path(__FILE__))
 db = SQLite3::Database.new(File.join(path.parent.parent.to_s, 'db/kjb.db'))
@@ -14,10 +13,11 @@ csv_text = File.read(File.join(path.parent.to_s, 'books.csv'))
 csv = CSV.parse(csv_text)
 csv.each do |row| # build books table
   book_name = row[0]
+  permalink = book_name.downcase.gsub(/[^a-z0-9\-_]+/, '-')
   abbreviations = row[1].split(',').map{|abb| abb.downcase.gsub(' ', '')}
   abbreviations << book_name.downcase
   abbreviations.uniq!
-  db.execute("INSERT INTO books(name, abbreviations, permalink) VALUES (?, ?, ?)", [book_name, abbreviations.join(','), parameterize(book_name)])
+  db.execute("INSERT INTO books(name, abbreviations, permalink) VALUES (?, ?, ?)", [book_name, abbreviations.join(','), permalink])
 end
 
 current_book_id, current_book_name, current_chapter_id, current_chapter_number = nil, nil, nil, nil # import chapters, verses

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kj
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - David John
@@ -100,7 +100,6 @@ files:
 - vendor/README.md
 - vendor/books.csv
 - vendor/import.rb
-- vendor/parameterize.rb
 homepage: http://github.com/billguy/kj
 licenses:
 - MIT

data/vendor/parameterize.rb

@@ -1,15 +0,0 @@
-# File activesupport/lib/active_support/inflector/transliterate.rb, line 80
-def parameterize(string, sep = '-')
-  # replace accented chars with their ascii equivalents
-  parameterized_string = string.dup.downcase
-  # Turn unwanted chars into the separator
-  parameterized_string.gsub!(/[^a-z0-9\-_]+/, sep)
-  unless sep.nil? || sep.empty?
-    re_sep = Regexp.escape(sep)
-    # No more than one of the separator in a row.
-    parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
-    # Remove leading/trailing separator.
-    parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
-  end
-  parameterized_string
-end