From b76b9e216463f045c8a5ca4b1a6a7994f2baa389 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Sat, 7 Jul 2012 09:58:56 +0100 Subject: Simplify Relation#inspect --- activerecord/lib/active_record/relation.rb | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index dc00448dff..0d1c9ef3e5 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -515,19 +515,10 @@ module ActiveRecord end def inspect - text = if limit_value && limit_value <= 10 - to_a.inspect - else - entries = limit(11).to_a - if entries.size > 10 - entries.pop - "[#{entries.map(&:inspect).join(', ')}, ...]" - else - entries.inspect - end - end + entries = limit([limit_value, 11].compact.min).map(&:inspect) + entries[10] = '...' if entries.size == 11 - "#<#{self.class.name} #{text}>" + "#<#{self.class.name} [#{entries.join(', ')}]>" end private -- cgit v1.2.3