aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2018-09-10 12:41:14 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2018-09-12 18:51:55 +0300
commitd40e33fcc5899a91ceab10f8bd86a1455846917a (patch)
tree84823d526b1be0336f2a3f886fdd88bb2043c2b6 /activerecord/lib/active_record/core.rb
parent9945cd097a46771aedfcb9abc110419198452022 (diff)
downloadrails-d40e33fcc5899a91ceab10f8bd86a1455846917a.tar.gz
rails-d40e33fcc5899a91ceab10f8bd86a1455846917a.tar.bz2
rails-d40e33fcc5899a91ceab10f8bd86a1455846917a.zip
DRY `activerecord/lib/active_record/core.rb` and fix tests
- Move ``` filter_attributes = self.filter_attributes.map(&:to_s).to_set filter_attributes.include?(attribute_name) && !read_attribute(attribute_name).nil? ``` to private method. - Fix tests in `activerecord/test/cases/filter_attributes_test.rb` - Ensure that `teardown` sets `ActiveRecord::Base.filter_attributes` to previous state. - Ensure that `Admin::Account.filter_attributes` is set to previous state in the "filter_attributes could be overwritten by models" test. Follow up #33756
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r--activerecord/lib/active_record/core.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 4f10cddc87..d5d2c70a8a 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -493,13 +493,12 @@ module ActiveRecord
# Returns the contents of the record as a nicely formatted string.
def inspect
- filter_attributes = self.filter_attributes.map(&:to_s).to_set
# We check defined?(@attributes) not to issue warnings if the object is
# allocated but not initialized.
inspection = if defined?(@attributes) && @attributes
self.class.attribute_names.collect do |name|
if has_attribute?(name)
- if filter_attributes.include?(name) && !read_attribute(name).nil?
+ if filter_attribute?(name)
"#{name}: #{ActiveRecord::Core::FILTERED}"
else
"#{name}: #{attribute_for_inspect(name)}"
@@ -517,21 +516,19 @@ module ActiveRecord
# when pp is required.
def pretty_print(pp)
return super if custom_inspect_method_defined?
- filter_attributes = self.filter_attributes.map(&:to_s).to_set
pp.object_address_group(self) do
if defined?(@attributes) && @attributes
column_names = self.class.column_names.select { |name| has_attribute?(name) || new_record? }
pp.seplist(column_names, proc { pp.text "," }) do |column_name|
- column_value = read_attribute(column_name)
pp.breakable " "
pp.group(1) do
pp.text column_name
pp.text ":"
pp.breakable
- if filter_attributes.include?(column_name) && !column_value.nil?
+ if filter_attribute?(column_name)
pp.text ActiveRecord::Core::FILTERED
else
- pp.pp column_value
+ pp.pp read_attribute(column_name)
end
end
end
@@ -583,5 +580,11 @@ module ActiveRecord
def custom_inspect_method_defined?
self.class.instance_method(:inspect).owner != ActiveRecord::Base.instance_method(:inspect).owner
end
+
+ def filter_attribute?(attribute_name)
+ filter_attributes = self.filter_attributes.map(&:to_s).to_set
+
+ filter_attributes.include?(attribute_name) && !read_attribute(attribute_name).nil?
+ end
end
end