rails_bootstrap_form 0.5.3 → 0.6.1

data/lib/rails_bootstrap_form/inputs/text_area.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module TextArea
+      extend ActiveSupport::Concern
+
+      included do
+        bootstrap_field :text_area
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs/text_field.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module TextField
+      extend ActiveSupport::Concern
+
+      included do
+        bootstrap_field :text_field
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs/time_field.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module TimeField
+      extend ActiveSupport::Concern
+
+      included do
+        bootstrap_field :time_field
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs/time_select.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module TimeSelect
+      extend ActiveSupport::Concern
+
+      included do
+        bootstrap_select_group :time_select
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs/time_zone_select.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module TimeZoneSelect
+      extend ActiveSupport::Concern
+
+      included do
+        def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
+          options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
+
+          field_wrapper_builder(attribute, options, html_options) do
+            super(attribute, priority_zones, options, html_options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs/url_field.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module UrlField
+      extend ActiveSupport::Concern
+
+      included do
+        bootstrap_field :url_field
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs/week_field.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+module RailsBootstrapForm
+  module Inputs
+    module WeekField
+      extend ActiveSupport::Concern
+
+      included do
+        bootstrap_field :week_field
+      end
+    end
+  end
+end

data/lib/rails_bootstrap_form/inputs.rb

@@ -4,219 +4,72 @@
 
 module RailsBootstrapForm
   module Inputs
-
     extend ActiveSupport::Autoload
 
     autoload :Base
+    autoload :CheckBox
+    autoload :CollectionCheckBoxes
+    autoload :CollectionRadioButtons
+    autoload :CollectionSelect
+    autoload :ColorField
+    autoload :DateField
+    autoload :DateSelect
+    autoload :DatetimeField
+    autoload :DatetimeLocalField
+    autoload :DatetimeSelect
+    autoload :EmailField
+    autoload :FileField
+    autoload :GroupedCollectionSelect
+    autoload :HiddenField
+    autoload :MonthField
+    autoload :NumberField
+    autoload :PasswordField
+    autoload :PhoneField
+    autoload :RadioButton
+    autoload :RangeField
+    autoload :SearchField
+    autoload :Select
+    autoload :StaticField
+    autoload :TelephoneField
+    autoload :TextArea
+    autoload :TextField
+    autoload :TimeField
+    autoload :TimeSelect
+    autoload :TimeZoneSelect
+    autoload :UrlField
+    autoload :WeekField
 
     include Base
-
-    FIELD_HELPERS = %i[
-      text_field
-      url_field
-      search_field
-      telephone_field
-      number_field
-      email_field
-      file_field
-      phone_field
-      password_field
-      text_area
-      date_field
-      time_field
-      datetime_field
-      datetime_local_field
-      month_field
-      week_field
-    ].freeze
-
-    DATE_SELECT_HELPERS = %i[
-      date_select
-      time_select
-      datetime_select
-    ].freeze
-
-    FIELD_HELPERS.each do |field_tag_name|
-      define_method(field_tag_name) do |attribute, options = {}|
-        field_wrapper_builder(attribute, options) do
-          super(attribute, options)
-        end
-      end
-    end
-
-    DATE_SELECT_HELPERS.each do |field_tag_name|
-      define_method(field_tag_name) do |attribute, options = {}, html_options = {}|
-        options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
-
-        field_wrapper_builder(attribute, options, html_options) do
-          tag.div(class: control_specific_class(field_tag_name)) do
-            super(attribute, options, html_options)
-          end
-        end
-      end
-    end
-
-    def select(attribute, choices = nil, options = {}, html_options = {}, &block)
-      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
-
-      field_wrapper_builder(attribute, options, html_options) do
-        super(attribute, choices, options, html_options, &block)
-      end
-    end
-
-    def collection_select(attribute, collection, value_method, text_method, options = {}, html_options = {})
-      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
-
-      field_wrapper_builder(attribute, options, html_options) do
-        super(attribute, collection, value_method, text_method, options, html_options)
-      end
-    end
-
-    def grouped_collection_select(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
-
-      field_wrapper_builder(attribute, options, html_options) do
-        super(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
-      end
-    end
-
-    def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
-      options = {bootstrap_form: {field_class: "form-select"}}.deep_merge!(options)
-
-      field_wrapper_builder(attribute, options, html_options) do
-        super(attribute, priority_zones, options, html_options)
-      end
-    end
-
-    def range_field(attribute, options = {})
-      options = {bootstrap_form: {field_class: "form-range"}}.deep_merge!(options)
-
-      field_wrapper_builder(attribute, options) do
-        super(attribute, options)
-      end
-    end
-
-    def color_field(attribute, options = {})
-      options = {bootstrap_form: {field_class: "form-control form-control-color"}}.deep_merge!(options)
-
-      field_wrapper_builder(attribute, options) do
-        super(attribute, options)
-      end
-    end
-
-    def hidden_field(attribute, options = {})
-      options[:value] = object.send(attribute) unless options.key?(:value)
-
-      super(attribute, options)
-    end
-
-    def static_field(*args)
-      options = args.extract_options!
-      attribute = args.first
-
-      static_options = options.merge(
-        readonly: true,
-        disabled: true,
-        bootstrap_form: {
-          field_class: bootstrap_form_options.static_field_class
-        }
-      )
-
-      static_options[:value] = object.send(attribute) unless options.key?(:value)
-
-      text_field(attribute, static_options)
-    end
-
-    def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0", &block)
-      bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap_form))
-
-      options[:class] = check_box_classes(attribute, options)
-
-      check_box_field = super(attribute, options, checked_value, unchecked_value)
-      check_box_help_text = help_text(attribute, bootstrap_options)
-
-      check_box_label = check_box_label(attribute, checked_value, options, bootstrap_options, &block)
-
-      check_box_html = tag.div(**check_box_wrapper_options(bootstrap_options)) do
-        concat(check_box_field)
-        concat(check_box_label)
-        concat(check_box_help_text) unless bootstrap_options.inline?
-        concat(generate_error(attribute)) if is_invalid?(attribute) && !bootstrap_options.inline?
-      end
-
-      check_box_html
-    end
-
-    def radio_button(attribute, value, options = {})
-      bootstrap_options = bootstrap_form_options.scoped(options.delete(:bootstrap_form))
-
-      options[:class] = radio_button_classes(attribute, options)
-
-      radio_button_field = super(attribute, value, options)
-      radio_button_help_text = help_text(attribute, bootstrap_options)
-
-      radio_button_label = radio_button_label(attribute, value, options, bootstrap_options)
-
-      radio_button_html = tag.div(**radio_button_wrapper_options(bootstrap_options)) do
-        concat(radio_button_field)
-        concat(radio_button_label)
-        concat(radio_button_help_text) unless bootstrap_options.inline?
-        concat(generate_error(attribute)) if is_invalid?(attribute) && !bootstrap_options.inline?
-      end
-
-      radio_button_html
-    end
-
-    def collection_check_boxes(attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
-      options[:multiple] = true
-
-      inputs = ActiveSupport::SafeBuffer.new
-
-      collection.each do |object|
-        input_value = value_method.respond_to?(:call) ? value_method.call(object) : object.send(value_method)
-        input_options = {
-          bootstrap_form: {
-            label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method)
-          }
-        }.deep_merge!(options)
-
-        inputs << check_box(attribute, input_options, input_value, nil)
-      end
-
-      if options.delete(:include_hidden) { true }
-        inputs.prepend hidden_field(attribute, value: "", multiple: true)
-      end
-
-      field_wrapper_builder(attribute, options, html_options) do
-        concat(tag.div(class: control_specific_class(:collection_check_boxes)) do
-          concat(inputs)
-        end)
-      end
-    end
-
-    def collection_radio_buttons(attribute, collection, value_method, text_method, options = {}, html_options = {}, &block)
-      inputs = ActiveSupport::SafeBuffer.new
-
-      collection.each do |object|
-        input_value = value_method.respond_to?(:call) ? value_method.call(object) : object.send(value_method)
-        input_options = {
-          bootstrap_form: {
-            label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method)
-          }
-        }.deep_merge!(options)
-
-        if (checked = input_options[:checked])
-          input_options[:checked] = collection_input_checked?(checked, object, object.send(value_method))
-        end
-
-        inputs << radio_button(attribute, input_value, input_options)
-      end
-
-      field_wrapper_builder(attribute, options, html_options) do
-        concat(tag.div(class: control_specific_class(:collection_radio_buttons)) do
-          concat(inputs)
-        end)
-      end
-    end
+    include CheckBox
+    include CollectionCheckBoxes
+    include CollectionRadioButtons
+    include CollectionSelect
+    include ColorField
+    include DateField
+    include DateSelect
+    include DatetimeField
+    include DatetimeLocalField
+    include DatetimeSelect
+    include EmailField
+    include FileField
+    include GroupedCollectionSelect
+    include HiddenField
+    include MonthField
+    include NumberField
+    include PasswordField
+    include PhoneField
+    include RadioButton
+    include RangeField
+    include SearchField
+    include Select
+    include StaticField
+    include TelephoneField
+    include TextArea
+    include TextField
+    include TimeField
+    include TimeSelect
+    include TimeZoneSelect
+    include UrlField
+    include WeekField
   end
 end

data/lib/rails_bootstrap_form/version.rb

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

data/lib/rails_bootstrap_form.rb

@@ -13,16 +13,17 @@ module RailsBootstrapForm
     autoload :Configuration
     autoload :BootstrapFormOptions
     autoload :BootstrapFormBuilder
-    autoload :Components
     autoload :FieldWrapperBuilder
     autoload :InputGroupBuilder
     autoload :Inputs
+    autoload :Helpers
   end
 
   class << self
     def eager_load!
       super
-      RailsBootstrapForm::Components.eager_load!
+      RailsBootstrapForm::Helpers.eager_load!
+      RailsBootstrapForm::Inputs.eager_load!
     end
 
     def config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-21 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: Rails form helpers and form builder extensions that make it super easy
   to build Bootstrap 5 forms.
 email:
@@ -65,6 +93,7 @@ files:
 - demo/app/views/layouts/application.html.erb
 - demo/app/views/users/_form.html.erb
 - demo/app/views/users/_form_without_bootstrap_helpers.html.erb
+- demo/app/views/users/_horizontal_form.html.erb
 - demo/app/views/users/_vertical_form.html.erb
 - demo/app/views/users/edit.html.erb
 - demo/app/views/users/index.html.erb
@@ -110,19 +139,50 @@ files:
 - lib/rails_bootstrap_form/action_view_extensions/bootstrap_form_helper.rb
 - lib/rails_bootstrap_form/bootstrap_form_builder.rb
 - lib/rails_bootstrap_form/bootstrap_form_options.rb
-- lib/rails_bootstrap_form/components.rb
-- lib/rails_bootstrap_form/components/check_box.rb
-- lib/rails_bootstrap_form/components/errors.rb
-- lib/rails_bootstrap_form/components/help_text.rb
-- lib/rails_bootstrap_form/components/labels.rb
-- lib/rails_bootstrap_form/components/radio_button.rb
-- lib/rails_bootstrap_form/components/required_field.rb
 - lib/rails_bootstrap_form/configuration.rb
 - lib/rails_bootstrap_form/engine.rb
 - lib/rails_bootstrap_form/field_wrapper_builder.rb
+- lib/rails_bootstrap_form/helpers.rb
+- lib/rails_bootstrap_form/helpers/check_box.rb
+- lib/rails_bootstrap_form/helpers/errors.rb
+- lib/rails_bootstrap_form/helpers/help_text.rb
+- lib/rails_bootstrap_form/helpers/labels.rb
+- lib/rails_bootstrap_form/helpers/radio_button.rb
+- lib/rails_bootstrap_form/helpers/required_field.rb
 - lib/rails_bootstrap_form/input_group_builder.rb
 - lib/rails_bootstrap_form/inputs.rb
 - lib/rails_bootstrap_form/inputs/base.rb
+- lib/rails_bootstrap_form/inputs/check_box.rb
+- lib/rails_bootstrap_form/inputs/collection_check_boxes.rb
+- lib/rails_bootstrap_form/inputs/collection_radio_buttons.rb
+- lib/rails_bootstrap_form/inputs/collection_select.rb
+- lib/rails_bootstrap_form/inputs/color_field.rb
+- lib/rails_bootstrap_form/inputs/date_field.rb
+- lib/rails_bootstrap_form/inputs/date_select.rb
+- lib/rails_bootstrap_form/inputs/datetime_field.rb
+- lib/rails_bootstrap_form/inputs/datetime_local_field.rb
+- lib/rails_bootstrap_form/inputs/datetime_select.rb
+- lib/rails_bootstrap_form/inputs/email_field.rb
+- lib/rails_bootstrap_form/inputs/file_field.rb
+- lib/rails_bootstrap_form/inputs/grouped_collection_select.rb
+- lib/rails_bootstrap_form/inputs/hidden_field.rb
+- lib/rails_bootstrap_form/inputs/month_field.rb
+- lib/rails_bootstrap_form/inputs/number_field.rb
+- lib/rails_bootstrap_form/inputs/password_field.rb
+- lib/rails_bootstrap_form/inputs/phone_field.rb
+- lib/rails_bootstrap_form/inputs/radio_button.rb
+- lib/rails_bootstrap_form/inputs/range_field.rb
+- lib/rails_bootstrap_form/inputs/search_field.rb
+- lib/rails_bootstrap_form/inputs/select.rb
+- lib/rails_bootstrap_form/inputs/static_field.rb
+- lib/rails_bootstrap_form/inputs/telephone_field.rb
+- lib/rails_bootstrap_form/inputs/text_area.rb
+- lib/rails_bootstrap_form/inputs/text_field.rb
+- lib/rails_bootstrap_form/inputs/time_field.rb
+- lib/rails_bootstrap_form/inputs/time_select.rb
+- lib/rails_bootstrap_form/inputs/time_zone_select.rb
+- lib/rails_bootstrap_form/inputs/url_field.rb
+- lib/rails_bootstrap_form/inputs/week_field.rb
 - lib/rails_bootstrap_form/version.rb
 - sig/rails_bootstrap_form.rbs
 homepage: https://github.com/shivam091/rails_bootstrap_form
@@ -132,7 +192,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/shivam091/rails_bootstrap_form
   source_code_uri: https://github.com/shivam091/rails_bootstrap_form
-  changelog_uri: https://github.com/shivam091/rails_bootstrap_form/CHANGELOG.md
+  changelog_uri: https://github.com/shivam091/rails_bootstrap_form/blob/main/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/rails_bootstrap_form/components.rb

@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-# -*- frozen_string_literal: true -*-
-# -*- warn_indent: true -*-
-
-module RailsBootstrapForm
-  module Components
-    extend ActiveSupport::Autoload
-
-    autoload :HelpText
-    autoload :Labels
-    autoload :RequiredField
-    autoload :Errors
-    autoload :CheckBox
-    autoload :RadioButton
-
-    include HelpText
-    include Labels
-    include RequiredField
-    include Errors
-    include CheckBox
-    include RadioButton
-  end
-end