activemodel_object_info 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffbeccaf729fa60ff4a6bfb305472191010d8c8471231a5f83cd0f456bf16867
-  data.tar.gz: 1d7f614a8eae793109e3250dca61fea7b4c6bb53f3af7226931becc6d37a2bea
+  metadata.gz: abdbe53ed9b841d86cd68c381074bc6b683902b54d64fc88817d29d3ae094c31
+  data.tar.gz: a4b37550899691eecc023f2fb93a41aa16cc9f9732195ad5e9d6c87f16b585c6
 SHA512:
-  metadata.gz: c3b84704de15eb041492c63b60789eef034a7bc345775f227563eec70705b1bf150782cc55cfbc9a38ff69e1008d659b4156244d7ce3bafe5c37d301736316b7
-  data.tar.gz: dfda3161d5052fb3608af38613b8dda667324f9b83ced02e40fb04e10f88b7e667333101feb6a848ebc6085ccb60e030fc4c6a9d5182b6a5753fcb7236cc30ab
+  metadata.gz: be5ce90fe8081a9e4dd8bf561306edc076cd2cfa8cba5baadbcd1984cf596c89e3c6a5f35432aaace6281877777c1e2e6f5184482d9517f57b61e255cc0b2a99
+  data.tar.gz: c16b4076d916203cc384c32c433ffdd52b8b11b4cde913820c31fb22953f1dc8132fb0a452c2204b07004b009eac3b45b42d78810761cbaebf10b28d4c3f2a7e

data/lib/activemodel_object_info/deleted_operation.rb

@@ -16,7 +16,10 @@ module ActivemodelObjectInfo
       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) }
+      default_scope do
+        _current_model = try(:name).to_s.safe_constantize
+        where(deleted_field.to_sym => deleted_value_valid) if _current_model.has_attribute?(deleted_field)
+      end
 
       # 通用的删除过程
       define_method(:delete_block) do |**options|

data/lib/activemodel_object_info/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemodel_object_info
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - shiner