Merge pull request #4340 from rafaelfranca/patch-1

Remove more Array.wrap calls

7 files changed, 12 insertions, 17 deletions

diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index 15103f1185..25d26ede52 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/callbacks'
 
 module ActiveModel
@@ -93,7 +92,7 @@ module ActiveModel
          :only => [:before, :around, :after]
       }.merge(options)
 
-      types = Array.wrap(options.delete(:only))
+      types = Array(options.delete(:only))
 
       callbacks.each do |callback|
         define_callbacks(callback, options)
@@ -125,7 +124,7 @@ module ActiveModel
         def self.after_#{callback}(*args, &block)
           options = args.extract_options!
           options[:prepend] = true
-          options[:if] = Array.wrap(options[:if]) << "!halted && value != false"
+          options[:if] = Array(options[:if]) << "!halted && value != false"
           set_callback(:#{callback}, :after, *(args << options), &block)
         end
       CALLBACK
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index cd8eb357de..a8309bf682 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -1,6 +1,5 @@
 require 'singleton'
 require 'active_model/observer_array'
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext/string/inflections'
@@ -200,7 +199,7 @@ module ActiveModel
       #     end
       #   end
       def observed_classes
-        Array.wrap(observed_class)
+        Array(observed_class)
       end
 
       # The class observed by default is inferred from the observer's class name:
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb
index a4b58ab456..ba9721cc70 100644
--- a/activemodel/lib/active_model/serialization.rb
+++ b/activemodel/lib/active_model/serialization.rb
@@ -73,15 +73,15 @@ module ActiveModel
 
       attribute_names = attributes.keys.sort
       if only = options[:only]
-        attribute_names &= Array.wrap(only).map(&:to_s)
+        attribute_names &= Array(only).map(&:to_s)
       elsif except = options[:except]
-        attribute_names -= Array.wrap(except).map(&:to_s)
+        attribute_names -= Array(except).map(&:to_s)
       end
 
       hash = {}
       attribute_names.each { |n| hash[n] = read_attribute_for_serialization(n) }
 
-      method_names = Array.wrap(options[:methods]).select { |n| respond_to?(n) }
+      method_names = Array(options[:methods]).select { |n| respond_to?(n) }
       method_names.each { |n| hash[n] = send(n) }
 
       serializable_add_includes(options) do |association, records, opts|
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb
index d61d9d7119..5084298210 100644
--- a/activemodel/lib/active_model/serializers/xml.rb
+++ b/activemodel/lib/active_model/serializers/xml.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/hash/conversions'
@@ -56,7 +55,7 @@ module ActiveModel
         end
 
         def serializable_collection
-          methods = Array.wrap(options[:methods]).map(&:to_s)
+          methods = Array(options[:methods]).map(&:to_s)
           serializable_hash.map do |name, value|
             name = name.to_s
             if methods.include?(name)
@@ -146,7 +145,7 @@ module ActiveModel
 
         def add_procs
           if procs = options.delete(:procs)
-            Array.wrap(procs).each do |proc|
+            Array(procs).each do |proc|
               if proc.arity == 1
                 proc.call(options)
               else
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 1779efd526..15b8e824ac 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/except'
@@ -133,7 +132,7 @@ module ActiveModel
         options = args.extract_options!
         if options.key?(:on)
           options = options.dup
-          options[:if] = Array.wrap(options[:if])
+          options[:if] = Array(options[:if])
           options[:if].unshift("validation_context == :#{options[:on]}")
         end
         args << options
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb
index 22a77320dc..c80ace7b82 100644
--- a/activemodel/lib/active_model/validations/callbacks.rb
+++ b/activemodel/lib/active_model/validations/callbacks.rb
@@ -30,7 +30,7 @@ module ActiveModel
         def before_validation(*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].unshift("self.validation_context == :#{options[:on]}")
           end
           set_callback(:validation, :before, *args, &block)
@@ -39,7 +39,7 @@ module ActiveModel
         def after_validation(*args, &block)
           options = args.extract_options!
           options[:prepend] = true
-          options[:if] = Array.wrap(options[:if])
+          options[:if] = Array(options[:if])
           options[:if] << "!halted"
           options[:if].unshift("self.validation_context == :#{options[:on]}") if options[:on]
           set_callback(:validation, :after, *(args << options), &block)
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index 35ec98c822..2953126c3c 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/wrap'
 require "active_support/core_ext/module/anonymous"
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/inclusion'
@@ -137,7 +136,7 @@ module ActiveModel #:nodoc:
     # +options+ reader, however the <tt>:attributes</tt> option will be removed
     # and instead be made available through the +attributes+ reader.
     def initialize(options)
-      @attributes = Array.wrap(options.delete(:attributes))
+      @attributes = Array(options.delete(:attributes))
       raise ":attributes cannot be blank" if @attributes.empty?
       super
       check_validity!