Fix rubocop offences

Author: UweKubosch

lib/bootstrap_form/inputs/check_box.rb

@@ -68,8 +68,8 @@ def check_box_wrapper_class(options)
         classes << "form-check-inline" if layout_inline?(options[:inline])
         classes << "mb-3" unless options[:multiple] || layout == :horizontal
         classes << "form-switch" if options[:switch]
-        classes << options[:wrapper][:class] if options.dig(:wrapper, :class).present?
-        classes << options[:wrapper_class] if options[:wrapper_class].present?
+        classes << options.dig(:wrapper, :class).presence
+        classes << options[:wrapper_class].presence
         classes.flatten.compact
       end
     end

lib/bootstrap_form/inputs/radio_button.rb

@@ -9,13 +9,10 @@ module RadioButton
       included do
         def radio_button_with_bootstrap(name, value, *args)
           options = args.extract_options!.symbolize_keys!
-          radio_button_options = options.except(:class, :label, :label_class, :error_message, :help,
-                                                :inline, :hide_label, :skip_label, :wrapper, :wrapper_class)
-
-          radio_button_options[:class] = radio_button_classes(name, options)
-
-          tag.div(class: radio_button_wrapper_class(options), **options[:wrapper].to_h.except(:class)) do
-            html = radio_button_without_bootstrap(name, value, radio_button_options)
+          wrapper_attributes = options[:wrapper] || {}
+          wrapper_attributes[:class] = radio_button_wrapper_class(options)
+          tag.div(**wrapper_attributes) do
+            html = radio_button_without_bootstrap(name, value, radio_button_options(name, options))
             html.concat(radio_button_label(name, value, options)) unless options[:skip_label]
             html.concat(generate_error(name)) if options[:error_message]
             html
@@ -27,6 +24,13 @@ def radio_button_with_bootstrap(name, value, *args)
 
       private
 
+      def radio_button_options(name, options)
+        radio_button_options = options.except(:class, :label, :label_class, :error_message, :help,
+                                              :inline, :hide_label, :skip_label, :wrapper, :wrapper_class)
+        radio_button_options[:class] = radio_button_classes(name, options)
+        radio_button_options
+      end
+
       def radio_button_label(name, value, options)
         label_options = { value: value, class: radio_button_label_class(options) }
         label_options[:for] = options[:id] if options[:id].present?
@@ -51,8 +55,8 @@ def radio_button_wrapper_class(options)
         classes = ["form-check"]
         classes << "form-check-inline" if layout_inline?(options[:inline])
         classes << "disabled" if options[:disabled]
-        classes << options[:wrapper][:class] if options.dig(:wrapper, :class).present?
-        classes << options[:wrapper_class] if options[:wrapper_class].present?
+        classes << options.dig(:wrapper, :class).presence
+        classes << options[:wrapper_class].presence
         classes.flatten.compact
       end
     end