[Fix #6429] Rails/Validation with braced options

Rails/Validation autocorrect was failing to recognize options hashes that
already was wrapped in braces, always adding an extra set of braces around them.

Author: bquorning

lib/rubocop/cop/rails/validation.rb

@@ -80,12 +80,20 @@ def correct_validate_type(corrector, node)
 
           if options
             corrector.replace(options.loc.expression,
-                              "#{validate_type}: { #{options.source} }")
+                              "#{validate_type}: #{braced_options(options)}")
           else
             corrector.insert_after(node.loc.expression,
                                    ", #{validate_type}: true")
           end
         end
+
+        def braced_options(options)
+          if options.braces?
+            options.source
+          else
+            "{ #{options.source} }"
+          end
+        end
       end
     end
   end

spec/rubocop/cop/rails/validation_spec.rb

@@ -39,4 +39,13 @@
       'validates :age, numericality: { minimum: 0, maximum: 122 }'
     )
   end
+
+  it 'autocorrect validates_numericality_of with options in braces' do
+    new_source = autocorrect_source(
+      'validates_numericality_of :age, { minimum: 0, maximum: 122 }'
+    )
+    expect(new_source).to eq(
+      'validates :age, numericality: { minimum: 0, maximum: 122 }'
+    )
+  end
 end