bootstrap_form 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a510f995829dd7bbdfa67fa4eeaa73b8cb8a10a73a2d46c89aad425709caf7c2
-  data.tar.gz: 33543b5b3a9dd167ef7896e0ad55c7d86d31a54e4c19072d13e09b332bb5a872
+  metadata.gz: 75c715774dfcbad34c15dbd54c3a14da015c4e67805c0a1adfbfd36ff0f0d27b
+  data.tar.gz: f1a3c95a6cd6f2012c8062f5e3c3f8b680cb17292141443d8465625a552d1e5b
 SHA512:
-  metadata.gz: 4a703b03f34bb7208380b3370aab0b6444526fb4a33303f473c5b1a78c4c55639701d499c4013d437f79a240554c9da703a1698fc32fe5d91f73f69b919d080c
-  data.tar.gz: 77362e8c4c482ad19a81d63b8c4b55fe213b42e28e44dc66cd716da7106afc2e7509e43428ec135a00f652ed6112cd6fcee4af8bb2e271bb77d3cc187e441045
+  metadata.gz: 75107dba8802198d3685161d292ae40e28e9e83acd688c7779a5bf9eade665bdad236c7f64aeac906872a9e751f77ad98a6e24bda27334a8472bb5ec11855906
+  data.tar.gz: 0c30626a9bde0725bc7ca12713bc9d9acc588832e450752a4142c3a9bc63a47aec9bbdf016a1973ea173153ae700c88f4e0be820ca75c0047ced7cd5d8daa0dc

data/.github/workflows/ruby.yml

@@ -2,25 +2,26 @@ name: Ruby
 
 on:
   push:
-    branches: [ main ]
   pull_request:
-    branches: [ main ]
 
 jobs:
   Lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.2
+          ruby-version: 2.7
           bundler-cache: true
-      - name: Danger
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          gem install danger
-          export DANGER_GITHUB_API_TOKEN=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
-          danger
+      # Disabled since it requires access not granted by GitHub Actions for PRs
+      # - name: Danger
+      #   if: ${{ github.event_name == 'pull_request' }}
+      #   env:
+      #     DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   run: |
+      #     bundle exec danger
       - name: Rubocop
         run: bundle exec rubocop --auto-correct
   Test:
@@ -28,11 +29,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ '3.0', '2.7', '2.6' ]
-        gemfile: [ '6.1', '6.0', '5.2', 'edge' ]
+        ruby-version: [ '3.1', '3.0', '2.7' ]
+        gemfile: [ '7.0', '6.1', '6.0', '5.2', 'edge' ]
         exclude:
+          - { ruby-version: '3.1', gemfile: "6.0" }
+          - { ruby-version: '3.1', gemfile: "5.2" }
           - { ruby-version: '3.0', gemfile: "5.2" }
-          - { ruby-version: '2.6', gemfile: "edge" }
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

data/.gitignore

@@ -3,16 +3,20 @@
 log/*.log
 pkg/
 demo/db/*.sqlite3
+demo/doc/screenshots/**/*.committed.png
+demo/doc/screenshots/**/*.latest.png
 demo/log/*.log
 demo/tmp/
 *.gem
 .rbenv-gemsets
 *.swp
-Gemfile.lock
+/Gemfile.lock
 test/gemfiles/*.lock
-.ruby-version
+gemfiles/*.lock
+/.ruby-version
 Vagrantfile
 .vagrant
+.yarnrc
 
 # For the demo app.
 
@@ -27,10 +31,13 @@ demo/public/assets
 demo/config/master.key
 demo/public/packs
 demo/public/packs-test
+demo/app/assets/builds/*
+!demo/app/assets/builds/.keep
 demo/node_modules
 demo/yarn-error.log
 demo/yarn-debug.log*
 demo/.yarn-integrity
+demo/vendor/bundle
 
 # For stuff that gets created if using the Dockerfile image
 .bundle/
@@ -45,3 +52,6 @@ vendor/bundle
 .bash_history
 # For Alpine images
 .ash_history
+.sqlite_history
+
+docker-compose.override.yml

data/.rubocop.yml

@@ -5,7 +5,7 @@ require:
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - bin/*
@@ -37,6 +37,7 @@ Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 
 Metrics/AbcSize:
+  Max: 18
   Exclude:
     - "demo/test/**/*"
     - "test/**/*"

data/CHANGELOG.md

@@ -1,17 +1,59 @@
+# Change Log
+
+## Apology
+
+The tooling to support our old way of doing the change log doesn't work anymore, and we don't have a better solution, so this change log has become unreliable since version 4.5.0. Please refer to the commit history if you need to debug changes.
+
+
+- [Pending Release](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.1.0...HEAD)
+- [5.1.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.0.0...v5.1.0)
+- [5.0.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.5.0...v5.0.0)
+- [4.5.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.4.0...v4.5.0)
+- [4.4.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.3.0...v4.4.0)
+- [4.3.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0)
+- [4.2.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.1.0...v4.2.0)
+- [4.1.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.0.0...v4.1.0)
+- [4.0.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.0.0.alpha1...v4.0.0)
+- [4.0.0.alpha1](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.7.0...v4.0.0.alpha1)
+- [2.7.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.6.0...v2.7.0)
+- [2.6.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.5.3...v2.6.0)
+- [2.5.3](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.5.2...v2.5.3)
+- [2.5.2](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.5.1...v2.5.2)
+- [2.5.1](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.5.0...v2.5.1)
+- [2.5.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.4.0...v2.5.0)
+- [2.4.0](https://github.com/bootstrap-ruby/bootstrap_form/compare/v2.3.0...v2.4.0)
+
 ## [Pending Release][]
 
 ### Breaking changes
 
+* [#618](https://github.com/bootstrap-ruby/bootstrap_form/pull/618): Allow overriding the wrapper class - [@donv](https://github.com/donv).
 * Your contribution here!
 
 ### New features
 
-* Your contribution here!
+* [#572](https://github.com/bootstrap-ruby/bootstrap_form/issues/572): Simplify the formatting of the file upload control to follow the new Bootstrap 5 styles
+* [#573](https://github.com/bootstrap-ruby/bootstrap_form/issues/573): Add support for Bootstrap 5's floating labels
 
+* [#215](https://github.com/bootstrap-ruby/bootstrap_form/issues/215): Add `include_hidden` option to `check_box`
 ### Bugfixes
 
+* [#582](https://github.com/bootstrap-ruby/bootstrap_form/issues/582): Fix tests in bootstrap-5 branch, removes Rubocop offenses, and adds testing with Rails 6.1.
+
+## [5.0.0.alpha1][]
+
+### Breaking changes
+
+* [#569] Remove `role="form"` from the default generated form HTML so forms pass W3C validation. (Only a breaking change if you depended on the `form` attribute. `bootstrap_form` doesn't depend on it.)
+
+### New features
+
 * Your contribution here!
 
+### Bugfixes
+
+* [#284] [#300] Field's help message is displayed, even while inline error message is displayed. - [@antpaw](https://github.com/antpaw)
+
 ## [5.0.0][] (2021-11-11)
 
 ### Breaking changes
@@ -322,7 +364,8 @@ Features:
   - Added support for bootstrap_form_tag (@baldwindavid)
 
 
-[Pending Release]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.0.0...HEAD
+[Pending Release]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.1.0...HEAD
+[5.1.0]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v5.0.0...v5.1.0
 [5.0.0]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.5.0...v5.0.0
 [4.5.0]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.4.0...v4.5.0
 [4.4.0]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.3.0...v4.4.0

data/CONTRIBUTING.md

@@ -10,11 +10,6 @@ There are a number of ways you can contribute to `bootstrap_form`:
 - Add to the documentation
 - Review pull requests
 
-*Note:* If you want to work on preparing `bootstrap_form` for Bootstrap 5,
-please start from the `bootstrap-5` branch.
-If you're submitting a pull request with code or documentation,
-target the pull request to the `bootstrap-5` branch.
-
 ## Code Contributions
 
 Here's a quick guide for code contributions:
@@ -47,12 +42,7 @@ Fork the project. Optionally, create a branch you want to work on.
 - Add a line to the CHANGELOG for your bug fix or feature.
 - Read the [Coding Guidelines](#coding-guidelines) section and make sure that `rake lint` doesn't find any offences.
 
-You may find the demo application useful for development and debugging.
-
-- `cd demo`
-- `rake db:schema:load`
-- `rails s`
-- Navigate to http://localhost:3000
+You may find the [demo application](#the-demo-application) useful for development and debugging.
 
 ### 6. Make a pull request
 
@@ -109,16 +99,18 @@ You can run tests in the container as normal, with `rake test`.
 
 (Some of that command line is need for Linux hosts, to run the container as the current user.)
 
-### The Demo App
+### The Demo Application
 
 There is a demo app in this repository. It shows some of the features of `bootstrap_form`, and provides a base on which to build ad-hoc testing, if you need it.
 
+Currently, the demo app is only set up to run for Rails 7, due to the variety of ways to include CSS and JavaScript in a modern Rails application.
 To run the demo app, set up the database and run the server:
 
 ```bash
 cd demo
-export BUNDLER_GEMFILE=../gemfiles/6.1.gemfile
+bundle
 rails db:setup
+yarn build --watch &
 rails s -b 0.0.0.0
 ```
 
@@ -127,18 +119,27 @@ To run the demo app in the Docker container:
 ```bash
 docker run --volume "$PWD:/app" --user $UID:`grep ^$USERNAME /etc/passwd | cut -d: -f4` -p 3000:3000 -it bootstrap_form /bin/bash
 cd demo
-export BUNDLER_GEMFILE=../gemfiles/6.1.gemfile
+export BUNDLE_GEMFILE=../gemfiles/7.0.gemfile
 rails db:setup
+yarn build --watch &
 rails s -b 0.0.0.0
 ```
 
-To use other supported versions of Rails, change the `export BUNDLER_GEMFILE...` line to another gem file.
+The app doesn't appear to find the source map, or perhaps it isn't being generated. In the Rails log you will see messages similar to:
+
+```bash
+ActionController::RoutingError (No route matches [GET] "/assets/application.js-c6c0edbd68f05cffd0e2495198bfbc4bf42be8a11b76eecbfade30a8036b6b87.map")
+```
+
+But this doesn't seem to affect how the app runs.
+
+To use other supported versions of Rails, you will need to create a `Gemfile` for the Rails version. Then, change the `export BUNDLE_GEMFILE...` line to your gem file. Finally, figure out how to include the assets.
 
 ## Documentation Contributions
 
 Contributions to documentation are always welcome. Even fixing one typo improves the quality of `bootstrap_form`. To make a documentation contribution, follow steps 1-3 of Code Contributions, then make the documentation changes, then make the pull request (step 6 of Code Contributions).
 
-If you put `[ci skip]` in the commit message of the most recent commit of the PR, you'll be a good citizen by not causing Travis CI to run all the tests when it's not necessary.
+If you put `[ci skip]` in the commit message of the most recent commit of the PR, you'll be a good citizen by not causing our CI pipeline to run all the tests when it's not necessary.
 
 ## Reviewing Pull Requests
 

data/Dangerfile

@@ -44,7 +44,7 @@ end
 # ------------------------------------------------------------------------------
 # Did you remove the CHANGELOG's "Your contribution here!" line?
 # ------------------------------------------------------------------------------
-if has_changelog_changes && IO.read("CHANGELOG.md").scan(/^\s*[-*] Your contribution here/i).count < 3
+if has_changelog_changes && File.read("CHANGELOG.md").scan(/^\s*[-*] Your contribution here/i).count < 3
   raise(
     "Please put the `- Your contribution here!` line back into CHANGELOG.md.",
     sticky: false

data/Dockerfile

@@ -1,5 +1,5 @@
-ARG DISTRO=buster
-ARG RUBY_VERSION=2.6
+ARG RUBY_VERSION=2.7
+ARG DISTRO=bullseye
 
 FROM ruby:$RUBY_VERSION-$DISTRO
 
@@ -18,9 +18,4 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     apt update -y -q && \
     apt install -y -q yarn sqlite3
 
-# Ruby now comes with bundler, but we're not using the default version yet, because we were using
-# a newer version of bundler already. Ruby 3 comes with Bundler 2.2.3. Ruby 2.7 has Bundler 2.1.2,
-# which is still behind what we were using.
-RUN gem install bundler -v 2.1.4
-
 EXPOSE 3000

data/Gemfile

@@ -2,18 +2,12 @@ source "http://rubygems.org"
 
 gemspec path: __dir__
 
-# Uncomment and change rails version for testing purposes
-# gem "rails", "~> 5.2.0"
-# gem "rails", "~> 6.0.0"
-# gem "rails", "~> 6.1.0"
-# gem "rails", git: "https://github.com/rails/rails.git"
+# To test with different Rails versions, use the files in `./gemfiles`
 
 group :development do
-  gem "chandler", ">= 0.7.0"
   gem "htmlbeautifier"
   gem "rubocop-performance", require: false
   gem "rubocop-rails", require: false
-  gem "sassc-rails"
   gem "webpacker"
 end
 
@@ -23,3 +17,7 @@ group :test do
   gem "mocha"
   gem "sqlite3"
 end
+
+group :ci do
+  gem "danger"
+end