sqlbible 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db4b2a65f0c016b81b2d1ec4c0cb45c85bb619eacf7aa802cea2fcfda88048c
-  data.tar.gz: 61e97c6905189eec0a5cfc6ef1b02a8cc91dd1d4ecd1fe1d9250db1c9c93c423
+  metadata.gz: b620e9b57b9ffdc57b71231b5a6bfb0619dd196dd99428a4f3ab71d682f60b72
+  data.tar.gz: 196e6a8907ab5b90adce9d9d2c935593796e9b86eb6b7d362a0ca419436b76ad
 SHA512:
-  metadata.gz: 7ba9e92407bc21109d36538b6932b04790a0d6082ca6131260280b6aaaf2b96e3bf42872d352637c8846ebb4d28999da222b0130a30ac41e47414d36684bd09a
-  data.tar.gz: c5250da5c011c5e4fb1e5f3536be717a84c550f9f10dd8c03d2665cdb369982aaa4fbab4d83a183010245621dda4cf092f05746f05f61c4349507dd96d1a4b5d
+  metadata.gz: 2ac874cb85c60996f406f522f6d010e9e6c07c950b10ed1d9783a87ac936bc1ddc8123dc382ae92298e15382962faed773c2b43b4e6a35e4787e06a3183c5e58
+  data.tar.gz: 927964e349b1e54f5156b3e994ef704411ed5845a0c7c13edabe175170a2d759801525438e1459c76598100159f7e7b8b07d13f39f6043edc5872f71bfa22261

data/README.md

@@ -19,7 +19,7 @@ bible = Sqlbible.new('kjv.sqlite')
 # simple search
 bible.search(/Jesus/)
 
-# Sqlbible is designed to use well with Scripref references and passages
+# Sqlbible is designed to work well with Scripref references and passages
 require 'scripref'
 
 # define a reference for the gospels

data/bin/sqlbible

@@ -7,17 +7,20 @@ require 'scripref'
 require 'sqlbible'
 
 result = OptimistXL.options do
-  synopsis 'Usage: sqlitebible [options] [<command> [suboptions] <filename>]'
+  synopsis 'Usage: sqlbible [options] [<command> [suboptions] <filename>]'
   subcmd :convert, 'Convert a bible from OSIS-XML to Sqlbible format' do
-    opt :output, 'Output filename of the generated Sqlbible file', type: String
+    opt :name, 'Name of the converted bible module or output filename of the generated .sqlbible file', type: String, required: true
+    opt :overwrite, 'Overwrite existing module or output file if exist', type: :Boolean, default: false
   end
   subcmd :search, 'Search with regular expressions' do
+    opt :name, 'Name of the bible module filename of an .sqlbible file', type: String
     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 :output, 'Output filename', type: String
     opt :range, 'Search range, example: "John 1-10"', type: String
   end
   subcmd :text, 'Show text of references' do
+    opt :name, '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 :output, 'Output filename', type: String
     opt :reference, 'Reference to show, example: "John 3:16; 10:27-30"', type: String, required: true
@@ -25,11 +28,6 @@ result = OptimistXL.options do
   version format("sqlbible %s\nschema version %s", Sqlbible::VERSION, Sqlbible.schema_version)
 end
 
-unless filename = result.leftovers.first
-  $stderr.puts 'no filename given'
-  exit 1
-end
-
 def determine_lang_mod subopts
   case l = subopts[:lang]
   when 'en', nil
@@ -57,13 +55,25 @@ subopts = result.subcommand_options
 
 case result.subcommand
 when 'convert'
+  require 'fileutils'
   require 'sqlbible/convert'
-  osis_fn = filename
-  sqlite_fn = subopts[:output] || osis_fn.sub(/\.xml/i, '') << '.sqlite'
+  unless osis_fn = result.leftovers.first
+    $stderr.puts 'no filename given'
+    exit 1
+  end
+  sqlbible_fn = Sqlbible.resolve_db_filename(subopts[:name])
+  if !subopts[:overwrite] && File.exist?(sqlbible_fn)
+    $stderr.puts format('file %s exist, conversion aborted', sqlbible_fn)
+    exit 1
+  end
+  unless File.exist?(dir = Sqlbible.bibles_dir)
+    puts format('create directory %s', dir)
+    FileUtils.mkdir_p dir
+  end
   if $stdout.tty?
-    puts "convert #{osis_fn} to #{sqlite_fn} ..."
+    puts "convert #{osis_fn} to #{sqlbible_fn} ..."
   end
-  Sqlbible.convert osis_fn, sqlite_fn
+  Sqlbible.convert osis_fn, sqlbible_fn
   exit
 when 'search'
   searches = subopts[:search]
@@ -74,8 +84,8 @@ when 'search'
   else
     range = nil
   end
-  out = determine_out subopts
-  bible = Sqlbible.new(filename)
+  out = determine_out(subopts)
+  bible = Sqlbible.new(subopts[:name])
   regexes = searches.map {|s| Regexp.new(s)}
   f = Scripref::Formatter.new(lang_mod, bookformat: :abbrev)
   bible.search(regexes, range: range).each do |v|
@@ -86,7 +96,7 @@ when 'text'
   p = Scripref::Parser.new(lang_mod)
   f = Scripref::Formatter.new(lang_mod, bookformat: :abbrev)
   ref = p.parse(subopts[:reference])
-  bible = Sqlbible.new(filename)
+  bible = Sqlbible.new(subopts[:name])
   out = determine_out subopts
   bible.reference(ref).flatten.each do |v|
     out.puts format_verse(f, v)

data/lib/sqlbible/version.rb

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

data/lib/sqlbible.rb

@@ -8,8 +8,14 @@ require_relative 'sqlbible/version'
 
 class Sqlbible
 
-  def initialize db_filename
-    @db = SQLite3::Database.new(db_filename)
+  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
+    @db = SQLite3::Database.new(@db_filename)
     @db.enable_load_extension(true)
     pcre_extension_file = ENV['SQLITE_PCRE_EXTENSION']
     @db.load_extension(pcre_extension_file) if pcre_extension_file
@@ -37,7 +43,7 @@ class Sqlbible
     if range
       passages = Array(range).select {|e| e.kind_of? Scripref::Passage}
       passages.size.times {where_arr << 'rowid between ? and ?'}
-      where_arr == [or_join_where(where_arr)]
+      where_arr = [or_join_where(where_arr)]
       args = passages.map {|p| passage2rowids(p)}.flatten
     end
     searches.flatten.each do |o|
@@ -66,8 +72,12 @@ class Sqlbible
     end
   end
 
+  @bibles_dir = File.join(Dir.home, '.sqlbible/bibles')
+
   class << self
 
+    attr_reader :bibles_dir
+
     # Get the database schema as string
     def db_schema
       File.read(File.join(__dir__, '../schema.sql'))
@@ -96,6 +106,15 @@ class Sqlbible
       select_schema_major_minor(db).join('.')
     end
 
+    def resolve_db_filename db_name
+      fn = db_name.to_s
+      if File.basename(fn) == fn
+        File.join(bibles_dir, format('%s.sqlbible', fn.sub(/\.sqlbible$/, '')))
+      else
+        fn
+      end
+    end
+
   end
 
   private

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlbible
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
+original_platform: ''
 authors:
 - Jan Friedrich
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri