arxutils_sqlite3 0.1.61 → 0.1.63

data/lib/arxutils_sqlite3/config.rb

@@ -1,45 +1,45 @@
 # frozen_string_literal: true
 
-require 'ykutils'
+require "ykutils"
 
 module Arxutils_Sqlite3
   ##
   # migrateに必要なファイルをテンプレートから作成し、migarteを実行する
   class Config
     # DB格納ディレクトリ名
-    DB_DIR = 'db'
+    DB_DIR = "db"
     # migrate用スクリプト格納ディレクトリ名
-    MIGRATE_BASE_DIR = 'migrate'
+    MIGRATE_BASE_DIR = "migrate"
     # SQLITE3用DB構成名
-    DBCONFIG_SQLITE3 = 'sqlite3'
+    DBCONFIG_SQLITE3 = "sqlite3"
     # MYSQL用DB構成名
-    DBCONFIG_MYSQL = 'mysql'
+    DBCONFIG_MYSQL = "mysql"
     # DB構成格納用ディレクトリ名
-    CONFIG_DIR_NAME = 'config'
+    CONFIG_DIR_NAME = "config"
 
     # コンフィグディレクトリへのパス
     CONFIG_DIR = Pathname.new(CONFIG_DIR_NAME)
     # データベース用ログファイル名
-    DATABASELOG = 'database.log'
+    DATABASELOG = "database.log"
     # テンプレートディレクトリへのパス
-    TEMPLATE_DIR = Arxutils_Sqlite3::TOP_DIR.join('template')
+    TEMPLATE_DIR = Arxutils_Sqlite3::TOP_DIR.join("template")
     # リレーションテンプレートディレクトリへのパス
-    TEMPLATE_ACRECORD_DIR = TEMPLATE_DIR.join('acrecord')
+    TEMPLATE_ACRECORD_DIR = TEMPLATE_DIR.join("acrecord")
     TEMPLATE_CONFIG_DIR = TEMPLATE_DIR.join(CONFIG_DIR)
-    DB_SCHEME_DIR = TEMPLATE_ACRECORD_DIR.join('db_scheme')
-    DB_SCHEME_FILE = DB_SCHEME_DIR.join('db_scheme.yml')
-    SAMPLE_DB_SCHEME_FILE = CONFIG_DIR.join('db_scheme.yml.sample')
-    DB_SCHEME_FILE_NAME = 'db_scheme.yml'
-    DB_SCHEME_FILE_NAME_B = 'db_scheme'
-    OPTS_FILE_NAME = 'opts.tmpl'
-    SAMPLE_OPTS_FILE_NAME = 'opts.rb.sample'
-    OPTS_FILE_NAME_B = 'opts'
-    DEST_OPTS_FILE_NAME = 'opts.rb'
-    DEST_OPTS_FILE_NAME_B = 'opts'
-    DBSETUP_FILE_NAME = 'dbsetup.tmpl'
-    DBSETUP_FILE_NAME_B = 'dbsetup'
-    DEST_DBSETUP_FILE_NAME = 'dbsetup.rb'
-    SETTING_YAML_FILE_NAME = 'setting.yml'
+    DB_SCHEME_DIR = TEMPLATE_ACRECORD_DIR.join("db_scheme")
+    DB_SCHEME_FILE = DB_SCHEME_DIR.join("db_scheme.yml")
+    SAMPLE_DB_SCHEME_FILE = CONFIG_DIR.join("db_scheme.yml.sample")
+    DB_SCHEME_FILE_NAME = "db_scheme.yml"
+    DB_SCHEME_FILE_NAME_B = "db_scheme"
+    OPTS_FILE_NAME = "opts.tmpl"
+    SAMPLE_OPTS_FILE_NAME = "opts.rb.sample"
+    OPTS_FILE_NAME_B = "opts"
+    DEST_OPTS_FILE_NAME = "opts.rb"
+    DEST_OPTS_FILE_NAME_B = "opts"
+    DBSETUP_FILE_NAME = "dbsetup.tmpl"
+    DBSETUP_FILE_NAME_B = "dbsetup"
+    DEST_DBSETUP_FILE_NAME = "dbsetup.rb"
+    SETTING_YAML_FILE_NAME = "setting.yml"
     DEST_CONFIG_DIR = Pathname.new(CONFIG_DIR)
     OPTS_FILE = DB_SCHEME_DIR.join(OPTS_FILE_NAME)
     SAMPLE_OPTS_FILE = CONFIG_DIR.join(SAMPLE_OPTS_FILE_NAME)
@@ -63,7 +63,7 @@ module Arxutils_Sqlite3
     # 削除しないファイル群
     EXCLUDE_FILES = %w[SETTING_YAML_FILE_NAME].freeze
     # 作成対象のActiveRecordの子クラスのデフォルトクラス名
-    DEFAULT_MOD = 'Xenop'
+    DEFAULT_MOD = "Xenop"
 
     def default_mod
       DEFAULT_MOD
@@ -171,7 +171,7 @@ module Arxutils_Sqlite3
     def require_opts_file
       return unless DEST_OPTS_FILE.exist?
 
-      opts_file = File.join('./', DEST_OPTS_FILE_B.to_s)
+      opts_file = File.join("./", DEST_OPTS_FILE_B.to_s)
       begin
         require opts_file
       rescue LoadError
@@ -190,7 +190,7 @@ module Arxutils_Sqlite3
 
     # Dbsetupファイル(Rubyスクリプトファイル)のrequire
     def require_dbsetup_file
-      dbsetup_file = File.join('.', dest_dbsetup_file_b.to_s)
+      dbsetup_file = File.join(".", dest_dbsetup_file_b.to_s)
       begin
         require dbsetup_file
       rescue LoadError
@@ -289,7 +289,7 @@ module Arxutils_Sqlite3
 
     def make_dbsetup_file(db_scheme_ary, acrecord, _mod, dest_dbsetup_file)
       scope = Object.new
-      hash0 = { mod_name: acrecord[:module].join('::') }
+      hash0 = { mod_name: acrecord[:module].join("::") }
       hash = db_scheme_ary[0].merge(hash0)
       result_content = Ykutils::Erubyx.erubi_render_with_template_file(src_dbsetup_file, scope, hash)
 

data/lib/arxutils_sqlite3/dbutil/dbconnect.rb

@@ -1,18 +1,18 @@
 #! -*- encoding : UTF-8 -*-
 # frozen_string_literal: true
 
-require 'fileutils'
-require 'yaml'
-require 'active_record'
-require 'sqlite3'
-require 'ykxutils'
+require "fileutils"
+require "yaml"
+require "active_record"
+require "sqlite3"
+require "ykxutils"
 
 module Arxutils_Sqlite3
   module Dbutil
     # DB操作用ユーティリティクラス
     class Dbconnect
       def self.make_log_file_name(dbconfig, log_file_base_name)
-        format('%s-%s', dbconfig.to_s, log_file_base_name)
+        format("%s-%s", dbconfig.to_s, log_file_base_name)
       end
 
       def self.db_connect(config, dbconfig, env)
@@ -44,9 +44,11 @@ module Arxutils_Sqlite3
         unless @connect_time
           begin
             # p "@dbconfig_dest_path=#{@dbconfig_dest_path}"
-            dbconfig = Ykxutils.yaml_load_file_compati(@dbconfig_dest_path)
+            dbconfig, _value = Ykxutils.yaml_load_file_compati(@dbconfig_dest_path)
             # p "dbconfig=#{dbconfig}"
             # p "@env=#{@env}"
+            # x =  dbconfig[@env]
+            # p x 
             ActiveRecord::Base.establish_connection(dbconfig[@env])
             ActiveRecord::Base.logger = Logger.new(@log_path)
             @connect_time = DateTime.now.new_offset

data/lib/arxutils_sqlite3/dbutil.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'dbutil/dbconnect'
+require_relative "dbutil/dbconnect"
 
 module Arxutils_Sqlite3
   # DB操作用ユーティリティクラス

data/lib/arxutils_sqlite3/hier.rb

@@ -27,7 +27,7 @@ module Arxutils_Sqlite3
       # '/'が区切り文字の文字列で階層処理を実現するクラスの階層構造を表す文字列を持つメソッド／アトリビュートを表すシンボ
       @hier_symbol = hier_symbol
       # '/'が区切り文字の文字列で階層処理を実現するクラスのクラス名(DB中のテーブルに対応するActiveRecordの子クラス)
-      @base_klass  = base_klass
+      @base_klass = base_klass
       # '/'が区切り文字の文字列で階層処理を実現するクラスのカレントに対応するクラス名(DB中のテーブルに対応するActiveRecordの子クラス)
       @current_klass = current_klass
       # '/'が区切り文字の文字列で階層処理を実現するクラスのインバリッドに対応するクラス名(DB中のテーブルに対応するActiveRecordの子クラス)
@@ -74,10 +74,10 @@ module Arxutils_Sqlite3
 
       dest_parent_row_item = @base_klass.find_by(name: dest_parent_hier)
       dest_parent_num = if dest_parent_row_item
-                          dest_parent_row_item.id
-                        else
-                          register(dest_parent_hier)
-                        end
+          dest_parent_row_item.id
+        else
+          register(dest_parent_hier)
+        end
       dest_parent_level = get_level_by_child(dest_parent_num)
 
       # srcの親をdest_parentにする
@@ -98,7 +98,7 @@ module Arxutils_Sqlite3
     def register_parent(hier_ary, child_num, level)
       hier_ary.pop
       parent_hier_ary = hier_ary
-      parent_hier = parent_hier_ary.join('/')
+      parent_hier = parent_hier_ary.join("/")
       parent_num = register(parent_hier)
       hs = { parent_id: parent_num, child_id: child_num, level: level }
       @hier_klass.create(hs)
@@ -106,7 +106,7 @@ module Arxutils_Sqlite3
 
     # 文字列で指定した階層(/を区切り文字として持つ)をhier_klassに登録
     def register(hier)
-      hier_ary = hier.split('/')
+      hier_ary = hier.split("/")
       level = get_level_by_array(hier_ary)
 
       # もしhier_aryがnilだけを1個持つ配列、または空文字列だけを1個もつ配列であれば、hier_nameは空文字列になる
@@ -187,7 +187,7 @@ module Arxutils_Sqlite3
 
     # 階層を表すデータ構造から階層の名前を得る
     def get_name(items_row)
-      items_row ? items_row.name.split('/').pop : ''
+      items_row ? items_row.name.split("/").pop : ""
     end
 
     # 階層を表すデータ構造で指定された階層の下部階層の名前を調整する
@@ -226,7 +226,7 @@ module Arxutils_Sqlite3
 
     # 文字列で指定された親の階層の下の子の名前から、子の名前を作成
     def make_hier(parent_hier, name)
-      [parent_hier, name].join('/')
+      [parent_hier, name].join("/")
     end
   end
 end

data/lib/arxutils_sqlite3/migrate.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # require "arxutils_sqlite3"
-require 'ykutils'
-require 'fileutils'
+require "ykutils"
+require "fileutils"
 # require "active_support"
-require 'active_record'
-require 'active_record/migration'
-require 'pp'
+require "active_record"
+require "active_record/migration"
+require "pp"
 
 # ActiveRecord用ユーティリティモジュール
 module Arxutils_Sqlite3
@@ -60,7 +60,7 @@ module Arxutils_Sqlite3
     def delete_migrate_and_config_and_db
       #    def delete_migrate_and_config
       delete_migrate
-      Dir.glob(File.join(@dest_config_dir, '*')).each do |x|
+      Dir.glob(File.join(@dest_config_dir, "*")).each do |x|
         basename = File.basename(x)
         ret = !@config.exclude_file?(basename)
         ret_file = File.file?(x)
@@ -79,14 +79,14 @@ module Arxutils_Sqlite3
     def delete_migrate
       return unless @migrate_dir
 
-      Dir.glob(File.join(@migrate_dir, '*')).each do |x|
+      Dir.glob(File.join(@migrate_dir, "*")).each do |x|
         FileUtils.rm(x) if File.file?(x)
       end
     end
 
     # DBファイルの削除
     def delete_db
-      Dir.glob(File.join(@db_dir, '*')).each do |x|
+      Dir.glob(File.join(@db_dir, "*")).each do |x|
         FileUtils.rm(x) if File.file?(x)
       end
     end
@@ -108,12 +108,12 @@ module Arxutils_Sqlite3
       if content_array.find { |x| !x.nil? }
         # p "####### 1"
         data_count = {
-          count_classname: 'Count',
-          need_count_class_plural: need_count_class_plural
+          count_classname: "Count",
+          need_count_class_plural: need_count_class_plural,
         }
         # p "data_count=#{data_count}"
         ary = content_array.collect { |x| x[:content] }.flatten
-        count_content = convert_count_class_acrecord(data_count, 'acrecord_count.tmpl')
+        count_content = convert_count_class_acrecord(data_count, "acrecord_count.tmpl")
         ary.unshift(count_content)
         content_array = ary
       end
@@ -134,7 +134,7 @@ module Arxutils_Sqlite3
     def make_content_array
       # スキーマ設定配列から、acrecordのmigrate用のスクリプトの内容(ハッシュ形式)の配列を作成する
       acrecords = @db_scheme_ary.map do |x|
-        make_acrecord(x, 'count')
+        make_acrecord(x, "count")
       end
       acrecords.select { |x| x.size.positive? }
     end
@@ -155,7 +155,7 @@ module Arxutils_Sqlite3
     def make_dbconfig(data)
       content = convert(data, @src_config_path, @dbconfig_src_fname)
       File.open(
-        @dbconfig_dest_path, 'w:utf-8'
+        @dbconfig_dest_path, "w:utf-8"
       ) do |f|
         f.puts(content)
       end
@@ -171,8 +171,8 @@ module Arxutils_Sqlite3
         # 指定フィールドのフィールド名に対応したテンプレートファイルを用いて、acrecord設定を作成
         data[:flist].each_with_object({ content: [], need_count_class: nil }) do |field_name, s|
           case field_name
-          when 'base', 'noitem'
-            name_base = 'acrecord'
+          when "base", "noitem"
+            name_base = "acrecord"
             # data[:acrecord]がnilに設定されていたら改めて空の配列を設定
             data[:acrecord] = [] unless data[:acrecord]
           else
@@ -200,13 +200,13 @@ module Arxutils_Sqlite3
     # migrationのスクリプトをファイル出力する
     def output_script(idy, kind, content, classname_downcase)
       additional = case kind
-                   when 'base', 'noitem'
-                     ''
-                   else
-                     kind
-                   end
-      fname = File.join(@migrate_dir, format('%03d_create_%s%s.rb', idy, additional, classname_downcase))
-      File.open(fname, 'w', **{ encoding: Encoding::UTF_8 }) do |f|
+        when "base", "noitem"
+          ""
+        else
+          kind
+        end
+      fname = File.join(@migrate_dir, format("%03d_create_%s%s.rb", idy, additional, classname_downcase))
+      File.open(fname, "w", **{ encoding: Encoding::UTF_8 }) do |f|
         f.puts(content)
       end
     end
@@ -218,13 +218,13 @@ module Arxutils_Sqlite3
       fpath = File.join(dir, fname)
       ret = :SUCCESS
       begin
-        File.open(fpath, 'w') do |file|
+        File.open(fpath, "w") do |file|
           acrecord_config[:module].map { |mod| file.puts("module #{mod}") }
           content_array.map do |x|
             file.puts x
-            file.puts ''
+            file.puts ""
           end
-          acrecord_config[:module].map { |_mod| file.puts('end') }
+          acrecord_config[:module].map { |_mod| file.puts("end") }
         end
       rescue StandardError
         ret = :StandardError

data/lib/arxutils_sqlite3/rake_task.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Defining a task called default that depends on the tasks setup, makeconfig, migrate, and acr.
-require 'arxutils_sqlite3'
+require "arxutils_sqlite3"
 config = Arxutils_Sqlite3::Config.new
 
 mod = nil
@@ -9,7 +9,7 @@ setting = config.load_setting_yaml_file
 mod = setting[:mod]
 mod = config.default_mod if mod.nil?
 
-desc_arxutils_sqlite3 = 'setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr'
+desc_arxutils_sqlite3 = "setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
 
 desc desc_arxutils_sqlite3.to_s
 task arxutils_sqlite3: %w[arx:setup arx:copy_db_scheme arx:copy_opts arx:makeconfig arx:make_migrate_script arx:migrate arx:acr]
@@ -17,78 +17,78 @@ task arxutils_sqlite3: %w[arx:setup arx:copy_db_scheme arx:copy_opts arx:makecon
 desc desc_arxutils_sqlite3.to_s
 task 'arx:arxutils_sqlite3': %w[arxutils_sqlite3]
 
-desc 'delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr'
+desc "delete setup copy_db_scheme copy_opts makeconfig make_migrate_script migrate acr"
 task 'arx:bootstrap': %w[arx:delete arxutils_sqlite3]
 
-desc 'migrate acr'
+desc "migrate acr"
 task 'arx:ma': %w[arx:migrate arx:acr]
 
-desc 'delete_db'
+desc "delete_db"
 task 'arx:b': %w[arx:delete_db]
 
-desc 'delete setting.yaml'
+desc "delete setting.yaml"
 task 'arx:ds': %w[arx:delete_setting]
 
 # コマンドラインで指定したクラス名を含むオプション指定用ハッシュの定義を含むRubyスクリ
 # プトファイルの生成
 desc "produce setting.yml, db_scheme.yml.sample and opts.rb.sample with class name #{mod}"
-task 'arx:setup' do
+task "arx:setup" do
   sh "bundle exec arxutils_sqlite3 --cmd=s --mod=#{mod}"
 end
 
-desc 'copy from db_scheme.yml.sample to db_scheme.yml'
-task 'arx:copy_db_scheme' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=cds'
+desc "copy from db_scheme.yml.sample to db_scheme.yml"
+task "arx:copy_db_scheme" do
+  sh "bundle exec arxutils_sqlite3 --cmd=cds"
 end
 
-desc 'copy from opts.rb.sample to opts.rb'
-task 'arx:copy_opts' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=co'
+desc "copy from opts.rb.sample to opts.rb"
+task "arx:copy_opts" do
+  sh "bundle exec arxutils_sqlite3 --cmd=co"
 end
 
 # DB構成情報の生成
-desc 'produce sqlite3.yml'
-task 'arx:makeconfig' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=c'
+desc "produce sqlite3.yml"
+task "arx:makeconfig" do
+  sh "bundle exec arxutils_sqlite3 --cmd=c"
 end
 
 # マイグレート用スクリプトファイルの生成
-desc 'produce migration scripts'
-task 'arx:make_migrate_script' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=f --yaml=config/db_scheme.yml'
+desc "produce migration scripts"
+task "arx:make_migrate_script" do
+  sh "bundle exec arxutils_sqlite3 --cmd=f --yaml=config/db_scheme.yml"
 end
 # マイグレートの実行
-desc 'execute migration'
-task 'arx:migrate' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=m'
+desc "execute migration"
+task "arx:migrate" do
+  sh "bundle exec arxutils_sqlite3 --cmd=m"
 end
 
-desc 'call ActiveRecord instance method'
-task 'arx:acr' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=a'
+desc "call ActiveRecord instance method"
+task "arx:acr" do
+  sh "bundle exec arxutils_sqlite3 --cmd=a"
 end
 
-desc 'delete configuration files adn migration scripts and db files'
-task 'arx:delete' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=del'
+desc "delete configuration files adn migration scripts and db files"
+task "arx:delete" do
+  sh "bundle exec arxutils_sqlite3 --cmd=del"
 end
 
-desc 'delete configuration files adn migration scripts and db files'
-task 'arx:clean' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=d'
+desc "delete configuration files adn migration scripts and db files"
+task "arx:clean" do
+  sh "bundle exec arxutils_sqlite3 --cmd=d"
 end
 
-desc 'delete db files'
-task 'arx:delete_db' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=b'
+desc "delete db files"
+task "arx:delete_db" do
+  sh "bundle exec arxutils_sqlite3 --cmd=b"
 end
 
-desc 'delete setting yaml'
-task 'arx:delete_setting' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=y'
+desc "delete setting yaml"
+task "arx:delete_setting" do
+  sh "bundle exec arxutils_sqlite3 --cmd=y"
 end
 
-desc 'delete migrate scripts'
-task 'arx:delete_migrate' do
-  sh 'bundle exec arxutils_sqlite3 --cmd=dm'
+desc "delete migrate scripts"
+task "arx:delete_migrate" do
+  sh "bundle exec arxutils_sqlite3 --cmd=dm"
 end

data/lib/arxutils_sqlite3/util.rb

@@ -5,7 +5,7 @@ module Arxutils_Sqlite3
   class Util
     # DBログファイルへのパスの作成
     def self.make_log_path(db_dir, dbconfig)
-      log_path = ''
+      log_path = ""
       log_fname = Dbutil::Dbconnect.make_log_file_name(
         dbconfig, Config::DATABASELOG
       )

data/lib/arxutils_sqlite3/version.rb

@@ -2,5 +2,5 @@
 
 module Arxutils_Sqlite3
   # バージョン番号
-  VERSION = '0.1.61'
+  VERSION = "0.1.63"
 end

data/lib/arxutils_sqlite3.rb

@@ -1,28 +1,30 @@
 # frozen_string_literal: true
 
-require 'ykutils'
-require 'ykxutils'
+# require "ykutils"
+require "ykxutils"
 
-require 'bigdecimal'
-require 'active_support'
-require 'active_support/core_ext'
-require 'active_record'
-require 'pathname'
+require "bigdecimal"
+require "active_support"
+require "active_support/core_ext"
+require "active_record"
+require "pathname"
 
 module Arxutils_Sqlite3
   TOP_DIR = Pathname(__FILE__).parent
+
   class Error < StandardError; end
+
   # Your code goes here...
 end
 
-require_relative 'arxutils_sqlite3/dbutil'
-require_relative 'arxutils_sqlite3/config'
-require_relative 'arxutils_sqlite3/cli'
+require_relative "arxutils_sqlite3/dbutil"
+require_relative "arxutils_sqlite3/config"
+require_relative "arxutils_sqlite3/cli"
 
-require_relative 'arxutils_sqlite3/version'
-require_relative 'arxutils_sqlite3/arx'
-require_relative 'arxutils_sqlite3/transactstate'
-require_relative 'arxutils_sqlite3/hier'
-require_relative 'arxutils_sqlite3/migrate'
-require_relative 'arxutils_sqlite3/util'
-require_relative 'dbacrecord'
+require_relative "arxutils_sqlite3/version"
+require_relative "arxutils_sqlite3/arx"
+require_relative "arxutils_sqlite3/transactstate"
+require_relative "arxutils_sqlite3/hier"
+require_relative "arxutils_sqlite3/migrate"
+require_relative "arxutils_sqlite3/util"
+require_relative "dbacrecord"