effective_bootstrap 1.26.4 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca3151713ddf3fe2ba10d003040a7337e4af6fc606d20e1228e6d8f397bc7ed8
-  data.tar.gz: 8f51c987255a11ed33121e9c891a4615b2f05d449c32245e3a6fe3023645529f
+  metadata.gz: 4e155196cc973da70cd353e2f57f25f1e6cd1be03701eafcad73174562914588
+  data.tar.gz: 94387409afcd7c5158f616f326ff868cdf9cc2e47c79f30617de4cdf935fccfe
 SHA512:
-  metadata.gz: 2b4a0afdb255cb6c3e2111aee0a2ace632aa7a5c36ad716d25b2ad0d31ece912033876f30d02e3e161bb0640011cb8914e4394923dbabf1c168a25e1e5f477bb
-  data.tar.gz: 96385c23409c64e43152fd35e2ce4eb957b9e315a86029816f36f8c810a245901f9d4886e1f0ab9cd27200ebb205478a811c34b20e3479af6db51fbc6349677b
+  metadata.gz: b5c737e47f942dc665e5d4700af8ebf18fa7d6901211777b34ebdd9fe5af73229b3a5c3d6b7d3dd2476058f674ed91cd03005a68452ef34b74b59aa66d0af62e
+  data.tar.gz: 94f564bf1e08fe4e5a1f5b45985d003e25ba09f111531c6421994c009a0a55346aa2243792f039f5c887adcd9844374e2b281426d08a82bd8a3d9b999632d66b

data/README.md

@@ -165,6 +165,10 @@ or
 
 https://getbootstrap.com/docs/4.0/components/navs/#tabs
 
+Use `tab 'Logs', lazy: true do ... end` to defer an inactive tab's block until it is opened. The contents are fetched once from the same page and initialized with the existing Effective Bootstrap and DataTables hooks. Active tabs, non-GET renders, and inline datatable forms render normally. Repeated initialization is safe; failed loads wait for Retry. Use distinct `controls:` values when lazy tabs on the same page share a label, including with `unique: true`. Lazy tabs are intended for read-only content; unloaded form fields cannot be submitted. The follow-up GET renders only the requested tab and its ancestors; the controller, layout, and code outside tab blocks still run.
+
+Use `?tab=logs` to select and render Logs in the initial server response. A `#tab-logs` fragment alone is only visible to the browser and therefore still requires a lazy request.
+
 ```haml
 = tabs do
   = tab 'Demographics' do
@@ -808,3 +812,15 @@ We are just extending these existing community projects for ease of use with Rai
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
+
+## Tests
+
+From the gem repository, run:
+
+```sh
+bundle install
+bundle exec ruby test/tabs_test.rb
+bundle exec ruby test/tabs_browser_test.rb
+```
+
+The browser suite requires a local Chrome or Chromium installation.

data/app/assets/javascripts/effective_bootstrap/base.js.coffee

@@ -1,6 +1,8 @@
 # This initializes all the effective_* form inputs also in this gem
 this.EffectiveBootstrap ||= new class
   initialize: (target) ->
+    initializeEffectiveLazyTabs(target)
+
     $(target || document).find('[data-input-js-options]:not(.initialized)').each (i, element) ->
       $element = $(element)
       options = $element.data('input-js-options')

data/app/assets/javascripts/effective_bootstrap/form.js.coffee

@@ -8,7 +8,7 @@ this.EffectiveForm ||= new class
 
   validate: (form, event) ->
     $form = $(form)
-    valid = form.checkValidity() && @allChecksValid($form)
+    valid = event?.submitter?.formNoValidate || (form.checkValidity() && @allChecksValid($form))
 
     @clearFlash()
     @reset($form) if $form.hasClass('was-validated')

data/app/assets/javascripts/effective_bootstrap/tabs.js

@@ -3,33 +3,84 @@ $(document).on('show.bs.tab', function (e) {
   history.replaceState(history.state, null, '#' + e.target.getAttribute('id'));
 });
 
+// Resolve one tab link; unique: true adds a numeric suffix to its controls.
+function findEffectiveTab(href) {
+  if (!href) { return $(); }
+  var $links = $('.nav a[data-toggle="tab"]');
+  var $tab = $links.filter(function() { return this.getAttribute('href') === href; });
+  if (!$tab.length) {
+    $tab = $links.filter(function() {
+      var target = this.getAttribute('href') || '';
+      return target.startsWith(href + '-') && /^\d+$/.test(target.slice(href.length + 1));
+    });
+  }
+  return $tab.length === 1 ? $tab : $();
+}
+
 // Display the tab based on form errors, the document hash, or ?tab= params
 function initializeEffectiveTabs() {
-  var href = '';
-
-  var $tab_with_error = $(".form-control.is-invalid").first().closest('.tab-pane')
-
-  if ($tab_with_error.length > 0) {
-    href = $tab_with_error.attr('id')
-  } else if (document.location.hash.length > 0) {
-    var hash = document.location.hash
-    if(hash.startsWith('#tab-')) { href = hash.replace('#tab-', '') }
-  } else if (document.location.search.length > 0) {
-    var param = new URLSearchParams(document.location.search).get('tab') || ''
-    if(param.length > 0) { href = param }
+  var hash = document.location.hash;
+  var tabId = $('.form-control.is-invalid').first().closest('.tab-pane').attr('id') || (hash.startsWith('#tab-') ? hash.slice(5) : new URLSearchParams(document.location.search).get('tab'));
+
+  if (tabId) {
+    var $tab = findEffectiveTab('#' + tabId);
+
+    $tab.parents('.tab-pane').each (function() { findEffectiveTab('#' + this.id).tab('show'); });
+    $tab.tab('show');
   }
 
-  if (href.length > 0) {
-    var $tab = $(".nav.nav-tabs").find("a[href^='#" + href + "']")
+  initializeEffectiveLazyTabs();
+}
+
+function initializeEffectiveLazyTabs(target) {
+  var selector = '.tab-pane[data-lazy-tab-url]:not(.initialized)';
+  $(target || document).find(selector).addBack(selector).filter(':visible').each(function() {
+    loadEffectiveTab(this);
+  });
+}
 
-    $tab.parents('.tab-pane').each (function() {
-      $('.nav.nav-tabs').find("a[href^='#" + $(this).attr('id') + "']").tab('show')
-    })
+function loadEffectiveTab(pane) {
+  var $pane = $(pane);
+  if ($pane.hasClass('initialized') || $pane.data('lazy-tab-loading') || $pane.find('.effective-lazy-tab-retry').length) { return; }
 
-    $tab.tab('show')
-  }
+  var selector = '[data-lazy-tab="' + $.escapeSelector($pane.attr('data-lazy-tab')) + '"].initialized';
+  var tabKeys = $pane.parents('[data-lazy-tab]').addBack().map(function() { return this.getAttribute('data-lazy-tab'); }).get();
+  var sourceUrl = $pane.attr('data-lazy-tab-url');
+  var url = sourceUrl + (sourceUrl.includes('?') ? '&' : '?') + $.param({ _lazy_tab: tabKeys });
+
+  $pane.data('lazy-tab-loading', true).attr('aria-busy', 'true').html('<p>Loading...</p>');
+
+  // Loading into a detached container keeps late responses away from replacement panes.
+  var $content = $('<div>');
+
+  $content.load(url + ' ' + selector, function(_response, status) {
+    $pane.removeAttr('aria-busy').removeData('lazy-tab-loading');
+    if (!pane.isConnected) { return; }
+
+    var $loaded = $content.children();
+    if (status === 'error' || $loaded.length !== 1 || $loaded.attr('data-lazy-tab-url') !== $pane.attr('data-lazy-tab-url')) {
+      $pane.html('<p role="alert">Unable to load this tab. <button type="button" class="btn btn-link effective-lazy-tab-retry">Retry</button></p>');
+      return;
+    }
+
+    // Inserting content can itself trigger initialization.
+    $pane.addClass('initialized').html($loaded.html());
+    EffectiveBootstrap.initialize(pane);
+    $pane.trigger('effective-datatables:initialize');
+  });
 }
 
+$(document).on('shown.bs.tab', 'a[data-toggle="tab"]', function(event) {
+  var pane = document.getElementById(event.currentTarget.getAttribute('aria-controls'));
+  if (pane) { initializeEffectiveLazyTabs(pane); }
+});
+
+$(document).on('click', '.effective-lazy-tab-retry', function(event) {
+  var $pane = $(event.currentTarget).closest('.tab-pane');
+  $pane.empty();
+  loadEffectiveTab($pane[0]);
+});
+
 $(initializeEffectiveTabs);
 $(document).on('turbolinks:load turbo:load', initializeEffectiveTabs);
 
@@ -38,6 +89,5 @@ $(document).on('turbolinks:load turbo:load', initializeEffectiveTabs);
 $(document).on('click', '[data-click-tab]', function(event) {
   event.preventDefault();
 
-  var href = $(event.currentTarget).attr('href');
-  $('.nav.nav-tabs').find("a[href^='" + href + "']").tab('show');
+  findEffectiveTab($(event.currentTarget).attr('href')).tab('show');
 });

data/app/assets/stylesheets/effective_bootstrap/overrides.scss

@@ -8,6 +8,11 @@
 // tabs do
 ul.nav.nav-tabs { margin-bottom: 1rem; }
 
+@media print {
+  // Omit unloaded lazy panes even when print styles reveal inactive tabs.
+  .tab-content > .tab-pane[data-lazy-tab-url]:not(.initialized) { display: none !important; }
+}
+
 // cursor on disabled radios
 .custom-control-input:disabled ~ .custom-control-label { cursor: no-drop; }
 .custom-control-input:disabled ~ .custom-control-label::after { cursor: no-drop; }

data/app/controllers/concerns/effective_bootstrap/save_tabs.rb

@@ -3,18 +3,15 @@ module EffectiveBootstrap
     extend ActiveSupport::Concern
 
     included do
-
       # If there is a params[:_tabs], save it to the session
-      before_action(if: -> { params[:_tabs] }) do
+      before_action(if: -> { params[:_tabs] && !(request.get? && params[:_lazy_tab].present?) }) do
         session[:_tabs] = params[:_tabs]
       end
 
       # After we're done, delete it from session
-      after_action(if: -> { session[:_tabs] }) do
+      after_action(if: -> { session[:_tabs] && !(request.get? && params[:_lazy_tab].present?) }) do
         session.delete(:_tabs) unless response.redirect?
       end
-
     end
-
   end
 end

data/app/helpers/effective_article_editor_helper.rb

@@ -14,5 +14,4 @@ module EffectiveArticleEditorHelper
 
     rendered.html_safe
   end
-
 end

data/app/helpers/effective_bootstrap_helper.rb

@@ -1,3 +1,5 @@
+require 'benchmark'
+
 # frozen_string_literal: true
 
 # Boostrap4 Helpers
@@ -51,7 +53,7 @@ module EffectiveBootstrapHelper
     return if value.blank?
 
     badge_opts = opts
-    badge_opts = {context: opts} unless badge_opts.kind_of?(Hash)
+    badge_opts = { context: opts } unless badge_opts.kind_of?(Hash)
 
     context = badge_opts[:context].to_s.sub('badge-', '').presence || 'secondary'
     badge_opts[:class] ||= "badge badge-#{context}"
@@ -110,11 +112,11 @@ module EffectiveBootstrapHelper
     label = (icon('clipboard', class: 'small-1') + ' ' + opts[:label]).html_safe
 
     content_tag(
-      :button, 
-      label, 
-      class: ['btn-clipboard-copy', opts[:class]].compact.join(' '), 
-      type: 'button', 
-      'data-clipboard': text, 
+      :button,
+      label,
+      class: ['btn-clipboard-copy', opts[:class]].compact.join(' '),
+      type: 'button',
+      'data-clipboard': text,
       'data-clipboard-label': label
     )
   end
@@ -175,13 +177,13 @@ module EffectiveBootstrapHelper
     link_class += ' collapsed' unless show
 
     # Figure out all the button / link options
-    link_opts = { 
-      'data-toggle': 'collapse', 
-      role: 'button', 
-      href: "##{id}", 
-      'aria-controls': "##{id}", 
-      'aria-expanded': show, 
-      class: link_class 
+    link_opts = {
+      'data-toggle': 'collapse',
+      role: 'button',
+      href: "##{id}",
+      'aria-controls': "##{id}",
+      'aria-expanded': show,
+      class: link_class
     }.merge(opts)
 
     # Normal collapse
@@ -209,14 +211,14 @@ 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_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_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_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
@@ -522,7 +524,7 @@ module EffectiveBootstrapHelper
     )
     last = (collection_count.to_f / per_page).ceil
 
-    return unless (last > 1 || render_single_page) # If there's only 1 page, don't render a pagination at all.
+    return unless last > 1 || render_single_page # If there's only 1 page, don't render a pagination at all.
 
     # Build URL
     uri = URI(url || request.fullpath)
@@ -589,7 +591,7 @@ module EffectiveBootstrapHelper
   end
 
   # Let Kaminari override this method.
-  alias_method(:paginate, :bootstrap_paginate) unless (respond_to?(:paginate) || defined?(Kaminari))
+  alias_method(:paginate, :bootstrap_paginate) unless respond_to?(:paginate) || defined?(Kaminari)
 
   def reveal_mail_to(email)
     raise('expected an email') unless email.kind_of?(String) && email.include?('@')
@@ -609,45 +611,56 @@ module EffectiveBootstrapHelper
   # If you pass active 'label' it will make that tab active. Otherwise first.
   # Unique will make sure the tab html IDs are unique
   # $('#tab-demographics').tab('show')
-  def tabs(active: nil, unique: false, ignore_save_tab: false, benchmarks: EffectiveBootstrap.benchmarks, list: {}, content: {}, &block)
+  def tabs(active: nil, unique: false, ignore_save_tab: false, benchmarks: EffectiveBootstrap.benchmarks, list: {}, content: {}, vertical: false, &block)
+    previous_tabs = @_effective_tabs
     raise 'expected a block' unless block_given?
 
+    requested_tabs = previous_tabs ? previous_tabs[:requested] : (request.get? ? Array.wrap(params[:_lazy_tab]) : [])
+    state = { labels: [], requested: requested_tabs }
+    @_effective_tabs = state
+
     # The Active Tab might be set from a previous form submission, or passed into helper
-    tab_active = session[:_tabs].try(:pop) unless ignore_save_tab
+    tab_active = session[:_tabs].try(:pop) unless ignore_save_tab || (request.get? && params[:_lazy_tab].present?)
     tab_active ||= active
 
-    # If an active tab is passed, we validate we have a tab with that label, or fallback to first
-    if tab_active.present?
-      @_tab_mode = :validate
-      @_tab_labels = []
+    # Validate selections against the available labels and controls before rendering.
+    if tab_active.present? || params[:tab].present?
+      state[:mode] = :validate
       yield
 
-      tab_active = nil unless @_tab_labels.include?(tab_active)
+      tab_active = params[:tab] if state[:labels].include?(params[:tab])
+      tab_active = nil if tab_active && !state[:labels].include?(tab_active)
     end
 
-    tab_active ||= :first if tab_active.nil?
-    @_tab_unique = effective_bootstrap_unique_id if unique
-    @_tab_benchmarks = {} if benchmarks # Enables benchmarks
+    tab_active = :first if tab_active.nil?
+    state[:unique] = effective_bootstrap_unique_id if unique
+    state[:benchmarks] = {} if benchmarks
+
+    list_options = if vertical
+      { class: 'nav flex-column nav-pills my-2', role: 'tablist', 'aria-orientation': :vertical }
+    else
+      { class: 'nav nav-tabs', role: 'tablist' }
+    end
 
     # Generate the html in two passes
-    tabs_list = content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) do
-      @_tab_mode = :tablist
-      @_tab_active = tab_active
+    tabs_list = content_tag(vertical ? :div : :ul, list_options.merge(list)) do
+      state[:mode] = vertical ? :tablist_vertical : :tablist
+      state[:active] = tab_active
 
       yield # Yield to tab the first time
     end
 
-    tabs_divs = content_tag(:div, {class: 'tab-content'}.merge(content)) do
-      @_tab_mode = :content
-      @_tab_active = tab_active
+    tabs_divs = content_tag(:div, { class: (vertical ? 'tab-content my-2' : 'tab-content') }.merge(content)) do
+      state[:mode] = :content
+      state[:active] = tab_active
 
       yield # Yield to tab the second time
     end
 
     if benchmarks
-      total = @_tab_benchmarks.values.sum(&:real)
+      total = state[:benchmarks].values.sum(&:real)
 
-      @_tab_benchmarks.each do |label, benchmark|
+      state[:benchmarks].each do |label, benchmark|
         percent = (benchmark.real / total * 100).round(0)
         amount = (benchmark.real * 1000).round(0)
 
@@ -665,75 +678,80 @@ module EffectiveBootstrapHelper
       tabs_list = tabs_list.html_safe
     end
 
-    (tabs_list + tabs_divs)
-  end
+    return tabs_list + tabs_divs unless vertical
 
-  NUMBERS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
+    content_tag(:div, class: 'row border') do
+      content_tag(:div, tabs_list, class: 'col-3 border-right') + content_tag(:div, tabs_divs, class: 'col-9')
+    end
+  ensure
+    @_effective_tabs = previous_tabs
+  end
 
   def tab(resource, opts = {}, &block)
     return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
+
+    state = @_effective_tabs || {}
     plural = resource.kind_of?(ActiveRecord::Base) == false
     label = opts[:label] || effective_bootstrap_human_name(resource, plural: opts.fetch(:plural, plural), prefer_model_name: true)
 
-    (@_tab_labels.push(label) and return) if @_tab_mode == :validate
+    key = (opts[:controls] || label.to_s.parameterize.gsub('_', '-')).delete_prefix('#')
+    key = "item-#{key}" if key.match?(/\A\d/) # Can't start with a number
 
-    controls = opts[:controls] || label.to_s.parameterize.gsub('_', '-')
-    controls = "item-#{controls}" if NUMBERS.include?(controls[0]) # Can't start with a number
-    controls = controls[1..-1] if controls[0] == '#'
-    controls = "#{controls}-#{@_tab_unique}" if @_tab_unique
+    if state[:mode] == :validate
+      state[:labels].push(label, key)
+      return
+    end
 
-    active = (@_tab_active == :first || @_tab_active == label)
+    controls = [key, state[:unique]].compact.join('-')
+    active = [:first, label, key].include?(state[:active])
 
-    @_tab_active = nil if @_tab_active == :first
+    state[:active] = nil if state[:active] == :first
 
-    if @_tab_mode == :tablist_vertical
-      content_tag(:a, label, id: ('tab-' + controls), class: ['nav-link', ('active' if active)].compact.join(' '), href: '#' + controls, 'aria-controls': controls, 'aria-selected': active.to_s, 'data-toggle': 'tab', role: 'tab')
-    elsif @_tab_mode == :tablist # Inserting the label into the tablist top
-      content_tag(:li, class: 'nav-item') do
-        content_tag(:a, label, id: ('tab-' + controls), class: ['nav-link', ('active' if active)].compact.join(' '), href: '#' + controls, 'aria-controls': controls, 'aria-selected': active.to_s, 'data-toggle': 'tab', role: 'tab')
-      end
-    else # Inserting the content into the tab itself
-      classes = ['tab-pane', 'fade', ('show active' if active), opts[:class].presence].compact.join(' ')
-      content_tag(:div, id: controls, class: classes, role: 'tabpanel', 'aria-labelledby': ('tab-' + controls), 'data-tab-label': label) do
-        if @_tab_benchmarks.kind_of?(Hash)
-          @_tab_benchmarks[label] = Benchmark.measure { yield }
-        else
-          yield
-        end
-      end
+    if [:tablist, :tablist_vertical].include?(state[:mode])
+      link = content_tag(:a, label, id: ('tab-' + controls), class: ['nav-link', ('active' if active)], href: '#' + controls, 'aria-controls': controls, 'aria-selected': active.to_s, 'data-toggle': 'tab', role: 'tab')
+      return state[:mode] == :tablist ? content_tag(:li, link, class: 'nav-item') : link
     end
-  end
 
-  def vertical_tabs(active: nil, unique: false, list: {}, content: {}, &block)
-    raise 'expected a block' unless block_given?
+    requested_tabs = state.fetch(:requested) { request.get? ? Array.wrap(params[:_lazy_tab]) : [] }
+    return if requested_tabs.present? && !requested_tabs.include?(key)
 
-    @_tab_mode = :tablist_vertical
-    @_tab_active = (active || :first)
-    @_tab_unique = effective_bootstrap_unique_id if unique
+    lazy = opts[:lazy] && request.get? && !(respond_to?(:inline_datatable?) && inline_datatable?)
+    deferred = lazy && !active && !requested_tabs.include?(key)
 
-    content_tag(:div, class: 'row border') do
-      content_tag(:div, class: 'col-3 border-right') do
-        content_tag(:div, {class: 'nav flex-column nav-pills my-2', role: 'tablist', 'aria-orientation': :vertical}.merge(list)) do
-          yield # Yield to tab the first time
-        end
-      end +
-      content_tag(:div, class: 'col-9') do
-        content_tag(:div, {class: 'tab-content my-2'}.merge(content)) do
-          @_tab_mode = :content
-          @_tab_active = (active || :first)
-          yield # Yield to tab the second time
-        end
+    source_url = if lazy
+      query = request.query_parameters.except('_tabs', '_lazy_tab').to_query.presence
+      [request.path, query].compact.join('?')
+    end
+
+    classes = ['tab-pane', 'fade', ('show active' if active), ('initialized' if lazy && !deferred), opts[:class]]
+    # Ancestor keys let fragment requests skip unrelated tab blocks.
+    content_tag(:div, id: controls, class: classes, role: 'tabpanel', 'aria-labelledby': ('tab-' + controls), 'data-tab-label': label,
+      'data-lazy-tab': key, 'data-lazy-tab-url': source_url) do
+      # Once the target is reached, render its subtree normally.
+      state[:requested] = [] if requested_tabs.last == key
+      if deferred
+        content_tag(:p, 'Loading...')
+      elsif state[:benchmarks]
+        state[:benchmarks][label] = Benchmark.measure { yield }
+      else
+        yield
       end
+    ensure
+      state[:requested] = requested_tabs
     end
   end
 
+  def vertical_tabs(active: nil, unique: false, list: {}, content: {}, &block)
+    tabs(active: active, unique: unique, list: list, content: content, vertical: true, ignore_save_tab: true, benchmarks: false, &block)
+  end
+
   def merge_class_key(hash, value)
-    return { :class => value } unless hash.kind_of?(Hash)
+    return { class: value } unless hash.kind_of?(Hash)
 
     if hash[:class].present?
-      hash.merge!(:class => "#{hash[:class]} #{value}")
+      hash.merge!(class: "#{hash[:class]} #{value}")
     else
-      hash.merge!(:class => value)
+      hash.merge!(class: value)
     end
   end
 
@@ -781,5 +799,4 @@ module EffectiveBootstrapHelper
     # Return the updated value
     @_effective_bootstrap_unique_id
   end
-
 end

data/app/helpers/effective_editor_helper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module EffectiveEditorHelper
-
   def effective_editor_tag(content, options = {})
     content = content.presence || '{}'
 
@@ -27,5 +26,4 @@ module EffectiveEditorHelper
 
     content_tag(:div, '', id: "ql-#{content.object_id}", class: 'effective_editor_content ql-effective', data: { 'input-js-options': input_js, 'content': content })
   end
-
 end

data/app/helpers/effective_form_builder_helper.rb

@@ -91,5 +91,4 @@ module EffectiveFormBuilderHelper
       ActionView::Base.field_error_proc = original
     end
   end
-
 end

data/app/helpers/effective_icons_helper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module EffectiveIconsHelper
-
   # icon('check', class: 'big-4')
   # icon('check', class: 'small-3')
   def icon(svg, options = {})
@@ -49,5 +48,4 @@ module EffectiveIconsHelper
   def remove_icon_to(path, options = {})
     icon_to('remove', path, { title: 'Remove' }.merge(options))
   end
-
 end

data/app/helpers/effective_iframe_helper.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 module EffectiveIframeHelper
-
   def iframe_srcdoc_tag(srcdoc)
     content_tag(
-      :iframe, 
+      :iframe,
       '',
       srcdoc: srcdoc,
       style: 'frameborder: 0; border: 0; width: 100%; height: 100%;',
@@ -12,5 +11,4 @@ module EffectiveIframeHelper
       scrolling: 'no'
     )
   end
-
 end

data/app/helpers/effective_table_builder_helper.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module EffectiveTableBuilderHelper
-
   def effective_table_with(resource, options = {}, &block)
     builder = Effective::TableBuilder.new(resource, self, options)
     builder.render(&block)
   end
-
 end

data/app/models/effective/form_builder.rb

@@ -2,7 +2,6 @@
 
 module Effective
   class FormBuilder < ActionView::Helpers::FormBuilder
-
     attr_accessor :template, :layout, :action, :readonly, :disabled, :remote
 
     delegate :content_tag, to: :template
@@ -222,6 +221,5 @@ module Effective
 
       Effective::FormInputs::HasMany.new(name, options, builder: self).to_html(&block)
     end
-
   end
 end

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