Improve uniqueness validator

.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
   TargetRubyVersion: 2.2
 
 Metrics/AbcSize:
-  Max: 41.39 # TODO: Lower to 15
+  Max: 37.23 # TODO: Lower to 15
 
 Metrics/BlockLength:
   Exclude:

lib/client_side_validations/active_record/uniqueness.rb

@@ -8,23 +8,30 @@ def client_side_hash(model, attribute, _force = nil)
         hash[:id]             = model.id unless model.new_record?
         hash[:allow_blank]    = true if options[:allow_blank]
 
+        apply_class_option! hash, model
+        apply_scope_option! hash, model
+
+        hash
+      end
+
+      private
+
+      def apply_class_option!(hash, model)
         if options.key?(:client_validations) && options[:client_validations].key?(:class)
           hash[:class] = options[:client_validations][:class].underscore
         elsif model.class.name.demodulize != model.class.name
           hash[:class] = model.class.name.underscore
         end
+      end
 
-        if options.key?(:scope) && options[:scope].present?
-          hash[:scope] = Array.wrap(options[:scope]).inject({}) do |scope_hash, scope_item|
-            scope_hash.merge!(scope_item => model.send(scope_item))
-          end
-        end
+      def apply_scope_option!(hash, model)
+        return unless options.key?(:scope) && options[:scope].present?
 
-        hash
+        hash[:scope] = Array.wrap(options[:scope]).inject({}) do |scope_hash, scope_item|
+          scope_hash.merge!(scope_item => model.send(scope_item))
+        end
       end
 
-      private
-
       def message_type
         :taken
       end