sqlbible 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9766fb43d793d07864c2de0ddbc6df73883f6d606498776e0f4c323e75440618
-  data.tar.gz: 906e690a19110464e8e2a42511eadc1e29eefc7b0fcd216e8fc7d999f2fa1706
+  metadata.gz: f39d010a766a67ef4574af340249107716a57be643c51cea6dbfb78c71b14682
+  data.tar.gz: 48861d4b399b62d0d572ec7e414eb8188f2364b0c6b3d5009fbcd37c917ecaf8
 SHA512:
-  metadata.gz: ace4dd9751b380f6b61f95ad16b9929f6a0f88e141ebd6c3c19e35a2b8e0b4d8720383a79048c70c2de6b4a8f2fe9c109e090ba5d9c4fccaebe3afc101d3c9e4
-  data.tar.gz: 4fed2ba4ad46cd2bc47a017c2a1b8c6c13b086cf77c8467f16cbcbd0551a652f21b0e68252913d647a6a1e943de34d6cef0c96df47b0e6f268b950d3839bd19e
+  metadata.gz: 4c37623b9841ecde065861f6364a6be31758d3f7c358004f32983dd96ae71870b8afa6f99682871b4e148af4cf8d9e2ad41a50157323c0aea85404477ac634d7
+  data.tar.gz: 31e6d182ba802cfc3f96581c239e8fc5d7039b26f1fc1476b0b0502820360d0b948fbaefd276ec035b5a24a2bbd755bea3ccd59e5e208d051ba3bd86f37fd7e7

data/bin/sqlbible

@@ -6,6 +6,11 @@ require 'optimist_xl'
 require 'scripref'
 require 'sqlbible'
 
+default_bible_param = {}
+if b = Sqlbible.bible
+  default_bible_param[:default] = b.to_s
+end
+
 result = OptimistXL.options do
   synopsis 'Usage: sqlbible <command> [options] [filename]?'
   subcmd :convert, 'Convert a bible from OSIS-XML to Sqlbible format' do
@@ -14,15 +19,15 @@ result = OptimistXL.options do
   end
   subcmd :list, 'Show a list of the names of the bibles in central directory'
   subcmd :search, 'Search with regular expressions' do
-    opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String
+    opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String, **default_bible_param
     opt :search, 'Regular expression to search (multiple allowed)', type: String, multi: true, required: true
-    opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: 'en'
+    opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: Sqlbible.lang.to_s
     opt :output, 'Output filename', type: String
     opt :range, 'Search range, example: "John 1-10"', type: String
   end
   subcmd :text, 'Show text of references' do
-    opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String
-    opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: 'en'
+    opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String, **default_bible_param
+    opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: Sqlbible.lang.to_s
     opt :output, 'Output filename', type: String
     opt :reference, 'Reference to show, example: "John 3:16; 10:27-30"', type: String, required: true
   end

data/lib/sqlbible/convert.rb

@@ -20,6 +20,7 @@ class Sqlbible
 
     doc.css('verse').each do |v|
       osisid = v['osisID']
+      next unless osisid
       bookid, chapter, verse = osisid.split('.')
       unless bookid == last_bookid
         booknumber += 1

data/lib/sqlbible/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 class Sqlbible
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

data/lib/sqlbible.rb

@@ -11,11 +11,8 @@ class Sqlbible
 
   attr_reader :db_filename
 
-  def initialize db_name
-    @db_filename = Sqlbible.resolve_db_filename(db_name)
-    unless File.exist? @db_filename
-      fail ArgumentError, format('database %s not found, file %s does not exist', db_name, @db_filename)
-    end
+  def initialize db_name=Sqlbible.bible
+    @db_filename = Sqlbible.resolve_db_filename(db_name, check_existence: true)
     @db = SQLite3::Database.new(@db_filename)
     @db.enable_load_extension(true)
     pcre_extension_file = ENV['SQLITE_PCRE_EXTENSION']
@@ -74,10 +71,12 @@ class Sqlbible
   end
 
   @bibles_dir = File.join(Dir.home, '.sqlbible/bibles')
+  @lang = :en
 
   class << self
 
     attr_reader :bibles_dir
+    attr_accessor :bible, :lang
 
     # Get the database schema as string
     def db_schema
@@ -112,11 +111,11 @@ class Sqlbible
       select_schema_major_minor(db).join('.')
     end
 
-    def resolve_db_filename db_name
+    def resolve_db_filename db_name, check_existence: false
       db_name = db_name.to_s
       if File.basename(db_name, '.sqlbible') == db_name
         fn = File.join(bibles_dir, format('%s.sqlbible', db_name))
-        unless bible_names.include?(db_name)
+        if check_existence && !File.exist?(fn)
           msg = format('database %s not found, file %s does not exist', db_name, fn)
           sc = DidYouMean::SpellChecker.new(dictionary: bible_names)
           res = sc.correct(db_name)
@@ -125,10 +124,18 @@ class Sqlbible
           end
           fail ArgumentError, msg
         end
-        fn
       else
-        db_name
+        fn = db_name
+        if check_existence && !File.exist?(fn)
+          fail ArgumentError, format('file %s does not exist', fn)
+        end
       end
+      fn
+    end
+
+    config_file = Dir[File.join(Dir.home, '.sqlbible/config{,.rb}')].first
+    if config_file && !ENV['NOSQLBIBLECONFIG']
+      load config_file
     end
 
   end
@@ -152,14 +159,33 @@ class Sqlbible
 
   def passage2rowids pass
     rowid1 = select_rowid(pass.b1, pass.c1, pass.v1, :asc)
+    unless rowid1
+      fail_book_chapter_verse pass.b1, pass.c1, pass.v1
+    end
     if rowid1 && pass.v2 == :f
       rowid2 = rowid1 + 1
       return [rowid1, rowid2]
     end
     rowid2 = select_rowid(pass.b2, pass.c2, pass.v2, :desc)
+    unless rowid2
+      fail_book_chapter_verse pass.b2, pass.c2, pass.v2
+    end
     [rowid1, rowid2]
   end
 
+  def fail_book_chapter_verse b, c, v
+    parts = []
+    parts << format('Passage for %s', b)
+    if c
+      parts << format(' chapter %d', c.to_i)
+    end
+    if v
+      parts << format(' verse %d', v.to_i)
+    end
+    parts << ' does not exist'
+    fail parts.join
+  end
+
   def select_rowid b, c, v, orderby
     cond = []
     args = []

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sqlbible
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Jan Friedrich
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: did_you_mean
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.1
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Library for bibles as SQLite databases
 test_files: []