activemodel_object_info 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffbeccaf729fa60ff4a6bfb305472191010d8c8471231a5f83cd0f456bf16867
-  data.tar.gz: 1d7f614a8eae793109e3250dca61fea7b4c6bb53f3af7226931becc6d37a2bea
+  metadata.gz: 57c5e5b167d779ecddc9ef0880eae2eb80a1e5a5cfea65a041900952d105e746
+  data.tar.gz: 305b684a599a961fd454c06a9fb234abab64def44b629fc85ea53413973f9c93
 SHA512:
-  metadata.gz: c3b84704de15eb041492c63b60789eef034a7bc345775f227563eec70705b1bf150782cc55cfbc9a38ff69e1008d659b4156244d7ce3bafe5c37d301736316b7
-  data.tar.gz: dfda3161d5052fb3608af38613b8dda667324f9b83ced02e40fb04e10f88b7e667333101feb6a848ebc6085ccb60e030fc4c6a9d5182b6a5753fcb7236cc30ab
+  metadata.gz: a787ba950b878f3fc7e40955a4cc5cf50a55ad0e8c783891c74e3c0fcee8d2f9f2630bec312717bb52c13ee52c63b41ea2f61efd19da03396ace20ea7f859e6a
+  data.tar.gz: 2fafd8e49b9ad0e1b1a4cef8ef813f8ea0a57b1e60f23588d617bada644eb50302af6fa395ebd041aac86b2b97c8de53ae8a4e206259495ada4dc13c9185652c

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.method_defined?(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.3'
   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.3
 platform: ruby
 authors:
 - shiner