arxutils_sqlite3 0.1.60 → 0.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba5f7070ec93ff0ea6f25e7b66fa8f8fb74860ff477adb367fe653ad4853dd70
-  data.tar.gz: fe71d7c10f6ad03081531fc0f69d532b99a66bc7b2be25a13b5535803dc04ab0
+  metadata.gz: 17be2bd82bd6e648b09f7e49c16ef003b4c61404796620641a1f7f1a6a63e704
+  data.tar.gz: 2407844b80f1b15b74781a71a88f134c1538dc0900cc2a8cd71d8c621e4f4217
 SHA512:
-  metadata.gz: 93fa710fff1d92e873823ac196de7436e66e7b7999d3a4291670c260dd6a338ab11ef30ebc58e769a4a04a86fe895cf0300c6698a71ad2a7486d54ad4ed7285b
-  data.tar.gz: 502b418dc1faaf99a295a53dc24e642464ea9f4c1052e7b85995914bfc9f4b19eec8b1a6d9a69cb2867d33f659449ee13b393fd2923d76bb28fb21191f92e1e9
+  metadata.gz: 8de44db00668e653da29e044f0b4b3bd25256aa7ae466b6747a3417da40ae081954dd6bf45250ce6ea5978393a55620d6e0c75289c0607f8de690a2aca154024
+  data.tar.gz: b5c8de59e6bb28ac0c41ad1e0320ab98982107434141c57a25e030a5261aed9ed0ed940efc6d8a0074a426c76709b167568b342e4332a664d57e53aace842cc6

data/Gemfile

@@ -5,27 +5,27 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in arxutils_sqlite3.gemspec
 gemspec
 
-gem 'activesupport'
 gem 'activerecord', '~> 6.1'
-gem 'sqlite3'
+gem 'activesupport'
+gem 'bundler'
+gem 'rake', '~> 13.0'
 gem 'simpleoptparse'
+gem 'sqlite3'
 gem 'ykutils'
 gem 'ykxutils'
-gem 'bundler'
-gem 'rake', '~> 13.0'
 
 group :development do
   gem 'yard'
 end
 
 group :test, optional: true do
-  gem "rspec", "~> 3.0"
+  gem 'rspec', '~> 3.0'
   # gem "rspec"
-  gem "rubocop", '~> 1.7'
-  gem "rubocop-performance"
-  gem "rubocop-rake"
-  gem "rubocop-rspec"
   gem 'power_assert', '~> 1.1.5'
+  gem 'rubocop', '~> 1.7'
+  gem 'rubocop-performance'
+  gem 'rubocop-rake'
+  gem 'rubocop-rspec'
 end
 
 # group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arxutils_sqlite3 (0.1.60)
+    arxutils_sqlite3 (0.1.61)
       activerecord (~> 6.1)
       activesupport
       bundler

data/Rakefile

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 begin
-  require "rspec/core/rake_task"
+  require 'rspec/core/rake_task'
 rescue LoadError => e
   puts e.message
 end
@@ -15,7 +15,7 @@ rescue NameError, LoadError => e
 end
 
 begin
-  require "rubocop/rake_task"
+  require 'rubocop/rake_task'
 rescue LoadError => e
   puts e.message
 end
@@ -37,4 +37,3 @@ begin
 rescue LoadError => e
   puts e.message
 end
-

data/arxutils_sqlite3.gemspec

@@ -33,16 +33,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   # p spec.executables
   spec.require_paths = ['lib']
-  
+
   spec.add_runtime_dependency 'bundler'
 
-  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'activerecord', '~> 6.1'
-  spec.add_runtime_dependency 'sqlite3'
+  spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'rake', '~> 13.0'
   spec.add_runtime_dependency 'simpleoptparse'
+  spec.add_runtime_dependency 'sqlite3'
   spec.add_runtime_dependency 'ykutils'
   spec.add_runtime_dependency 'ykxutils'
-  spec.add_runtime_dependency 'rake', '~> 13.0'
 
   spec.add_development_dependency 'power_assert', '~> 1.1.5'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/arxutils_sqlite3/hier.rb

@@ -12,13 +12,13 @@ module Arxutils_Sqlite3
     # nameというメソッド／アトリビュート(string)を持つ。"'/'を区切り文字として持つ階層を表す文字列
     # registerメソッドを呼び出す時は、hier_symbolのみを指定してcreate出来なければならない（そうでなければSQLの制約違反発生）
     attr_reader :base_klass
+    # IDの親子関係で階層処理を実現するクラス名(DB中のテーブルに対応するActiveRecordの子クラス)
+    # parent_id(integer) , child_id(integer) , leve(integer)というメソッド／アトリビュートを持つ
+    attr_reader :hier_klass
     # '/'が区切り文字の文字列で階層処理を実現するクラスのカレントに対応するクラス名(DB中のテーブルに対応するActiveRecordの子クラス)
     attr_reader :current_klass
     # '/'が区切り文字の文字列で階層処理を実現するクラスのインバリッドに対応するクラス名(DB中のテーブルに対応するActiveRecordの子クラス)
     attr_reader :invalid_klass
-    # IDの親子関係で階層処理を実現するクラス名(DB中のテーブルに対応するActiveRecordの子クラス)
-    # parent_id(integer) , child_id(integer) , leve(integer)というメソッド／アトリビュートを持つ
-    attr_reader :hier_klass
 
     # 初期化
     def initialize(field_name, hier_symbol, _hier_name, base_klass, hier_klass, current_klass, invalid_klass)
@@ -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の子クラス)
@@ -43,16 +43,19 @@ module Arxutils_Sqlite3
       id = nil
       base = @base_klass.find_by({ @hier_symbol => hier })
       if base
-        delete_at(base.org_id)
-        @base_klass.delete_at(base.id)
+        delete_at(base.id)
+        # @base_klass.delete_at(base.id)
+        @base_klass.delete(base.id)
       end
       id
     end
 
     def delete_by_id(id)
-      base = @base_klass.find_by(org_id: id)
+      # base = @base_klass.find_by(id: id)
+      base = @base_klass.find(id)
       delete_at(id)
       @base_klass.delete_at(base.id)
+      @base_klass.delete_at(base.id)
     end
 
     # 文字列で指定した階層を移動
@@ -142,15 +145,22 @@ module Arxutils_Sqlite3
     def delete_at(num)
       # 子として探す
       hier = @hier_klass.find_by(child_id: num)
-      level = hier.level
-      parent_id = hier.parent_id
-      # base = @base_klass.find_by(ord_id: num)
-
-      # parent_base = @base_klass.find_by(ord_id: parent_id)
-      # parent_hier_string = parent_base.__send__ @hier_symbol
+      if hier
+        level = hier.level
+        parent_id = hier.parent_id
+      end
 
+      parent = @base_klass.find(num)
+      parent_hier = get_name(parent)
       # 属する子を探す
       children_hier = @hier_klass.where(parent_id: num)
+      return unless children_hier
+
+      adjust_children_hier(children_hier, level, parent_id, parent_hier)
+    end
+
+    # 子の階層の調整
+    def adjust_children_hier(children_hier, level, parent_id, parent_hier)
       # 属する子の階層レベルを調整する(削除するのでlevel - 1になる)
       children_hier.map { |x| level_adjust(x, level - 1) }
       # 属する子の親を、親の親にする
@@ -160,7 +170,7 @@ module Arxutils_Sqlite3
       end
       # 属する子のhierを調整する
       children_hier.map do |x|
-        child_base = @base_klass.find_by(org_id: x.child_id)
+        child_base = @base_klass.find_by(id: x.child_id)
         name = get_name(child_base)
         child_base.hier = make_hier(parent_hier, name)
         child_base.save
@@ -183,14 +193,16 @@ module Arxutils_Sqlite3
     # 階層を表すデータ構造で指定された階層の下部階層の名前を調整する
     def hier_adjust(base)
       parent_hier_string = base.__send__ @hier_symbol
-      parent_num = base.org_id
+      # parent_num = base.org_id
+      parent_num = base.id
 
       tbl_rows = @hier_klass.where(parent_id: parent_num)
       return if tbl_rows.size.zero?
 
       tbl_rows.map do |x|
         child_num = x.child_id
-        item_row = @base_klass.find_by(org_id: child_num)
+        #        item_row = @base_klass.find_by(org_id: child_num)
+        item_row = @base_klass.find(child_num)
         item_row.hier = make_hier(parent_hier_string, get_name(item_row))
         item_row.save
         hier_adjust(item_row)

data/lib/arxutils_sqlite3/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arxutils_sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.60
+  version: 0.1.61
 platform: ruby
 authors:
 - yasuo kominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simpleoptparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simpleoptparse
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: power_assert
   requirement: !ruby/object:Gem::Requirement