activemodel 5.2.4 → 6.0.0

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.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +114 -65
  3. data/MIT-LICENSE +1 -1
  4. data/README.rdoc +4 -2
  5. data/lib/active_model.rb +1 -1
  6. data/lib/active_model/attribute.rb +3 -4
  7. data/lib/active_model/attribute/user_provided_default.rb +1 -2
  8. data/lib/active_model/attribute_assignment.rb +1 -1
  9. data/lib/active_model/attribute_methods.rb +54 -15
  10. data/lib/active_model/attribute_mutation_tracker.rb +88 -34
  11. data/lib/active_model/attribute_set.rb +2 -10
  12. data/lib/active_model/attribute_set/builder.rb +1 -3
  13. data/lib/active_model/attribute_set/yaml_encoder.rb +1 -2
  14. data/lib/active_model/attributes.rb +60 -33
  15. data/lib/active_model/callbacks.rb +10 -7
  16. data/lib/active_model/conversion.rb +1 -1
  17. data/lib/active_model/dirty.rb +36 -99
  18. data/lib/active_model/errors.rb +104 -20
  19. data/lib/active_model/gem_version.rb +3 -3
  20. data/lib/active_model/naming.rb +19 -3
  21. data/lib/active_model/railtie.rb +6 -0
  22. data/lib/active_model/secure_password.rb +47 -48
  23. data/lib/active_model/serializers/json.rb +10 -9
  24. data/lib/active_model/type/binary.rb +1 -1
  25. data/lib/active_model/type/date.rb +0 -4
  26. data/lib/active_model/type/date_time.rb +3 -7
  27. data/lib/active_model/type/float.rb +0 -2
  28. data/lib/active_model/type/helpers/accepts_multiparameter_time.rb +4 -0
  29. data/lib/active_model/type/helpers/numeric.rb +9 -2
  30. data/lib/active_model/type/helpers/time_value.rb +17 -4
  31. data/lib/active_model/type/integer.rb +7 -19
  32. data/lib/active_model/type/registry.rb +2 -10
  33. data/lib/active_model/type/string.rb +2 -2
  34. data/lib/active_model/type/time.rb +1 -5
  35. data/lib/active_model/validations.rb +0 -2
  36. data/lib/active_model/validations/acceptance.rb +4 -8
  37. data/lib/active_model/validations/clusivity.rb +1 -1
  38. data/lib/active_model/validations/confirmation.rb +2 -2
  39. data/lib/active_model/validations/inclusion.rb +1 -1
  40. data/lib/active_model/validations/length.rb +1 -1
  41. data/lib/active_model/validations/numericality.rb +2 -2
  42. data/lib/active_model/validations/validates.rb +2 -2
  43. data/lib/active_model/validator.rb +1 -1
  44. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8c27b55ee497bfdf026134049c936763e3254ef1561f45a6a179873b0f87d3b8
4
- data.tar.gz: 3608c2ecfe07df5e1e331af94587c08c237db5ba3a45c606e4a7fe25ce4979a5
3
+ metadata.gz: 69a5bee0cfba77f4724c2db8488624ecf96cf07711dcdc049dd0c3dc63ee5511
4
+ data.tar.gz: 19750eda0fd5b204ae2825c05808351c33a5c73b94e46e5cc6a083e7f71392f3
5
5
  SHA512:
6
- metadata.gz: 546872cf44219865884bd32cdbc097bec4366cd72a25d93cacbd1d5bd751c4ef3d77b1aff52bcaffef12d98c993062dc9cfb2a199183b89b95d4980c0298fda7
7
- data.tar.gz: 158c3d3677fc9b0a6459780dbe341aada1cf207b755b9ab2d53581de51d871c86bf590ddd6b4e746445b49d505495c8c5da39d4a00eed8dd37846252c40c852b
6
+ metadata.gz: 0717aa6a3b1c7d833939ce27faf0f2603dfa37c4b07cc67c3e87d4ab596fb086a4da1d719943b6d16fd679dbafdb227f9221d22822359b4c355d398e3bc35850
7
+ data.tar.gz: 325635123b6a4f68f09fe7ae5c5606cdadef8c011e890a54b638bd91bb272c9e45de3d7eda403ad291c365463891d420d2212dcfdefd9212717ddc255c296f1d
@@ -1,4 +1,14 @@
1
- ## Rails 5.2.4 (November 27, 2019) ##
1
+ ## Rails 6.0.0 (August 16, 2019) ##
2
+
3
+ * No changes.
4
+
5
+
6
+ ## Rails 6.0.0.rc2 (July 22, 2019) ##
7
+
8
+ * No changes.
9
+
10
+
11
+ ## Rails 6.0.0.rc1 (April 24, 2019) ##
2
12
 
3
13
  * Type cast falsy boolean symbols on boolean attribute as false.
4
14
 
@@ -6,8 +16,36 @@
6
16
 
7
17
  *Ryuta Kamizono*
8
18
 
19
+ * Change how validation error translation strings are fetched: The new behavior
20
+ will first try the more specific keys, including doing locale fallback, then try
21
+ the less specific ones.
22
+
23
+ For example, this is the order in which keys will now be tried for a `blank`
24
+ error on a `product`'s `title` attribute with current locale set to `en-US`:
25
+
26
+ en-US.activerecord.errors.models.product.attributes.title.blank
27
+ en-US.activerecord.errors.models.product.blank
28
+ en-US.activerecord.errors.messages.blank
29
+
30
+ en.activerecord.errors.models.product.attributes.title.blank
31
+ en.activerecord.errors.models.product.blank
32
+ en.activerecord.errors.messages.blank
9
33
 
10
- ## Rails 5.2.3 (March 27, 2019) ##
34
+ en-US.errors.attributes.title.blank
35
+ en-US.errors.messages.blank
36
+
37
+ en.errors.attributes.title.blank
38
+ en.errors.messages.blank
39
+
40
+ *Hugo Vacher*
41
+
42
+
43
+ ## Rails 6.0.0.beta3 (March 11, 2019) ##
44
+
45
+ * No changes.
46
+
47
+
48
+ ## Rails 6.0.0.beta2 (February 25, 2019) ##
11
49
 
12
50
  * Fix date value when casting a multiparameter date hash to not convert
13
51
  from Gregorian date to Julian date.
@@ -15,109 +53,120 @@
15
53
  Before:
16
54
 
17
55
  Day.new({"day(1i)"=>"1", "day(2i)"=>"1", "day(3i)"=>"1"})
18
- => #<Day id: nil, day: "0001-01-03", created_at: nil, updated_at: nil>
56
+ # => #<Day id: nil, day: "0001-01-03", created_at: nil, updated_at: nil>
19
57
 
20
58
  After:
21
59
 
22
60
  Day.new({"day(1i)"=>"1", "day(2i)"=>"1", "day(3i)"=>"1"})
23
- => #<Day id: nil, day: "0001-01-01", created_at: nil, updated_at: nil>
61
+ # => #<Day id: nil, day: "0001-01-01", created_at: nil, updated_at: nil>
24
62
 
25
63
  Fixes #28521.
26
64
 
27
65
  *Sayan Chakraborty*
28
66
 
29
- * Fix numericality equality validation of `BigDecimal` and `Float`
30
- by casting to `BigDecimal` on both ends of the validation.
67
+ * Fix year value when casting a multiparameter time hash.
31
68
 
32
- *Gannon McGibbon*
69
+ When assigning a hash to a time attribute that's missing a year component
70
+ (e.g. a `time_select` with `:ignore_date` set to `true`) then the year
71
+ defaults to 1970 instead of the expected 2000. This results in the attribute
72
+ changing as a result of the save.
33
73
 
74
+ Before:
75
+ ```
76
+ event = Event.new(start_time: { 4 => 20, 5 => 30 })
77
+ event.start_time # => 1970-01-01 20:30:00 UTC
78
+ event.save
79
+ event.reload
80
+ event.start_time # => 2000-01-01 20:30:00 UTC
81
+ ```
34
82
 
35
- ## Rails 5.2.2.1 (March 11, 2019) ##
83
+ After:
84
+ ```
85
+ event = Event.new(start_time: { 4 => 20, 5 => 30 })
86
+ event.start_time # => 2000-01-01 20:30:00 UTC
87
+ event.save
88
+ event.reload
89
+ event.start_time # => 2000-01-01 20:30:00 UTC
90
+ ```
36
91
 
37
- * No changes.
92
+ *Andrew White*
38
93
 
39
94
 
40
- ## Rails 5.2.2 (December 04, 2018) ##
95
+ ## Rails 6.0.0.beta1 (January 18, 2019) ##
41
96
 
42
- * Fix numericality validator to still use value before type cast except Active Record.
97
+ * Internal calls to `human_attribute_name` on an `Active Model` now pass attributes as strings instead of symbols
98
+ in some cases.
43
99
 
44
- Fixes #33651, #33686.
100
+ This is in line with examples in Rails docs and puts the code in line with the intention -
101
+ the potential use of strings or symbols.
45
102
 
46
- *Ryuta Kamizono*
103
+ It is recommended to cast the attribute input to your desired type as if you you are overriding that methid.
47
104
 
105
+ *Martin Larochelle*
48
106
 
49
- ## Rails 5.2.1.1 (November 27, 2018) ##
107
+ * Add `ActiveModel::Errors#of_kind?`.
50
108
 
51
- * No changes.
52
-
53
-
54
- ## Rails 5.2.1 (August 07, 2018) ##
55
-
56
- * No changes.
109
+ *bogdanvlviv*, *Rafael Mendonça França*
57
110
 
111
+ * Fix numericality equality validation of `BigDecimal` and `Float`
112
+ by casting to `BigDecimal` on both ends of the validation.
58
113
 
59
- ## Rails 5.2.0 (April 09, 2018) ##
114
+ *Gannon McGibbon*
60
115
 
61
- * Do not lose all multiple `:includes` with options in serialization.
116
+ * Add `#slice!` method to `ActiveModel::Errors`.
62
117
 
63
- *Mike Mangino*
118
+ *Daniel López Prat*
64
119
 
65
- * Models using the attributes API with a proc default can now be marshalled.
120
+ * Fix numericality validator to still use value before type cast except Active Record.
66
121
 
67
- Fixes #31216.
122
+ Fixes #33651, #33686.
68
123
 
69
- *Sean Griffin*
124
+ *Ryuta Kamizono*
70
125
 
71
- * Fix to working before/after validation callbacks on multiple contexts.
126
+ * Fix `ActiveModel::Serializers::JSON#as_json` method for timestamps.
72
127
 
73
- *Yoshiyuki Hirano*
128
+ Before:
129
+ ```
130
+ contact = Contact.new(created_at: Time.utc(2006, 8, 1))
131
+ contact.as_json["created_at"] # => 2006-08-01 00:00:00 UTC
132
+ ```
74
133
 
75
- * Execute `ConfirmationValidator` validation when `_confirmation`'s value is `false`.
134
+ After:
135
+ ```
136
+ contact = Contact.new(created_at: Time.utc(2006, 8, 1))
137
+ contact.as_json["created_at"] # => "2006-08-01T00:00:00.000Z"
138
+ ```
76
139
 
77
- *bogdanvlviv*
140
+ *Bogdan Gusiev*
78
141
 
79
- * Allow passing a Proc or Symbol to length validator options.
142
+ * Allows configurable attribute name for `#has_secure_password`. This
143
+ still defaults to an attribute named 'password', causing no breaking
144
+ change. There is a new method `#authenticate_XXX` where XXX is the
145
+ configured attribute name, making the existing `#authenticate` now an
146
+ alias for this when the attribute is the default 'password'.
80
147
 
81
- *Matt Rohrer*
148
+ Example:
82
149
 
83
- * Add method `#merge!` for `ActiveModel::Errors`.
150
+ class User < ActiveRecord::Base
151
+ has_secure_password :recovery_password, validations: false
152
+ end
84
153
 
85
- *Jahfer Husain*
154
+ user = User.new()
155
+ user.recovery_password = "42password"
156
+ user.recovery_password_digest # => "$2a$04$iOfhwahFymCs5weB3BNH/uX..."
157
+ user.authenticate_recovery_password('42password') # => user
86
158
 
87
- * Fix regression in numericality validator when comparing Decimal and Float input
88
- values with more scale than the schema.
159
+ *Unathi Chonco*
89
160
 
90
- *Bradley Priest*
161
+ * Add `config.active_model.i18n_customize_full_message` in order to control whether
162
+ the `full_message` error format can be overridden at the attribute or model
163
+ level in the locale files. This is `false` by default.
91
164
 
92
- * Fix methods `#keys`, `#values` in `ActiveModel::Errors`.
165
+ *Martin Larochelle*
93
166
 
94
- Change `#keys` to only return the keys that don't have empty messages.
167
+ * Rails 6 requires Ruby 2.5.0 or newer.
95
168
 
96
- Change `#values` to only return the not empty values.
169
+ *Jeremy Daer*, *Kasper Timm Hansen*
97
170
 
98
- Example:
99
171
 
100
- # Before
101
- person = Person.new
102
- person.errors.keys # => []
103
- person.errors.values # => []
104
- person.errors.messages # => {}
105
- person.errors[:name] # => []
106
- person.errors.messages # => {:name => []}
107
- person.errors.keys # => [:name]
108
- person.errors.values # => [[]]
109
-
110
- # After
111
- person = Person.new
112
- person.errors.keys # => []
113
- person.errors.values # => []
114
- person.errors.messages # => {}
115
- person.errors[:name] # => []
116
- person.errors.messages # => {:name => []}
117
- person.errors.keys # => []
118
- person.errors.values # => []
119
-
120
- *bogdanvlviv*
121
-
122
-
123
- Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activemodel/CHANGELOG.md) for previous changes.
172
+ Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activemodel/CHANGELOG.md) for previous changes.
@@ -1,4 +1,4 @@
1
- Copyright (c) 2004-2018 David Heinemeier Hansson
1
+ Copyright (c) 2004-2019 David Heinemeier Hansson
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
@@ -5,6 +5,8 @@ They allow for Action Pack helpers to interact with non-Active Record models,
5
5
  for example. Active Model also helps with building custom ORMs for use outside of
6
6
  the Rails framework.
7
7
 
8
+ You can read more about Active Model in the {Active Model Basics}[https://edgeguides.rubyonrails.org/active_model_basics.html] guide.
9
+
8
10
  Prior to Rails 3.0, if a plugin or gem developer wanted to have an object
9
11
  interact with Action Pack helpers, it was required to either copy chunks of
10
12
  code from Rails, or monkey patch entire helpers to make them handle objects
@@ -239,7 +241,7 @@ The latest version of Active Model can be installed with RubyGems:
239
241
 
240
242
  Source code can be downloaded as part of the Rails project on GitHub
241
243
 
242
- * https://github.com/rails/rails/tree/5-2-stable/activemodel
244
+ * https://github.com/rails/rails/tree/master/activemodel
243
245
 
244
246
 
245
247
  == License
@@ -253,7 +255,7 @@ Active Model is released under the MIT license:
253
255
 
254
256
  API documentation is at:
255
257
 
256
- * http://api.rubyonrails.org
258
+ * https://api.rubyonrails.org
257
259
 
258
260
  Bug reports for the Ruby on Rails project can be filed here:
259
261
 
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  #--
4
- # Copyright (c) 2004-2018 David Heinemeier Hansson
4
+ # Copyright (c) 2004-2019 David Heinemeier Hansson
5
5
  #
6
6
  # Permission is hereby granted, free of charge, to any person obtaining
7
7
  # a copy of this software and associated documentation files (the
@@ -133,10 +133,6 @@ module ActiveModel
133
133
  end
134
134
 
135
135
  protected
136
-
137
- attr_reader :original_attribute
138
- alias_method :assigned?, :original_attribute
139
-
140
136
  def original_value_for_database
141
137
  if assigned?
142
138
  original_attribute.original_value_for_database
@@ -146,6 +142,9 @@ module ActiveModel
146
142
  end
147
143
 
148
144
  private
145
+ attr_reader :original_attribute
146
+ alias :assigned? :original_attribute
147
+
149
148
  def initialize_dup(other)
150
149
  if defined?(@value) && @value.duplicable?
151
150
  @value = @value.dup
@@ -44,8 +44,7 @@ module ActiveModel
44
44
  end
45
45
  end
46
46
 
47
- protected
48
-
47
+ private
49
48
  attr_reader :user_provided_value
50
49
  end
51
50
  end
@@ -27,7 +27,7 @@ module ActiveModel
27
27
  # cat.status # => 'sleeping'
28
28
  def assign_attributes(new_attributes)
29
29
  if !new_attributes.respond_to?(:stringify_keys)
30
- raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
30
+ raise ArgumentError, "When assigning attributes, you must pass a hash as an argument, #{new_attributes.class} passed."
31
31
  end
32
32
  return if new_attributes.empty?
33
33
 
@@ -286,12 +286,12 @@ module ActiveModel
286
286
  method_name = matcher.method_name(attr_name)
287
287
 
288
288
  unless instance_method_already_implemented?(method_name)
289
- generate_method = "define_method_#{matcher.method_missing_target}"
289
+ generate_method = "define_method_#{matcher.target}"
290
290
 
291
291
  if respond_to?(generate_method, true)
292
292
  send(generate_method, attr_name.to_s)
293
293
  else
294
- define_proxy_call true, generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
294
+ define_proxy_call true, generated_attribute_methods, method_name, matcher.target, attr_name.to_s
295
295
  end
296
296
  end
297
297
  end
@@ -352,53 +352,54 @@ module ActiveModel
352
352
 
353
353
  def attribute_method_matchers_matching(method_name)
354
354
  attribute_method_matchers_cache.compute_if_absent(method_name) do
355
- # Must try to match prefixes/suffixes first, or else the matcher with no prefix/suffix
356
- # will match every time.
355
+ # Bump plain matcher to last place so that only methods that do not
356
+ # match any other pattern match the actual attribute name.
357
+ # This is currently only needed to support legacy usage.
357
358
  matchers = attribute_method_matchers.partition(&:plain?).reverse.flatten(1)
358
- matchers.map { |method| method.match(method_name) }.compact
359
+ matchers.map { |matcher| matcher.match(method_name) }.compact
359
360
  end
360
361
  end
361
362
 
362
363
  # Define a method `name` in `mod` that dispatches to `send`
363
364
  # using the given `extra` args. This falls back on `define_method`
364
365
  # and `send` if the given names cannot be compiled.
365
- def define_proxy_call(include_private, mod, name, send, *extra)
366
+ def define_proxy_call(include_private, mod, name, target, *extra)
366
367
  defn = if NAME_COMPILABLE_REGEXP.match?(name)
367
368
  "def #{name}(*args)"
368
369
  else
369
370
  "define_method(:'#{name}') do |*args|"
370
371
  end
371
372
 
372
- extra = (extra.map!(&:inspect) << "*args").join(", ".freeze)
373
+ extra = (extra.map!(&:inspect) << "*args").join(", ")
373
374
 
374
- target = if CALL_COMPILABLE_REGEXP.match?(send)
375
- "#{"self." unless include_private}#{send}(#{extra})"
375
+ body = if CALL_COMPILABLE_REGEXP.match?(target)
376
+ "#{"self." unless include_private}#{target}(#{extra})"
376
377
  else
377
- "send(:'#{send}', #{extra})"
378
+ "send(:'#{target}', #{extra})"
378
379
  end
379
380
 
380
381
  mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
381
382
  #{defn}
382
- #{target}
383
+ #{body}
383
384
  end
384
385
  RUBY
385
386
  end
386
387
 
387
388
  class AttributeMethodMatcher #:nodoc:
388
- attr_reader :prefix, :suffix, :method_missing_target
389
+ attr_reader :prefix, :suffix, :target
389
390
 
390
- AttributeMethodMatch = Struct.new(:target, :attr_name, :method_name)
391
+ AttributeMethodMatch = Struct.new(:target, :attr_name)
391
392
 
392
393
  def initialize(options = {})
393
394
  @prefix, @suffix = options.fetch(:prefix, ""), options.fetch(:suffix, "")
394
395
  @regex = /^(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})$/
395
- @method_missing_target = "#{@prefix}attribute#{@suffix}"
396
+ @target = "#{@prefix}attribute#{@suffix}"
396
397
  @method_name = "#{prefix}%s#{suffix}"
397
398
  end
398
399
 
399
400
  def match(method_name)
400
401
  if @regex =~ method_name
401
- AttributeMethodMatch.new(method_missing_target, $1, method_name)
402
+ AttributeMethodMatch.new(target, $1)
402
403
  end
403
404
  end
404
405
 
@@ -474,5 +475,43 @@ module ActiveModel
474
475
  def _read_attribute(attr)
475
476
  __send__(attr)
476
477
  end
478
+
479
+ module AttrNames # :nodoc:
480
+ DEF_SAFE_NAME = /\A[a-zA-Z_]\w*\z/
481
+
482
+ # We want to generate the methods via module_eval rather than
483
+ # define_method, because define_method is slower on dispatch.
484
+ # Evaluating many similar methods may use more memory as the instruction
485
+ # sequences are duplicated and cached (in MRI). define_method may
486
+ # be slower on dispatch, but if you're careful about the closure
487
+ # created, then define_method will consume much less memory.
488
+ #
489
+ # But sometimes the database might return columns with
490
+ # characters that are not allowed in normal method names (like
491
+ # 'my_column(omg)'. So to work around this we first define with
492
+ # the __temp__ identifier, and then use alias method to rename
493
+ # it to what we want.
494
+ #
495
+ # We are also defining a constant to hold the frozen string of
496
+ # the attribute name. Using a constant means that we do not have
497
+ # to allocate an object on each call to the attribute method.
498
+ # Making it frozen means that it doesn't get duped when used to
499
+ # key the @attributes in read_attribute.
500
+ def self.define_attribute_accessor_method(mod, attr_name, writer: false)
501
+ method_name = "#{attr_name}#{'=' if writer}"
502
+ if attr_name.ascii_only? && DEF_SAFE_NAME.match?(attr_name)
503
+ yield method_name, "'#{attr_name}'.freeze"
504
+ else
505
+ safe_name = attr_name.unpack1("h*")
506
+ const_name = "ATTR_#{safe_name}"
507
+ const_set(const_name, attr_name) unless const_defined?(const_name)
508
+ temp_method_name = "__temp__#{safe_name}#{'=' if writer}"
509
+ attr_name_expr = "::ActiveModel::AttributeMethods::AttrNames::#{const_name}"
510
+ yield temp_method_name, attr_name_expr
511
+ mod.alias_method method_name, temp_method_name
512
+ mod.undef_method temp_method_name
513
+ end
514
+ end
515
+ end
477
516
  end
478
517
  end