effective_bootstrap 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09d2f8d91357f5486377ae6a31483533bf214f4c8f1ba536bc9061828529370
-  data.tar.gz: e6a42b55fc5b377d7ccebf1b7418c41df907ed4b66de6ee58407690e46e82767
+  metadata.gz: 653ce4dc21d9961a88154cbfb0b3c59e4d4f85615e3edc4d89f774fbca7a0026
+  data.tar.gz: 724f3a374fe198d935fb72773e0e411c070bb9365c93228ca64c01bf93893a27
 SHA512:
-  metadata.gz: 95b1495a52b26a3970754866ef7d35735be448daa675c3f21745ec8ff6298d893d8ecc912d37b28d1dd03ffad3fed29fa3adbcc26e6a278a050a6565bb052dbb
-  data.tar.gz: 174be86ba9a4064b21a3dcdbe4c13787165a574a31f93773ac12de60d20212e37edea12793197afa360502f95f6f2fd8941281696f114f881c2aa61da6fea470
+  metadata.gz: d8d946e930a29d18016012f49f2df1b72a43da46504fdc7e0c943bc111c92d85d34f394fe77a708bb93a27b10bb25c0ef003024d3b29606449057c8d156546ef
+  data.tar.gz: 4d23bd8f9fb754f318a3115ae72ddd924714e9704bfad6d4e489510503dcbdead65f13abef5b0ab2867f18e2377700aa4c672fd7126e0d4889d6a21158d9b112

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.2'.freeze
+  VERSION = '0.9.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Code and Effect