bootstrap_form 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d4313478eda1a0db587b6c45b7e107aedca0d59683f2231d348c09e9585e59
-  data.tar.gz: f07b72a464b509975d9a6a573718787b9c245b7b3b1f362e3448d842fff93891
+  metadata.gz: 4e064911f3a679f4ecf322d6e3e240b35cf1f33e73908d3bf3494a71a3013781
+  data.tar.gz: 044b4a8d8dd6c046f88b45ddd6fb83ed9d619fd6e2872fbd1eb32c84fda50f71
 SHA512:
-  metadata.gz: 370f4f419457d0737505add14f48f6ebb879e185f9b132d7409d59b789944dff9a156eabb3c821764f1de8783879729639f99334812077f2c99cccf44da7378c
-  data.tar.gz: a5ac9f28944a788c996a7da4d57760cb6331bf2d3a490a8a3a96ddaffec2f7357fce07e2e16fcabbe59eb7f12967fc8950f19f4644369981b30eaaa63fd588a4
+  metadata.gz: ec13235058d63f5ff4a12991660d10acff7b7576954e3a103d38592cd90a6ee0a8431c93eeb33878d7a228e432bbf590ff248d60445cfacbca278efc73d5fc52
+  data.tar.gz: 2b3c704fa1981633bbaaa04dc543d72e9a1e3d535f8d56852752fb9eef65ea4d75089971e073defb193119f80c8cc13a3708a8ac603bcdef0edc8946f2a95958

data/.rubocop.yml

@@ -20,6 +20,7 @@ AllCops:
     - "demo/tmp/**/*"
     - "demo/vendor/**/*"
     - Gemfile
+    - gemfiles/vendor/bundle/**/*
     - Guardfile
     - Rakefile
 

data/.travis.yml

@@ -1,36 +1,36 @@
 language: ruby
 rvm:
-  - 2.4.6
-  - 2.5.6
-  - 2.6.4
+  - 2.7
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
 gemfile:
-  - test/gemfiles/5.0.gemfile
-  - test/gemfiles/5.1.gemfile
-  - test/gemfiles/5.2.gemfile
-  - test/gemfiles/6.0.gemfile
-before_install:
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - gem install bundler -v 1.17.3 --no-document
+  - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
+cache:
+  bundler: true
 script:
   - bundle exec rake test
 
 matrix:
   exclude:
-    - rvm: 2.4.6
-      gemfile: test/gemfiles/6.0.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/6.0.gemfile
 
   include:
     # Bleeding edge Ruby
     - rvm: ruby-head
-      gemfile: test/gemfiles/6.0.gemfile
+      gemfile: gemfiles/6.0.gemfile
 
     # Next version of Rails
-    - rvm: 2.5.0
-      gemfile: test/gemfiles/edge.gemfile
+    - rvm: 2.5.7
+      gemfile: gemfiles/edge.gemfile
 
     # Running one job to execute DANGER bot and linting
-    - rvm: 2.5.0
-      gemfile: test/gemfiles/6.0.gemfile
+    - rvm: 2.5.7
+      gemfile: gemfiles/6.0.gemfile
       script:
         - gem install danger
         - danger
@@ -38,5 +38,5 @@ matrix:
 
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.5.0
-      gemfile: test/gemfiles/edge.gemfile
+    - rvm: 2.5.7
+      gemfile: gemfiles/edge.gemfile

data/CHANGELOG.md

@@ -12,7 +12,18 @@
 
 * Your contribution here!
 
-## [4.3.0][] (2019-03-08)
+## [4.4.0][] (2020-03-08)
+
+### New features
+
+* [#557](https://github.com/bootstrap-ruby/bootstrap_form/pull/557): Allow prepending and appending multiple items to an input by passing an array to `prepend` and `append` options - [@donv](https://github.com/donv).
+* [#550](https://github.com/bootstrap-ruby/bootstrap_form/pull/550): Add `default_layout` so we can use it for all forms - [@duleorlovic](https://github.com/duleorlovic).
+
+### Bugfixes
+
+* Your contribution here!
+
+## [4.3.0][] (2019-09-22)
 
 ### New features
 
@@ -275,7 +286,9 @@ Features:
   - Added support for bootstrap_form_tag (@baldwindavid)
 
 
-[Pending Release]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...HEAD
+[Pending Release]: https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.4.0...HEAD
+[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

data/README.md

@@ -47,12 +47,17 @@ Then:
 
 `bundle install`
 
-Then require the CSS in your `application.css` file:
+Depending on which CSS pre-processor you are using, adding the bootstrap form styles differs slightly.
+If you use Rails in the default mode without any pre-processor, you'll have to add the following line to your `application.css` file:
 
 ```css
-/*
- *= require rails_bootstrap_forms
- */
+*= require rails_bootstrap_forms
+```
+
+If you followed the [official bootstrap installation guide](https://github.com/twbs/bootstrap-rubygem#a-ruby-on-rails), you'll probably have switched to SCSS. In this case add the following line to your `application.scss`:
+
+```scss
+@import "rails_bootstrap_forms";
 ```
 
 ## Usage
@@ -234,7 +239,8 @@ To add help text, use the `help` option:
 ```
 
 This generates:
-```
+
+```html
 <small class="form-text text-muted">Must be at least 6 characters long</small>
 ```
 
@@ -272,6 +278,12 @@ You can pass `prepend` and/or `append` options to input fields:
 <%= f.text_field :price, prepend: "$", append: ".00" %>
 ```
 
+If you want to attach multiple items to the input, pass them as an array:
+
+```erb
+<%= f.text_field :price, prepend: ['Net', '$'], append: ['.00', 'per day'] %>
+```
+
 You can also prepend and append buttons. Note: The buttons must contain the
 `btn` class to generate the correct markup.
 
@@ -308,9 +320,9 @@ If you only want to set the class on the form group div, you can use the `wrappe
 
 ### Suppressing the Form Group Altogether
 
-You may have want to define your own form group div around a field. To do so, add the option `wrapper: false` to the input field. For example:
+You may want to define your own form group div around a field. To do so, add the option `wrapper: false` to the input field. For example:
 
-```
+```ruby
 f.form_group :user do
   f.email_field :email, wrapper: false
 end
@@ -369,6 +381,7 @@ Check boxes and radio buttons are wrapped in a `div.form-check`. You can add cla
 ```erb
 <%= f.radio_button :skill_level, 0, label: "Novice", inline: true, wrapper_class: "w-auto" %>
 ```
+
 ### Switches
 
 To render checkboxes as switches with Bootstrap 4.2+, use `custom: :switch`:
@@ -390,6 +403,7 @@ To render checkboxes as switches with Bootstrap 4.2+, use `custom: :switch`:
 NOTE: These helpers do not currently support a block, unlike their equivalent Rails helpers. See issue [#477](https://github.com/bootstrap-ruby/bootstrap_form/issues/477). If you need to use the block syntax, use `collection_check_boxes_without_bootstrap` or `collection_radio_buttons_without_bootstrap` for now.
 
 Collection methods accept these options:
+
 * `:label`: Customize the `form_group`'s label
 * `:hide_label`: Pass true to hide the `form_group`'s label
 * `:help`: Add a help span to the `form_group`
@@ -512,7 +526,6 @@ will be rendered as
 
 If you're using Rails 6, `bootstrap_form` supports the `rich_text_area` helper.
 
-
 ```erb
 <%= f.rich_text_area(:life_story) %>
 ```
@@ -617,6 +630,10 @@ module BootstrapForm
     def default_control_col
       'col-sm-8'
     end
+    def default_layout
+      # :default, :horizontal or :inline
+      :horizontal
+    end
   end
 end
 ```
@@ -839,4 +856,4 @@ document first.
 
 ## License
 
-MIT License. Copyright 2012-2019 Stephen Potenza (https://github.com/potenza)
+MIT License. Copyright 2012-2020 Stephen Potenza (https://github.com/potenza) and others

data/demo/config/environments/development.rb

@@ -16,7 +16,7 @@ Rails.application.configure do
 
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join("tmp", "caching-dev.txt").exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store

data/gemfiles/5.0.gemfile

@@ -0,0 +1,18 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", "~> 5.0.0"
+
+group :development do
+  gem "rubocop-rails", require: false
+end
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "minitest", "~> 5.10.3"
+  gem "mocha"
+  gem "sqlite3", "~> 1.3.6"
+  gem "timecop", "~> 0.7.1"
+end

data/gemfiles/5.1.gemfile

@@ -0,0 +1,17 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", "~> 5.1.0"
+
+group :development do
+  gem "rubocop-rails", require: false
+end
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mocha"
+  gem "sqlite3", "~> 1.4"
+  gem "timecop", "~> 0.7.1"
+end

data/gemfiles/5.2.gemfile

@@ -0,0 +1,17 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", "~> 5.2.0"
+
+group :development do
+  gem "rubocop-rails", require: false
+end
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mocha"
+  gem "sqlite3", "~> 1.4"
+  gem "timecop", "~> 0.7.1"
+end

data/gemfiles/6.0.gemfile

@@ -0,0 +1,19 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", "~> 6.0.0"
+
+group :development do
+  gem "rubocop-rails", require: false
+  gem "sassc"
+  gem "webpacker", ">= 4.0.0.rc.3"
+end
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mocha"
+  gem "sqlite3"
+  gem "timecop", "~> 0.7.1"
+end

data/gemfiles/edge.gemfile

@@ -0,0 +1,19 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", git: "https://github.com/rails/rails.git"
+
+group :development do
+  gem "rubocop-rails", require: false
+  gem "sassc-rails"
+  gem "webpacker"
+end
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mocha"
+  gem "sqlite3"
+  gem "timecop", "~> 0.7.1"
+end

data/lib/bootstrap_form/action_view_extensions/form_helper.rb

@@ -20,8 +20,6 @@ module BootstrapForm
       def bootstrap_form_for(record, options={}, &block)
         options.reverse_merge!(builder: BootstrapForm::FormBuilder)
 
-        options = process_options(options)
-
         with_bootstrap_form_field_error_proc do
           form_for(record, options, &block)
         end
@@ -30,8 +28,6 @@ module BootstrapForm
       def bootstrap_form_with(options={}, &block)
         options.reverse_merge!(builder: BootstrapForm::FormBuilder)
 
-        options = process_options(options)
-
         with_bootstrap_form_field_error_proc do
           form_with(options, &block)
         end
@@ -45,16 +41,6 @@ module BootstrapForm
 
       private
 
-      def process_options(options)
-        options[:html] ||= {}
-        options[:html][:role] ||= "form"
-
-        options[:layout] == :inline &&
-          options[:html][:class] = [options[:html][:class], "form-inline"].compact.join(" ")
-
-        options
-      end
-
       def with_bootstrap_form_field_error_proc
         original_proc = ActionView::Base.field_error_proc
         ActionView::Base.field_error_proc = BootstrapForm.field_error_proc

data/lib/bootstrap_form/components/layout.rb

@@ -8,7 +8,7 @@ module BootstrapForm
       private
 
       def layout_default?(field_layout=nil)
-        [:default, nil].include? layout_in_effect(field_layout)
+        layout_in_effect(field_layout) == :default
       end
 
       def layout_horizontal?(field_layout=nil)

data/lib/bootstrap_form/form_builder.rb

@@ -45,8 +45,9 @@ module BootstrapForm
 
     delegate :content_tag, :capture, :concat, to: :@template
 
+    # rubocop:disable Metrics/AbcSize
     def initialize(object_name, object, template, options)
-      @layout = options[:layout]
+      @layout = options[:layout] || default_layout
       @label_col = options[:label_col] || default_label_col
       @control_col = options[:control_col] || default_control_col
       @label_errors = options[:label_errors] || false
@@ -57,8 +58,19 @@ module BootstrapForm
                          options[:inline_errors] != false
                        end
       @acts_like_form_tag = options[:acts_like_form_tag]
+      add_form_role_and_form_inline options
       super
     end
+    # rubocop:enable Metrics/AbcSize
+
+    def add_form_role_and_form_inline(options)
+      options[:html] ||= {}
+      options[:html][:role] ||= "form"
+
+      return unless options[:layout] == :inline
+
+      options[:html][:class] = [options[:html][:class], "form-inline"].compact.join(" ")
+    end
 
     def fields_for_with_bootstrap(record_name, record_object=nil, fields_options={}, &block)
       fields_options = fields_for_options(record_object, fields_options)
@@ -86,6 +98,11 @@ module BootstrapForm
       field_options
     end
 
+    def default_layout
+      # :default, :horizontal or :inline
+      :default
+    end
+
     def default_label_col
       "col-sm-2"
     end

data/lib/bootstrap_form/helpers/bootstrap.rb

@@ -82,7 +82,7 @@ module BootstrapForm
 
         input = capture(&block) || ActiveSupport::SafeBuffer.new
 
-        input = prepend_input(options) + input + append_input(options)
+        input = attach_input(options, :prepend) + input + attach_input(options, :append)
         input += generate_error(name)
         options.present? &&
           input = content_tag(:div, input, class: ["input-group", options[:input_group_class]].compact)
@@ -106,14 +106,11 @@ module BootstrapForm
 
       private
 
-      def append_input(options)
-        html = content_tag(:div, input_group_content(options[:append]), class: "input-group-append") if options[:append]
-        html || ActiveSupport::SafeBuffer.new
-      end
-
-      def prepend_input(options)
-        html = content_tag(:div, input_group_content(options[:prepend]), class: "input-group-prepend") if options[:prepend]
-        html || ActiveSupport::SafeBuffer.new
+      def attach_input(options, key)
+        tags = [*options[key]].map do |item|
+          content_tag(:div, input_group_content(item), class: "input-group-#{key}")
+        end
+        ActiveSupport::SafeBuffer.new(tags.join)
       end
 
       def setup_css_class(the_class, options={})

data/lib/bootstrap_form/version.rb

@@ -1,3 +1,3 @@
 module BootstrapForm
-  VERSION = "4.3.0".freeze
+  VERSION = "4.4.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Stephen Potenza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -125,6 +125,11 @@ files:
 - demo/public/favicon.ico
 - demo/test/fixtures/action_text/rich_texts.yml
 - demo/yarn.lock
+- gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
+- gemfiles/edge.gemfile
 - lib/bootstrap_form.rb
 - lib/bootstrap_form/action_view_extensions/form_helper.rb
 - lib/bootstrap_form/components.rb