effective_bootstrap 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4538dcdf672ff18dadb24146b5186498ffad746ff81d736fbfd24ba8f23a7f89
-  data.tar.gz: b0a95bd9c6d58c1a3cf86da55a871c5d5da85faa4296d9d5de3201bd6b45ba67
+  metadata.gz: c99ee9149a14d12b358d091ad6cebb80daf48170b609911e12d219d7ce5419af
+  data.tar.gz: 70107ccde4ca9fb2b7913ed8f262c8086cd15889bb27e79d4c4ba4c1f22f95d4
 SHA512:
-  metadata.gz: 653f533b1ae794be6558a9da86c99fc4c69bab5fe19c85a16395a10b24d3c8d43c4878386586006dea73d1380177c09ffeb5fca5986dc317b452f5a003251ea9
-  data.tar.gz: eedc133811ffea31458b65ae3d2c76a2562b410ac285d25bdf07056568cc0ac587b708b310bcedc278f180bf769970ee5996f27afde0bd4ac0d04e2999bf76d4
+  metadata.gz: c4b8aa210f3a582a110c1eca6959c6238c5f897381126b958f584cea4d51e60f7218435a113c0e50b4031a1f7cf6bc39b7ab1b3cfdcfe276b33c5f1a5f511485
+  data.tar.gz: 5ec8f4f333bb7e7ac46fdeaf1d47583b38732ddfbb157390efa9968b140a0640f35c7734b905d901d89247ad957110b557b3fed5122425666ca4242eeda08edd

data/app/assets/stylesheets/effective_bootstrap.scss

@@ -2,9 +2,6 @@
 
 @import 'effective_checks/input';
 @import 'effective_datetime/input';
-@import 'effective_date/input';
-@import 'effective_time/input';
-
 @import 'effective_file/input';
 @import 'effective_rich_text_area/input';
 @import 'effective_select/input';

data/app/assets/stylesheets/effective_rich_text_area/input.scss

@@ -1,4 +1,4 @@
-.trix-content {
+.effective_rich_text_area {
   height: 100%;
   border-color: #ccc;
 

data/app/helpers/effective_bootstrap_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Boostrap4 Helpers
 
 module EffectiveBootstrapHelper
@@ -30,7 +32,7 @@ module EffectiveBootstrapHelper
   def collapse(label, opts = {}, &block)
     raise 'expected a block' unless block_given?
 
-    id = "collapse-#{''.object_id}"
+    id = "collapse-#{String.new.object_id}"
     show = (opts.delete(:show) == true)
 
     link_opts = { 'data-toggle': 'collapse', role: 'button', href: "##{id}", 'aria-controls': "##{id}", 'aria-expanded': show }
@@ -72,15 +74,27 @@ module EffectiveBootstrapHelper
   # variations can be :dropup, :dropleft, :dropright
   # split can be true, false
   # right is to right align things
+  DROPDOWN_SPLIT_OPTS = {class: "btn dropdown-toggle dropdown-toggle-split btn-sm btn-outline-primary", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false}
+  DROPDOWN_UNSPLIT_OPTS= {class: "btn dropdown-toggle btn-sm btn-outline-primary", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false}
+
+  DROPDOWN_DROPLEFT_GROUP_OPTS = {class: 'btn-group'}
+  DROPDOWN_DROPLEFT_OPTS = {class: 'btn-group dropleft', role: 'group'}
+
+  DROPDOWN_MENU_OPTS = {class: 'dropdown-menu'}
+  DROPDOWN_MENU_RIGHT_OPTS = {class: 'dropdown-menu dropdown-menu-right'}
+
+  DROPDOWN_BTN_CLASS = 'btn-sm btn-outline-primary'
+  DROPDOWN_TOGGLE_DROPDOWN = "<span class='sr-only'>Toggle Dropdown</span>".html_safe
+
   def dropdown(variation: nil, split: true, btn_class: nil, btn_content: nil, right: false, &block)
     raise 'expected a block' unless block_given?
 
-    btn_class = btn_class.presence || 'btn-outline-primary'
+    btn_class ||= DROPDOWN_BTN_CLASS
 
+    # Process all dropdown_link_tos
     @_dropdown_link_tos = []
     @_dropdown_split = split
-
-    # process dropdown_link_tos
+    @_dropdown_button_class = btn_class
     yield
 
     return @_dropdown_link_tos.first if @_dropdown_link_tos.length <= 1
@@ -88,31 +102,37 @@ module EffectiveBootstrapHelper
     # Build tags
     first = @_dropdown_link_tos.first
 
-    button = content_tag(:button, class: "btn #{btn_class} dropdown-toggle" + (split ? " dropdown-toggle-split" : ''), type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
-      btn_content || content_tag(:span, 'Toggle Dropdown', class: 'sr-only')
+    button_opts = (split ? DROPDOWN_SPLIT_OPTS : DROPDOWN_UNSPLIT_OPTS)
+
+    if btn_class != DROPDOWN_BTN_CLASS
+      button_opts[:class] = button_opts[:class].sub(DROPDOWN_BTN_CLASS, btn_class)
+    end
+
+    button = content_tag(:button, button_opts) do
+      btn_content || DROPDOWN_TOGGLE_DROPDOWN
     end
 
+    menu_opts = (right ? DROPDOWN_MENU_RIGHT_OPTS : DROPDOWN_MENU_OPTS)
+
     menu = if split
-      content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
+      content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, menu_opts)
     else
-      content_tag(:div, @_dropdown_link_tos.join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
+      content_tag(:div, @_dropdown_link_tos.join.html_safe, menu_opts)
     end
 
-    retval = if split
+    @_dropdown_link_tos = nil
+
+    if split && variation == :dropleft
+      content_tag(:div, DROPDOWN_DROPLEFT_GROUP_OPTS) do
+        content_tag(:div, (button + menu), DROPDOWN_DROPLEFT_OPTS) + first.html_safe
+      end
+    elsif split
       content_tag(:div, class: 'btn-group') do
-        content_tag(:div, class: ['btn-group', variation.to_s.presence].compact.join(' '), role: 'group') do
-          [:dropleft].include?(variation) ? (button + menu) : (first + button + menu)
-        end + ([:dropleft].include?(variation) ? first : '').html_safe
+        content_tag(:div, (first + button + menu), class: "btn-group #{variation}", role: 'group')
       end
     else
-      content_tag(:div, class: 'dropdown') do
-        button + menu
-      end
+      content_tag(:div, (button + menu), class: 'dropdown')
     end
-
-    @_dropdown_link_tos = nil
-
-    retval
   end
 
   # This is a special variant of dropdown
@@ -135,17 +155,17 @@ module EffectiveBootstrapHelper
 
   # Works with dots do and dropdown do
   def dropdown_link_to(label, path, options = {})
-    btn_class = options.delete(:btn_class).presence || 'btn-outline-primary'
+    btn_class = options.delete(:btn_class).presence || @_dropdown_button_class || 'btn-outline-primary'
 
     unless @_dropdown_link_tos
-      options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
+      options[:class] = (options[:class] ? "dropdown-item #{options[:class]}" : 'dropdown-item')
       return link_to(label, path, options)
     end
 
     if @_dropdown_link_tos.length == 0 && @_dropdown_split
-      options[:class] = [options[:class], 'btn', btn_class].compact.join(' ')
+      options[:class] = (options[:class] ? "btn #{btn_class} #{options[:class]}" : "btn #{btn_class}")
     else
-      options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')
+      options[:class] = (options[:class] ? "dropdown-item #{options[:class]}" : 'dropdown-item')
     end
 
     @_dropdown_link_tos << link_to(label, path, options)

data/app/models/effective/form_input.rb

@@ -1,11 +1,25 @@
+# frozen_string_literal: true
+
 module Effective
   class FormInput
     attr_accessor :name, :options
 
     BLANK = ''.html_safe
+    EMPTY_HASH = {}
+
     EXCLUSIVE_CLASS_PREFIXES = [] # None
     EXCLUSIVE_CLASS_SUFFIXES = ['-primary', '-secondary', '-success', '-danger', '-warning', '-info', '-light', '-dark']
 
+    DEFAULT_INPUT_GROUP_OPTIONS = { input_group: { class: 'input-group' }, prepend: false, append: false }
+
+    HORIZONTAL_LABEL_OPTIONS = { class: 'col-sm-2 col-form-label'}
+    INLINE_LABEL_OPTIONS = { class: 'sr-only' }
+
+    DEFAULT_FEEDBACK_OPTIONS = { valid: { class: 'valid-feedback' }, invalid: { class: 'invalid-feedback' } }
+
+    HORIZONTAL_WRAPPER_OPTIONS = { class: 'form-group row' }
+    VERTICAL_WRAPPER_OPTIONS = { class: 'form-group' }
+
     delegate :object, to: :@builder
     delegate :capture, :content_tag, :image_tag, :link_to, :icon, :asset_path, to: :@template
 
@@ -20,7 +34,7 @@ module Effective
     end
 
     def input_group_options
-      { input_group: { class: 'input-group' }, prepend: false, append: false }
+      DEFAULT_INPUT_GROUP_OPTIONS
     end
 
     def input_html_options
@@ -28,17 +42,17 @@ module Effective
     end
 
     def input_js_options
-      {}
+      EMPTY_HASH
     end
 
     def label_options
       case layout
       when :horizontal
-        { class: 'col-sm-2 col-form-label'}
+        HORIZONTAL_LABEL_OPTIONS
       when :inline
-        { class: 'sr-only' }
+        INLINE_LABEL_OPTIONS
       else
-        { }
+        EMPTY_HASH
       end
     end
 
@@ -47,7 +61,7 @@ module Effective
       when :inline
         false
       else
-        { valid: { class: 'valid-feedback' }, invalid: { class: 'invalid-feedback' } }
+        DEFAULT_FEEDBACK_OPTIONS
       end
     end
 
@@ -63,9 +77,9 @@ module Effective
     def wrapper_options
       case layout
       when :horizontal
-        { class: 'form-group row' }
+        HORIZONTAL_WRAPPER_OPTIONS
       else
-        { class: 'form-group' }
+        VERTICAL_WRAPPER_OPTIONS
       end
     end
 
@@ -166,7 +180,7 @@ module Effective
 
       invalid = object.errors[name].to_sentence.presence if object.respond_to?(:errors)
       invalid ||= options[:feedback][:invalid].delete(:text).presence
-      invalid ||= [("can't be blank" if options[:input][:required]), ('must be valid' if validated?(name))].compact.join(' and ').presence
+      invalid ||= [("can't be blank" if options[:input][:required]), ('must be valid' if validated?(name))].tap(&:compact!).join(' and ').presence
       invalid ||= "can't be blank or is invalid"
 
       valid = options[:feedback][:valid].delete(:text) || 'Looks good!'
@@ -268,7 +282,7 @@ module Effective
         item_value = (item.send(value_method).to_s.parameterize.presence rescue nil)
       end
 
-      [tag_id, item_value, object_id].compact.join('_')
+      [tag_id, item_value, object_id].tap(&:compact!).join('_')
     end
 
     private
@@ -282,7 +296,7 @@ module Effective
       # effective_bootstrap specific options
       layout = options.delete(:layout) # Symbol
       wrapper = options.delete(:wrapper) # Hash
-      input_group = { append: options.delete(:append), prepend: options.delete(:prepend), input_group: options.delete(:input_group) }.compact
+      input_group = { append: options.delete(:append), prepend: options.delete(:prepend), input_group: options.delete(:input_group) }.tap(&:compact!)
 
       feedback = options.delete(:feedback) # Hash
       label = options.delete(:label) # String or Hash
@@ -317,11 +331,11 @@ module Effective
       # Server side validation
       if has_error?
         if has_error?(name)
-          options[:input][:class] = [options[:input][:class], 'is-invalid'].compact.join(' ')
+          options[:input][:class] = (options[:input][:class] ? "#{options[:input][:class]} is-invalid" : 'is-invalid')
         elsif reset_feedback?
           # Nothing
         else
-          options[:input][:class] = [options[:input][:class], 'is-valid'].compact.join(' ')
+          options[:input][:class] = (options[:input][:class] ? "#{options[:input][:class]} is-valid" : 'is-valid')
         end
       end
 
@@ -333,7 +347,7 @@ module Effective
         options[:input][:readonly] = 'readonly'
 
         unless options[:input][:class].to_s.include?('form-control-plaintext')
-          options[:input][:class] = options[:input][:class].to_s.sub('form-control', 'form-control-plaintext')
+          options[:input][:class] = (options[:input][:class] || '').sub('form-control', 'form-control-plaintext')
         end
       end
 
@@ -347,17 +361,17 @@ module Effective
     end
 
     def merge_defaults!(obj, defaults)
-      defaults = {} if defaults.nil?
+      defaults = EMPTY_HASH if defaults.nil?
 
       case obj
       when false
         false
       when nil, true
-        defaults
+        defaults.dup
       when String
         defaults.merge(text: obj)
       when Hash
-        html_classes = (obj[:class].to_s.split(' ') + defaults[:class].to_s.split(' ')).uniq
+        html_classes = ((obj[:class] || '').split(' ') + (defaults[:class] || '').split(' ')).uniq
 
         # Try to smart merge bootstrap classes
         if (exclusive = html_classes.select { |c| c.include?('-') }).length > 1
@@ -421,11 +435,11 @@ module Effective
     end
 
     def sanitized_object_name
-      @builder.object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+      @sanitized_object_name ||= @builder.object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
     end
 
     def sanitized_method_name
-      name.to_s.sub(/\?$/, "")
+      @sanitized_method_name ||= name.to_s.sub(/\?$/, "")
     end
 
     def input_js_options_method_name

data/app/models/effective/form_logic.rb

@@ -34,7 +34,7 @@ module Effective
     end
 
     def input_js_options
-      { 'data-input-js-options' => JSON.generate({method_name: input_js_options_method_name}.merge(logic_options)) }
+      { 'data-input-js-options' => JSON.generate({method_name: input_js_options_method_name}.merge!(logic_options)) }
     end
 
     def input_js_options_method_name

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.9.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -575,7 +575,6 @@ files:
 - app/assets/stylesheets/effective_bootstrap/overrides.scss
 - app/assets/stylesheets/effective_bootstrap_editor.scss
 - app/assets/stylesheets/effective_checks/input.scss
-- app/assets/stylesheets/effective_date/input.scss
 - app/assets/stylesheets/effective_datetime/bootstrap-datetimepicker.scss
 - app/assets/stylesheets/effective_datetime/input.scss
 - app/assets/stylesheets/effective_datetime/overrides.scss
@@ -590,7 +589,6 @@ files:
 - app/assets/stylesheets/effective_select/overrides.scss
 - app/assets/stylesheets/effective_select/select2.css
 - app/assets/stylesheets/effective_select_or_text/input.scss
-- app/assets/stylesheets/effective_time/input.scss
 - app/helpers/effective_bootstrap_helper.rb
 - app/helpers/effective_editor_helper.rb
 - app/helpers/effective_form_builder_helper.rb

data/app/assets/stylesheets/effective_date/input.scss

@@ -1 +0,0 @@
-@import '../effective_datetime/input';

data/app/assets/stylesheets/effective_time/input.scss

@@ -1 +0,0 @@
-@import '../effective_datetime/input';