activemodel_object_info 0.3.1 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bbb6a128f372e595dd59cd9a82a97555a7b9604d67e37bfb7fb3bb4f3d423b66
4
- data.tar.gz: 73eb6de2ece21e4ff5ac9aaa3d0eedfd7e13ce5acd07cc5aeb0916716f7f8ec6
3
+ metadata.gz: ffbeccaf729fa60ff4a6bfb305472191010d8c8471231a5f83cd0f456bf16867
4
+ data.tar.gz: 1d7f614a8eae793109e3250dca61fea7b4c6bb53f3af7226931becc6d37a2bea
5
5
  SHA512:
6
- metadata.gz: bf30d44c6941877a3b3cdfeb23abfbff40350411073a4d88a3e7787742bac6666c10c01f57723ed378a623b2ea7f9659520ce1d43c387679aac2fee28ea7d90f
7
- data.tar.gz: f1b45c95d45d360cf4881e890d7c9e92b1b6052d63d4ba577cecef74f8aa9e6b4ca158b239462303f577193979487931287d0aaf55753a1dc3ce52bc57101884
6
+ metadata.gz: c3b84704de15eb041492c63b60789eef034a7bc345775f227563eec70705b1bf150782cc55cfbc9a38ff69e1008d659b4156244d7ce3bafe5c37d301736316b7
7
+ data.tar.gz: dfda3161d5052fb3608af38613b8dda667324f9b83ced02e40fb04e10f88b7e667333101feb6a848ebc6085ccb60e030fc4c6a9d5182b6a5753fcb7236cc30ab
@@ -12,11 +12,11 @@ module ActivemodelObjectInfo
12
12
  # 当被 include 关键字引入后的处理
13
13
  included do |_|
14
14
  # 定义好默认的删除查询语句
15
- deleted_field = 'deleted'
16
- deleted_value_valid = 0
17
- deleted_value_invalid = 1
15
+ deleted_field = const_defined?(:DELETED_FIELD) ? DELETED_FIELD : 'deleted'
16
+ deleted_value_valid = const_defined?(:DELETED_VALID_VALUE) ? DELETED_VALID_VALUE : 0
17
+ deleted_value_invalid = const_defined?(:DELETED_INVALID_VALUE) ? DELETED_INVALID_VALUE : 1
18
18
  # 如果定义了删除标记字段则默认搜索自动排除该内容
19
- default_scope { where(deleted_field.to_sym => deleted_value_valid) } if defined_method?(deleted_field)
19
+ default_scope { where(deleted_field.to_sym => deleted_value_valid) }
20
20
 
21
21
  # 通用的删除过程
22
22
  define_method(:delete_block) do |**options|
@@ -2,6 +2,6 @@
2
2
 
3
3
  module ActivemodelObjectInfo
4
4
  module Version
5
- VERSION = '0.3.1'
5
+ VERSION = '0.3.2'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activemodel_object_info
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - shiner