rails-crud-tools 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9780c9345c5eb0ec2a7647681dac9a64b57194db6ef5fa4bd8ee92788b05fd
-  data.tar.gz: 708d9395be78f1e80cebc09d9cc24df79d24d3dd731ff72b528ce2e7b0376ba7
+  metadata.gz: '008fdf2673bcbae231ccc376ca9fdf1c7647ea2df3a3a5037e6beb60d4b67728'
+  data.tar.gz: c8006b6be02b313626f05cf021a3264a555ed54314f60c3e349aabdc680e28b4
 SHA512:
-  metadata.gz: 219063db88019b029890b3263d33569b96e771fe7e01c65631d07a12fdb12ac7151ef90a3c7a631c161b66e407f2a5e2d21731f25ae783d52918b78e8a34e34f
-  data.tar.gz: cf01b00c5edf43220459ef19175f693acb0828d67c036b45a2996912397647d616365bda53d28f024c6c9fd2a54a379fd59127d6c0744296e943a02c4c1210ba
+  metadata.gz: 5f7b3dd252dad14b4e262d33e6f7c79fb784e791739ba0d74adb33fb6187f473d84d314c342f897ea97670b215bd8811a36195b070642252990f9f26d6adb142
+  data.tar.gz: fe6df88290d5132775d2e796e9a2b80f01ec3409f5ffc1b7c9438b4993f16681bd5e4c06e63cc91d46e4b31f8f5a8f8e7c707d9acfbde428d4f3faa4637773a5

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Style/StringLiterals:
   Enabled: true

data/CHANGELOG.md

@@ -1,64 +1,59 @@
+## [0.4.3] - 2025-01-07
+- Refactored `crud_notifications.rb`.
+- Modified to not execute the `setup` method in `tools.rb` when running commands.
+
+## [0.4.2] - 2025-01-06
+- Fixed to update the last modifier of the CRUD file
+- Changed CRUD file saving process to asynchronous processing
+
 ## [0.4.1] - 2025-01-04
-- 初期化時にベースディレクトリが存在しない場合は作成する
+- Create the base directory if it does not exist during initialization
 
 ## [0.4.0] - 2025-01-04
-- セルの値が変化する場合のみ保存するよう修正
-- 設定ファイルにシート名を追加
-- 設定ファイルにフォント名を追加
-- テストコード作成
-- 初期化コマンド追加
-- 設定ファイル作成コマンド追加
+- Fixed to save only when cell values change
+- Added sheet name to configuration file
+- Added font name to configuration file
+- Created test code
+- Added initialization command
+- Added configuration file creation command
 
 ## [0.3.2] - 2025-01-01
-
-- 複数スレッド対応
+- Multi-thread support
 
 ## [0.3.1] - 2024-12-31
-
-- rails-crud-toolsに変更
+- Changed to rails-crud-tools
 
 ## [0.3.0] - 2024-12-30
-
-- ジョブ対応
-- クラッド図生成コマンドの追加
+- Job support
+- Added command to generate CRUD diagrams
 
 ## [0.2.2] - 2024-12-25
-
-- SQL出力のON/OFFを追加
-- サマリーログの改善
+- Added ON/OFF for SQL output
+- Improved summary log
 
 ## [0.2.1] - 2024-12-25
-
-- リファクタリング
+- Refactoring
 
 ## [0.2.0] - 2024-12-25
-
-- api対応
+- API support
 
 ## [0.1.6] - 2024-12-25
-
-- ログ改善
+- Improved logging
 
 ## [0.1.5] - 2024-12-25
-
-- マルチスレッド改善
+- Improved multi-threading
 
 ## [0.1.4] - 2024-12-24
-
-- リファクタリング
+- Refactoring
 
 ## [0.1.3] - 2024-12-24
-
-- bug fix
+- Bug fix
 
 ## [0.1.2] - 2024-12-24
-
-- bug fix
+- Bug fix
 
 ## [0.1.1] - 2024-12-24
-
-- プレビュー版のリリース
+- Preview release
 
 ## [0.1.0] - 2024-12-23
-
-- Initial release
+- Initial release

data/Gemfile

@@ -11,7 +11,8 @@ gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.21"
 
-group :test do
-  gem "rails"
-  gem "simplecov"
-end
+gem "rubyzip", "~> 2.4"
+
+gem "rails"
+
+gem "simplecov"

data/README.md

@@ -65,7 +65,7 @@ This workbook contains macros that help in managing and visualizing CRUD operati
 
 You can download the `crud_macro.xlsm` file from the following link:
 
-[Download crud_macro.xlsm](https://github.com/YamabikoLab/rails-crud/raw/main/tools/crud_macro.xlsm)
+[Download crud_macro.xlsm](https://github.com/YamabikoLab/rails-crud-tools/raw/main/tools/crud_macro.xlsm)
 
 ## Development
 

data/exe/crud

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+ENV["SKIP_CRUD_SETUP"] = "true"
 require "rails/crud/tools/cli"
 
 def display_help

data/lib/rails/crud/tools/crud_data.rb

@@ -1,3 +1,4 @@
+require "zip"
 require_relative "crud_logger"
 require_relative "constants"
 
@@ -8,9 +9,10 @@ module Rails
       class CrudData
         include Singleton
 
-        attr_accessor :crud_rows, :crud_cols, :workbook, :last_loaded_time
+        attr_accessor :process_id, :crud_rows, :crud_cols, :workbook, :last_loaded_time
 
         def initialize
+          @process_id = nil
           @crud_rows = {}
           @crud_cols = {}
           @last_loaded_time = nil
@@ -61,9 +63,30 @@ module Rails
           return unless config.enabled
 
           return unless @last_loaded_time.nil? || File.mtime(config.crud_file_path) > @last_loaded_time
+
+          last_modified_by = get_last_modified_by(config.crud_file_path)
+          CrudLogger.logger.info "last modified by: #{last_modified_by}. process_id: #{process_id}"
+          return if process_id == last_modified_by
+
           CrudLogger.logger.info "Reloading CRUD data due to file modification. last_loaded_time = #{@last_loaded_time}"
           load_crud_data
+        end
+
+        # xlsxファイルの最終更新者を取得する
+        def get_last_modified_by(file_path)
+          last_modified_by = nil
+
+          Zip::File.open(file_path) do |zipfile|
+            doc_props = zipfile.find_entry("docProps/core.xml")
+            if doc_props
+              content = doc_props.get_input_stream.read
+              last_modified_by = content[/\<cp:lastModifiedBy\>(.*?)\<\/cp:lastModifiedBy\>/, 1]
+            else
+              CrudLogger.logger.warn "docProps/core.xml が見つかりませんでした。"
+            end
+          end
 
+          last_modified_by
         end
 
         # CRUDシートを取得する

data/lib/rails/crud/tools/crud_notifications.rb

@@ -10,38 +10,10 @@ module Rails
         # 既に通知が登録されている場合は処理を中断
         return if @subscribed
 
-        config = CrudConfig.instance
-        if config.enabled
+        if CrudConfig.instance.enabled
           # SQL クエリを監視する
           ActiveSupport::Notifications.subscribe(/sql.active_record/) do |name, started, finished, unique_id, data|
-            # INSERT, UPDATE, DELETE, SELECT のみを対象とする
-            if data[:sql] =~ /(INSERT|UPDATE|DELETE|SELECT)/
-              operation = case $1
-                          when "INSERT" then "C"
-                          when "UPDATE" then "U"
-                          when "DELETE" then "D"
-                          when "SELECT" then "R"
-                          else "Unknown"
-                          end
-
-              match_data = data[:sql].match(/(?:INSERT INTO|UPDATE|DELETE FROM|FROM)\s+`?(\w+)`?/i)
-              if match_data
-                # テーブル名を取得して CRUD 操作に追加
-                table_name = match_data[1]
-                key, method = determine_key_and_method
-                next if key.nil? || method.nil?
-
-                CrudOperations.instance.add_operation(method, key, table_name, operation)
-
-                next unless config.sql_logging_enabled
-
-                # SQL ログを出力
-                CrudLogger.logger.info "#{data[:name]} - #{data[:sql]}"
-              else
-                # テーブル名が見つからない場合は警告を出力
-                CrudLogger.logger.warn "Table name not found in SQL: #{data[:sql]}"
-              end
-            end
+            process_sql(data)
           end
         end
 
@@ -49,7 +21,40 @@ module Rails
         @subscribed = true
       end
 
-      private
+      def self.process_sql(data)
+        return unless data[:sql] =~ /(INSERT|UPDATE|DELETE|SELECT)/
+
+        operation = case ::Regexp.last_match(1)
+                    when "INSERT" then "C"
+                    when "SELECT" then "R"
+                    when "UPDATE" then "U"
+                    when "DELETE" then "D"
+                    else "Unknown"
+                    end
+
+        match_data = data[:sql].match(/(?:INSERT INTO|UPDATE|DELETE FROM|FROM)\s+`?(\w+)`?/i)
+        unless match_data
+          # テーブル名が見つからない場合は警告を出力
+          CrudLogger.logger.warn "Table name not found in SQL: #{data[:sql]}"
+          return
+        end
+
+        # テーブル名を取得して CRUD 操作に追加
+        table_name = match_data[1]
+        key, method = determine_key_and_method
+        if key.nil? || method.nil?
+          CrudLogger.logger.warn "Request not found. #{data[:name]} - #{data[:sql]}"
+          return
+        end
+
+        CrudOperations.instance.add_operation(method, key, table_name, operation)
+
+        return unless CrudConfig.instance.sql_logging_enabled
+
+        # SQL ログを出力
+        CrudLogger.logger.info "#{data[:name]} - #{data[:sql]}"
+
+      end
 
       # キーとメソッドを決定する
       def self.determine_key_and_method
@@ -65,7 +70,6 @@ module Rails
           key = sidekiq_job_class
           method = Constants::DEFAULT_METHOD
         else
-          CrudLogger.logger.warn "Unknown method and key detected"
           return nil
         end
 

data/lib/rails/crud/tools/crud_operations_logger.rb

@@ -1,5 +1,6 @@
-require_relative 'crud_logger'
-require_relative 'constants'
+require "zip"
+require_relative "crud_logger"
+require_relative "constants"
 
 # ログ出力を行うモジュール
 module Rails
@@ -50,6 +51,31 @@ module Rails
           Thread.current[:crud_sidekiq_job_class] = nil
         end
 
+        # xlsxファイルの最終更新者を更新する
+        def set_last_modified_by(file_path, modifier_name)
+          Zip::File.open(file_path) do |zip_file|
+            doc_props = zip_file.find_entry("docProps/core.xml")
+            if doc_props
+              content = doc_props.get_input_stream.read
+              updated_content = if content.include?("<cp:lastModifiedBy>")
+                                  content.sub(
+                                    %r{<cp:lastModifiedBy>.*?</cp:lastModifiedBy>},
+                                    "<cp:lastModifiedBy>#{modifier_name}</cp:lastModifiedBy>"
+                                  )
+                                else
+                                  content.sub(
+                                    %r{</cp:coreProperties>},
+                                    "<cp:lastModifiedBy>#{modifier_name}</cp:lastModifiedBy></cp:coreProperties>"
+                                  )
+                                end
+              zip_file.get_output_stream("docProps/core.xml") { |f| f.write(updated_content) }
+              CrudLogger.logger.info "Set the last modifier to #{modifier_name}."
+            else
+              CrudLogger.logger.warn "docProps/core.xml was not found."
+            end
+          end
+        end
+
         private
 
         # リクエストの詳細をログ出力する
@@ -107,15 +133,34 @@ module Rails
             end
           end
 
-          if contents_changed
-            # Excelファイルを書き込む
-            CrudData.instance.workbook.write(CrudConfig.instance.crud_file_path)
-            timestamp = File.mtime(CrudConfig.instance.crud_file_path)
-            CrudLogger.logger.debug "Updated timestamp: #{timestamp}"
-            # タイムスタンプを更新する
-            CrudData.instance.last_loaded_time = timestamp
+          return unless contents_changed
+
+          Thread.new do
+            update_crud_file
+          rescue StandardError => e
+            CrudLogger.logger.error "Failed to update #{CrudConfig.instance.crud_file_path}: #{e.message}"
+
+          end
+
+        end
+
+        def update_crud_file
+          File.open(CrudConfig.instance.crud_file_path, "r+") do |crud_file|
+            crud_file.flock(File::LOCK_EX)
+            begin
+              # Excelファイルを書き込む
+              CrudData.instance.workbook.write(crud_file)
+              set_last_modified_by(crud_file, CrudData.instance.process_id)
+              timestamp = File.mtime(crud_file)
+              # タイムスタンプを更新する
+              CrudData.instance.last_loaded_time = timestamp
+              CrudLogger.logger.info "Updated timestamp: #{timestamp}"
+            ensure
+              crud_file.flock(File::LOCK_UN)
+            end
           end
         end
+
       end
     end
   end

data/lib/rails/crud/tools/version.rb

@@ -3,7 +3,7 @@
 module Rails
   module Crud
     module Tools
-      VERSION = "0.4.1"
+      VERSION = "0.4.3"
     end
   end
 end

data/lib/rails/crud/tools.rb

@@ -24,11 +24,12 @@ module Rails
           return
         end
 
+        CrudData.instance.process_id = "rails-crud-tools-#{Time.now.strftime("%Y%m%d%H%M%S")}"
         CrudData.instance.load_crud_data
         setup_notifications
       end
 
-      setup
+      setup unless ENV["SKIP_CRUD_SETUP"] == "true"
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rails-crud-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - yhijikata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2.4'
 description: This gem provides CRUD functionality for Rails applications.
 email:
 - yhijikata@systemlancer.com
@@ -89,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="