bomdb 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5218f7bf1edf9df9a3360e7488cecf285ea7ab02
-  data.tar.gz: cdede845e0f795e1a11d38fca5c4fec52007f640
+  metadata.gz: 9ef43d46210651b66ea43b74d7c839eb46016fb0
+  data.tar.gz: d31dc13344a3dc942ff850f368d7879819440ec2
 SHA512:
-  metadata.gz: fa072e14a3b56055279761ae47f971282b771603a0df94066973cf5a908e87df17a0e883d26073709267943b22abccd82165cd5b80cd298a145bc908c7515d09
-  data.tar.gz: c8010f32c6fd199e7eb3d4a3eac3fd6248d033fe99771c03e368bcc8e1c6580b63cc0d9e919ce6a6f992ec235c1355f1a08d7573e9c1c1bfa20c3e0be46c3ed0
+  metadata.gz: ed8edfd7c1df4ed59bba75cf4f7688429a0ec4776cb199ed43f3fb0ef6749123e9ee9d4284516ba4492fb877937690e04cf9ae21a22eb11462a61c42c4bf09ae
+  data.tar.gz: 7be412d55eb0d296467807f163501acb5cf88ed1d37b8c728f8364df8def4b9610114b2263aaae1bf75e09ac9f4f0a99cf09a221c39dabb7e44146d9f63a8fa3

data/Gemfile.lock

@@ -14,48 +14,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     byebug (4.0.5)
       columnize (= 0.9.0)
-    colorize (0.7.7)
+    colorize (0.8.1)
     columnize (0.9.0)
+    concurrent-ruby (1.0.5)
     constellation (0.1.1)
       multi_json
-    diff-lcs (1.2.5)
-    ffi (1.9.10)
-    i18n (0.7.0)
-    json (1.8.3)
+    diff-lcs (1.3)
+    ffi (1.9.23)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     levenshtein-ffi (1.1.0)
       ffi (~> 1.9)
     mericope (0.2.0)
       activesupport (~> 4.0)
-    minitest (5.9.0)
-    multi_json (1.12.1)
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    sequel (4.35.0)
-    sqlite3 (1.3.11)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    sequel (4.49.0)
+    sqlite3 (1.3.13)
     text_clean (0.2.2)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/Rakefile

@@ -1,2 +1,5 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
+# invoke with `bundle exec rake test`
+RSpec::Core::RakeTask.new(:test)

data/lib/bomdb/cli/application.rb

@@ -205,7 +205,7 @@ module BomDB
       def editions
         BomDB.db[:editions].
           left_outer_join(:contents, :edition_id => :edition_id).
-          select_group(:editions__edition_id, :edition_name).
+          select_group(Sequel.qualify("editions", "edition_id"), :edition_name).
           select_append{ Sequel.as(count(:verse_id), :count) }.
           order(:edition_name).
         each do |r|

data/lib/bomdb/export/contents.rb

@@ -75,7 +75,7 @@ module BomDB
       def edition_query
         @db[:editions].
           left_outer_join(:contents, :edition_id => :edition_id).
-          select_group(:editions__edition_id, :edition_year, :edition_name).
+          select_group(Sequel.qualify("editions", "edition_id"), :edition_year, :edition_name).
           select_append{ Sequel.as(count(:verse_id), :count) }.
           having{ count > 0 }.
           order(:edition_name)
@@ -85,10 +85,10 @@ module BomDB
         @db[:verses].
           join(:books, :book_id => :book_id).
           join(:editions).
-          join(:contents, :edition_id => :edition_id, :verse_id => :verses__verse_id).
+          join(:contents, :edition_id => :edition_id, :verse_id => Sequel.qualify("verses", "verse_id")).
           order(:book_sort, :verse_heading, :verse_chapter, :verse_number).
-          select(:editions__edition_id, :book_name, :verse_chapter, :verse_number, :content_body).
-          where(:editions__edition_id => edition_ids).
+          select(Sequel.qualify("editions", "edition_id"), :book_name, :verse_chapter, :verse_number, :content_body).
+          where(Sequel.qualify("editions", "edition_id") => edition_ids).
           where(:verse_heading => nil)
       end
 

data/lib/bomdb/query.rb

@@ -21,18 +21,22 @@ module BomDB
       q = db[:verses].
         join(:books, :book_id => :book_id).
         join(:editions).
-        join(:contents, :edition_id => :edition_id, :verse_id => :verses__verse_id).
+        join(:contents, :edition_id => :edition_id, :verse_id => Sequel.qualify("verses", "verse_id")).
         order(:book_sort, :verse_heading, :verse_chapter, :verse_number).
         select(:book_name, :verse_chapter, :verse_number, :content_body)
-      q.where!(:editions__edition_id => edition[:edition_id]) if @edition
-      q.where!(:verse_heading => nil) unless @headings
+      if @edition
+        q = q.where(Sequel.qualify("editions", "edition_id") => edition[:edition_id])
+      end
+      if not @headings
+        q = q.where(:verse_heading => nil)
+      end
       if @range
         pericope = Mericope.new(@range)
         pairs = pericope.ranges.map{ |r| [:verse_range_id, r] }
-        q.where!(Sequel::SQL::BooleanExpression.from_value_pairs(pairs, :OR))
+        q = q.where(Sequel::SQL::BooleanExpression.from_value_pairs(pairs, :OR))
       end
       if @search
-        q.where!(Sequel.like(Sequel.function(:LOWER, :content_body), "%#{@search.downcase}%"))
+        q = q.where(Sequel.like(Sequel.function(:LOWER, :content_body), "%#{@search.downcase}%"))
       end
       if @exclude
         excluded_ref_names = @exclude.split(/\s*,\s*/).map do |name|
@@ -40,11 +44,11 @@ module BomDB
         end
         excluded_verse_ids = db[:refs].
           select(:verse_id).
-          where(excluded_ref_names)
+          where(Sequel.&(excluded_ref_names))
         if @exclude_only_quotations
-          excluded_verse_ids.where!(ref_is_quotation: true)
+          excluded_verse_ids = excluded_verse_ids.where(ref_is_quotation: true)
         end
-        q.exclude!(:verses__verse_id => excluded_verse_ids)
+        q = q.exclude(Sequel.qualify("verses", "verse_id") => excluded_verse_ids)
       end
       q
     end

data/lib/bomdb/version.rb

@@ -1,3 +1,3 @@
 module BomDB
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/bomdb/query_spec.rb

@@ -12,15 +12,36 @@ describe BomDB::Query do
     end
 
     context "with schema" do
-      before do
-        BomDB::Schema.create_tables(BomDB.db)
-      end
+      let(:db) { BomDB.db }
 
       context "with data" do
-        # let(:book_id) { BomDB.db[:books].insert(book_name: "1 Nephi") }
-        # let(:verse1) { BomDB.db[:verses].insert(book_id: book_id, verse_chapter: 1, verse_number: 1) }
-        # let(:verse2) { BomDB.db[:verses].insert(book_id: book_id, verse_chapter: 1, verse_number: 2) }
-        # let(:edition1) { BomDB.db[:editions].insert() }
+        let(:data) { BomDB::Query.new(exclude: 'Bible-OT') }
+
+        it "queries wherefore/therefore" do
+          result = data.books.map do |book,content|
+            [ book,
+              content.scan(/wherefore/i).size,
+              content.scan(/therefore/i).size ]
+          end
+
+          expect(result).to match([
+            ["1 Nephi", 99, 13],
+            ["2 Nephi", 126, 6],
+            ["Jacob", 53, 1],
+            ["Enos", 6, 0],
+            ["Jarom", 3, 0],
+            ["Omni", 6, 0],
+            ["Words of Mormon", 5, 0],
+            ["Mosiah", 0, 122],
+            ["Alma", 3, 288],
+            ["Helaman", 0, 63],
+            ["3 Nephi", 3, 97],
+            ["4 Nephi", 0, 5],
+            ["Mormon", 0, 22],
+            ["Ether", 63, 26],
+            ["Moroni", 38, 0]
+          ])
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
-require 'byebug'
 require 'tmpdir'
 
 require_relative '../lib/bomdb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bomdb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Duane Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel