ui_bibz 3.0.0.beta12 → 3.0.0.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50692a30f39e9110cec4b66aca482aac06b5954f6785350c66e0e3f5b34fb79f
-  data.tar.gz: 1dcf3b39d353062f5ba6e5265339a98474f78e0fa74b7822f1269db13a036c52
+  metadata.gz: c8e9f704fae6975451f3f51f700ee7df8e880045c95b686065e2992b9ed027ea
+  data.tar.gz: 6ae209045ca11867361a63347150cf8435984976f00026b89c556fcf2dea5674
 SHA512:
-  metadata.gz: 5ea403acad7678809350b802ebaab7f3c96b13daa26c3637b46c3b40da038930b2a0a921b96efb7f044bc562d4604ab57c0826781d88bb73b0b2b458f3f76b52
-  data.tar.gz: 1b22114c6aaf66f7de20b8dfd80e8e790eea1a07e1695a3ba31f7c26a95fd30d404babc9981332731605c2015733fa03dd570bb719c4689ba7430102efa6f791
+  metadata.gz: d387972cb0c0b4a0d4d8768782e92608876e0c90fb16a1f3895c5b130707df80901317440b5e69cfaecefebc691d03a614935d595bbcf8246664340d564923df
+  data.tar.gz: 5786310071a16944f8a45d3c0bb0e282cd21c151fd8513d45a8d31b5e43892e44113e8f2800a326e528b6f424b73db8952b27c508cc6ffca1e1ea063b4591027

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta12)
+    ui_bibz (3.0.0.beta13)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4

data/lib/ui_bibz/infos.rb

@@ -12,6 +12,6 @@ module UiBibz
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '3.0.0.beta12'
+  VERSION             = '3.0.0.beta13'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_radio_field_input.rb

@@ -1,20 +1,9 @@
 # frozen_string_literal: true
 
 module UiBibzInputs
-  class UiRadioFieldInput < SimpleForm::Inputs::CollectionRadioButtonsInput
-    include UiBibz::Ui::Core::Forms::Choices
-
+  class UiRadioFieldInput < UiCheckboxFieldInput
     def input(_wrapper_options)
-      i = UiBibz::Ui::Core::Forms::Choices::RadioField.new(attribute_name, options, input_html_options)
-      options[:item_wrapper_tag] = :div
-      options[:item_wrapper_class] = i.html_options[:class]
-
-      label_method, value_method = detect_collection_methods
-
-      @builder.send(:collection_radio_buttons,
-                    attribute_name, collection, value_method, label_method,
-                    input_options, i.html_options,
-                    &collection_block_for_nested_boolean_style)
+      UiBibz::Ui::Core::Forms::Choices::RadioField.new(input_attribute_name, new_options, input_html_options).render
     end
   end
 end

data/lib/ui_bibz/inputs/ui_bibz_inputs/ui_switch_field_input.rb

@@ -1,23 +1,11 @@
 # frozen_string_literal: true
 
 module UiBibzInputs
-  class UiSwitchFieldInput < BaseInput
+  class UiSwitchFieldInput < UiCheckboxFieldInput
     include UiBibz::Ui::Core::Forms::Choices
 
     def input(_wrapper_options)
       UiBibz::Ui::Core::Forms::Choices::SwitchField.new(input_attribute_name, new_options, new_input_html_options).render
     end
-
-    def new_input_html_options
-      input_html_options.merge({ checked: value.nil? ? false : value })
-    end
-
-    def value
-      @value ||= @builder.object.send(attribute_name)
-    end
-
-    def new_options
-      options.merge({ label: attribute_name.to_s.titleize })
-    end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/checkbox_field.rb

@@ -65,13 +65,13 @@ module UiBibz::Ui::Core::Forms::Choices
 
     def wrapper_html_options
       (options[:wrapper_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check', inline, options[:wrapper_html].try(:[], :class))
+        option[:class] = UiBibz::Utils::Screwdriver.join_classes(wrapper_classes, inline, options[:wrapper_html].try(:[], :class))
       end
     end
 
     def label_html_options
       (options[:label_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check-label', options[:label_html].try(:[], :class))
+        option[:class] = UiBibz::Utils::Screwdriver.join_classes(label_classes, options[:label_html].try(:[], :class))
       end
     end
 
@@ -111,5 +111,13 @@ module UiBibz::Ui::Core::Forms::Choices
     def inline
       'form-check-inline' if options[:inline]
     end
+
+    def wrapper_classes
+      'form-check'
+    end
+
+    def label_classes
+      'form-check-label'
+    end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/radio_field.rb

@@ -61,27 +61,8 @@ module UiBibz::Ui::Core::Forms::Choices
 
     private
 
-    def wrapper_html_options
-      (options[:wrapper_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check', inline, options[:wrapper_html].try(:[], :class))
-      end
-    end
-
-    def label_html_options
-      (options[:label_html] || {}).tap do |option|
-        option[:class] = UiBibz::Utils::Screwdriver.join_classes('form-check-label', options[:label_html].try(:[], :class))
-      end
-    end
-
-    def radio_field_html_tag
-      content_tag :div, html_options.except(:id) do
-        concat radio_button_tag content, options[:value], options[:checked] || false, checkbox_html_options
-        concat label_tag(label_name, label_content, class: 'form-check-label') if options[:label] != false
-      end
-    end
-
     def label_name
-      "#{content}_#{options[:value]}"
+      html_options[:id] || "#{content}_#{options[:value]}"
     end
   end
 end

data/lib/ui_bibz/ui/core/forms/choices/switch_field.rb

@@ -47,8 +47,8 @@ module UiBibz::Ui::Core::Forms::Choices
       { boolean: true }
     end
 
-    def component_html_classes
-      ['form-check', 'form-switch', inline]
+    def wrapper_classes
+      %w[form-check form-switch]
     end
   end
 end

data/test/simple_form_test.rb

@@ -132,10 +132,10 @@ test1</textarea></div></form>"
 
   test 'radio field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :ui_radio_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_radio_field, label: 'Radio 1', input_html: { id: "radio_1" }
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_radio_field optional user_name_fr\"><label class=\"control-label ui_radio_field optional\">Name fr</label><input type=\"hidden\" name=\"user[name_fr]\" value=\"\" /><div class=\"radio ui_radio_field optional form-check-input\"><input class=\"ui_radio_field optional form-check-input\" type=\"radio\" value=\"1\" name=\"user[name_fr]\" id=\"user_name_fr_1\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_1\">test1</label></div><div class=\"radio ui_radio_field optional form-check-input\"><input class=\"ui_radio_field optional form-check-input\" type=\"radio\" value=\"2\" name=\"user[name_fr]\" id=\"user_name_fr_2\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_2\">test2</label></div></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_radio_field optional user_name_fr\"><div class=\"form-check\"><input type=\"radio\" name=\"user[name_fr]\" id=\"radio_1\" value=\"test1\" class=\"ui_radio_field optional form-check-input\" /><label class=\"form-check-label\" for=\"radio_1\">Radio 1</label></div></div></form>"
 
     assert_equal expected, actual
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta12
+  version: 3.0.0.beta13
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]