bootstrap_form 4.4.0 → 5.1.0

data/RELEASING.md

@@ -6,20 +6,15 @@ Follow these steps to release a new version of bootstrap_form to rubygems.org.
 
 * You must have commit rights to the bootstrap_form repository.
 * You must have push rights for the bootstrap_form gem on rubygems.org.
-* You must be using Ruby >= 2.4.
-* Your GitHub credentials must be available to Chandler via `~/.netrc` or an environment variable, [as explained here](https://github.com/mattbrictson/chandler#2-configure-credentials).
+* You must be using a Ruby version that is not end-of-life.
 
 ## How to release
 
-1. Run `bundle install` to make sure that you have all the gems necessary for testing and releasing.
-2. **Ensure the tests are passing by running `bundle exec rake`.**
+1. Run `BUNDLE_GEMFILE=gemfiles/7.0.gemfile bundle update` to make sure that you have all the gems necessary for testing and releasing.
+2. **Ensure the tests are passing by running `BUNDLE_GEMFILE=gemfiles/7.0.gemfile bundle update`.** (Currently this step shows a lot of warnings about method redefinitions, but otherwise everything must be green before release.)
 3. Determine which would be the correct next version number according to [semver](http://semver.org/).
 4. Update the version in `./lib/bootstrap_form/version.rb`.
-5. Update the `CHANGELOG.md` (for an illustration of these steps, refer to the [4.0.0.alpha1 commit](https://github.com/bootstrap-ruby/bootstrap_form/commit/8aac3667931a16537ab68038ec4cebce186bd596#diff-4ac32a78649ca5bdd8e0ba38b7006a1e) as an example):
-    * Rename the Pending Release section to `[version][] (date)` with appropriate values `version` and `date`
-    * Remove the "Your contribution here!" bullets from the release notes
-    * Add a new Pending Release section at the top of the file with a template for contributors to fill in, including "Your contribution here!" bullets
-    * Add the appropriate GitHub diff links to the footer of the document
+5. Update the GitHub diff links at the beginning of `CHANGELOG.md` (The pattern should be obvious when you look at them).
 6. Update the installation instructions in `README.md` to use the new version.
 7. Commit the CHANGELOG and version changes in a single commit; the message should be "Preparing vX.Y.Z" where `X.Y.Z` is the version being released.
-8. Run `bundle exec rake release`; this will tag, push to GitHub, publish to rubygems.org, and upload the latest CHANGELOG entry to the [GitHub releases page](https://github.com/bootstrap-ruby/bootstrap_form/releases).
+8. Run `bundle exec rake release`; this will tag, push to GitHub, and publish to rubygems.org.

data/UPGRADE-4.0.md

@@ -33,7 +33,7 @@ One way to make the above behave the same in `bootstrap_form` v4.0 is to write i
 <%= bootstrap_form_for(@user) do |f| %>
   <%= f.form_group(:email) do %>
     <p class="form-control-plaintext">Bar</p>
-    <%= content_tag(:div, @user.errors[:email].join(", "), class: "invalid-feedback", style: "display: block;") unless @user.errors[:email].empty? %>
+    <%= tag.div(@user.errors[:email].join(", "), class: "invalid-feedback", style: "display: block;") unless @user.errors[:email].empty? %>
   <%= end %>
 <%= end %>
 ```

data/UPGRADE-5.0.md

@@ -0,0 +1,25 @@
+# Upgrading to `bootstrap_form` 5.0
+
+We made every effort to make the upgrade from `bootstrap_form` v4 (Bootstrap 4) to `bootstrap_form` 5.0 (Bootstrap 5) as easy as possible. However, Bootstrap 5 is fundamentally different from Bootstrap 4, so some changes may be necessary in your code.
+
+## Bootstrap 5 Changes
+
+Upgrading `bootstrap_form` to version 5 means you must upgrade your whole application to Bootstrap 5. Read the [Bootstrap 5 migration guide](https://v5.getbootstrap.com/docs/5.0/migration/) to see what changes you have to make to your views. This will also help you understand changes you might have to make to your `bootstrap_form` code.
+
+## `bootstrap_form` Version 5 Changes
+
+## No `role="form"` Attribute
+
+As explained in #560, the `role="form"` attribute generated by `bootstrap_4` caused the W3C validator to output a warning. The `role="form"` attribute was deprecated in the 4.5.0 and is being remove completely in 5.0.0. This has no impact on `bootstrap_form` code itself, but may affect your application if it depended on a form having this attribute set. (Issue #569)
+
+## Different behavior for `errors_on` helper
+
+The `errors_on` helper now wraps the error message in a CSS class `invalid-feedback`, instead of `alert` and `alert-danger`, as before.
+
+This will display the error as any other [Bootstrap inline form error](https://getbootstrap.com/docs/5.0/forms/validation/#server-side), instead of displaying it as an [Bootstrap alert](https://getbootstrap.com/docs/5.0/components/alerts/).
+
+You can use the `custom_class` options for this helper with `alert alert-danger` to restore the old behaviour:
+
+```erb
+<%= f.errors_on :tasks, custom_class: 'alert alert-danger' %>
+```

data/bootstrap_form.gemspec

@@ -3,6 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "bootstrap_form/version"
 
+REQUIRED_RAILS_VERSION = ">= 5.2".freeze
+
 Gem::Specification.new do |s|
   s.name        = "bootstrap_form"
   s.version     = BootstrapForm::VERSION
@@ -10,10 +12,11 @@ Gem::Specification.new do |s|
   s.email       = ["potenza@gmail.com", "carlos.el.lopes@gmail.com"]
   s.homepage    = "https://github.com/bootstrap-ruby/bootstrap_form"
   s.summary     = "Rails form builder that makes it easy to style forms using "\
-                  "Bootstrap 4"
+                  "Bootstrap 5"
   s.description = "bootstrap_form is a rails form builder that makes it super "\
-                  "easy to create beautiful-looking forms using Bootstrap 4"
+                  "easy to create beautiful-looking forms using Bootstrap 5"
   s.license     = "MIT"
+  s.metadata    = { "rubygems_mfa_required" => "true" }
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test)/})
@@ -22,8 +25,8 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.3"
+  s.required_ruby_version = ">= 2.7"
 
-  s.add_dependency("actionpack", ">= 5.0")
-  s.add_dependency("activemodel", ">= 5.0")
+  s.add_dependency("actionpack", REQUIRED_RAILS_VERSION)
+  s.add_dependency("activemodel", REQUIRED_RAILS_VERSION)
 end

data/demo/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.6

data/demo/Gemfile

@@ -0,0 +1,80 @@
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+ruby File.read("#{__dir__}/.ruby-version").delete_prefix("ruby-").chomp
+
+# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
+gem "rails", "~> 7.0.0"
+
+# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
+gem "sprockets-rails"
+
+# Use sqlite3 as the database for Active Record
+gem "sqlite3", "~> 1.4"
+
+# Use the Puma web server [https://github.com/puma/puma]
+gem "puma", "~> 5.0"
+
+# Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]
+gem "jsbundling-rails"
+
+# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
+gem "turbo-rails"
+
+# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
+gem "stimulus-rails"
+
+# Bundle and process CSS [https://github.com/rails/cssbundling-rails]
+gem "cssbundling-rails"
+
+# Build JSON APIs with ease [https://github.com/rails/jbuilder]
+gem "jbuilder"
+
+# Use Redis adapter to run Action Cable in production
+# gem "redis", "~> 4.0"
+
+# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
+# gem "kredis"
+
+# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
+# gem "bcrypt", "~> 3.1.7"
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
+
+# Reduces boot times through caching; required in config/boot.rb
+gem "bootsnap", require: false
+
+gem "bootstrap_form", "~> 5.0"
+
+# Needed for our demo app but not the gem itself
+gem "htmlbeautifier"
+
+# Use Sass to process CSS
+gem "sassc-rails"
+
+# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
+# gem "image_processing", "~> 1.2"
+
+group :development, :test do
+  # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
+  gem "debug", platforms: %i[mri mingw x64_mingw]
+end
+
+group :development do
+  # Use console on exceptions pages [https://github.com/rails/web-console]
+  gem "web-console"
+
+  # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
+  # gem "rack-mini-profiler"
+
+  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
+  # gem "spring"
+end
+
+group :test do
+  # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
+  gem "capybara-screenshot-diff"
+  gem "selenium-webdriver"
+  gem "webdrivers"
+end

data/demo/Gemfile.lock

@@ -0,0 +1,261 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activestorage (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      actionview (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.2.4)
+      actionview (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activestorage (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.2.4)
+      activesupport (= 7.0.2.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.2.4)
+      activesupport (= 7.0.2.4)
+      globalid (>= 0.3.6)
+    activemodel (7.0.2.4)
+      activesupport (= 7.0.2.4)
+    activerecord (7.0.2.4)
+      activemodel (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+    activestorage (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.2.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    bindex (0.8.1)
+    bootsnap (1.11.1)
+      msgpack (~> 1.2)
+    bootstrap_form (5.0.0)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
+    builder (3.2.4)
+    capybara (3.36.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
+    capybara-screenshot-diff (1.6.1)
+      actionpack (>= 4.2, < 8)
+      capybara (>= 2, < 4)
+      chunky_png (~> 1.3)
+    childprocess (4.1.0)
+    chunky_png (1.4.0)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    cssbundling-rails (1.1.0)
+      railties (>= 6.0.0)
+    debug (1.5.0)
+      irb (>= 1.3.6)
+      reline (>= 0.2.7)
+    digest (3.1.0)
+    erubi (1.10.0)
+    ffi (1.15.5)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    htmlbeautifier (1.4.2)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
+      activesupport (>= 5.0.0)
+    jsbundling-rails (1.0.2)
+      railties (>= 6.0.0)
+    loofah (2.16.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.2)
+    matrix (0.4.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.15.0)
+    msgpack (1.5.1)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.4-x86_64-linux)
+      racc (~> 1.4)
+    public_suffix (4.0.7)
+    puma (5.6.4)
+      nio4r (~> 2.0)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (7.0.2.4)
+      actioncable (= 7.0.2.4)
+      actionmailbox (= 7.0.2.4)
+      actionmailer (= 7.0.2.4)
+      actionpack (= 7.0.2.4)
+      actiontext (= 7.0.2.4)
+      actionview (= 7.0.2.4)
+      activejob (= 7.0.2.4)
+      activemodel (= 7.0.2.4)
+      activerecord (= 7.0.2.4)
+      activestorage (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      bundler (>= 1.15.0)
+      railties (= 7.0.2.4)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (7.0.2.4)
+      actionpack (= 7.0.2.4)
+      activesupport (= 7.0.2.4)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rake (13.0.6)
+    regexp_parser (2.3.1)
+    reline (0.3.1)
+      io-console (~> 0.5)
+    rexml (3.2.5)
+    rubyzip (2.3.2)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2)
+    sprockets (4.0.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    stimulus-rails (1.0.4)
+      railties (>= 6.0.0)
+    strscan (3.0.1)
+    thor (1.2.1)
+    tilt (2.0.10)
+    timeout (0.2.0)
+    turbo-rails (1.0.1)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    web-console (4.2.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
+    webdrivers (5.0.0)
+      nokogiri (~> 1.6)
+      rubyzip (>= 1.3.0)
+      selenium-webdriver (~> 4.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  x86_64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  bootsnap
+  bootstrap_form (~> 5.0)
+  capybara-screenshot-diff
+  cssbundling-rails
+  debug
+  htmlbeautifier
+  jbuilder
+  jsbundling-rails
+  puma (~> 5.0)
+  rails (~> 7.0.0)
+  sassc-rails
+  selenium-webdriver
+  sprockets-rails
+  sqlite3 (~> 1.4)
+  stimulus-rails
+  turbo-rails
+  tzinfo-data
+  web-console
+  webdrivers
+
+RUBY VERSION
+   ruby 2.7.6p219
+
+BUNDLED WITH
+   2.3.12

data/demo/Procfile.dev

@@ -0,0 +1,2 @@
+web: bin/rails server -p 3000 -b 0.0.0.0
+js: yarn build --watch

data/demo/app/assets/builds/application.js.LICENSE.txt

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */

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

@@ -1,2 +1,2 @@
-//= link_tree ../images
-//= link_directory ../stylesheets .css
+//= link application.css
+//= link_tree ../builds

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

@@ -0,0 +1,31 @@
+/*
+ * 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.
+ *
+ *= require 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,
+.trix-content .attachment-gallery > .attachment {
+  flex: 1 0 33%;
+  padding: 0 0.5em;
+  max-width: 33%;
+}
+
+.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--4 > .attachment {
+  flex-basis: 50%;
+  max-width: 50%;
+}
+
+.trix-content action-text-attachment .attachment {
+  padding: 0 !important;
+  max-width: 100% !important;
+}

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

@@ -1 +1 @@
-@import "actiontext";
+// @import "actiontext";

data/demo/app/controllers/bootstrap_controller.rb

@@ -1,13 +1,28 @@
 class BootstrapController < ApplicationController
   def form
+    load_models
+  end
+
+  def fragment
+    @erb = params[:erb]
+
+    @erb.prepend '<div class="p-3 border">'
+    @erb << "</div>"
+    load_models
+    render inline: @erb, layout: "application" # rubocop: disable Rails/RenderInline
+  end
+
+  private
+
+  def load_models
     @collection = [
       Address.new(id: 1, street: "Foo"),
       Address.new(id: 2, street: "Bar")
     ]
 
-    @user = User.new
+    @user = User.new email: "steve@example.com"
 
-    @user_with_error = User.new
+    @user_with_error = User.new email: "steve.example.com"
     @user_with_error.errors.add(:email)
     @user_with_error.errors.add(:misc)
   end

data/demo/app/controllers/users_controller.rb

@@ -0,0 +1,9 @@
+class UsersController < ApplicationController
+  def create
+    redirect_to root_path
+  end
+
+  def update
+    redirect_to root_path
+  end
+end

data/demo/app/helpers/bootstrap_helper.rb

@@ -2,7 +2,7 @@ module BootstrapHelper
   def form_with_source(&block)
     form_html = capture(&block)
 
-    content_tag(:div, class: "example") do
+    tag.div(class: "example") do
       concat(form_html)
       concat(toggle)
       concat(codemirror(form_html))
@@ -12,16 +12,16 @@ module BootstrapHelper
   private
 
   def codemirror(form_html)
-    content_tag(:div, class: "code", style: "display: none") do
-      content_tag(:textarea, class: "codemirror") do
+    tag.div(class: "code", style: "display: none") do
+      tag.textarea(class: "codemirror") do
         HtmlBeautifier.beautify(form_html.strip.gsub(">", ">\n").gsub("<", "\n<"))
       end
     end
   end
 
   def toggle
-    content_tag(:button, class: "toggle btn btn-sm btn-info") do
-      "Show Source Code"
+    tag.button(class: "toggle btn btn-sm btn-info") do
+      "Toggle Source Code"
     end
   end
 end

data/demo/app/javascript/application.js

@@ -0,0 +1,3 @@
+// Entry point for the build script in your package.json
+import "trix"
+import "@rails/actiontext"

data/demo/app/models/skill.rb

@@ -0,0 +1,15 @@
+class Skill
+  attr_accessor :id, :name
+
+  def initialize(id:, name:)
+    @id = id
+    @name = name
+  end
+
+  def self.all
+    [
+      Skill.new(id: 1, name: "Mind reading"),
+      Skill.new(id: 2, name: "Farming")
+    ]
+  end
+end

data/demo/app/models/user.rb

@@ -1,4 +1,6 @@
 class User < ApplicationRecord
+  attr_accessor :remember_me
+
   serialize :preferences
 
   validates :email, presence: true, length: { minimum: 5 }
@@ -8,4 +10,16 @@ class User < ApplicationRecord
   accepts_nested_attributes_for :address
 
   has_rich_text(:life_story) if Rails::VERSION::STRING > "6"
+
+  def age
+    42
+  end
+
+  def feet
+    5
+  end
+
+  def inches
+    7
+  end
 end

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

@@ -1,6 +1,6 @@
 <figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
   <% if blob.representable? %>
-    <%= image_tag blob.representation(resize_to_fit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
   <% end %>
 
   <figcaption class="attachment__caption">

data/demo/app/views/bootstrap/form.html.erb

@@ -52,3 +52,16 @@
     <%= form.submit %>
   <% end %>
 <% end %>
+
+<h3>Floating Labels</h3>
+
+<%= form_with_source do %>
+  <%= bootstrap_form_for @user do |form| %>
+    <%= form.email_field :email, placeholder: "Enter Email", label: "Email address", help: "We'll never share your email with anyone else", floating: true %>
+    <%= form.password_field :password, placeholder: "Password", floating: true %>
+    <%= form.text_field :misc, floating: true %>
+    <%= form.text_area :comments, floating: true %>
+    <%= form.select :status, [["Active", 1], ["Inactive", 2]], include_blank: "Select a value", floating: true %>
+    <%= form.submit %>
+  <% end %>
+<% end %>

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

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