From f9cfe9a4b2bf79c97d221c627a43103fbc0e5a58 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sat, 9 Jun 2012 09:40:55 -0300 Subject: Use each_with_object instead of each here --- activerecord/lib/active_record/attribute_methods.rb | 6 +++--- activerecord/lib/active_record/relation/predicate_builder.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index c445ec15dd..172026d150 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -149,9 +149,9 @@ module ActiveRecord # Returns a hash of all the attributes with their names as keys and the values of the attributes as values. def attributes - attrs = {} - attribute_names.each { |name| attrs[name] = read_attribute(name) } - attrs + attribute_names.each_with_object({}) { |name, attrs| + attrs[name] = read_attribute(name) + } end # Returns an #inspect-like string for the value of the diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index cb8f903474..a240c137ea 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -4,7 +4,7 @@ module ActiveRecord attributes.map do |column, value| table = default_table - if value.is_a?(Hash) + if value.is_a?(Hash) && !value.empty? table = Arel::Table.new(column, engine) value.map { |k,v| build(table[k.to_sym], v) } else -- cgit v1.2.3