activemodel_object_info 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da83d32a95c5c84452dc1d40245e61e1cc1f9302274903c7002021385c7a661
-  data.tar.gz: 6a8a19cfda27cedccc39d7cedaa7ce9701dc117060eeff50e19ce82b268a8d5b
+  metadata.gz: ffbeccaf729fa60ff4a6bfb305472191010d8c8471231a5f83cd0f456bf16867
+  data.tar.gz: 1d7f614a8eae793109e3250dca61fea7b4c6bb53f3af7226931becc6d37a2bea
 SHA512:
-  metadata.gz: e3c8b9299eed185bd0abfc9e37cf92dd82d9a3851416f5d64114435b1b7b153b0f7ff9e277ecaec5673e6adec6dd5d9478ec2661489486e58fe4c8d630d399c0
-  data.tar.gz: 4f90f6a03ebdebda3184b3393d3edba1b1aa452df0b6c86ebbb84a75d1bcf38205b94f70bd0f28a54897d9c9cb2849a5a669bcb1c24a4c923e9e9820ff409f0c
+  metadata.gz: c3b84704de15eb041492c63b60789eef034a7bc345775f227563eec70705b1bf150782cc55cfbc9a38ff69e1008d659b4156244d7ce3bafe5c37d301736316b7
+  data.tar.gz: dfda3161d5052fb3608af38613b8dda667324f9b83ced02e40fb04e10f88b7e667333101feb6a848ebc6085ccb60e030fc4c6a9d5182b6a5753fcb7236cc30ab

data/lib/activemodel_object_info/deleted_operation.rb

@@ -12,9 +12,10 @@ module ActivemodelObjectInfo
     # 当被 include 关键字引入后的处理
     included do |_|
       # 定义好默认的删除查询语句
-      deleted_field = 'deleted'
-      deleted_value_valid = 0
-      deleted_value_invalid = 1
+      deleted_field = const_defined?(:DELETED_FIELD) ? DELETED_FIELD : 'deleted'
+      deleted_value_valid = const_defined?(:DELETED_VALID_VALUE) ? DELETED_VALID_VALUE : 0
+      deleted_value_invalid = const_defined?(:DELETED_INVALID_VALUE) ? DELETED_INVALID_VALUE : 1
+      # 如果定义了删除标记字段则默认搜索自动排除该内容
       default_scope { where(deleted_field.to_sym => deleted_value_valid) }
 
       # 通用的删除过程
@@ -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/version.rb

@@ -2,6 +2,6 @@
 
 module ActivemodelObjectInfo
   module Version
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel_object_info
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - shiner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport