diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-10-26 19:05:34 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-26 19:05:34 +0900 |
commit | 61490805fe25091b080f5bba0e286716cdb56245 (patch) | |
tree | 4868de648bd55ecfe7a69e9d17b3d8465a6e5a7b /activerecord/lib/active_record/attribute_methods.rb | |
parent | 9e9e2b7f71d767e54bd14af752cbbbd9908e3713 (diff) | |
parent | 32b03b46150b0161eba2321ccac7678511e3d58e (diff) | |
download | rails-61490805fe25091b080f5bba0e286716cdb56245.tar.gz rails-61490805fe25091b080f5bba0e286716cdb56245.tar.bz2 rails-61490805fe25091b080f5bba0e286716cdb56245.zip |
Merge pull request #34208 from yskkin/inspect_with_parameter_filter
Implement AR#inspect using ParameterFilter
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods.rb')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index eeb88e4b7a..1e92ee3b96 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -329,14 +329,7 @@ module ActiveRecord # # => "[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]" def attribute_for_inspect(attr_name) value = read_attribute(attr_name) - - if value.is_a?(String) && value.length > 50 - "#{value[0, 50]}...".inspect - elsif value.is_a?(Date) || value.is_a?(Time) - %("#{value.to_s(:db)}") - else - value.inspect - end + format_for_inspect(value) end # Returns +true+ if the specified +attribute+ has been set by the user or by a @@ -456,6 +449,16 @@ module ActiveRecord end end + def format_for_inspect(value) + if value.is_a?(String) && value.length > 50 + "#{value[0, 50]}...".inspect + elsif value.is_a?(Date) || value.is_a?(Time) + %("#{value.to_s(:db)}") + else + value.inspect + end + end + def readonly_attribute?(name) self.class.readonly_attributes.include?(name) end |