rails-crud-tools 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6550332d57eaa6efc9a533edcd245dc0fbb622f3db4dc60137ded1ce07b9732f
-  data.tar.gz: d640cad53acee4a59aaf354dec8c0fee9b80c51112f3240814c34205288a2ef7
+  metadata.gz: b5f67e7e466a9b26e7ddf8a539d276694c0ad188117fc6b6719739b923a3577e
+  data.tar.gz: e684b41c0054a02162343721f290e3c77bd5d73a48302faed1858716a4c14fa7
 SHA512:
-  metadata.gz: a54979463a9fc47dc5da2e932b94f82e0c992b19ea59b4107d56f55cd88fc5426beaea58042b7c693c305e3a4aa9856afacf239c96acb990af13557e94eba0ea
-  data.tar.gz: 8e2638a585a23d084a7c9e1347138604d0f65aa33e680af4aa93c2e216f345ce80037335e502617a8ce78698aa2a168517dffc11a996901753caa42d384dbba6
+  metadata.gz: e7dbb6a30981ee535a3656a80e88281d899d0b4271580e2920aedf670bfa846a2a4c0f4cb739a31ff016cb763bf6a491ceae34125a4b69b4885135b408a59091
+  data.tar.gz: db890338796f0430d4502a198c8f9ecb54184188b189ecdbefc4a4cb194b61761ca4c68e4e949cdff1801ecab103af135ffd918ad76439edb9f0c7b3365a75a8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.5.0] - 2025-01-07
+- Multiple table support
+
+## [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

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

@@ -65,7 +65,7 @@ module Rails
           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.debug "last modified by: #{last_modified_by}. process_id: #{process_id}"
+          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}"

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,41 @@ 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
+
+        table_names = data[:sql].scan(/(?:INSERT INTO|UPDATE|DELETE FROM|FROM|JOIN)\s+`?(\w+)`?(?:\s*,\s*`?(\w+)`?)*/i).flatten.compact
+        if table_names.empty?
+          # テーブル名が見つからない場合は警告を出力
+          CrudLogger.logger.warn "Table name not found in SQL: #{data[:sql]}"
+          return
+        end
+
+        key, method = determine_key_and_method
+        if key.nil? || method.nil?
+          CrudLogger.logger.warn "Request not found. #{data[:name]} - #{data[:sql]}"
+          return
+        end
+
+        # テーブル名を取得して CRUD 操作に追加
+        table_names.each do |table_name|
+          CrudOperations.instance.add_operation(method, key, table_name, operation)
+        end
+
+        return unless CrudConfig.instance.sql_logging_enabled
+
+        # SQL ログを出力
+        CrudLogger.logger.info "#{data[:name]} - #{data[:sql]}"
+
+      end
 
       # キーとメソッドを決定する
       def self.determine_key_and_method
@@ -65,7 +71,6 @@ module Rails
           key = sidekiq_job_class
           method = Constants::DEFAULT_METHOD
         else
-          CrudLogger.logger.warn "Unknown method and key detected: method=#{method}, key=#{key}"
           return nil
         end
 

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

@@ -152,9 +152,9 @@ module Rails
               CrudData.instance.workbook.write(crud_file)
               set_last_modified_by(crud_file, CrudData.instance.process_id)
               timestamp = File.mtime(crud_file)
-              CrudLogger.logger.debug "Updated timestamp: #{timestamp}"
               # タイムスタンプを更新する
               CrudData.instance.last_loaded_time = timestamp
+              CrudLogger.logger.info "Updated timestamp: #{timestamp}"
             ensure
               crud_file.flock(File::LOCK_UN)
             end

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

@@ -3,7 +3,7 @@
 module Rails
   module Crud
     module Tools
-      VERSION = "0.4.2"
+      VERSION = "0.5.0"
     end
   end
 end

data/lib/rails/crud/tools.rb

@@ -29,7 +29,7 @@ module Rails
         setup_notifications
       end
 
-      setup
+      setup unless ENV["SKIP_CRUD_SETUP"] == "true"
     end
   end
 end

metadata

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