Remove options from the attributes method, tidy up the implementation. Closes #11093 [juanjo.bazan, Koz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8863 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 5 insertions, 22 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index cd33c8891c..94ff704b25 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2214,35 +2214,18 @@ module ActiveRecord #:nodoc:
 
       # Returns a hash of all the attributes with their names as keys and the values of the attributes as values.
       def attributes(options = nil)
-        attrs = {}
-        self.attribute_names.each do |name|
-          attrs[name]=read_attribute(name)
-        end
-
-        if options.nil?
+        self.attribute_names.inject({}) do |attrs, name|
+          attrs[name] = read_attribute(name)
           attrs
-        else
-          if except = options[:except]
-            except = Array(except).collect { |attribute| attribute.to_s }
-            except.each { |attribute_name| attrs.delete(attribute_name) }
-            attrs
-          elsif only = options[:only]
-            only = Array(only).collect { |attribute| attribute.to_s }
-            attrs.delete_if { |key, value| !only.include?(key) }
-            attrs
-          else
-            raise ArgumentError, "Options does not specify :except or :only (#{options.keys.inspect})"
-          end
         end
       end
 
       # Returns a hash of attributes before typecasting and deserialization.
       def attributes_before_type_cast
-        attrs = {}
-        self.attribute_names.each do |name|
-          attrs[name]=read_attribute_before_type_cast(name)
+        self.attribute_names.inject({}) do |attrs, name|
+          attrs[name] = read_attribute_before_typecast(name)
+          attrs
         end
-        attrs
       end
 
       # Format attributes nicely for inspect.