rails_bootstrap_form 0.9.7 → 0.9.9

data/lib/rails_bootstrap_form/helpers/errors.rb

@@ -7,59 +7,69 @@ module RailsBootstrapForm
     module Errors
       extend ActiveSupport::Concern
 
-      def self.included(base_class)
-        def is_invalid?(attribute)
-          (attribute && object.respond_to?(:errors) && object.errors[attribute].any?) ||
-            has_association_error?(attribute)
-        end
+      private
 
-        # def input_with_error(attribute, &block)
-        #   input = capture(&block)
-        #   input << generate_error(attribute)
-        #   input
-        # end
+      def is_invalid?(attribute)
+        (attribute && object.respond_to?(:errors) && has_attribute_error?(attribute)) ||
+          has_association_error?(attribute)
+      end
 
-        def generate_error(attribute)
-          if is_invalid?(attribute)
-            error_text = error_messages(attribute)
-            error_klass = "invalid-feedback"
+      def generate_error(attribute)
+        if is_invalid?(attribute)
+          error_text = error_messages(attribute)
+          error_klass = "invalid-feedback"
 
-            tag.div(error_text, class: error_klass)
-          end
+          tag.div(error_text, class: error_klass)
         end
+      end
+
+      def error_messages(attribute)
+        messages = Array(attribute_error_messages(attribute))
+        messages << associated_error_messages(attribute)
 
-        def has_association_error?(attribute)
-          object.class.try(:reflections)&.any? do |association_name, association|
-            next unless is_belongs_to_association?(association)
-            next unless is_association_same?(attribute, association)
+        messages.flatten.to_sentence
+      end
+
+      def has_attribute_error?(attribute)
+        attribute_error_messages(attribute).any?
+      end
 
-            object.errors[association_name].any?
-          end
+      def has_association_error?(attribute)
+        object.class.try(:reflections)&.any? do |association_name, association|
+          has_errors_on_association?(attribute, association_name)
         end
+      end
 
-        def error_messages(attribute)
-          messages = object.errors[attribute]
+      def has_errors_on_association?(attribute, association_name)
+        return false unless is_belongs_to_association?(object.class.reflections[association_name])
+        return false unless is_association_same?(attribute, object.class.reflections[association_name])
 
-          object.class.try(:reflections)&.each do |association_name, association|
-            next unless is_belongs_to_association?(association)
-            next unless is_association_same?(attribute, association)
+        object.errors[association_name].any?
+      end
 
-            messages << object.errors[association_name]
-          end
+      def attribute_error_messages(attribute)
+        object.errors[attribute]
+      end
 
-          messages.flatten.to_sentence
-        end
+      def associated_error_messages(attribute)
+        error_messages = []
 
-        def is_belongs_to_association?(association)
-          association.is_a?(ActiveRecord::Reflection::BelongsToReflection)
-        end
+        object.class.try(:reflections)&.each do |association_name, association|
+          next unless is_belongs_to_association?(association)
+          next unless is_association_same?(attribute, association)
 
-        def is_association_same?(attribute, association)
-          (association.foreign_key == attribute.to_s)
+          error_messages << object.errors[association_name]
         end
 
-        private :is_invalid?, :generate_error, :has_association_error?,
-                :error_messages, :is_belongs_to_association?, :is_association_same?
+        error_messages
+      end
+
+      def is_belongs_to_association?(association)
+        association.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+      end
+
+      def is_association_same?(attribute, association)
+        (association.foreign_key == attribute.to_s)
       end
     end
   end

data/lib/rails_bootstrap_form/helpers/help_text.rb

@@ -7,46 +7,43 @@ module RailsBootstrapForm
     module HelpText
       extend ActiveSupport::Concern
 
-      def self.included(base_class)
-        def help_text(attribute, bootstrap)
-          return if bootstrap.help_text == false
+      private
 
-          help_text = (bootstrap.help_text || scoped_help_text(attribute))
+      def help_text(attribute, bootstrap)
+        return if bootstrap.help_text == false
 
-          tag.div(help_text, class: "form-text text-muted") if help_text.present?
-        end
+        help_text = (bootstrap.help_text || scoped_help_text(attribute))
 
-        def object_class
-          if !object.class.is_a?(ActiveModel::Naming) &&
-             object.respond_to?(:klass) && object.klass.is_a?(ActiveModel::Naming)
-            object.klass
-          else
-            object.class
-          end
-        end
+        tag.div(help_text, class: "form-text text-muted") if help_text.present?
+      end
 
-        def partial_scope
-          if object_class.respond_to?(:model_name)
-            object_class.model_name.name
-          else
-            object_class.name
-          end
+      def object_class
+        if !object.class.is_a?(ActiveModel::Naming) &&
+           object.respond_to?(:klass) && object.klass.is_a?(ActiveModel::Naming)
+          object.klass
+        else
+          object.class
         end
+      end
 
-        def scoped_help_text(attribute)
-          translation_scope = "activerecord.help_texts.#{partial_scope.underscore}"
+      def partial_scope
+        if object_class.respond_to?(:model_name)
+          object_class.model_name.name
+        else
+          object_class.name
+        end
+      end
 
-          help_text = translated_help_text(attribute, translation_scope).presence
+      def scoped_help_text(attribute)
+        translation_scope = "activerecord.help_texts.#{partial_scope.underscore}"
 
-          help_text
-        end
+        help_text = translated_help_text(attribute, translation_scope).presence
 
-        def translated_help_text(attribute, scope)
-          ActiveSupport::SafeBuffer.new(I18n.t(attribute, scope: scope, default: ""))
-        end
+        help_text
+      end
 
-        private :help_text, :partial_scope, :object_class, :scoped_help_text
-                :translated_help_text
+      def translated_help_text(attribute, scope)
+        ActiveSupport::SafeBuffer.new(I18n.t(attribute, scope: scope, default: ""))
       end
     end
   end

data/lib/rails_bootstrap_form/helpers/labels.rb

@@ -7,47 +7,44 @@ module RailsBootstrapForm
     module Labels
       extend ActiveSupport::Concern
 
-      def self.included(base_class)
-        def draw_label(attribute, options, bootstrap)
-          unless bootstrap.skip_label? && !bootstrap.floating?
-            label_options = {
-              class: label_classes(attribute, options, bootstrap)
-            }
-            label_options[:for] = options[:id] if options[:id].present?
-            label_text = label_text(attribute, bootstrap)
-
-            label(attribute, label_text, label_options)
-          end
-        end
+      private
 
-        def label_classes(attribute, options, bootstrap)
-          classes = []
-          classes << label_layout_classes(bootstrap)
-          classes << bootstrap.additional_label_class
-          classes << bootstrap.hide_class if hide_class_required?(bootstrap)
-          classes << "required" if is_field_required?(attribute, options)
-          classes << "is-invalid" if is_invalid?(attribute)
-          classes.flatten.compact
-        end
+      def draw_label(attribute, options, bootstrap)
+        unless bootstrap.skip_label? && !bootstrap.floating?
+          label_options = {
+            class: label_classes(attribute, options, bootstrap)
+          }
+          label_options[:for] = options[:id] if options[:id].present?
+          label_text = label_text(attribute, bootstrap)
 
-        def label_layout_classes(bootstrap)
-          if bootstrap.layout_horizontal?
-            [bootstrap.label_col_class, bootstrap.label_col_wrapper_class]
-          else
-            bootstrap.label_class
-          end
+          label(attribute, label_text, label_options)
         end
+      end
 
-        def label_text(attribute, bootstrap)
-          bootstrap.label_text || object&.class.try(:human_attribute_name, attribute)
-        end
+      def label_classes(attribute, options, bootstrap)
+        classes = []
+        classes << label_layout_classes(bootstrap)
+        classes << bootstrap.additional_label_class
+        classes << bootstrap.hide_class if hide_class_required?(bootstrap)
+        classes << "required" if is_field_required?(attribute, options)
+        classes << "is-invalid" if is_invalid?(attribute)
+        classes.flatten.compact
+      end
 
-        def hide_class_required?(bootstrap)
-          bootstrap.hide_label? || (bootstrap.layout_inline? && !bootstrap.floating?)
+      def label_layout_classes(bootstrap)
+        if bootstrap.layout_horizontal?
+          [bootstrap.label_col_class, bootstrap.label_col_wrapper_class]
+        else
+          bootstrap.label_class
         end
+      end
+
+      def label_text(attribute, bootstrap)
+        bootstrap.label_text || object&.class.try(:human_attribute_name, attribute)
+      end
 
-        private :draw_label, :label_classes, :label_text, :label_layout_classes,
-                :hide_class_required?
+      def hide_class_required?(bootstrap)
+        bootstrap.hide_label? || (bootstrap.layout_inline? && !bootstrap.floating?)
       end
     end
   end

data/lib/rails_bootstrap_form/helpers/required_field.rb

@@ -7,57 +7,61 @@ module RailsBootstrapForm
     module RequiredField
       extend ActiveSupport::Concern
 
-      def self.included(base_class)
-        def is_field_required?(attribute, options)
-          return false unless attribute
+      private
 
-          if options.key?(:required)
-            options[:required]
-          else
-            is_attribute_required?(attribute)
-          end
+      def is_field_required?(attribute, options)
+        return false unless attribute
+
+        if options.key?(:required)
+          options[:required]
+        else
+          is_attribute_required?(attribute)
         end
+      end
 
-        def required_field_options(attribute, options)
-          required = is_field_required?(attribute, options)
+      def required_field_options(attribute, options)
+        required = is_field_required?(attribute, options)
 
-          {}.tap do |option|
-            option[:aria] = {required: true} if required
-            option[:required] = required
-          end
+        {}.tap do |option|
+          option[:aria] = {required: true} if required
+          option[:required] = required
         end
+      end
 
-        def is_attribute_required?(attribute)
-          return false unless attribute
+      def is_attribute_required?(attribute)
+        return false unless attribute
 
-          target = object.instance_of?(Class) ? object : object.class
-          return false unless target.respond_to?(:validators_on)
+        target = target_object(object)
+        return false unless target.respond_to?(:validators_on)
 
-          has_presence_validator?(target_validators(target, attribute)) ||
-            is_required_association?(target, attribute)
-        end
+        has_presence_validator?(target_validators(target, attribute)) || is_required_association?(target, attribute)
+      end
 
-        def target_validators(target, attribute)
-          target.validators_on(attribute).map(&:class)
-        end
+      def target_object(object)
+        object.instance_of?(Class) ? object : object.class
+      end
 
-        def has_presence_validator?(target_validators)
-          target_validators.include?(ActiveModel::Validations::PresenceValidator) ||
-            (defined?(ActiveRecord::Validations::PresenceValidator) &&
-              target_validators.include?(ActiveRecord::Validations::PresenceValidator))
-        end
+      def target_validators(target, attribute)
+        target.validators_on(attribute).map(&:class)
+      end
 
-        def is_required_association?(target, attribute)
-          target.try(:reflections)&.find do |name, a|
-            next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
-            next unless a.foreign_key == attribute.to_s
+      def has_presence_validator?(target_validators)
+        target_validators.include?(ActiveModel::Validations::PresenceValidator) ||
+          (defined?(ActiveRecord::Validations::PresenceValidator) &&
+            target_validators.include?(ActiveRecord::Validations::PresenceValidator))
+      end
 
-            has_presence_validator?(target_validators(target, name))
-          end
+      def is_required_association?(target, attribute)
+        target.try(:reflections)&.find do |name, reflection|
+          required_association?(reflection, attribute)
         end
+      end
+
+      def required_association?(reflection, attribute)
+        return false unless reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+        return false unless reflection.foreign_key == attribute.to_s
 
-        private :is_field_required?, :required_field_options, :target_validators,
-                :has_presence_validator?, :is_required_association?
+        has_presence_validator?(target_validators(reflection.active_record, reflection.name))
       end
     end
   end

data/lib/rails_bootstrap_form/helpers.rb

@@ -21,37 +21,29 @@ module RailsBootstrapForm
     include Buttons
     include Choice
 
-    def self.included(base_class)
-      def sanitized_tag_name(attribute, value)
-        # label's `for` attribute needs to match checkbox/radio button tag's id, IE sanitized value, IE
-        # https://github.com/rails/rails/blob/5-0-stable/actionview/lib/action_view/helpers/tags/base.rb#L123-L125
-        "#{@object_name}_#{attribute}_#{value.to_s.gsub(/\s/, "_").gsub(/[^-[[:word:]]]/, "").mb_chars.downcase}"
-      end
-
-      def control_specific_class(field_tag_name)
-        "rails-bootstrap-forms-#{field_tag_name.to_s.tr("_", "-")}"
-      end
-
-      def is_size_valid?(bootstrap)
-        bootstrap.size && %i(sm lg).include?(bootstrap.size)
-      end
-
-      def field_offset_class(label_col_wrapper_class)
-        label_col_wrapper_class.gsub(/\bcol-(\w+)-(\d)\b/, 'offset-\1-\2')
-      end
-
-      def add_css_class!(options, css_class)
-        the_class = [options[:class], css_class].compact
-        options[:class] = the_class if the_class.present?
-      end
-
-      # def remove_css_class!(options, css_class)
-      #   the_class = options[:class].to_s.split(" ")
-      #   options[:class] = (the_class - [css_class]).compact.join(" ")
-      #   options.delete(:class) if options[:class].blank?
-      # end
-
-      private :control_specific_class, :is_size_valid?, :add_css_class!
+    private
+
+    def sanitized_tag_name(attribute, value)
+      # label's `for` attribute needs to match checkbox/radio button tag's id, IE sanitized value, IE
+      # https://github.com/rails/rails/blob/5-0-stable/actionview/lib/action_view/helpers/tags/base.rb#L123-L125
+      "#{@object_name}_#{attribute}_#{value.to_s.gsub(/\s/, "_").gsub(/[^-[[:word:]]]/, "").mb_chars.downcase}"
+    end
+
+    def field_offset_class(label_col_wrapper_class)
+      label_col_wrapper_class.gsub(/\bcol-(\w+)-(\d)\b/, 'offset-\1-\2')
+    end
+
+    def add_css_class!(options, css_class)
+      the_class = [options[:class], css_class].compact
+      options[:class] = the_class if the_class.present?
+    end
+
+    def control_specific_class(field_tag_name)
+      "rails-bootstrap-forms-#{field_tag_name.to_s.tr("_", "-")}"
+    end
+
+    def is_size_valid?(bootstrap)
+      bootstrap.size && %i(sm lg).include?(bootstrap.size)
     end
   end
 end

data/lib/rails_bootstrap_form/input_group_builder.rb

@@ -6,58 +6,55 @@ module RailsBootstrapForm
   module InputGroupBuilder
     extend ActiveSupport::Concern
 
-    def self.included(base_class)
-      def input_group_wrapper(attribute, bootstrap, &block)
-        input = capture(&block) || ActiveSupport::SafeBuffer.new
+    private
 
-        if input_group_required?(bootstrap)
-          prepend = attach_input(bootstrap, :prepend)
-          append = attach_input(bootstrap, :append)
+    def input_group_wrapper(attribute, bootstrap, &block)
+      input = capture(&block) || ActiveSupport::SafeBuffer.new
 
-          input = prepend + input + append
-          input += generate_error(attribute)
+      if input_group_required?(bootstrap)
+        prepend = attach_input(bootstrap, :prepend)
+        append = attach_input(bootstrap, :append)
 
-          input = tag.div(input, class: input_group_classes(attribute, bootstrap))
-        else
-          input += generate_error(attribute)
-        end
+        input = prepend + input + append
+        input += generate_error(attribute)
 
-        input
+        input = tag.div(input, class: input_group_classes(attribute, bootstrap))
+      else
+        input += generate_error(attribute)
       end
 
-      def input_group_classes(attribute, bootstrap)
-        classes = Array("input-group") << bootstrap.additional_input_group_class
-        if is_size_valid?(bootstrap)
-          classes << "input-group-#{bootstrap.size}"
-        end
-        # Require `has-validation` class if field has errors.
-        classes << "has-validation" if is_invalid?(attribute)
-        classes.flatten.compact
-      end
+      input
+    end
 
-      def attach_input(bootstrap, key)
-        tags = [*bootstrap.send(key)].map do |item|
-          input_group_content(item)
-        end
+    def input_group_classes(attribute, bootstrap)
+      classes = Array("input-group") << bootstrap.additional_input_group_class
+      if is_size_valid?(bootstrap)
+        classes << "input-group-#{bootstrap.size}"
+      end
+      # Require `has-validation` class if field has errors.
+      classes << "has-validation" if is_invalid?(attribute)
+      classes.flatten.compact
+    end
 
-        ActiveSupport::SafeBuffer.new(tags.join)
+    def attach_input(bootstrap, key)
+      tags = [*bootstrap.send(key)].map do |item|
+        input_group_content(item)
       end
 
-      def input_group_content(content)
-        return content if /button|submit/.match?(content)
+      ActiveSupport::SafeBuffer.new(tags.join)
+    end
 
-        tag.span(content.html_safe, class: "input-group-text")
-      end
+    def input_group_content(content)
+      return content if /button|submit/.match?(content)
 
-      def input_group_required?(bootstrap)
-        [
-          bootstrap.prepend,
-          bootstrap.append
-        ].any?(&:present?)
-      end
+      tag.span(content.html_safe, class: "input-group-text")
+    end
 
-      private :input_group_wrapper, :input_group_classes, :attach_input,
-              :input_group_content, :input_group_required?
+    def input_group_required?(bootstrap)
+      [
+        bootstrap.prepend,
+        bootstrap.append
+      ].any?(&:present?)
     end
   end
 end

data/lib/rails_bootstrap_form/inputs/base.rb

@@ -12,22 +12,8 @@ module RailsBootstrapForm
           inputs = ActiveSupport::SafeBuffer.new
 
           collection.each do |object|
-            value = object.send(value_method)
-
-            input_options = {
-              bootstrap: {
-                label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method),
-                inline: (bootstrap.inline? || bootstrap.layout_inline?)
-              },
-              required: false,
-              id: sanitized_tag_name(attribute, value)
-            }.deep_merge!(options)
-
-            if (checked = input_options[:checked])
-              input_options[:checked] = collection_input_checked?(checked, object, value)
-            end
-
-            input_value = value_method.respond_to?(:call) ? value_method.call(object) : value
+            input_options = build_input_options(object, attribute, value_method, text_method, bootstrap, options)
+            input_value = resolve_input_value(object, value_method)
 
             inputs << yield(attribute, input_value, input_options)
           end
@@ -66,6 +52,36 @@ module RailsBootstrapForm
           end
         end
       end
+
+      private
+
+      def build_input_options(object, attribute, value_method, text_method, bootstrap, options)
+        input_options = {
+          bootstrap: {
+            label_text: resolve_label_text(text_method, object),
+            inline: (bootstrap.inline? || bootstrap.layout_inline?)
+          },
+          required: false,
+          id: sanitized_tag_name(attribute, object.send(value_method))
+        }.deep_merge!(options)
+
+        input_options[:checked] = resolve_checked_option(input_options[:checked], object, value_method)
+
+        input_options
+      end
+
+      def resolve_label_text(text_method, object)
+        text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method)
+      end
+
+      def resolve_input_value(object, value_method)
+        value_method.respond_to?(:call) ? value_method.call(object) : object.send(value_method)
+      end
+
+      def resolve_checked_option(checked_option, object, value_method)
+        return collection_input_checked?(checked_option, object, object.send(value_method)) if checked_option
+        false
+      end
     end
   end
 end

data/lib/rails_bootstrap_form/inputs/check_box.rb

@@ -12,20 +12,10 @@ module RailsBootstrapForm
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
-          check_box_html = tag.div(class: choice_wrapper_classes(bootstrap)) do
-            concat(bootstrap_check_box(attribute, checked_value, options, bootstrap))
-            concat(help_text(attribute, bootstrap))
-            concat(generate_error(attribute)) if is_invalid?(attribute)
-          end
+          check_box_html = build_check_box_html(attribute, checked_value, bootstrap, options)
 
           if bootstrap.wrapper
-            tag.div(**field_wrapper_options(bootstrap)) do
-              if bootstrap.layout_horizontal?
-                tag.div(class: choice_container_classes(bootstrap)) { check_box_html }
-              else
-                check_box_html
-              end
-            end
+            build_wrapped_check_box_html(bootstrap, check_box_html)
           else
             check_box_html
           end

data/lib/rails_bootstrap_form/inputs/radio_button.rb

@@ -12,20 +12,10 @@ module RailsBootstrapForm
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
-          radio_button_html = tag.div(class: choice_wrapper_classes(bootstrap)) do
-            concat(bootstrap_radio_button(attribute, value, options, bootstrap))
-            concat(help_text(attribute, bootstrap))
-            concat(generate_error(attribute)) if is_invalid?(attribute)
-          end
+          radio_button_html = build_radio_button_html(attribute, value, bootstrap, options)
 
           if bootstrap.wrapper
-            tag.div(**field_wrapper_options(bootstrap)) do
-              if bootstrap.layout_horizontal?
-                tag.div(class: choice_container_classes(bootstrap)) { radio_button_html }
-              else
-                radio_button_html
-              end
-            end
+            build_wrapped_radio_button_html(bootstrap, radio_button_html)
           else
             radio_button_html
           end

data/lib/rails_bootstrap_form/version.rb

@@ -3,6 +3,6 @@
 # -*- warn_indent: true -*-
 
 module RailsBootstrapForm
-  VERSION = "0.9.7".freeze
+  VERSION = "0.9.9".freeze
   REQUIRED_RAILS_VERSION = "~> 7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-26 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
@@ -60,6 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".rspec"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md