rails-crud-tools 0.6.19 → 0.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892dfb8bba908b09cde0be58f6df72ea071dc0370b261efc9642e1ed904006e7
-  data.tar.gz: 347ab5a7c98f2e78d824319a7a683ee9401e9194edfe73642c44064d79b5ca58
+  metadata.gz: e8c8fe1e3590b9f9d338def25a4a4202854cb744950119a4ca58b809bcc33d77
+  data.tar.gz: baca515de9005597ae4664b317812c57558d5ef33991bacceb85c3bb7df313f6
 SHA512:
-  metadata.gz: 5a52975a743403bda0b878094396fc0f5b515ec6140f71554f2837350b5df3b471ea9598ca2c3a5d662103a4575dddf6853a815742ca54834d8a6e14fa294f8b
-  data.tar.gz: 435fbd9500a604ae449164b3444d6ee7930c5bd626fa8776a325118657f07b208ed78923da0e8a32d95cb29a5010a40ec0ab27dabe6d19b648e79b6d65af1791
+  metadata.gz: f59fb3f51760b34b527a92263f68ee54d1698f66836875027903a147dfe0e2e16553b3c62c2ba1ed7ae35c72e3f2c2e731597b177956ae5aae041d68632eafa8
+  data.tar.gz: e9c6cf57f1f8dfab373e98d6364df3b421b5f609e599a8bbf141f4a1c41b025c28f8891933c10a4f960c71c2e54db65a40c9ca2369939e7292def391bd3776bc

data/.rubocop.yml

@@ -28,7 +28,12 @@ Metrics/PerceivedComplexity:
   Max: 20
 
 Metrics/ModuleLength:
-  Max: 120
+  Max: 130
+
+Metrics/BlockLength:
+  Enabled: true
+  Max: 30
+
 Gemspec/AddRuntimeDependency:
   Enabled: true
 Gemspec/DeprecatedAttributeAssignment:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.6.20] - 2025-02-05
+- modified CRUD diagram is backed up on update
+- made last updated thread-safe
+
+## [0.6.19] - 2025-01-30
+- Bug fixes
+
 ## [0.6.11] - 2025-01-30
 - Bug fixes related to activesupport
 

data/README.md

@@ -53,6 +53,17 @@ sql_logging_enabled: true # Enables or disables SQL logging for CRUD operations
 Once integrated, the gem automatically tracks CRUD operations (Create, Read, Update, Delete) performed in your application.   
 The diagrams will update dynamically based on these operations, providing you with real-time insights into your application's data flow.
 
+### Automatic Backup
+
+The gem automatically creates backup files when updating the CRUD diagram. When changes are made to the CRUD Excel file:
+
+1. A backup file is created with the `.bak` extension (e.g., `crud.xlsx.bak`)
+2. The backup is created before any modifications to the original file
+3. If an error occurs during the update, the backup file is used to restore the original file
+4. The backup file is automatically removed after a successful update
+
+This ensures that your CRUD diagram data is protected against potential corruption or errors during updates.
+
 ## Logs
 
 Please refer to the log file at `log/crud.log`.

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

@@ -79,15 +79,24 @@ module Rails
 
         # xlsxファイルの最終更新者を取得する
         def get_last_modified_by(file_path)
-          last_modified_by = nil
+          CrudLogger.logger.debug "Starting to read ZIP file: #{file_path}"
+          CrudLogger.logger.debug "File size: #{File.size(file_path)}"
 
-          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[%r{<cp:lastModifiedBy>(.*?)</cp:lastModifiedBy>}, 1]
-            else
-              CrudLogger.logger.warn "docProps/core.xml が見つかりませんでした。"
+          last_modified_by = nil
+          File.open(file_path, "r") do |f|
+            f.flock(File::LOCK_SH)
+            begin
+              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[%r{<cp:lastModifiedBy>(.*?)</cp:lastModifiedBy>}, 1]
+                else
+                  CrudLogger.logger.warn "docProps/core.xml が見つかりませんでした。"
+                end
+              end
+            ensure
+              f.flock(File::LOCK_UN)
             end
           end
 

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

@@ -3,6 +3,7 @@
 require "zip"
 require_relative "crud_logger"
 require_relative "constants"
+require "fileutils"
 
 module Rails
   module Crud
@@ -55,25 +56,35 @@ module Rails
 
         # 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."
+          CrudLogger.logger.debug "Starting to read/write ZIP file: #{file_path}"
+          CrudLogger.logger.debug "File size: #{File.size(file_path)}"
+
+          File.open(file_path, "r+") do |f|
+            f.flock(File::LOCK_EX)
+            begin
+              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
+            ensure
+              f.flock(File::LOCK_UN)
             end
           end
         end
@@ -140,17 +151,22 @@ module Rails
           Thread.new do
             update_crud_file
           rescue StandardError => e
-            CrudLogger.logger.error "Failed to update #{CrudConfig.instance.config.crud_file_path}: #{e.message}"
+            CrudLogger.logger.error "Failed to update #{CrudConfig.instance.config.crud_file_path}: #{e.message}\n#{e.backtrace.join("\n")}"
           end
         end
 
         def update_crud_file
+          # バックアップを作成
+          if File.size(CrudConfig.instance.config.crud_file_path).positive?
+            backup_path = "#{CrudConfig.instance.config.crud_file_path}.bak"
+            FileUtils.cp(CrudConfig.instance.config.crud_file_path, backup_path)
+          end
+
           File.open(CrudConfig.instance.config.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
@@ -159,6 +175,9 @@ module Rails
               crud_file.flock(File::LOCK_UN)
             end
           end
+
+          # 最終更新者を設定
+          set_last_modified_by(CrudConfig.instance.config.crud_file_path, CrudData.instance.process_id)
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Rails
   module Crud
     module Tools
-      VERSION = "0.6.19"
+      VERSION = "0.6.20"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-crud-tools
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.20
 platform: ruby
 authors:
 - yhijikata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord