diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-23 10:27:17 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-23 10:27:17 -0700 |
commit | 727e2863e5ed8ebfae7d5f4724d1a797b80e59d7 (patch) | |
tree | 45ce12c43d3e7b2e223ae85c1f02b77a08b35a6e /activerecord | |
parent | 6ff36de5d1d5d3b490b2ebcd11ac7ab1c4421dcd (diff) | |
parent | 3650edf039fd26fbd31d438295b7629613594655 (diff) | |
download | rails-727e2863e5ed8ebfae7d5f4724d1a797b80e59d7.tar.gz rails-727e2863e5ed8ebfae7d5f4724d1a797b80e59d7.tar.bz2 rails-727e2863e5ed8ebfae7d5f4724d1a797b80e59d7.zip |
Merge pull request #9880 from wangjohn/refactoring_attribute_assignment
Refactoring validate_missing_parameters to validate_required_parameters.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/attribute_assignment.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index ecfa556ab4..e536f5ebcc 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -81,7 +81,7 @@ module ActiveRecord end def extract_callstack_for_multiparameter_attributes(pairs) - attributes = { } + attributes = {} pairs.each do |(multiparameter_name, value)| attribute_name = multiparameter_name.split("(").first @@ -146,7 +146,7 @@ module ActiveRecord end else # else column is a timestamp, so if Date bits were not provided, error - validate_missing_parameters!([1,2,3]) + validate_required_parameters!([1,2,3]) # If Date bits were provided but blank, then return nil return if blank_date_parameter? @@ -172,14 +172,14 @@ module ActiveRecord def read_other(klass) max_position = extract_max_param positions = (1..max_position) - validate_missing_parameters!(positions) + validate_required_parameters!(positions) set_values = values.values_at(*positions) klass.new(*set_values) end # Checks whether some blank date parameter exists. Note that this is different - # than the validate_missing_parameters! method, since it just checks for blank + # than the validate_required_parameters! method, since it just checks for blank # positions instead of missing ones, and does not raise in case one blank position # exists. The caller is responsible to handle the case of this returning true. def blank_date_parameter? @@ -187,7 +187,7 @@ module ActiveRecord end # If some position is not provided, it errors out a missing parameter exception. - def validate_missing_parameters!(positions) + def validate_required_parameters!(positions) if missing_parameter = positions.detect { |position| !values.key?(position) } raise ArgumentError.new("Missing Parameter - #{name}(#{missing_parameter})") end |