effective_bootstrap 1.26.3 → 1.27.0

data/app/models/effective/form_input.rb

@@ -12,7 +12,7 @@ module Effective
 
     DEFAULT_INPUT_GROUP_OPTIONS = { input_group: { class: 'input-group' }, prepend: false, append: false }
 
-    HORIZONTAL_LABEL_OPTIONS = { class: 'col-sm-2 col-form-label'}
+    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' } }
@@ -194,7 +194,7 @@ module Effective
       return nil if key.blank?
 
       hint = ::I18n.t(key)
-      return nil if hint.include?(key) # missing translation 
+      return nil if hint.include?(key) # missing translation
 
       hint
     end
@@ -259,7 +259,7 @@ module Effective
     end
 
     def required_options?(opts)
-      return true unless (opts.key?(:if) || opts.key?(:unless))
+      return true unless opts.key?(:if) || opts.key?(:unless)
 
       # if opts[:if].respond_to?(:call)
       #   return object.instance_exec(object, &opts[:if])
@@ -482,6 +482,5 @@ module Effective
     def input_js_options_method_name
       { method_name: "effective_#{self.class.name.split('::').last.underscore.chomp('_field')}" }
     end
-
   end
 end

data/app/models/effective/form_inputs/article_editor.rb

@@ -3,11 +3,10 @@
 module Effective
   module FormInputs
     class ArticleEditor < Effective::FormInput
-
       # https://imperavi.com/article/docs/settings/
       def self.defaults
         {
-           # This is overridden by the active_storage() method below
+          # This is overridden by the active_storage() method below
           active_storage: nil,
 
           # This is overridden by the css() method below
@@ -50,7 +49,7 @@ module Effective
             gutter: '1px',
             offset: {
               left: '15px',
-              right: '15px',
+              right: '15px'
             },
             patterns: {
               '6|6': 'col-md-6|col-md-6',
@@ -111,13 +110,13 @@ module Effective
               'bordered': { title: 'Bordered', classname: 'table-bordered' },
               'responsive': { title: 'Responsive', classname: 'table-responsive' },
               'small': { title: 'Small', classname: 'table-sm' },
-              'striped': { title: 'Striped', classname: 'table-striped' },
+              'striped': { title: 'Striped', classname: 'table-striped' }
             }
           },
           topbar: {
             undoredo: true,
             shortcuts: true
-          },
+          }
         }
       end
 
@@ -209,16 +208,15 @@ module Effective
 
       def build_human_label
         name = self.name.to_s
-  
+
         label = if object
           object.class.human_attribute_name(name).sub(/^Rich text /, '').capitalize
         else
           BLANK
         end
-  
+
         label
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/check_box.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class CheckBox < Effective::FormInput
-
       def to_html(&block)
         case layout
         when :horizontal
@@ -66,7 +65,6 @@ module Effective
         return @custom unless @custom.nil?
         @custom = (options.delete(:custom) != false)
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/checks.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module Effective
-
   module FormInputs
     class Checks < CollectionInput
-
       def build_input(&block)
         html = @builder.collection_check_boxes(name, options_collection, value_method, label_method, collection_options, item_input_options) { |builder| build_item(builder) }
 
@@ -75,7 +73,6 @@ module Effective
         content_tag(:label, options[:label]) do
           [text, actions].compact.join.html_safe
         end
-
       end
 
       def build_item(builder)
@@ -107,7 +104,6 @@ module Effective
         return @actions unless @actions.nil?
         @actions = (options[:input].delete(:actions) != false)
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/ck_editor.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class CkEditor < Effective::FormInput
-
       def build_input(&block)
         content = value.presence || (capture(&block) if block_given?)
         @builder.super_text_area(name, (options[:input] || {}).merge(autocomplete: 'off'))
@@ -44,7 +43,6 @@ module Effective
       def width
         @width ||= options.delete(:width)
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/clear.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class Clear < Effective::FormInput
-
       def to_html(&block)
         content_tag(:button, options[:input]) do
           icon_name.present? ? (icon(icon_name) + name) : name
@@ -18,7 +17,6 @@ module Effective
         return @icon unless @icon.nil?
         @icon = options[:input].delete(:icon) || ''.html_safe
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/collection_input.rb

@@ -96,7 +96,7 @@ module Effective
             collection.inject({}) { |h, (k, group)| h[k] = translate(group).map { |obj| [obj.to_s, "#{obj.class.model_name}_#{obj.id}"] }; h }
           elsif grouped
             collection.inject({}) { |h, (k, group)| h[k] = translate(group).map { |obj| obj }; h }
-          elsif (collection == :boolean || collection == :booleans || collection == :boolean_collection)
+          elsif collection == :boolean || collection == :booleans || collection == :boolean_collection
             EffectiveBootstrap.boolean_collection
           else
             translate(collection).map { |obj| obj }
@@ -132,8 +132,8 @@ module Effective
             first = Array(options_collection.values.first).first
 
             string_of_strings = (
-              options_collection.kind_of?(Hash) && 
-              options_collection.keys.all? { |key| key.kind_of?(String) } && 
+              options_collection.kind_of?(Hash) &&
+              options_collection.keys.all? { |key| key.kind_of?(String) } &&
               options_collection.values.all? { |values| values.kind_of?(Array) && values.all? { |value| value.kind_of?(String) } }
             )
 
@@ -174,7 +174,6 @@ module Effective
       def polymorphic_id_value
         value.try(:id)
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/date_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class DateField < DatetimeField
-
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_date', ('not-date-linked' if not_date_linked?)].compact.join(' '),
@@ -17,8 +16,8 @@ module Effective
       end
 
       def input_group_options
-        { 
-          input_group: { class: 'input-group effective_date_time_picker_input_group' }, 
+        {
+          input_group: { class: 'input-group effective_date_time_picker_input_group' },
           prepend: (content_tag(:span, icon('calendar'), class: 'input-group-text') unless readonly?)
         }
       end
@@ -34,7 +33,6 @@ module Effective
       def format # moment.js
         'YYYY-MM-DD'
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/datetime_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class DatetimeField < Effective::FormInput
-
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_datetime', ('not-date-linked' if not_date_linked?)].compact.join(' '),
@@ -80,7 +79,6 @@ module Effective
           raise "unexpected date object #{obj}. Expected a DateTime, Range of DateTimes or String"
         end
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/delete.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class Delete < Submit
-
       def build_input(&block)
         tags = [
           icon('check', style: 'display: none;'),
@@ -26,7 +25,6 @@ module Effective
       def border?
         false
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/editor.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class Editor < Effective::FormInput
-
       def build_input(&block)
         content = value.presence || (capture(&block) if block_given?)
 
@@ -39,8 +38,8 @@ module Effective
           # [{'header': [1, 2, 3, 4, false] }],
           ['bold', 'italic', 'underline'],
           ['link', 'image', 'video'], # also 'code-block'
-          [{'list': 'ordered'}, {'list': 'bullet'}, 'blockquote'],
-          [{'align': [] }, 'clean']
+          [{ 'list': 'ordered' }, { 'list': 'bullet' }, 'blockquote'],
+          [{ 'align': [] }, 'clean']
         ]
       end
 
@@ -56,7 +55,7 @@ module Effective
             border: 'none',
             color: 'white'
           },
-          modules: [ 'Resize', 'DisplaySize' ]
+          modules: ['Resize', 'DisplaySize']
         }
       end
 
@@ -89,7 +88,6 @@ module Effective
           end
         )
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/email_cc_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class EmailCcField < Effective::FormInput
-
       def build_input(&block)
         @builder.super_text_field(name, options[:input])
       end
@@ -15,7 +14,6 @@ module Effective
       def input_group_options
         { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('at-sign'), class: 'input-group-text') }
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/email_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class EmailField < Effective::FormInput
-
       def input_html_options
         { class: 'form-control effective_email', placeholder: 'someone@example.com', id: tag_id }
       end
@@ -16,7 +15,6 @@ module Effective
       def validated?(name)
         true
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/error_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class ErrorField < Effective::FormInput
-
       def input_html_options
         { class: 'alert alert-danger', id: tag_id }
       end
@@ -43,7 +42,6 @@ module Effective
         return @include_name unless @include_name.nil?
         @include_name = options[:input].key?(:include_name) ? options[:input].delete(:include_name) : true
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/file_field.rb

@@ -3,8 +3,8 @@
 module Effective
   module FormInputs
     class FileField < Effective::FormInput
-
       def build_input(&block)
+        @attachment_url = options[:input].delete(:attachment_url)
         case attachments_style
         when :card
           build_existing_attachments + build_attachments + build_uploads_and_purge(super)
@@ -23,7 +23,7 @@ module Effective
           direct_upload: true,
           'data-direct-upload-url': (@template.main_app.rails_direct_uploads_url unless options[:direct_upload] == false),
           'data-progress-template': progress_template,
-          'data-click-submit': (true if click_submit?),
+          'data-click-submit': (true if click_submit?)
         }.compact
       end
 
@@ -46,7 +46,7 @@ module Effective
 
       # This has the affect of appending files to the has_many. Which usually isnt what we want
       def build_existing_attachments
-        attachments = Array(object.send(name))
+        attachments = Array(object.send(name)).select { |attachment| attachment.blob&.persisted? }
 
         attachments.map.with_index do |attachment, index|
           if multiple?
@@ -60,7 +60,7 @@ module Effective
       def build_attachments
         return ''.html_safe unless object.respond_to?(name) && object.send(name).respond_to?(:attached?) && object.send(name).attached?
 
-        attachments = object.send(name).respond_to?(:length) ? object.send(name) : [object.send(name)]
+        attachments = Array(object.send(name)).select { |attachment| attachment.blob&.persisted? }
 
         case attachments_style
         when :card
@@ -90,9 +90,15 @@ module Effective
         end
       end
 
+      # Encrypted attachments can supply an authorized decrypted preview URL.
+      def attachment_url(attachment)
+        return @attachment_url.call(attachment) if @attachment_url.respond_to?(:call)
+        (@template.url_for(attachment) rescue false) ||
+          (Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true) rescue false)
+      end
+
       def build_table_attachment(attachment)
-        url = (@template.url_for(attachment) rescue false)
-        url ||= (Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true) rescue false)
+        url = attachment_url(attachment)
 
         return unless url
 
@@ -118,8 +124,7 @@ module Effective
       end
 
       def build_card_attachment(attachment)
-        url = (@template.url_for(attachment) rescue false)
-        url ||= (Rails.application.routes.url_helpers.rails_blob_path(attachment, only_path: true) rescue false)
+        url = attachment_url(attachment)
 
         return unless url
 
@@ -189,7 +194,6 @@ module Effective
       def attachments_style
         @attachments_style ||= (options[:input].delete(:attachments_style) || options[:input].delete(:attachment_style) || :card)
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/float_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class FloatField < Effective::FormInput
-
       def build_input(&block)
         @builder.super_number_field(name, options[:input])
       end
@@ -21,7 +20,6 @@ module Effective
       def validated?(name)
         true
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/form_group.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class FormGroup < Effective::FormInput
-
       def build_input(&block)
         content_tag(:label, (name || '&nbsp;').html_safe) + capture(&block)
       end
@@ -11,7 +10,6 @@ module Effective
       def feedback_options
         false
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/has_many.rb

@@ -167,7 +167,7 @@ module Effective
         else
           { class: ['has-many-fields', "has-many-fields-#{display}"].join(' ') }
         end
-        
+
         content_tag(:div, insert + render_fields(content, remove + reorder), opts)
       end
 
@@ -195,7 +195,7 @@ module Effective
         end
       end
 
-      def render_insert()
+      def render_insert
         content_tag(:div, link_to_insert(), class: 'has-many-actions')
       end
 
@@ -248,7 +248,7 @@ module Effective
           class: 'has-many-insert ' + (html_class || 'btn btn-sm btn-secondary'),
           title: (title || 'Insert Another'),
           data: {
-            'effective-form-has-many-insert': true,
+            'effective-form-has-many-insert': true
           }
         )
       end
@@ -260,7 +260,7 @@ module Effective
           class: 'has-many-reorder btn btn-sm btn-secondary',
           title: 'Reorder',
           data: {
-            'effective-form-has-many-reorder': true,
+            'effective-form-has-many-reorder': true
           }
         )
       end
@@ -280,7 +280,7 @@ module Effective
           title: (title || 'Remove'),
           data: {
             'confirm': "Remove #{resource}?",
-            'effective-form-has-many-remove': true,
+            'effective-form-has-many-remove': true
           }
         )
       end
@@ -292,7 +292,7 @@ module Effective
           class: 'has-many-remove-disabled btn btn-sm btn-danger',
           title: 'Remove',
           data: {
-            'effective-form-has-many-remove-disabled': true,
+            'effective-form-has-many-remove-disabled': true
           }
         )
       end
@@ -307,7 +307,6 @@ module Effective
           object.send(name).delete(resource)
         end
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/hidden_field.rb

@@ -3,11 +3,9 @@
 module Effective
   module FormInputs
     class HiddenField < Effective::FormInput
-
       def to_html(&block)
         @builder.super_hidden_field(name, options[:input].except(:class, :required))
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/integer_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class IntegerField < Effective::FormInput
-
       def build_input(&block)
         @builder.super_text_field(name, options[:input].merge(value: value_to_i))
       end

data/app/models/effective/form_inputs/number_text_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class NumberTextField < Effective::FormInput
-
       def build_input(&block)
         @builder.super_text_field(name, options[:input])
       end
@@ -11,7 +10,6 @@ module Effective
       def input_html_options
         { class: 'form-control effective_number_text', autocomplete: 'off', id: tag_id }
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/password_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class PasswordField < Effective::FormInput
-
       def input_html_options
         { class: 'form-control effective_password', id: tag_id }
       end
@@ -34,7 +33,6 @@ module Effective
           { valid: { class: 'valid-feedback' }, invalid: { class: 'invalid-feedback' }, reset: true }
         end
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/percent_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class PercentField < Effective::FormInput
-
       def build_input(&block)
         @builder.hidden_field(name, value: percent_to_integer, id: tag_id + '_value_as_integer') +
         @template.text_field_tag(name, percent_to_s, options[:input].merge(id: tag_id, name: nil))
@@ -34,7 +33,6 @@ module Effective
         str = value.kind_of?(Integer) ? ('%.3f' % (value / 1000.0)) : value.to_s
         str.gsub('.000', '')
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/phone_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class PhoneField < Effective::FormInput
-
       DEFAULT_TEL_MASK = '(999) 999-9999? x99999'
       DEFAULT_CELL_MASK = '(999) 999-9999'
 
@@ -35,7 +34,6 @@ module Effective
         return @cell unless @cell.nil?
         @cell = options.key?(:cell) ? options.delete(:cell) : name.to_s.include?('cell')
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/price_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class PriceField < Effective::FormInput
-
       def build_input(&block)
         @builder.hidden_field(name, value: price, id: tag_id + '_value_as_integer') +
         @template.text_field_tag(name, @template.number_to_currency(currency, unit: ''), options[:input].merge(id: tag_id, name: nil))
@@ -28,7 +27,6 @@ module Effective
         return nil unless value
         value.kind_of?(Integer) ? ('%.2f' % (value / 100.0)) : value
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/radios.rb

@@ -14,7 +14,6 @@
 module Effective
   module FormInputs
     class Radios < CollectionInput
-
       def build_wrapper(&block)
         tag = (buttons? || cards?) ? :div : :fieldset
 
@@ -110,12 +109,12 @@ module Effective
 
         if buttons?
           opts = item_label_options.merge(for: item_id)
-          opts[:class] = [opts[:class], ('active' if active_item?(builder)), ('first-button' if first_item?) ].compact.join(' ')
+          opts[:class] = [opts[:class], ('active' if active_item?(builder)), ('first-button' if first_item?)].compact.join(' ')
 
           builder.label(opts) { builder.radio_button(id: item_id) + builder.text }
         elsif cards?
           opts = item_label_options.merge(for: item_id)
-          opts[:class] = [opts[:class], ('active' if active_item?(builder)), ('first-card' if first_item?) ].compact.join(' ')
+          opts[:class] = [opts[:class], ('active' if active_item?(builder)), ('first-card' if first_item?)].compact.join(' ')
 
           builder.label(opts) { builder.radio_button(id: item_id) + build_item_wrap { builder.text } }
         else
@@ -187,7 +186,6 @@ module Effective
         value = self.value || collection_options[:checked]
         value == builder.value || Array(value).map(&:to_s) == Array(builder.value).map(&:to_s)
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/remote_link_to.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class RemoteLinkTo < Submit
-
       def build_input(&block)
         tags = [
           icon('check', style: 'display: none;'),
@@ -26,7 +25,6 @@ module Effective
       def confirm
         (options.delete(:confirm) || "#{name} to<br>#{object}?").html_safe
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/reset.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class Reset < Effective::FormInput
-
       def to_html(&block)
         content_tag(:button, options[:input]) do
           icon_name.present? ? (icon(icon_name) + name) : name
@@ -18,7 +17,6 @@ module Effective
         return @icon unless @icon.nil?
         @icon = options[:input].delete(:icon) || ''.html_safe
       end
-
     end
   end
 end