From 2958a1e14e1636ae84d3580f4c7a5a7baeab2b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 6 Jan 2012 00:53:29 -0300
Subject: Remove Array.wrap calls in ActiveRecord

---
 activerecord/lib/active_record/associations/association_scope.rb | 2 +-
 .../active_record/associations/builder/collection_association.rb | 4 ++--
 .../lib/active_record/associations/collection_association.rb     | 4 +---
 activerecord/lib/active_record/associations/collection_proxy.rb  | 2 +-
 activerecord/lib/active_record/autosave_association.rb           | 2 --
 activerecord/lib/active_record/callbacks.rb                      | 2 --
 .../connection_adapters/abstract/schema_statements.rb            | 9 ++++-----
 activerecord/lib/active_record/fixtures.rb                       | 3 +--
 activerecord/lib/active_record/migration.rb                      | 5 ++---
 activerecord/lib/active_record/serialization.rb                  | 4 ++--
 activerecord/lib/active_record/serializers/xml_serializer.rb     | 3 +--
 activerecord/lib/active_record/transactions.rb                   | 4 ++--
 activerecord/lib/active_record/validations/uniqueness.rb         | 4 +---
 13 files changed, 18 insertions(+), 30 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
index 090f690f0d..8a17f0ced4 100644
--- a/activerecord/lib/active_record/associations/association_scope.rb
+++ b/activerecord/lib/active_record/associations/association_scope.rb
@@ -15,7 +15,7 @@ module ActiveRecord
 
       def scope
         scope = klass.unscoped
-        scope = scope.extending(*Array.wrap(options[:extend]))
+        scope = scope.extending(*Array(options[:extend]))
 
         # It's okay to just apply all these like this. The options will only be present if the
         # association supports that option; this is enforced by the association builder.
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb
index 35f9a3ae8e..768f70b6c9 100644
--- a/activerecord/lib/active_record/associations/builder/collection_association.rb
+++ b/activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -32,7 +32,7 @@ module ActiveRecord::Associations::Builder
     private
 
       def wrap_block_extension
-        options[:extend] = Array.wrap(options[:extend])
+        options[:extend] = Array(options[:extend])
 
         if block_extension
           silence_warnings do
@@ -51,7 +51,7 @@ module ActiveRecord::Associations::Builder
 
         # TODO : why do i need method_defined? I think its because of the inheritance chain
         model.class_attribute full_callback_name.to_sym unless model.method_defined?(full_callback_name)
-        model.send("#{full_callback_name}=", Array.wrap(options[callback_name.to_sym]))
+        model.send("#{full_callback_name}=", Array(options[callback_name.to_sym]))
       end
 
       def define_readers
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 68538afbc9..7aed64d48c 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActiveRecord
   module Associations
     # = Active Record Association Collection
@@ -67,7 +65,7 @@ module ActiveRecord
       # Implements the ids writer method, e.g. foo.item_ids= for Foo.has_many :items
       def ids_writer(ids)
         pk_column = reflection.primary_key_column
-        ids = Array.wrap(ids).reject { |id| id.blank? }
+        ids = Array(ids).reject { |id| id.blank? }
         ids.map! { |i| pk_column.type_cast(i) }
         replace(klass.find(ids).index_by { |r| r.id }.values_at(*ids))
       end
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index eb320bc774..ba01df00e3 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -52,7 +52,7 @@ module ActiveRecord
 
       def initialize(association)
         @association = association
-        Array.wrap(association.options[:extend]).each { |ext| proxy_extend(ext) }
+        Array(association.options[:extend]).each { |ext| proxy_extend(ext) }
       end
 
       alias_method :new, :build
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index c86eaba498..8031912669 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActiveRecord
   # = Active Record Autosave Association
   #
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 8b2fc69b00..a050fabf35 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActiveRecord
   # = Active Record Callbacks
   #
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 20d3b4a1ef..54393e24a3 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/deprecation/reporting'
 
 module ActiveRecord
@@ -42,7 +41,7 @@ module ActiveRecord
       #  # Check an index with a custom name exists
       #  index_exists?(:suppliers, :company_id, :name => "idx_company_id"
       def index_exists?(table_name, column_name, options = {})
-        column_names = Array.wrap(column_name)
+        column_names = Array(column_name)
         index_name = options.key?(:name) ? options[:name].to_s : index_name(table_name, :column => column_names)
         if options[:unique]
           indexes(table_name).any?{ |i| i.unique && i.name == index_name }
@@ -377,7 +376,7 @@ module ActiveRecord
       def index_name(table_name, options) #:nodoc:
         if Hash === options # legacy support
           if options[:column]
-            "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"
+            "index_#{table_name}_on_#{Array(options[:column]) * '_and_'}"
           elsif options[:name]
             options[:name]
           else
@@ -436,7 +435,7 @@ module ActiveRecord
       end
 
       def assume_migrated_upto_version(version, migrations_paths = ActiveRecord::Migrator.migrations_paths)
-        migrations_paths = Array.wrap(migrations_paths)
+        migrations_paths = Array(migrations_paths)
         version = version.to_i
         sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
 
@@ -551,7 +550,7 @@ module ActiveRecord
         end
 
         def add_index_options(table_name, column_name, options = {})
-          column_names = Array.wrap(column_name)
+          column_names = Array(column_name)
           index_name   = index_name(table_name, :column => column_names)
 
           if Hash === options # legacy support, since this param was a string
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 339ba1e19e..cf315b687c 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -2,7 +2,6 @@ require 'erb'
 require 'yaml'
 require 'zlib'
 require 'active_support/dependencies'
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
 require 'active_support/ordered_hash'
 require 'active_record/fixtures/file'
@@ -783,7 +782,7 @@ module ActiveRecord
       end
 
       def setup_fixture_accessors(fixture_names = nil)
-        fixture_names = Array.wrap(fixture_names || fixture_table_names)
+        fixture_names = Array(fixture_names || fixture_table_names)
         methods = Module.new do
           fixture_names.each do |fixture_name|
             fixture_name = fixture_name.to_s
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 46464783fd..3d3918c043 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1,6 +1,5 @@
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/class/attribute_accessors"
-require "active_support/core_ext/array/wrap"
 
 module ActiveRecord
   # Exception that can be raised to stop migrations from going backwards.
@@ -587,7 +586,7 @@ module ActiveRecord
       def migrations_paths
         @migrations_paths ||= ['db/migrate']
         # just to not break things if someone uses: migration_path = some_string
-        Array.wrap(@migrations_paths)
+        Array(@migrations_paths)
       end
 
       def migrations_path
@@ -595,7 +594,7 @@ module ActiveRecord
       end
 
       def migrations(paths, subdirectories = true)
-        paths = Array.wrap(paths)
+        paths = Array(paths)
 
         glob = subdirectories ? "**/" : ""
         files = Dir[*paths.map { |p| "#{p}/#{glob}[0-9]*_*.rb" }]
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb
index 5ad40d8cd9..41e3b92499 100644
--- a/activerecord/lib/active_record/serialization.rb
+++ b/activerecord/lib/active_record/serialization.rb
@@ -7,8 +7,8 @@ module ActiveRecord #:nodoc:
     def serializable_hash(options = nil)
       options = options.try(:clone) || {}
 
-      options[:except] = Array.wrap(options[:except]).map { |n| n.to_s }
-      options[:except] |= Array.wrap(self.class.inheritance_column)
+      options[:except] = Array(options[:except]).map { |n| n.to_s }
+      options[:except] |= Array(self.class.inheritance_column)
 
       super(options)
     end
diff --git a/activerecord/lib/active_record/serializers/xml_serializer.rb b/activerecord/lib/active_record/serializers/xml_serializer.rb
index 0e7f57aa43..7f1dba5095 100644
--- a/activerecord/lib/active_record/serializers/xml_serializer.rb
+++ b/activerecord/lib/active_record/serializers/xml_serializer.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/conversions'
 
 module ActiveRecord #:nodoc:
@@ -179,7 +178,7 @@ module ActiveRecord #:nodoc:
   class XmlSerializer < ActiveModel::Serializers::Xml::Serializer #:nodoc:
     def initialize(*args)
       super
-      options[:except] = Array.wrap(options[:except]) | Array.wrap(@serializable.class.inheritance_column)
+      options[:except] = Array(options[:except]) | Array(@serializable.class.inheritance_column)
     end
 
     class Attribute < ActiveModel::Serializers::Xml::Serializer::Attribute #:nodoc:
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index 2c70d31b94..b492377d18 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -211,7 +211,7 @@ module ActiveRecord
       def after_commit(*args, &block)
         options = args.last
         if options.is_a?(Hash) && options[:on]
-          options[:if] = Array.wrap(options[:if])
+          options[:if] = Array(options[:if])
           options[:if] << "transaction_include_action?(:#{options[:on]})"
         end
         set_callback(:commit, :after, *args, &block)
@@ -220,7 +220,7 @@ module ActiveRecord
       def after_rollback(*args, &block)
         options = args.last
         if options.is_a?(Hash) && options[:on]
-          options[:if] = Array.wrap(options[:if])
+          options[:if] = Array(options[:if])
           options[:if] << "transaction_include_action?(:#{options[:on]})"
         end
         set_callback(:rollback, :after, *args, &block)
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index d56248b928..29a7b991b1 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array/wrap'
-
 module ActiveRecord
   module Validations
     class UniquenessValidator < ActiveModel::EachValidator
@@ -25,7 +23,7 @@ module ActiveRecord
         relation = build_relation(finder_class, table, attribute, value)
         relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.send(:id))) if record.persisted?
 
-        Array.wrap(options[:scope]).each do |scope_item|
+        Array(options[:scope]).each do |scope_item|
           scope_value = record.send(scope_item)
           relation = relation.and(table[scope_item].eq(scope_value))
         end
-- 
cgit v1.2.3