activemodel_object_info 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06251d26eb8e76bce7322a0828b75bddf9130227aca347632ffccd1000c8de38
-  data.tar.gz: 6204ace6d5d12156f491905df5b85a21a642fc2419b7029fb27071665ff5672a
+  metadata.gz: bbb6a128f372e595dd59cd9a82a97555a7b9604d67e37bfb7fb3bb4f3d423b66
+  data.tar.gz: 73eb6de2ece21e4ff5ac9aaa3d0eedfd7e13ce5acd07cc5aeb0916716f7f8ec6
 SHA512:
-  metadata.gz: 1e8032eeefb546d83ec9ec07b3c1812dd59fa325d6b80c9e96cd8cd52aaaa955f2f700b01ee74895db3bfab7d514d428d429bd139ba4051d1c379824f0156a55
-  data.tar.gz: 67e9ec9cd9fa34310b8b5fd525dbf2f2e7bd7f567351f4e87d78d0dbe9f81a55a316d283658ca95d10c3e904d6743fb406c684bafebc0dfd94c47d375ce38816
+  metadata.gz: bf30d44c6941877a3b3cdfeb23abfbff40350411073a4d88a3e7787742bac6666c10c01f57723ed378a623b2ea7f9659520ce1d43c387679aac2fee28ea7d90f
+  data.tar.gz: f1b45c95d45d360cf4881e890d7c9e92b1b6052d63d4ba577cecef74f8aa9e6b4ca158b239462303f577193979487931287d0aaf55753a1dc3ce52bc57101884

data/lib/activemodel_object_info/deleted_operation.rb

@@ -15,7 +15,8 @@ module ActivemodelObjectInfo
       deleted_field = 'deleted'
       deleted_value_valid = 0
       deleted_value_invalid = 1
-      default_scope { where(deleted_field.to_sym => deleted_value_valid) }
+      # 如果定义了删除标记字段则默认搜索自动排除该内容
+      default_scope { where(deleted_field.to_sym => deleted_value_valid) } if defined_method?(deleted_field)
 
       # 通用的删除过程
       define_method(:delete_block) do |**options|
@@ -40,6 +41,8 @@ module ActivemodelObjectInfo
       # 定义删除方法，但是不覆盖 ActiveRecord 的同名方法。
       define_method(:soft_delete) do |**options|
         opts = options.deep_symbolize_keys
+        # 如果没有定义删除标记字段则不执行
+        return unless respond_to?(deleted_field)
         delete_block(**opts)
         # 根据设置决定是否刷更新时间
         save(touch: opts[:refresh_updated])
@@ -48,6 +51,7 @@ module ActivemodelObjectInfo
       # 定义删除方法，区别为最终调用 save! 方法更新数据，所以遇到异常会抛出异常
       define_method(:soft_delete!) do |**options|
         opts = options.deep_symbolize_keys
+        return unless respond_to?(deleted_field)
         delete_block(**opts)
         # 根据设置决定是否刷更新时间
         save!(touch: opts[:refresh_updated])

data/lib/activemodel_object_info/table_definition.rb

@@ -3,6 +3,7 @@
 module ActivemodelObjectInfo
   #
   # 重新扩展一些方法，用来方便在创建迁移文件的时候进行一些通用类的设定。
+  # 从 @version 0.3.0 开始支持了自动创建的时间戳字段增加索引
   #
   # @author shiner527 <shiner527@hotmail.com>
   #
@@ -54,7 +55,7 @@ module ActivemodelObjectInfo
         # 如果要生成操作时间戳信息
         if with_timestamp
           timestamp_column_name = timestamp_prefix.to_s + field.to_s + timestamp_suffix.to_s
-          column(timestamp_column_name, :datetime, comment: '操作时间戳') if timestamp_column_name.present?
+          column(timestamp_column_name, :datetime, index: true, comment: '操作时间戳') if timestamp_column_name.present?
         end
       end
     end

data/lib/activemodel_object_info/version.rb

@@ -2,6 +2,6 @@
 
 module ActivemodelObjectInfo
   module Version
-    VERSION = '0.2.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel_object_info
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - shiner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Build a hash based on active record attributes.