rails_bootstrap_form 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c769ec63a2b3c1a8abaeaa8f8a8d11f7b473e71c69d7eb4fda3a4d200b9106e7
-  data.tar.gz: a477abf8d26482d15d9eb6a1a4dae62be453823def408d9958961945d81cfe97
+  metadata.gz: c71affc7b54a85ee1b7d1515c5124e1c337470bb1ccb16bb22b82b9f56342d84
+  data.tar.gz: dc88fb2396c94e92cb9516f1b65ba8e03c1e768f1c337241a74177227d7c497a
 SHA512:
-  metadata.gz: 6394304b9d69627c1032d8392a6cb586964f9dce3e0d948aeaf0854303ae222f26f9a357e4df40f41c4f42e4d381140d27cf3cb65b2d1582c2a0f8400895be72
-  data.tar.gz: fb8f1d8a37574de977551917b2e0b1577c2240d6443f48e7ac9d65fff3ca97939eaea6c97f54e88eb5d1322aed18c4336b4d6f440594b8089372d5185013ef6d
+  metadata.gz: 20e03576472e57b9d643eaa6b433a0cddb7e219271d14978de48b1175ce9b06422442240c9027719061b4e499b48a080010a9bca9deeb4bba34b013675bf7e91
+  data.tar.gz: b0038b7c98be63e6b97a2b256aa2a733d30241349f534312ec2222e40923824bf5c4e765d8946965ca03198640e4b41dc9ed02c05738522aca6f78b651cedf59

data/CHANGELOG.md

@@ -4,6 +4,27 @@ You can find recent releases with docs in GitHub:
 
 https://github.com/shivam091/rails_bootstrap_form/releases
 
+## [0.9.6](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.5...v0.9.6) - 2023-06-25
+
+### What's new
+
+- Integrated `importmap` and `actiontext` in demo application for demonstrating implementation of `rich_text_area`.
+- Added spec examples for `date_field`, `datetime_field`, `datetime_local_field`, `datetime_select`, `email_field`,
+  `file_field`, `hidden_field`, `month_field`, `number_field`, `password_field`, `phone_field`, `search_field`,
+  `telephone_field`, `text_area`, `time_field`, `time_select`, `url_field`, and `week_field` helpers.
+
+## [0.9.5](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.4...v0.9.5) - 2023-06-21
+
+### What's changed
+
+- Changed default value of `field_class` option to `nil`.
+
+### What's fixed
+
+- Fixed static field options to accept bootstrap options ([#45](https://github.com/shivam091/rails_bootstrap_form/issues/45))
+- Changes to allow overriding of field_class at form and field level ([#44](https://github.com/shivam091/rails_bootstrap_form/issues/44))
+- Fixed bug causing class attribute in select list to not get added to field ([#46](https://github.com/shivam091/rails_bootstrap_form/issues/46))
+
 ## [0.9.4](https://github.com/shivam091/rails_bootstrap_form/compare/v0.9.3...v0.9.4) - 2023-06-17
 
 ### What's new

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_bootstrap_form (0.9.4)
+    rails_bootstrap_form (0.9.6)
       actionpack (~> 7.0)
       activemodel (~> 7.0)
 
@@ -98,6 +98,9 @@ GEM
       activesupport (>= 5.0)
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
+    importmap-rails (1.2.1)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     loofah (2.21.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -213,6 +216,7 @@ DEPENDENCIES
   byebug
   compare-xml
   generator_spec
+  importmap-rails (~> 1.2)
   nokogiri
   pg (~> 1.1)
   puma

data/README.md

@@ -28,7 +28,7 @@ for setting up `application.scss` and `application.js`.
 Add the `rails_bootstrap_form` gem to your `Gemfile`:
 
 ```ruby
-gem "rails_bootstrap_form", "~> 0.9.4"
+gem "rails_bootstrap_form", "~> 0.9.6"
 ```
 
 Then:
@@ -154,13 +154,13 @@ This generates the following HTML:
 
 ## Bootstrap Configuration Options
 
-Here's a list of all possible options you can pass via `bootstrap` option that can be attached to the `bootstrap_form_for` or `bootstrap_form_with` or any field helpers inside of it:
+Here's a list of all possible options you can pass via `bootstrap` option that can be attached to the `bootstrap_form_for`, `bootstrap_form_with`, `fields_for`, or any field helpers inside of it:
 
 | Option | Description | Default value |
 | ------ | ------------- | ----------- |
 | `disabled` | An option to disable **rails_bootstrap_form** helpers. Default rails form builder element is rendered when set to `true` | `false` |
 | `layout` | Controls layout of form and field helpers. It can be `vertical` `horizontal`, or `inline`. | `vertical` |
-| `field_class` | A CSS class that will be applied to all form fields. | `form-control` |
+| `field_class` | A CSS class that will be applied to all form fields. | `nil` |
 | `help_text` | Describes help text for the HTML field. Help text is automatically read from translation file. If you want to customize it, you can pass a string. You can also set it `false` if you do not want help text displayed. | `nil` |
 | `label_text` | An option to customize automatically generated label text. | `nil` |
 | `skip_label` | An option to control whether the label is to be displayed or not. | `false` |
@@ -176,7 +176,7 @@ Here's a list of all possible options you can pass via `bootstrap` option that c
 | `switch` | An option to control whether the check box should look like Bootstrap switches. | `false` |
 | `wrapper` | An option to control the HTML attributes and options that will be added to a field wrapper. You can set it false if you don't the field to be rendered in a wrapper. | `{}` |
 | `size` | An option to control the size of input groups, buttons, labels, and fields. It can be `sm` or `lg`. | `nil` |
-| `inline` | An option to group checkboxes and radio buttons on the same horizontal row. | `false` |
+| `inline` | An option to group checkboxes and radio buttons on the same horizontal row. If form layout is `inline`, this option doesn't get considered. | `false` |
 | `label_col_class` | A CSS class that will be applied to all labels when layout is `horizontal`. | `col-form-label` |
 | `label_col_wrapper_class` | A CSS class for label column when layout is `horizontal`. | `col-sm-2` |
 | `field_col_wrapper_class` | A CSS class for field column when layout is `horizontal`. | `col-sm-10` |
@@ -322,7 +322,7 @@ time_field                   time_select                  time_zone_select
 url_field                    week_field                   weekday_select
 ```
 
-## Supported form layouts
+## Supported Form Layouts
 
 ### Vertical Layout
 
@@ -1030,6 +1030,8 @@ This generates the following HTML:
 </form>
 ```
 
+Options specified at the field level take precedence over those specified at the fields_for level, which take precedence over those specified at the form level.
+
 ### file_field
 
 Our `file_field` helper accepts the same arguments as the [default Rails helper](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-file_field).
@@ -1190,6 +1192,64 @@ This generates the following HTML:
 </div>
 ```
 
+### rich_text_area
+
+Our `rich_text_area` helper accepts the same arguments as the [default Rails helper](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-rich_text_area). This editor is also known as `Trix Editor`.
+
+![rich_text_area](https://github.com/shivam091/rails_bootstrap_form/assets/7858927/e845ee05-79f2-4352-899e-f93decc9b16b)
+
+```erb
+<%= form.rich_text_area :life_story %>
+```
+
+This generates the following HTML:
+
+```html
+<div class="mb-3">
+  <label class="form-label" for="user_life_story">Life story</label>
+  <input type="hidden" name="user[life_story]" id="user_life_story_trix_input_user" autocomplete="off">
+  <trix-toolbar id="trix-toolbar-1">
+    <div class="trix-button-row">
+      <span class="trix-button-group trix-button-group--text-tools" data-trix-button-group="text-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-bold" data-trix-attribute="bold" data-trix-key="b" title="Bold" tabindex="-1">Bold</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-italic" data-trix-attribute="italic" data-trix-key="i" title="Italic" tabindex="-1">Italic</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-strike" data-trix-attribute="strike" title="Strikethrough" tabindex="-1">Strikethrough</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-link" data-trix-attribute="href" data-trix-action="link" data-trix-key="k" title="Link" tabindex="-1">Link</button>
+      </span>
+      <span class="trix-button-group trix-button-group--block-tools" data-trix-button-group="block-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-heading-1" data-trix-attribute="heading1" title="Heading" tabindex="-1">Heading</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-quote" data-trix-attribute="quote" title="Quote" tabindex="-1">Quote</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-code" data-trix-attribute="code" title="Code" tabindex="-1">Code</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-bullet-list" data-trix-attribute="bullet" title="Bullets" tabindex="-1">Bullets</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-number-list" data-trix-attribute="number" title="Numbers" tabindex="-1">Numbers</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-decrease-nesting-level" data-trix-action="decreaseNestingLevel" title="Decrease Level" tabindex="-1">Decrease Level</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-increase-nesting-level" data-trix-action="increaseNestingLevel" title="Increase Level" tabindex="-1">Increase Level</button>
+      </span>
+      <span class="trix-button-group trix-button-group--file-tools" data-trix-button-group="file-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-attach" data-trix-action="attachFiles" title="Attach Files" tabindex="-1">Attach Files</button>
+      </span>
+      <span class="trix-button-group-spacer"></span>
+      <span class="trix-button-group trix-button-group--history-tools" data-trix-button-group="history-tools">
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-undo" data-trix-action="undo" data-trix-key="z" title="Undo" tabindex="-1">Undo</button>
+        <button type="button" class="trix-button trix-button--icon trix-button--icon-redo" data-trix-action="redo" data-trix-key="shift+z" title="Redo" tabindex="-1">Redo</button>
+      </span>
+    </div>
+    <div class="trix-dialogs" data-trix-dialogs="">
+      <div class="trix-dialog trix-dialog--link" data-trix-dialog="href" data-trix-dialog-attribute="href">
+        <div class="trix-dialog__link-fields">
+          <input type="url" name="href" class="trix-input trix-input--dialog" placeholder="Enter a URL…" aria-label="URL" required="" data-trix-input="" disabled="disabled">
+          <div class="trix-button-group">
+            <input type="button" class="trix-button trix-button--dialog" value="Link" data-trix-method="setAttribute">
+            <input type="button" class="trix-button trix-button--dialog" value="Unlink" data-trix-method="removeAttribute">
+          </div>
+        </div>
+      </div>
+    </div>
+  </trix-toolbar>
+  <trix-editor class="trix-content form-control" id="user_life_story" input="user_life_story_trix_input_user" data-direct-upload-url="http://test.host/rails/active_storage/direct_uploads" data-blob-url-template="http://test.host/rails/active_storage/blobs/redirect/:signed_id/:filename" contenteditable="" role="textbox" aria-label="Life story Life story" trix-id="1" toolbar="trix-toolbar-1"></trix-editor>
+</div>
+```
+
 ### search_field
 
 Our `search_field` helper accepts the same arguments as the [default Rails helper](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-search_field).
@@ -1488,12 +1548,12 @@ This generates the following HTML:
 ### collection_check_boxes
 
 This helper provides a way to create collection of check boxes. This helper accepts same arguments as [default Rails helper](https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_check_boxes) except it don't accept a `block` as
-an argument and takes care of rendering labels, check boxes, and wrapper for you.
+an argument and takes care of rendering labels, check boxes, and wrapper for you. `collection_check_boxes` are rendered by default for multiple option selections, but you can turn them into single selections by passing `options[:multiple] = false`.
 
 ![collection_check_boxes](https://github.com/shivam091/rails_bootstrap_form/assets/7858927/c92f5921-e572-4384-812e-31308e018f66)
 
 ```erb
-<%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {multiple: true, bootstrap: {layout: :horizontal, inline: true}, onchange: "this.form.submit();"}, {} %>
+<%= form.collection_check_boxes :skill_ids, ::Skill.all, :id, :name, {bootstrap: {layout: :horizontal, inline: true}, onchange: "this.form.submit();"}, {} %>
 ```
 
 This generates the following HTML:

data/demo/app/assets/config/manifest.js

@@ -1 +1,2 @@
 //= link_directory ../stylesheets .css
+//= link_tree ../../javascript .js

data/demo/app/assets/stylesheets/actiontext.scss

@@ -0,0 +1,36 @@
+//
+// Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+// the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+// inclusion directly in any other asset bundle and remove this file.
+//
+@import "trix";
+
+// We need to override trix.css’s image gallery styles to accommodate the
+// <action-text-attachment> element we wrap around attachments. Otherwise,
+// images in galleries will be squished by the max-width: 33%; rule.
+.trix-content {
+  .attachment-gallery {
+    > action-text-attachment,
+    > .attachment {
+      flex: 1 0 33%;
+      padding: 0 0.5em;
+      max-width: 33%;
+    }
+
+    &.attachment-gallery--2,
+    &.attachment-gallery--4 {
+      > action-text-attachment,
+      > .attachment {
+        flex-basis: 50%;
+        max-width: 50%;
+      }
+    }
+  }
+
+  action-text-attachment {
+    .attachment {
+      padding: 0 !important;
+      max-width: 100% !important;
+    }
+  }
+}

data/demo/app/assets/stylesheets/application.scss

@@ -1,3 +1,4 @@
 @charset "utf-8";
 @import "bootstrap";
-@import "rails_bootstrap_form"
+@import "actiontext";
+@import "rails_bootstrap_form";

data/demo/app/controllers/users_controller.rb

@@ -60,6 +60,7 @@ class UsersController < ApplicationController
       :interview_datetime,
       :weekly_off,
       :gender,
+      :life_story,
       skill_ids: [],
       address_attributes: [
         :street,

data/demo/app/javascript/application.js

@@ -0,0 +1,2 @@
+import "trix";
+import "@rails/actiontext";

data/demo/app/models/address.rb

@@ -3,7 +3,7 @@
 # -*- warn_indent: true -*-
 
 class Address < ApplicationRecord
-  validates :street, :city, :country_id, presence: true
+  validates :street, :city, presence: true
 
   belongs_to :user
   belongs_to :country

data/demo/app/models/user.rb

@@ -6,6 +6,10 @@ class User < ApplicationRecord
 
   attr_accessor :remember_me
 
+  has_rich_text :life_story
+
+  has_one_attached :avatar, dependent: :purge_later
+
   validates :name, presence: true, length: {in: 2..50}
   validates :terms, acceptance: true
   validates :email,

data/demo/app/views/active_storage/blobs/_blob.html.erb

@@ -0,0 +1,14 @@
+<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
+  <% if blob.representable? %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+  <% end %>
+
+  <figcaption class="attachment__caption">
+    <% if caption = blob.try(:caption) %>
+      <%= caption %>
+    <% else %>
+      <span class="attachment__name"><%= blob.filename %></span>
+      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
+    <% end %>
+  </figcaption>
+</figure>

data/demo/app/views/layouts/action_text/contents/_content.html.erb

@@ -0,0 +1,3 @@
+<div class="trix-content">
+  <%= yield -%>
+</div>

data/demo/app/views/layouts/application.html.erb

@@ -6,6 +6,7 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <%= stylesheet_link_tag "application" %>
+    <%= javascript_importmap_tags %>
   </head>
   <body>
     <div class="container-fluid p-3">

data/demo/app/views/users/_horizontal_form.html.erb

@@ -9,6 +9,7 @@
       <%= form.email_field :email, autocomplete: "new-email" %>
       <%= form.password_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
+      <%= form.file_field :avatar %>
       <%= form.date_field :birth_date %>
       <%= form.range_field :excellence %>
       <%= form.url_field :blog_url %>
@@ -20,6 +21,7 @@
       <%= form.time_select :interview_time %>
       <%= form.datetime_select :interview_datetime %>
       <%= form.weekday_select :weekly_off %>
+      <%= form.rich_text_area :life_story %>
       <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>

data/demo/app/views/users/_vertical_form.html.erb

@@ -9,6 +9,7 @@
       <%= form.email_field :email, autocomplete: "new-email" %>
       <%= form.password_field :password, autocomplete: "new-password" %>
       <%= form.phone_field :mobile_number %>
+      <%= form.file_field :avatar %>
       <%= form.date_field :birth_date %>
       <%= form.range_field :excellence %>
       <%= form.url_field :blog_url %>
@@ -20,6 +21,7 @@
       <%= form.time_select :interview_time %>
       <%= form.datetime_select :interview_datetime %>
       <%= form.weekday_select :weekly_off %>
+      <%= form.rich_text_area :life_story %>
       <%= form.fields_for :address, include_id: false do |address_form| %>
         <%= address_form.text_area :street %>
         <%= address_form.text_field :state %>

data/demo/bin/importmap

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+require_relative "../config/application"
+require "importmap/commands"

data/demo/config/environment.rb

@@ -7,3 +7,5 @@ require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!
+
+Rails.application.routes.default_url_options[:host] = "localhost"

data/demo/config/importmap.rb

@@ -0,0 +1,7 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+pin "trix", to: "https://ga.jspm.io/npm:trix@2.0.5/dist/trix.esm.min.js"
+pin "@rails/actiontext", to: "https://ga.jspm.io/npm:@rails/actiontext@7.0.5/app/assets/javascripts/actiontext.js"
+pin "application", preload: true

data/demo/config/locales/en.rb

@@ -35,6 +35,8 @@
           interview_datetime: "Interview date & time",
           weekly_off: "Week off",
           gender: "Gender",
+          bio: "Life story",
+          avatar: "Avatar",
         },
         user_skill: {
           user_id: "User",

data/demo/db/migrate/20230621041641_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :active_storage_blobs, id: primary_key_type do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments, id: primary_key_type do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
+      t.references :blob,     null: false, type: foreign_key_type
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records, id: primary_key_type do |t|
+      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
+      t.string :variation_digest, null: false
+
+      t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_and_foreign_key_types
+      config = Rails.configuration.generators
+      setting = config.options[config.orm][:primary_key_type]
+      primary_key_type = setting || :primary_key
+      foreign_key_type = setting || :bigint
+      [primary_key_type, foreign_key_type]
+    end
+end

data/demo/db/migrate/20230621041642_create_action_text_tables.action_text.rb

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+# -*- frozen_string_literal: true -*-
+# -*- warn_indent: true -*-
+
+# This migration comes from action_text (originally 20180528164100)
+class CreateActionTextTables < ActiveRecord::Migration[6.0]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :action_text_rich_texts, id: primary_key_type do |t|
+      t.string     :name, null: false
+      t.text       :body, size: :long
+      t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type
+
+      t.timestamps
+
+      t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true
+    end
+  end
+
+  private
+    def primary_and_foreign_key_types
+      config = Rails.configuration.generators
+      setting = config.options[config.orm][:primary_key_type]
+      primary_key_type = setting || :primary_key
+      foreign_key_type = setting || :bigint
+      [primary_key_type, foreign_key_type]
+    end
+end

data/demo/db/schema.rb

@@ -10,10 +10,48 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_05_28_041919) do
+ActiveRecord::Schema[7.0].define(version: 2023_06_21_041642) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "action_text_rich_texts", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "body"
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
+  end
+
+  create_table "active_storage_attachments", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.bigint "blob_id", null: false
+    t.datetime "created_at", null: false
+    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+  end
+
+  create_table "active_storage_blobs", force: :cascade do |t|
+    t.string "key", null: false
+    t.string "filename", null: false
+    t.string "content_type"
+    t.text "metadata"
+    t.string "service_name", null: false
+    t.bigint "byte_size", null: false
+    t.string "checksum"
+    t.datetime "created_at", null: false
+    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+  end
+
+  create_table "active_storage_variant_records", force: :cascade do |t|
+    t.bigint "blob_id", null: false
+    t.string "variation_digest", null: false
+    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+  end
+
   create_table "addresses", primary_key: "user_id", force: :cascade do |t|
     t.bigint "country_id"
     t.string "street"
@@ -84,4 +122,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_28_041919) do
     t.index ["fruit_id"], name: "index_users_on_fruit_id"
   end
 
+  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
 end

data/gemfiles/common.gemfile

@@ -12,6 +12,9 @@ gem "sprockets-rails"
 # Use Sass to process CSS
 gem "sassc-rails"
 
+# Use importmap to include JavaScript modules
+gem "importmap-rails", "~> 1.2"
+
 # Add bootstrap support
 gem "bootstrap", "~> 5.3.0.alpha3"
 

data/lib/rails_bootstrap_form/bootstrap_form_options.rb

@@ -25,7 +25,7 @@ module RailsBootstrapForm
     attr_accessor :layout
 
     # A CSS class that will be applied to all form fields.
-    # The default value is `form-control`.
+    # The default value is `nil`.
     attr_accessor :field_class
 
     # An additional CSS class that will be added along with the existing
@@ -169,12 +169,20 @@ module RailsBootstrapForm
       define_method("#{method}?") { self.send(method) }
     end
 
+    def disable_floating_labels!
+      self.floating = false
+    end
+
+    def set_field_class!(css_class)
+      self.field_class ||= css_class
+    end
+
     def set_defaults
       @disabled = false
 
       @layout = "vertical"
 
-      @field_class = "form-control"
+      @field_class = nil
       @additional_field_class = nil
 
       @help_text = nil

data/lib/rails_bootstrap_form/field_wrapper_builder.rb

@@ -72,7 +72,7 @@ module RailsBootstrapForm
     def field_css_options(attribute, bootstrap, options, html_options)
       css_options = (html_options || options)
 
-      field_classes = Array(bootstrap.field_class) << [bootstrap.additional_field_class || options[:class]]
+      field_classes = Array(bootstrap.field_class) << [bootstrap.additional_field_class || css_options[:class]]
       field_classes << "is-invalid" if is_invalid?(attribute)
       if is_size_valid?(bootstrap)
         field_classes << "#{bootstrap.field_class}-#{bootstrap.size}"

data/lib/rails_bootstrap_form/helpers/errors.rb

@@ -13,11 +13,11 @@ module RailsBootstrapForm
             has_association_error?(attribute)
         end
 
-        def input_with_error(attribute, &block)
-          input = capture(&block)
-          input << generate_error(attribute)
-          input
-        end
+        # def input_with_error(attribute, &block)
+        #   input = capture(&block)
+        #   input << generate_error(attribute)
+        #   input
+        # end
 
         def generate_error(attribute)
           if is_invalid?(attribute)
@@ -58,9 +58,8 @@ module RailsBootstrapForm
           (association.foreign_key == attribute.to_s)
         end
 
-        private :is_invalid?, :input_with_error, :generate_error,
-                :has_association_error?, :error_messages,
-                :is_belongs_to_association?, :is_association_same?
+        private :is_invalid?, :generate_error, :has_association_error?,
+                :error_messages, :is_belongs_to_association?, :is_association_same?
       end
     end
   end

data/lib/rails_bootstrap_form/inputs/base.rb

@@ -17,7 +17,7 @@ module RailsBootstrapForm
             input_options = {
               bootstrap: {
                 label_text: text_method.respond_to?(:call) ? text_method.call(object) : object.send(text_method),
-                inline: (bootstrap.inline? || bootstrap.layout_inline?) 
+                inline: (bootstrap.inline? || bootstrap.layout_inline?)
               },
               required: false,
               id: sanitized_tag_name(attribute, value)
@@ -42,6 +42,8 @@ module RailsBootstrapForm
             bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
             return super(attribute, options) if bootstrap.disabled?
 
+            bootstrap.set_field_class!("form-control")
+
             field_wrapper_builder(attribute, bootstrap, options) do
               super(attribute, options)
             end
@@ -50,11 +52,12 @@ module RailsBootstrapForm
 
         def bootstrap_select_group(tag_name)
           define_method(tag_name) do |attribute, options = {}, html_options = {}|
-            options = {bootstrap: {field_class: "form-select", floating: false}}.deep_merge!(options)
-
             bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
             return super(attribute, options, html_options) if bootstrap.disabled?
 
+            bootstrap.set_field_class!("form-select")
+            bootstrap.disable_floating_labels!
+
             field_wrapper_builder(attribute, bootstrap, options, html_options) do
               tag.fieldset(class: control_specific_class(tag_name)) do
                 super(attribute, options, html_options)

data/lib/rails_bootstrap_form/inputs/collection_check_boxes.rb

@@ -10,9 +10,12 @@ module RailsBootstrapForm
       included do
         def collection_check_boxes(attribute, collection, value_method, text_method, options = {}, html_options = {})
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          bootstrap.floating = false
           return super if bootstrap.disabled?
 
+          bootstrap.disable_floating_labels!
+
+          options[:multiple] = options.delete(:multiple) { true }
+
           inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap, options) do |attribute, value, options|
             bootstrap_opts = bootstrap_form_options.scoped(options.delete(:bootstrap))
 

data/lib/rails_bootstrap_form/inputs/collection_radio_buttons.rb

@@ -10,9 +10,10 @@ module RailsBootstrapForm
       included do
         def collection_radio_buttons(attribute, collection, value_method, text_method, options = {}, html_options = {})
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
-          bootstrap.floating = false
           return super if bootstrap.disabled?
 
+          bootstrap.disable_floating_labels!
+
           inputs = inputs_collection(attribute, collection, value_method, text_method, bootstrap, options) do |attribute, value, options|
             bootstrap_opts = bootstrap_form_options.scoped(options.delete(:bootstrap))
 

data/lib/rails_bootstrap_form/inputs/collection_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def collection_select(attribute, collection, value_method, text_method, options = {}, html_options = {})
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, collection, value_method, text_method, options, html_options)
           end

data/lib/rails_bootstrap_form/inputs/color_field.rb

@@ -9,16 +9,12 @@ module RailsBootstrapForm
 
       included do
         def color_field(attribute, options = {})
-          options = {
-            bootstrap: {
-              field_class: "form-control form-control-color",
-              floating: false
-            }
-          }.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-control form-control-color")
+          bootstrap.disable_floating_labels!
+
           field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end

data/lib/rails_bootstrap_form/inputs/grouped_collection_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def grouped_collection_select(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
           end

data/lib/rails_bootstrap_form/inputs/range_field.rb

@@ -9,11 +9,12 @@ module RailsBootstrapForm
 
       included do
         def range_field(attribute, options = {})
-          options = {bootstrap: {field_class: "form-range", floating: false}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-range")
+          bootstrap.disable_floating_labels!
+
           field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end

data/lib/rails_bootstrap_form/inputs/rich_text_area.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def rich_text_area(attribute, options = {})
-          options[:class] = ["trix-content", options[:class]].compact.join(" ")
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("trix-content form-control")
+
           field_wrapper_builder(attribute, bootstrap, options) do
             super(attribute, options)
           end

data/lib/rails_bootstrap_form/inputs/select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def select(attribute, choices = nil, options = {}, html_options = {}, &block)
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, choices, options, html_options, &block)
           end

data/lib/rails_bootstrap_form/inputs/static_field.rb

@@ -8,21 +8,19 @@ module RailsBootstrapForm
       extend ActiveSupport::Concern
 
       included do
-        def static_field(*args)
-          options = args.extract_options!
-          attribute = args.first
-
-          static_options = options.merge(
-            readonly: true,
-            disabled: true,
-            bootstrap: {
+        def static_field(attribute, options = {})
+          options.tap do |option|
+            option[:readonly] = true
+            option[:disabled] = true
+            option[:bootstrap] = {
+              floating: false,
               field_class: bootstrap_form_options.static_field_class
-            }.reverse_merge!(options.delete(:bootstrap))
-          )
+            }.reverse_merge!(options.fetch(:bootstrap, {}))
+          end
 
-          static_options[:value] = object.send(attribute) unless options.key?(:value)
+          options[:value] = object.send(attribute) unless options.key?(:value)
 
-          text_field(attribute, static_options)
+          text_field(attribute, options)
         end
       end
     end

data/lib/rails_bootstrap_form/inputs/time_zone_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def time_zone_select(attribute, priority_zones = nil, options = {}, html_options = {})
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, priority_zones, options, html_options)
           end

data/lib/rails_bootstrap_form/inputs/weekday_select.rb

@@ -9,11 +9,11 @@ module RailsBootstrapForm
 
       included do
         def weekday_select(attribute, options = {}, html_options = {}, &block)
-          options = {bootstrap: {field_class: "form-select"}}.deep_merge!(options)
-
           bootstrap = bootstrap_form_options.scoped(options.delete(:bootstrap))
           return super if bootstrap.disabled?
 
+          bootstrap.set_field_class!("form-select")
+
           field_wrapper_builder(attribute, bootstrap, options, html_options) do
             super(attribute, options, html_options, &block)
           end

data/lib/rails_bootstrap_form/version.rb

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

data/lib/rails_bootstrap_form.rb

@@ -5,6 +5,7 @@
 require "action_view"
 require "action_pack"
 require "rails_bootstrap_form/action_view_extensions/bootstrap_form_helper"
+require "#{Gem::Specification.find_by_name('actiontext').gem_dir}/app/helpers/action_text/tag_helper"
 
 module RailsBootstrapForm
   extend ActiveSupport::Autoload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Harshal LADHE (shivam091)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generator_spec
@@ -75,12 +75,14 @@ files:
 - demo/.ruby-version
 - demo/Rakefile
 - demo/app/assets/config/manifest.js
+- demo/app/assets/stylesheets/actiontext.scss
 - demo/app/assets/stylesheets/application.scss
 - demo/app/channels/application_cable/channel.rb
 - demo/app/channels/application_cable/connection.rb
 - demo/app/controllers/application_controller.rb
 - demo/app/controllers/users_controller.rb
 - demo/app/helpers/application_helper.rb
+- demo/app/javascript/application.js
 - demo/app/jobs/application_job.rb
 - demo/app/mailers/application_mailer.rb
 - demo/app/models/address.rb
@@ -91,6 +93,8 @@ files:
 - demo/app/models/skill.rb
 - demo/app/models/user.rb
 - demo/app/models/user_skill.rb
+- demo/app/views/active_storage/blobs/_blob.html.erb
+- demo/app/views/layouts/action_text/contents/_content.html.erb
 - demo/app/views/layouts/application.html.erb
 - demo/app/views/users/_form.html.erb
 - demo/app/views/users/_form_without_bootstrap_helpers.html.erb
@@ -101,6 +105,7 @@ files:
 - demo/app/views/users/index.html.erb
 - demo/app/views/users/new.html.erb
 - demo/bin/bundle
+- demo/bin/importmap
 - demo/bin/rails
 - demo/bin/rake
 - demo/bin/setup
@@ -113,6 +118,7 @@ files:
 - demo/config/environments/development.rb
 - demo/config/environments/production.rb
 - demo/config/environments/test.rb
+- demo/config/importmap.rb
 - demo/config/initializers/assets.rb
 - demo/config/initializers/content_security_policy.rb
 - demo/config/initializers/filter_parameter_logging.rb
@@ -131,6 +137,8 @@ files:
 - demo/db/migrate/20230514061100_create_user_skills.rb
 - demo/db/migrate/20230516044126_create_cities.rb
 - demo/db/migrate/20230528041919_add_columns_in_users.rb
+- demo/db/migrate/20230621041641_create_active_storage_tables.active_storage.rb
+- demo/db/migrate/20230621041642_create_action_text_tables.action_text.rb
 - demo/db/schema.rb
 - demo/db/seeds.rb
 - demo/public/favicon.ico