activerecord-bixformer 0.3.6 → 0.3.7

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
  SHA1:
3
- metadata.gz: 2f2aaea79e94ee05b140ae15ed385c5ec4999793
4
- data.tar.gz: a19453f489d05396d2fde98454d0a12ea98d93d7
3
+ metadata.gz: 97d5913b826868750d0d1e1288f95a8d8db90bfc
4
+ data.tar.gz: 196304605dd0439e3ff850558fe065acb8f6a298
5
5
  SHA512:
6
- metadata.gz: d615b5a21ad1c3f68e748898ac478dbb3d936ff041c3b5b39e763d698f8483c388de5b0d41dd991eca7d8ee00aa657bdc006231f65129bf46bbaac9b3c8d4d54
7
- data.tar.gz: 2e6997f50a5cca9a1d99d1ba3cdfc19006c27156f10b24c8f36b2e53c9c8a5af3ee17e192448801a146e23428a5b8e61cbf357e100ebd560feceb103d97cb9f0
6
+ metadata.gz: f1f9d5af59f47edc816b4d64059d1c4ef168a5e64c35fa4bb6326eff357d3a7530c7e04bd7d60bd9d0e4e00b861067fd8da87cace8ee42dfebf62c0d13a0cd8e
7
+ data.tar.gz: 0c945ca9c4fe5dc2004002a3fd05b2e23bcddb3bacb19b3edc59479e623e5947189ac05f0e7857cce0049b868b27056dcf2a0048467434981d8fe30ec2f7840a
@@ -132,15 +132,22 @@ module ActiveRecord
132
132
 
133
133
  # データの検証と正規化
134
134
  normalizer.normalize(values).tap do |normalized_values|
135
- # デフォルト値の補完
136
- @default_values.each do |attribute_name, default_value|
137
- # 結果にキーが存在していない( preferred_skip_attributes で指定されてる)場合は補完しない
138
- next unless normalized_values.key?(attribute_name)
139
-
140
- # 有効な値が既に格納されている場合も補完しない
141
- next if presence_value?(normalized_values[attribute_name])
142
-
143
- normalized_values[attribute_name] = default_value
135
+ # 結果ハッシュに有効な値がない(空と思われる)場合は補完しない
136
+ if presence_value?(normalized_values)
137
+ # デフォルト値の補完
138
+ @default_values.each do |attribute_name, default_value|
139
+ # 有効な値が既に格納されている場合は補完しない
140
+ next if presence_value?(normalized_values[attribute_name])
141
+
142
+ # preferred_skip_attributes で指定されてる場合は補完しない
143
+ next if @preferred_skip_attributes.include?(attribute_name)
144
+
145
+ normalized_values[attribute_name] = if default_value.is_a?(::Proc)
146
+ default_value.call
147
+ else
148
+ default_value
149
+ end
150
+ end
144
151
  end
145
152
  end
146
153
  end
@@ -1,5 +1,5 @@
1
1
  module ActiveRecord
2
2
  module Bixformer
3
- VERSION = "0.3.6"
3
+ VERSION = "0.3.7"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord-bixformer
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.6
4
+ version: 0.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Hiroaki Otsu
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-10-06 00:00:00.000000000 Z
11
+ date: 2016-10-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord