bomdb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9e5b23505580c0871d836fffd14b2355a636562
-  data.tar.gz: 7c31fa7627d57d7f6a179d21ad8ccab40dcc108d
+  metadata.gz: 50fee224307028e1d0970af931372cabad9a49a0
+  data.tar.gz: 63e2b95fee39540b9df7cf5ff836e3fe1342db34
 SHA512:
-  metadata.gz: 69b236b5a23555654d6c2b311c7acd9f0c7767ff902957a50a0ed91db8c4c231b28e058e191f698ca840afbed8da02738cb3ffe9cc12d37cff009b71552f415b
-  data.tar.gz: f3bff6acf0729645bbd90677a229db21db19fe59ea2adec262bd086318b16adf3e917ce503244b6f0cf6effb95d9a6c8b1b6c45ab91c8b1b9355ffaac4483a1d
+  metadata.gz: 5e78c010d8a87974ad21d3e8e03717105410f7ad429995dd3488bfbfdebbcc3b5f573b04733b1897bd56c92bfcb13ad99e02e46e4228e6babd77e72e053dab16
+  data.tar.gz: 03ff18efe84454627f25f841ce86db57fb528a834568580237de350cbeec69d5b2b879cc3eeab177fb6c7219b7db5110490900e4c66b3a3a0a0b22c56f058609

data/lib/bomdb/cli/application.rb

@@ -9,8 +9,9 @@ module BomDB
 
 
       desc "import FILE", "import data from FILE into database, e.g. books.json"
-      option :type,   :type => :string,  :default => nil
-      option :format, :type => :string,  :default => 'json'
+      option :type,    :type => :string, :default => nil
+      option :format,  :type => :string, :default => 'json'
+      option :edition, :type => :string, :default => nil
       def import(file)
         type   = (options[:type]   || type_from_file(file)).downcase
         format = (options[:format] || format_from_file(file)).downcase
@@ -20,7 +21,7 @@ module BomDB
         when 'books'    then BomDB::Import::Books.new(BomDB.db)
         when 'verses'   then BomDB::Import::Verses.new(BomDB.db)
         when 'editions' then BomDB::Import::Editions.new(BomDB.db)
-        when 'contents' then BomDB::Import::Contents.new(BomDB.db)
+        when 'contents' then BomDB::Import::Contents.new(BomDB.db, edition_prefix: options[:edition])
         when 'refs'     then BomDB::Import::Refs.new(BomDB.db)
         else
           puts "Unknown import type #{type}"
@@ -156,15 +157,40 @@ module BomDB
 
 
       desc "editions", "list available editions of the Book of Mormon"
-      option :all, :type => :boolean, :default => false
+      option :all, :type => :boolean, :default => false,
+             :description => "Show all known editions, including those without content in BomDB"
+      option :"show-missing-verses", :type => :boolean, :default => false,
+             :description => "Lists missing verses in each edition (useful for fixing import errors)"
       def editions
-        eds = BomDB.db[:editions].
+        BomDB.db[:editions].
           left_outer_join(:contents, :edition_id => :edition_id).
-          select_group(:edition_name).
+          select_group(:editions__edition_id, :edition_name).
           select_append{ Sequel.as(count(:verse_id), :count) }.
           order(:edition_name).
-          map { |r| "#{r[:count]} verses\t#{r[:edition_name]}" }
-        puts eds.join("\n")
+        each do |r|
+          if r[:count] > 0 || options[:all]
+            puts "#{r[:count]} verses\t#{r[:edition_name]}"
+          end
+          if options[:"show-missing-verses"] && r[:count] > 0
+            BomDB.db[
+              "SELECT b.book_name, v.verse_chapter, v.verse_number " +
+              "FROM verses v " +
+              "JOIN books b ON v.book_id = b.book_id " +
+              "WHERE v.verse_heading IS NULL " +
+              "AND v.verse_id NOT IN " +
+              "(" +
+              " SELECT verse_id FROM contents c " +
+              " WHERE c.edition_id = ? " +
+              " AND c.verse_id = v.verse_id" +
+              ") " +
+              "ORDER BY b.book_sort, v.verse_chapter, v.verse_number",
+              r[:edition_id]
+            ].
+            each do |s|
+              puts "  #{s[:book_name]} #{s[:verse_chapter]}:#{s[:verse_number]} missing"
+            end
+          end
+        end
       end
 
 

data/lib/bomdb/import/base.rb

@@ -26,15 +26,21 @@ module BomDB
           )
         end
 
-        case format
-        when 'json' then import_json(ensure_parsed_json(data))
-        when 'text' then import_text(data)
-        else
-          return Import::Result.new(
-            success: false,
-            error: "Unknown format: #{format}"
-          )
-        end
+        import_before() if respond_to?(:import_before)
+
+        result = case format
+          when 'json' then import_json(ensure_parsed_json(data))
+          when 'text' then import_text(data)
+          else
+            return Import::Result.new(
+              success: false,
+              error: "Unknown format: #{format}"
+            )
+          end
+
+        import_after() if respond_to?(:import_after)
+
+        result
       end
 
       def ensure_parsed_json(data)

data/lib/bomdb/import/contents.rb

@@ -5,12 +5,23 @@ module BomDB
   module Import
     class Contents < Import::Base
       tables :books, :verses, :editions, :contents
-      DEFAULT_VERSE_CONTENT_RE = /^\s*(.+)(\d+):(\d+)\s*(.*)$/
-      DEFAULT_VERSE_REF_RE = /^([^:]+)\s+(\d+):(\d+)$/
+      DEFAULT_VERSE_CONTENT_RE = /^\s*(.+)\s+(\d+):(\d+)\s+(.*)$/
+      DEFAULT_VERSE_REF_RE     = /^\s*(.+)\s+(\d+):(\d+)$/
 
       def import_text(data)
-        if opts[:edition_id].nil?
-          raise ArgumentError, "Edition is required for text import of contents"
+        if opts[:edition_prefix].nil?
+          return Import::Result.new(success: false,
+            error: "'--edition' is required for text import of contents"
+          )
+        end
+
+        edition_model = Models::Edition.new(@db)
+
+        edition = edition_model.find(opts[:edition_prefix])
+        if edition.nil?
+          return Import::Result.new(success: false,
+            error: "Edition matching prefix '#{opts[:edition_prefix]}' not found"
+          )
         end
 
         verse_re = opts[:verse_re] || DEFAULT_VERSE_CONTENT_RE
@@ -29,12 +40,13 @@ module BomDB
             )
 
             @db[:contents].insert(
-              edition_id:   opts[:edition_id],
+              edition_id:   edition[:edition_id],
               verse_id:     verse_id,
               content_body: content
             )
           end
         end
+        Import::Result.new(success: true)
       end
 
       def import_json(data)

data/lib/bomdb/version.rb

@@ -1,3 +1,3 @@
 module BomDB
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bomdb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Duane Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel