Move Model.extract_options! from base to the validation_class_method …

…plugin, since that is the only user

lib/sequel/model/base.rb

@@ -350,13 +350,6 @@ def def_bad_column_accessor(column)
         end
       end
 
-      # Removes and returns the last member of the array if it is a hash. Otherwise,
-      # an empty hash is returned This method is useful when writing methods that
-      # take an options hash as the last parameter.
-      def extract_options!(array)
-        array.last.is_a?(Hash) ? array.pop : {}
-      end
-
       # Get the schema from the database, fall back on checking the columns
       # via the database if that will return inaccurate results or if
       # it raises an error.

lib/sequel/model/deprecated_validations.rb

@@ -361,6 +361,10 @@ def validations
 
         private
 
+        def extract_options!(array)
+          array.last.is_a?(Hash) ? array.pop : {}
+        end
+
         def validation_if_proc(o, i)
           case i
           when Symbol then o.send(i)

lib/sequel/plugins/validation_class_methods.rb

@@ -352,6 +352,14 @@ def validations
 
         private
 
+        # Removes and returns the last member of the array if it is a hash. Otherwise,
+        # an empty hash is returned This method is useful when writing methods that
+        # take an options hash as the last parameter.
+        def extract_options!(array)
+          array.last.is_a?(Hash) ? array.pop : {}
+        end
+
+        # Handle the :if option for validations
         def validation_if_proc(o, i)
           case i
           when Symbol then o.send(i)