comfy_bootstrap_form 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f748f321101c2f0f88499a1d4bc0bc64528e4476dec757cf777d8f0c401f8f73
-  data.tar.gz: d257304f9ddcf1f62a713d2b1af1b2771bb49291607e3f148b5c312c3a4b847e
+  metadata.gz: 650142fb9785a2c81b49af5b2cb5dd6664a0eb2d97d03d9ec45dc0f3e7a82028
+  data.tar.gz: 8a5ba3cc671134a65c7ef5e5f85d903d378896c4383d5c663ea696f475e8f663
 SHA512:
-  metadata.gz: 751de8df7d4ad259428c50fc9df981cbb217471bf90cca3db10efb4c7fd493e24b30dc8cdcc86541932c98e79fcf32ebb54fdb3576ebfd6f2475c62061e2985f
-  data.tar.gz: 8cd0df58261044d8afd54ec00fd1a2a5ced9c6f32e22b410f3406a3fac45047abe103a1e67e610044d33b4772f96c2e599f75ad5d5a5e6ada28bc4149828a644
+  metadata.gz: 88934f425273927bcc89ac5046b73882171328e804c687d63f4b59e3c2aa3baef14a21a731dc393da4c0a69128e09bbab9060148faec6881bf9574ed4132e578
+  data.tar.gz: 1557ced41cb9823d56b5c56c6be7bfe3cdbe806284424133d46455b09cf3a8e8027d43e84d271d060ad040b8c793ce5b02b2377fa88159a126a36b38024dcd9f

data/.rubocop.yml

@@ -36,6 +36,9 @@ Metrics/AbcSize:
   Enabled: false
 
 # -- Layout --------------------------------------------------------------------
+Layout/AlignHash:
+  EnforcedColonStyle: table
+
 Layout/MultilineOperationIndentation:
   Enabled: false
 
@@ -45,7 +48,7 @@ Layout/MultilineMethodCallIndentation:
 Layout/MultilineHashBraceLayout:
   Enabled: false
 
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   EnforcedStyle: consistent
 
 Layout/EmptyLinesAroundModuleBody:

data/.travis.yml

@@ -1,12 +1,19 @@
 language: ruby
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 gemfile:
   - test/gemfiles/5.0.gemfile
   - test/gemfiles/5.1.gemfile
   - test/gemfiles/5.2.gemfile
+jobs:
+  include:
+    - rvm: 2.5.7
+      gemfile: test/gemfiles/6.0.gemfile
+    - rvm: 2.6.5
+      gemfile: test/gemfiles/6.0.gemfile
 branches:
   only:
     - master

data/Gemfile

@@ -5,10 +5,22 @@ source "http://rubygems.org"
 gemspec
 
 # Uncomment and change rails version for testing purposes
-gem "rails", "~> 5.2.0.rc1"
+# gem "rails", "~> 5.0.0"
+# gem "rails", "~> 5.1.0"
+# gem "rails", "~> 5.2.0"
+gem "rails", "~> 6.0.0"
+
+# Rails 5.0 needs lower version of this gem:
+# gem "sqlite3", "~> 1.3.0"
+gem "sqlite3"
 
 group :development do
-  gem "rubocop", require: false
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem "listen", ">= 3.0.5", "< 3.2"
+  gem "rubocop", "0.70.0", require: false
+  gem "sassc-rails"
+  gem "web-console", ">= 3.3.0"
+  gem "webpacker"
 end
 
 group :test do
@@ -16,6 +28,5 @@ group :test do
   gem "diffy"
   gem "equivalent-xml"
   gem "minitest"
-  gem "sqlite3"
   gem "timecop"
 end

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2018 Oleg Khabarov
+Copyright 2018-19 Oleg Khabarov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -188,6 +188,7 @@ label:                {}
 append:               nil
 prepend:              nil
 help:                 nil
+error:                nil
 check_inline:         false
 custom_control:       false
 ```
@@ -241,6 +242,7 @@ won't render all form elements. Things like errors messages won't show up right.
 You can change label generated by Rails to something else:
 
 ```erb
+<%= form.text_field :value, bootstrap: {label: "Custom Label"} %>
 <%= form.text_field :value, bootstrap: {label: {text: "Custom Label"}} %>
 ```
 
@@ -329,4 +331,4 @@ You may completely disable bootstrap and use default form builder by passing
 
 ---
 
-Copyright 2018 Oleg Khabarov, Released under the [MIT License](LICENSE.md)
+Copyright 2018-19 Oleg Khabarov, Released under the [MIT License](LICENSE.md)

data/lib/comfy_bootstrap_form/bootstrap_options.rb

@@ -12,22 +12,22 @@ module ComfyBootstrapForm
   class BootstrapOptions
 
     # When set to `true` only default rails form builder element is rendered.
-    attr_reader :disabled
+    attr_accessor :disabled
 
     # Controls form layout. Can be: "vertical" (default), "horizontal" or "inline"
-    attr_reader :layout
+    attr_accessor :layout
 
     # CSS class for label column when using horizontal form. Default: "col-sm-2"
-    attr_reader :label_col_class
+    attr_accessor :label_col_class
 
     # CSS class for control column when using horizontal form. Default: "col-sm-10"
-    attr_reader :control_col_class
+    attr_accessor :control_col_class
 
     # CSS class for label alignment in horizontal form. Default: "text-sm-right"
-    attr_reader :label_align_class
+    attr_accessor :label_align_class
 
     # CSS class used to space out form groups for inline forms. Default: "mr-sm-2"
-    attr_reader :inline_margin_class
+    attr_accessor :inline_margin_class
 
     # Label specific options. Default is and empty hash. Options are as follows:
     #   text:   "Label Text"  - override automatically generated label text
@@ -48,26 +48,32 @@ module ComfyBootstrapForm
     #
     #   form.text_field :search, bootstrap: {append: {html: "<button>Go</button>".html_safe}}
     #
-    attr_reader :prepend
-    attr_reader :append
+    attr_accessor :prepend
+    attr_accessor :append
 
     # Help text that goes under the form field. Example usage:
     #
     #   form.password_field :password, bootstrap: {help: "Password should be more than 8 characters in length"}
     #
-    attr_reader :help
+    attr_accessor :help
 
     # Options to render checkboxes and radio buttons inline. Default is false. Example:
     #
     #   form.collection_radio_buttons :choices, ["yes", "no"], :to_s, :to_s, bootstrap: {check_inline: true}
     #
-    attr_reader :check_inline
+    attr_accessor :check_inline
 
     # Enables special input styling for file_field, radio and checkboxes. Example:
     #
     #   form.file_file :photo, bootstrap: {custom_control: true}
     #
-    attr_reader :custom_control
+    attr_accessor :custom_control
+
+    # Manually rendering the error message. Example:
+    #
+    #   form.text_field :foo, bootstrap: {error: "Error Message"}
+    #
+    attr_accessor :error
 
     def initialize(options = {})
       set_defaults
@@ -103,10 +109,14 @@ module ComfyBootstrapForm
 
     def set_options(options = {})
       options.is_a?(Hash) && options.each do |key, value|
-        instance_variable_set("@#{key}", value)
+        public_send("#{key}=", value)
       end
     end
 
+    def label=(value)
+      @label = value.is_a?(Hash) ? value : { text: value }
+    end
+
   private
 
     def set_defaults
@@ -120,6 +130,7 @@ module ComfyBootstrapForm
       @append               = nil
       @prepend              = nil
       @help                 = nil
+      @error                = nil
       @check_inline         = false
       @custom_control       = false
     end

data/lib/comfy_bootstrap_form/form_builder.rb

@@ -7,8 +7,8 @@ module ComfyBootstrapForm
 
     FIELD_HELPERS = %w[
       color_field date_field datetime_field email_field month_field
-      number_field password_field phone_field range_field search_field text_area
-      text_field time_field url_field week_field
+      password_field phone_field range_field search_field text_area
+      text_field rich_text_area time_field url_field week_field
     ].freeze
 
     DATE_SELECT_HELPERS = %w[
@@ -67,6 +67,21 @@ module ComfyBootstrapForm
       RUBY_EVAL
     end
 
+    # Wrapper for the number field. It has default changed from `step: "1"` to `step: "any"`
+    # to prevent confusion when dealing with decimal numbers.
+    #
+    #   number_field :amount, step: 5
+    #
+    def number_field(method, options = {})
+      bootstrap = form_bootstrap.scoped(options.delete(:bootstrap))
+      options.reverse_merge!(step: "any")
+      return super(method, options) if bootstrap.disabled
+
+      draw_form_group(bootstrap, method, options) do
+        super(method, options)
+      end
+    end
+
     # Wrapper for select helper. Boostrap options are sent via options hash:
     #
     #   select :choices, ["a", "b"], bootstrap: {label: {text: "Custom"}}
@@ -116,8 +131,8 @@ module ComfyBootstrapForm
       bootstrap = form_bootstrap.scoped(options.delete(:bootstrap))
       return super if bootstrap.disabled
 
-      help_text = draw_help(bootstrap.help)
-      errors    = draw_errors(method)
+      help_text = draw_help(bootstrap)
+      errors    = draw_errors(bootstrap, method)
 
       add_css_class!(options, "form-check-input")
       add_css_class!(options, "is-invalid") if errors.present?
@@ -296,7 +311,7 @@ module ComfyBootstrapForm
     # form group wrapper for input fields
     def draw_form_group(bootstrap, method, options)
       label  = draw_label(bootstrap, method, for_attr: options[:id])
-      errors = draw_errors(method)
+      errors = draw_errors(bootstrap, method)
 
       control = draw_control(bootstrap, errors, method, options) do
         yield
@@ -312,9 +327,24 @@ module ComfyBootstrapForm
       end
     end
 
-    def draw_errors(method)
-      return unless object.present?
-      return unless (errors = object.errors[method]).present?
+    def draw_errors(bootstrap, method)
+      errors = []
+
+      if bootstrap.error.present?
+        errors = [bootstrap.error]
+      else
+        return if object.nil?
+
+        errors = object.errors[method]
+
+        # If error is on association like `belongs_to :foo`, we need to render it
+        # on an input field with `:foo_id` name.
+        if errors.blank?
+          errors = object.errors[method.to_s.sub(%r{_id$}, "")]
+        end
+      end
+
+      return if errors.blank?
 
       content_tag(:div, class: "invalid-feedback") do
         errors.join(", ")
@@ -331,6 +361,10 @@ module ComfyBootstrapForm
     #
     #   text_field(:value, bootstrap: {label: {text: "Custom", class: "custom"}})
     #
+    # You may also just set the label text by passing a string instead of label hash:
+    #
+    #   text_field(:value, bootstrap: {label: "Custom Label"})
+    #
     def draw_label(bootstrap, method, for_attr: nil)
       options = bootstrap.label.dup
       text    = options.delete(:text)
@@ -365,6 +399,7 @@ module ComfyBootstrapForm
     #
     def draw_control_column(bootstrap, offset:)
       return yield unless bootstrap.horizontal?
+
       css_class = bootstrap.control_col_class.to_s
       css_class += " #{bootstrap.offset_col_class}" if offset
       content_tag(:div, class: css_class) do
@@ -382,7 +417,7 @@ module ComfyBootstrapForm
       prepend_html  = draw_input_group_content(bootstrap, :prepend)
       append_html   = draw_input_group_content(bootstrap, :append)
 
-      help_text = draw_help(bootstrap.help)
+      help_text = draw_help(bootstrap)
 
       # Not prepending or appending anything. Bail.
       if prepend_html.blank? && append_html.blank?
@@ -420,8 +455,10 @@ module ComfyBootstrapForm
     #
     #   text_field(:value, bootstrap: {help: "help text"})
     #
-    def draw_help(text)
+    def draw_help(bootstrap)
+      text = bootstrap.help
       return if text.blank?
+
       content_tag(:small, text, class: "form-text text-muted")
     end
 
@@ -451,8 +488,8 @@ module ComfyBootstrapForm
           add_css_class!(html_options, "form-check-input")
         end
 
-        errors    = draw_errors(method)
-        help_text = draw_help(bootstrap.help)
+        errors    = draw_errors(bootstrap, method)
+        help_text = draw_help(bootstrap)
 
         add_css_class!(html_options, "is-invalid") if errors.present?
 

data/lib/comfy_bootstrap_form/version.rb

@@ -2,6 +2,6 @@
 
 module ComfyBootstrapForm
 
-  VERSION = "4.0.6"
+  VERSION = "4.0.7"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails