diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-12-10 17:38:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-10 17:38:47 -0500 |
commit | b3108275064353390848056bf097809743dcdf21 (patch) | |
tree | 0b7e1eac9ffb2cf2871b91f600cff765c33b28a0 /activesupport/lib | |
parent | 10457475b9fe2ae9dc4e7f932fd6e561416c3881 (diff) | |
parent | 3b7a4d3d75329d499d817c3fbeb75caefe9691ce (diff) | |
download | rails-b3108275064353390848056bf097809743dcdf21.tar.gz rails-b3108275064353390848056bf097809743dcdf21.tar.bz2 rails-b3108275064353390848056bf097809743dcdf21.zip |
Merge pull request #34666 from vinistock/upgrade_rubocop_and_fix_offenses
Upgrade Rubocop to 0.61.1 and fix offenses
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/descendants_tracker.rb | 11 | ||||
-rw-r--r-- | activesupport/lib/active_support/json/decoding.rb | 46 |
2 files changed, 29 insertions, 28 deletions
diff --git a/activesupport/lib/active_support/descendants_tracker.rb b/activesupport/lib/active_support/descendants_tracker.rb index a4cee788b6..05236d3162 100644 --- a/activesupport/lib/active_support/descendants_tracker.rb +++ b/activesupport/lib/active_support/descendants_tracker.rb @@ -38,12 +38,13 @@ module ActiveSupport end private - def accumulate_descendants(klass, acc) - if direct_descendants = @@direct_descendants[klass] - acc.concat(direct_descendants) - direct_descendants.each { |direct_descendant| accumulate_descendants(direct_descendant, acc) } + + def accumulate_descendants(klass, acc) + if direct_descendants = @@direct_descendants[klass] + acc.concat(direct_descendants) + direct_descendants.each { |direct_descendant| accumulate_descendants(direct_descendant, acc) } + end end - end end def inherited(base) diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb index 8c0e016dc5..402a3fbe60 100644 --- a/activesupport/lib/active_support/json/decoding.rb +++ b/activesupport/lib/active_support/json/decoding.rb @@ -45,32 +45,32 @@ module ActiveSupport private - def convert_dates_from(data) - case data - when nil - nil - when DATE_REGEX - begin - Date.parse(data) - rescue ArgumentError + def convert_dates_from(data) + case data + when nil + nil + when DATE_REGEX + begin + Date.parse(data) + rescue ArgumentError + data + end + when DATETIME_REGEX + begin + Time.zone.parse(data) + rescue ArgumentError + data + end + when Array + data.map! { |d| convert_dates_from(d) } + when Hash + data.each do |key, value| + data[key] = convert_dates_from(value) + end + else data end - when DATETIME_REGEX - begin - Time.zone.parse(data) - rescue ArgumentError - data - end - when Array - data.map! { |d| convert_dates_from(d) } - when Hash - data.each do |key, value| - data[key] = convert_dates_from(value) - end - else - data end - end end end end |