activemodel_object_info 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb6a128f372e595dd59cd9a82a97555a7b9604d67e37bfb7fb3bb4f3d423b66
-  data.tar.gz: 73eb6de2ece21e4ff5ac9aaa3d0eedfd7e13ce5acd07cc5aeb0916716f7f8ec6
+  metadata.gz: 57c5e5b167d779ecddc9ef0880eae2eb80a1e5a5cfea65a041900952d105e746
+  data.tar.gz: 305b684a599a961fd454c06a9fb234abab64def44b629fc85ea53413973f9c93
 SHA512:
-  metadata.gz: bf30d44c6941877a3b3cdfeb23abfbff40350411073a4d88a3e7787742bac6666c10c01f57723ed378a623b2ea7f9659520ce1d43c387679aac2fee28ea7d90f
-  data.tar.gz: f1b45c95d45d360cf4881e890d7c9e92b1b6052d63d4ba577cecef74f8aa9e6b4ca158b239462303f577193979487931287d0aaf55753a1dc3ce52bc57101884
+  metadata.gz: a787ba950b878f3fc7e40955a4cc5cf50a55ad0e8c783891c74e3c0fcee8d2f9f2630bec312717bb52c13ee52c63b41ea2f61efd19da03396ace20ea7f859e6a
+  data.tar.gz: 2fafd8e49b9ad0e1b1a4cef8ef813f8ea0a57b1e60f23588d617bada644eb50302af6fa395ebd041aac86b2b97c8de53ae8a4e206259495ada4dc13c9185652c

data/lib/activemodel_object_info/deleted_operation.rb

@@ -12,11 +12,14 @@ 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) } if defined_method?(deleted_field)
+      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.1'
+    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.1
+  version: 0.3.3
 platform: ruby
 authors:
 - shiner