rails_base 0.52.1 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f233f2247fd157198f76161529bca1bb88d55fee96b45104eaaa013882584c6
-  data.tar.gz: d5512bc281ea3ebef98bf1fd4cb8afd1f8c115494c2086f28ed305c0d7761916
+  metadata.gz: fe27d75cdddcc15a030ab4fa65a259e47cf05f2213495291b29aca0b31ea1bbf
+  data.tar.gz: 88fa8e22d35ffaf1357341ce223873a86ea313f0a628fdc9b1710583df358126
 SHA512:
-  metadata.gz: 0ee1fea7d46172fa3f51475c01b6accfa4e725182e46de18b3c0f4697a5f2e932036be43cd945461ddf6985ba250ffd3163d3c79df2dfabe57c4fd2a496b9e64
-  data.tar.gz: 17c9610469692e46e1c664f6bfea0a031de650090e8963c45986d5002fa86df9ed96c46eb29eadb9664c73b36e98123f0f3313090a448afb973d76d5048166c2
+  metadata.gz: 9b0b2c4d3685e8030655c05d294b25bc27740e547354eeb69400fbcb2383a84b515b3275493cea85315ddda0bd4417891098afd5620f0d1934e24f54b8f3d831
+  data.tar.gz: 2d1dab3b919b1b0b3534aa613b2aa40b79f6b34bc8f594602856d2266ba524f833616fee4f3a7fd474a7f7814e4dc5667ed455feaa11029a6f2365cfda3119bc

data/app/assets/javascripts/rails_base/application.js

@@ -11,7 +11,6 @@
 // about supported directives.
 //
 // = require rails-ujs
-// = require activestorage
 // = require turbolinks
 // = require_tree .
 

data/app/controllers/rails_base/admin_controller.rb

@@ -298,7 +298,8 @@ module RailsBase
       session.delete(RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON)
 
       flash[:notice] = 'You no longer have an identity crisis. You are back to normal.'
-      redirect_to RailsBase.url_routes.admin_base_path
+      redirect_url = RailsBase.config.admin.admin_impersonate_return.call(request, params)
+      redirect_to redirect_url
     end
 
     private

data/app/helpers/rails_base/appearance_helper.rb

@@ -1,6 +1,6 @@
 module RailsBase::AppearanceHelper
-  APPEARANCE_MODE_COOKIE = "_#{Rails.application.class.parent_name}_appearance_mode".gsub(' ', '-').downcase
-  APPEARANCE_MODE_ACTUAL_COOKIE = "_#{Rails.application.class.parent_name}_appearance_actual_mode".gsub(' ', '-').downcase
+  APPEARANCE_MODE_COOKIE = "_#{RailsBase.app_name}_appearance_mode".gsub(' ', '-').downcase
+  APPEARANCE_MODE_ACTUAL_COOKIE = "_#{RailsBase.app_name}_appearance_actual_mode".gsub(' ', '-').downcase
   APPEARANCE_TEXT_CLASS = RailsBase::Configuration::Display::Text::APPEARANCE_TEXT_CLASS
 
   VIEWPORT_EXTRA_SMALL = 'xs'.freeze

data/app/helpers/rails_base/application_helper.rb

@@ -1,6 +1,6 @@
 module RailsBase::ApplicationHelper
 
-  TIMEZONE_OFFSET_COOKIE = "_#{Rails.application.class.parent_name}_timeoffset"
+  TIMEZONE_OFFSET_COOKIE = "_#{RailsBase.app_name}_timeoffset"
   TIMEZONE_SESSION_NAME = TIMEZONE_THREAD_NAME = :tz_info
 
   def browser

data/app/mailers/rails_base/email_verification_mailer.rb

@@ -4,19 +4,19 @@ class RailsBase::EmailVerificationMailer < RailsBase::ApplicationMailer
 	def email_verification(user:, url:)
 	  @user = user
 	  @sso_url_for_user = url
-	  mail(to: @user.email, subject: "Welcome to #{Rails.application.class.parent_name}")
+	  mail(to: @user.email, subject: "Welcome to #{RailsBase.app_name}")
 	end
 
 	def forgot_password(user:, url:)
 	  @user = user
 	  @sso_url_for_user = url
-	  mail(to: @user.email, subject: "#{Rails.application.class.parent_name}: Forgot Password")
+	  mail(to: @user.email, subject: "#{RailsBase.app_name}: Forgot Password")
 	end
 
 	def event(user:, event:, msg: nil)
 	  @user = user
 	  @event = event
 	  @msg = msg
-	  mail(to: @user.email, subject: "#{Rails.application.class.parent_name}: #{event}")
+	  mail(to: @user.email, subject: "#{RailsBase.app_name}: #{event}")
 	end
 end

data/app/mailers/rails_base/event_mailer.rb

@@ -4,13 +4,13 @@ class RailsBase::EventMailer < RailsBase::ApplicationMailer
   def send_sso(user:, message:)
     @user = user
     @message = message
-    mail(to: user.email, subject: "#{Rails.application.class.parent_name}: SSO login", template_name: 'event')
+    mail(to: user.email, subject: "#{RailsBase.app_name}: SSO login", template_name: 'event')
     # event(user: user, event: 'SSO login', message: message)
   end
 
   def event(user:, event:, message:)
     @user = user
     @message = message
-    mail(to: @user.email, subject: "#{Rails.application.class.parent_name}: #{event}", template_name: 'event')
+    mail(to: @user.email, subject: "#{RailsBase.app_name}: #{event}", template_name: 'event')
   end
 end

data/app/models/rails_base/application_record.rb

@@ -6,7 +6,7 @@ module RailsBase
       columns.each do |column|
         next unless [:datetime].include?(column.type)
 
-        # This is actually pretty cool. If you set the thrad corectly, you can
+        # This is actually pretty cool. If you set the thread corectly, you can
         define_method("#{column.name}") do
           thread_tz = Thread.current[RailsBase::ApplicationController::TIMEZONE_THREAD_NAME]
           return super() if thread_tz.nil?

data/app/models/short_lived_data.rb

@@ -97,7 +97,7 @@ class ShortLivedData < RailsBase::ApplicationRecord
     # only update if count is valid and we can add things -- save db call
     return false unless used_count_valid?
 
-    update_attributes(exclusive_use_count: exclusive_use_count + 1)
+    update(exclusive_use_count: exclusive_use_count + 1)
   end
 
   def invalid_reason
@@ -126,7 +126,7 @@ class ShortLivedData < RailsBase::ApplicationRecord
   end
 
   def user=(u)
-    update_attributes(user_id: u.id)
+    update(user_id: u.id)
     u.id
   end
 end

data/app/models/user.rb

@@ -50,7 +50,7 @@ class User < RailsBase::ApplicationRecord
     end
 
     define_method("admin_#{admin_method}!") do
-      update_attributes!(admin: admin_method)
+      update!(admin: admin_method)
     end
 
     #### metods on the class
@@ -109,7 +109,7 @@ class User < RailsBase::ApplicationRecord
     return if last_known_timezone == tz_name
 
     Rails.logger.info { "#{id}: Setting tz_name: #{tz_name}"  }
-    update_attributes(last_known_timezone: tz_name, last_known_timezone_update: Time.now )
+    update(last_known_timezone: tz_name, last_known_timezone_update: Time.now )
   end
 
   def timezone

data/app/services/rails_base/admin_update_attribute.rb

@@ -14,7 +14,7 @@ module RailsBase
 
       original_value = model_row.public_send(attribute)
       begin
-        model_row.update_attributes!(attribute => sanitized_value)
+        model_row.update!(attribute => sanitized_value)
       rescue ActiveRecord::RecordInvalid => e
         context.fail!(message: "Failed to update [#{attribute}] with #{sanitized_value} on #{model}##{model_row.id}. #{e.message}")
       rescue StandardError

data/app/services/rails_base/authentication/single_sign_on_send.rb

@@ -9,6 +9,7 @@ module RailsBase::Authentication
     delegate :reason, to: :context
     delegate :token_type, to: :context
     delegate :url_redirect, to: :context
+    delegate :msg_proc, to: :context
 
     SSO_DECISION_TWILIO = :twilio
     SSO_DECISION_EMAIL = :email
@@ -38,17 +39,19 @@ module RailsBase::Authentication
       case sso_decision_type
       when SSO_DECISION_TWILIO
         context.sso_destination = :sms
-        send_to_twilio!(message: message(url: url))
+        send_to_twilio!(message: message(url: url, full_name: user.full_name))
       when SSO_DECISION_EMAIL
         context.sso_destination = :email
-        send_to_email!(message: message(url: url))
+        send_to_email!(message: message(url: url, full_name: user.full_name))
       end
     end
 
     # This method is expected to be overridden by the main app
     # This is the default message
     # Might consider shipping this to a locales that can be easily overridden in downstream app
-    def message(url:)
+    def message(url:, full_name:)
+      return msg_proc.call(url, full_name) if msg_proc.is_a?(Proc)
+
       "Hello #{user.full_name}. This is your SSO link to your favorite site.\n#{url}"
     end
 

data/app/views/layouts/rails_base/application.html.erb

@@ -20,6 +20,7 @@
     <link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">
     <script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>
     <script src="https://unpkg.com/sticky-table-headers"></script>
+    <script src="https://kit.fontawesome.com/3b649de495.js" crossorigin="anonymous"></script>
 
     <%=
     if RailsBase.config.app.favicon_path
@@ -31,7 +32,7 @@
   <body>
     <script type="text/javascript">
       // Load at top so available for rest of body oddy
-      function set_cookie(name, value, path ) {
+      function set_cookie(name, value, path) {
         path ||= '/'
         document.cookie = `${name}=${value}; path=${path}`
       }
@@ -126,6 +127,34 @@
     <% end %>
     </div>
 
+    <% if RailsBase.appearance.back_to_top.enable? %>
+      <a id="rails-base-back-to-top" class="btn btn-light btn-lg back-to-top" role="button"><i class="fas fa-chevron-up"></i></a>
+      <script type="text/javascript">
+        $(document).ready(function(){
+          $(window).scroll(function () {
+            if ($(this).scrollTop() > 100) {
+              $('#rails-base-back-to-top').fadeIn();
+            } else {
+              $('#rails-base-back-to-top').fadeOut();
+            }
+          });
+          $('#rails-base-back-to-top').click(function () {
+            $('body,html').animate({
+              scrollTop: 0
+            }, 400);
+          });
+        });
+      </script>
+      <style type="text/css">
+        .back-to-top {
+            position: fixed;
+            bottom: 50px;
+            right: 25px;
+            display: none;
+        }
+      </style>
+    <% end %>
+
     <script>
       modify_layout();
       function _rails_base_display_success(msg){
@@ -168,7 +197,7 @@
 
         // Attempt to set timezone on every request
         set_cookie('<%= RailsBase::ApplicationController::TIMEZONE_OFFSET_COOKIE %>', new Date().getTimezoneOffset())
-      });
+        });
       <% end %>
       <% if Rails.env == 'production' %>
       // Disable console logging

data/app/views/rails_base/devise/registrations/new.html.erb

@@ -69,7 +69,7 @@
     <div class="col-md-10 offset-md-1 text-center">
       <div class="row">
         <div class="col-md-9">
-          <%= f.submit "Sign Up for #{Rails.application.class.parent_name}", class: "btn btn_success btn-block #{submit_klass}" %>
+          <%= f.submit "Sign Up for #{RailsBase.app_name}", class: "btn btn_success btn-block #{submit_klass}" %>
         </div>
         <div class="col-md-3">
           <a class="btn btn_primary btn-block" href="<%=RailsBase.url_routes.new_user_session_path%>" role="button">Have an Account? Sign In</a>

data/app/views/rails_base/email_verification_mailer/email_verification.html.erb

@@ -7,7 +7,7 @@
   </br>
   </br>
   Best wishes,</br>
-  <%= Rails.application.class.parent_name %> team
+  <%= RailsBase.app_name %> team
 
 </p>
 </br>

data/app/views/rails_base/email_verification_mailer/event.html.erb

@@ -9,7 +9,7 @@
 </p>
 <% end %>
 <p>
-	If this is in error please login to your account: <a href=<%= RailsBase::ApplicationMailer::CONTACT_URL %>> Login link for <%= Rails.application.class.parent_name %> </a>
+	If this is in error please login to your account: <a href=<%= RailsBase::ApplicationMailer::CONTACT_URL %>> Login link for <%= RailsBase.app_name %> </a>
 </p>
 
 </br>

data/app/views/rails_base/mfa_auth/mfa_code.html.erb

@@ -8,3 +8,4 @@
     </div>
   </div>
 </div>
+

data/app/views/rails_base/shared/_appearance_mode_selector.html.erb

@@ -111,6 +111,11 @@
         '<%= dark %>': '<%= RailsBase.appearance.text.dark_mode %>',
         '<%= light %>': '<%= RailsBase.appearance.text.light_mode %>'
       },
+      {
+        'descriptor': '.card',
+        '<%= dark %>': '<%= RailsBase.appearance.card.dark_mode %>',
+        '<%= light %>': '<%= RailsBase.appearance.card.light_mode %>'
+      },
       // buttons
       <% RailsBase.appearance.class::BUTTONS.each do |klass| %>
       {
@@ -119,7 +124,6 @@
         '<%= light %>': '<%= RailsBase.appearance.dig(klass, :light_mode) %>'
       },
       <% end %>
-
     ]
 
     function toggle_dark_mode(set_key){
@@ -146,7 +150,7 @@
       set_and_toggle_mode(value)
     })
     // This function MUST be called outside of document ready
-    // to ensure dark mode does not activate after docuemnt is loaded
+    // to ensure dark mode does not activate after document is loaded
     set_and_toggle_mode( `<%= cookies[RailsBase::ApplicationController::APPEARANCE_MODE_COOKIE] || RailsBase.appearance.default_mode %>`)
     $('#appearance_mode_selector').appendTo('body');
     $(document).ready(function(){
@@ -180,4 +184,4 @@
       set_and_toggle_mode(get_cookie(cookie_name))
     });
   </script>
-<% end %>
+<% end %>

data/config/initializers/switch_user.rb

@@ -41,7 +41,7 @@ SwitchUser.setup do |config|
 
   # redirect_path is a block, it returns which page will be redirected
   # after switching a user.
-  config.redirect_path = ->(_request, _params) { RailsBase.url_routes.authenticated_root_path }
+  config.redirect_path = ->(request, params) { RailsBase.config.admin.admin_impersonate_redirect.call(request, params) }
 
   # helper_with_guest is a boolean value, if it set to false
   # the guest item in the helper won't be shown

data/lib/rails_base/admin/default_index_tile.rb

@@ -144,7 +144,6 @@ params = {
 instance = RailsBase::Admin::IndexTile.new(**params)
 RailsBase::Admin::IndexTile.add(instance)
 
-
 # Impersonation Tile
 params = {
   type: :button,

data/lib/rails_base/config.rb

@@ -1,3 +1,4 @@
+require 'singleton'
 require 'rails_base/configuration/admin'
 require 'rails_base/configuration/mfa'
 require 'rails_base/configuration/authentication'
@@ -13,6 +14,8 @@ require 'rails_base/configuration/active_job'
 
 module RailsBase
   class Config
+    include Singleton
+
     VARIABLES = {
       admin: nil,
       mfa: nil,

data/lib/rails_base/configuration/admin.rb

@@ -190,6 +190,16 @@ module RailsBase
           default: ENV.fetch('ADMIN_VELOCITY_FRAME', 5).to_i.hours,
           description: 'Debug purposes. How long to keep admin_velocity_max attempts',
         },
+        admin_impersonate_redirect:{
+          type: :proc,
+          default: ->(_request, _params) { RailsBase.url_routes.authenticated_root_path },
+          description: 'Redirection to impersonation -- Landing page when having an identity cris',
+        },
+        admin_impersonate_return:{
+          type: :proc,
+          default: ->(_request, _params) { RailsBase.url_routes.admin_base_path },
+          description: 'Redirection from impersonation -- Page to return from when you have found yourself',
+        }
       }
 
       attr_accessor *DEFAULT_VALUES.keys
@@ -211,8 +221,6 @@ module RailsBase
         admin_page_filter.flatten!
       end
 
-      private
-
       def convenience_methods
         # defines instance methods like
         # user.at_least_super?

data/lib/rails_base/configuration/app.rb

@@ -16,27 +16,27 @@ module RailsBase
         },
         web_name_logged_in: {
           type: :string_proc,
-          default: ->(user) { Rails.application.class.parent_name },
+          default: ->(user) { RailsBase.app_name },
           description: 'Name of the application when authenticated user is present. Name in the tab of the browser. Allows for dynamic tab names'
         },
         web_name_logged_out: {
           type: :string_proc,
-          default: ->(*) { Rails.application.class.parent_name },
+          default: ->(*) { RailsBase.app_name },
           description: 'Name of the application when no authenticated user. Name in the tab of the browser. Allows for dynamic tab names'
         },
         web_title_logged_in: {
           type: :string_proc,
-          default: ->(user) { Rails.application.class.parent_name },
+          default: ->(user) { RailsBase.app_name },
           description: 'Title in nav for the web when logged in. String or proc accepted. When proc, current user will be passed in.'
         },
         web_title_logged_out: {
           type: :string_proc,
-          default: ->(*) { Rails.application.class.parent_name },
+          default: ->(*) { RailsBase.app_name },
           description: 'Title in nav for the web when logged in. String or proc accepted. When proc, current user will be passed in.'
         },
         communication_name: {
           type: :string_proc,
-          default: ->(*) { Rails.application.class.parent_name },
+          default: ->(*) { RailsBase.app_name },
           description: 'Name used when communicating with users.'
         },
         favicon_path: {

data/lib/rails_base/configuration/appearance.rb

@@ -1,18 +1,22 @@
 require 'rails_base/configuration/base'
-require 'rails_base/configuration/display/table_header'
-require 'rails_base/configuration/display/table_body'
+require 'rails_base/configuration/display/back_to_top'
 require 'rails_base/configuration/display/background_color'
-require 'rails_base/configuration/display/navbar'
-require 'rails_base/configuration/display/text'
-require 'rails_base/configuration/display/footer'
+require 'rails_base/configuration/display/btn_danger'
+require 'rails_base/configuration/display/btn_dark'
+require 'rails_base/configuration/display/btn_info'
+require 'rails_base/configuration/display/btn_light'
 require 'rails_base/configuration/display/btn_primary'
 require 'rails_base/configuration/display/btn_secondary'
 require 'rails_base/configuration/display/btn_success'
-require 'rails_base/configuration/display/btn_danger'
 require 'rails_base/configuration/display/btn_warning'
-require 'rails_base/configuration/display/btn_info'
-require 'rails_base/configuration/display/btn_light'
-require 'rails_base/configuration/display/btn_dark'
+require 'rails_base/configuration/display/footer'
+require 'rails_base/configuration/display/navbar'
+require 'rails_base/configuration/display/table_body'
+require 'rails_base/configuration/display/table_header'
+require 'rails_base/configuration/display/text'
+require 'rails_base/configuration/display/card'
+require 'rails_base/configuration/display/card'
+require 'rails_base/configuration/display/bg_light'
 
 module RailsBase
   module Configuration
@@ -26,6 +30,8 @@ module RailsBase
         :btn_info,
         :btn_light,
         :btn_dark,
+        :bg_light,
+
       ]
 
       DOWNSTREAM_CLASSES = [
@@ -34,11 +40,12 @@ module RailsBase
         :bg_color,
         :navbar,
         :text,
+        :card,
         :footer,
-
+        :back_to_top,
       ] + BUTTONS
 
-      SKIP_DOWNSTREAM_CLASSES = [:footer]
+      SKIP_DOWNSTREAM_CLASSES = [:footer, :back_to_top]
       DARK_MODE = :dark
       LIGHT_MODE = :light
       MATCH_OS = :match_os
@@ -83,7 +90,10 @@ module RailsBase
         @bg_color = Configuration::Display::BackgroundColor.new
         @navbar = Configuration::Display::Navbar.new
         @text = Configuration::Display::Text.new
+        @card = Configuration::Display::Card.new
         @footer = Configuration::Display::Footer.new
+        @back_to_top = Configuration::Display::BackTotop.new
+        @bg_light = Configuration::Display::BgLight.new
 
         @btn_primary = Configuration::Display::BtnPrimary.new
         @btn_secondary = Configuration::Display::BtnSecondary.new

data/lib/rails_base/configuration/display/back_to_top.rb

@@ -0,0 +1,20 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    module Display
+      class BackTotop < Base
+
+        DEFAULT_VALUES = {
+          enable: {
+            type: :boolean,
+            default: true,
+            description: 'Enable Back to top icon on all pages',
+          },
+        }
+
+        attr_accessor *DEFAULT_VALUES.keys
+      end
+    end
+  end
+end

data/lib/rails_base/configuration/display/bg_light.rb

@@ -0,0 +1,25 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    module Display
+      class BgLight < Base
+
+        DEFAULT_VALUES = {
+          dark_mode: {
+            type: :string_nil,
+            default: 'bg-secondary',
+            description: 'Background to use in Dark mode'
+          },
+          light_mode: {
+            type: :string_nil,
+            default: 'bg-light',
+            description: 'Background to use in light mode'
+          },
+        }
+
+        attr_accessor *DEFAULT_VALUES.keys
+      end
+    end
+  end
+end

data/lib/rails_base/configuration/display/card.rb

@@ -0,0 +1,24 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    module Display
+      class Card < Base
+        DEFAULT_VALUES = {
+          dark_mode: {
+            type: :string_nil,
+            default: 'bg-dark',
+            description: 'Color of card for dark mode: https://getbootstrap.com/docs/4.0/utilities/colors/'
+          },
+          light_mode: {
+            type: :string_nil,
+            default: '',
+            description: 'Color of card for light mode : https://getbootstrap.com/docs/4.0/utilities/colors/'
+          },
+        }
+
+        attr_accessor *DEFAULT_VALUES.keys
+      end
+    end
+  end
+end

data/lib/rails_base/configuration/display/footer.rb

@@ -12,7 +12,7 @@ module RailsBase
           'RailsBase::MfaAuthController' => [:mfa_code],
           'RailsBase::SecondaryAuthenticationController' => [:static, :after_email_login_session_new, :forgot_password],
         }
-        DEFAULT_FOOTER_HTML = "© 2021 Year of the Rona: Bad Ass Rails Starter <a href='https://github.com/matt-taylor/' target='_blank'>@matt-taylor</a>"
+        DEFAULT_FOOTER_HTML = "© #{DateTime.now.year} Year of the Rona: Bad Ass Rails Starter built by <a href='https://github.com/matt-taylor/' target='_blank'>@matt-taylor</a>"
 
         DEFAULT_VALUES = {
           enable: {

data/lib/rails_base/configuration/display/text.rb

@@ -15,7 +15,6 @@ module RailsBase
             type: :string_nil,
             default: 'text-dark',
             description: 'Color of text for light mode. Text that is outside of standard elems (tables, navbars): https://getbootstrap.com/docs/4.0/utilities/colors/'
-
           },
         }
 

data/lib/rails_base/engine.rb

@@ -1,18 +1,26 @@
 module RailsBase
   class Engine < ::Rails::Engine
     isolate_namespace RailsBase
+    ActiveSupport::Reloader.to_prepare do
+      if RailsBase.___execute_initializer___?
+        RailsBase.config.admin.convenience_methods
+
+        RailsBase::ApplicationRecord.descendants.each do |model|
+          model._magically_defined_time_objects
+        end
+      end
+    end
 
     initializer 'instantiate RailsBase configs' do |_app|
-      RailsBase.config if ___execute_initializer___?
+      RailsBase.config if RailsBase.___execute_initializer___?
     end
 
     initializer 'remove write access to RailsBase config', after: 'after_initialize' do |app|
-      RailsBase::Configuration::Base._unset_allow_write! if ___execute_initializer___?
+      RailsBase::Configuration::Base._unset_allow_write! if RailsBase.___execute_initializer___?
     end
 
     initializer 'define magic convenionce methods for converting team', after: 'active_record.initialize_database' do |app|
-      if ___execute_initializer___?
-        raise
+      if RailsBase.___execute_initializer___?
         # need to eager load Models
         Rails.application.eager_load!
 
@@ -39,13 +47,6 @@ module RailsBase
       end
     end
 
-    def ___execute_initializer___?
-      # Only execute when not doing DB actions
-      boolean = defined?(ARGV) ? true : false  # for when no ARGVs are provided, we know its a railsc or rails s explicit
-      boolean = false if boolean && ARGV[0]&.include?('db') # when its the DB rake tasks
-      boolean = false if boolean && ARGV[0]&.include?('asset') # when its an asset
-      boolean = false if boolean && ARGV[0]&.include?(':') # else this delim should never be included
-      boolean = false if ENV['SKIP_CUSTOM_INIT']=='true' # explicitly set the variable to skip shit
-    end
+
   end
 end

data/lib/rails_base/version.rb

@@ -1,7 +1,7 @@
 module RailsBase
   MAJOR = '0'
-  MINOR = '52'
-  PATCH = '1'
+  MINOR = '54'
+  PATCH = '0'
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
   def self.print_version

data/lib/rails_base.rb

@@ -17,10 +17,31 @@ require 'rails_base/admin/action_cache'
 require 'rails_base/config'
 
 module RailsBase
+
+  # Rails 6 does not play nice with this function -- Find a different work around
+  def self.___execute_initializer___?
+    # Only execute when not doing DB actions
+    boolean = defined?(ARGV) ? true : false  # for when no ARGVs are provided, we know its a railsc or rails s explicit
+    boolean = false if boolean && ARGV[0]&.include?('db') # when its the DB rake tasks
+    boolean = false if boolean && ARGV[0]&.include?('asset') # when its an asset
+    boolean = false if boolean && ARGV[0]&.include?(':') # else this delim should never be included
+    boolean = false if ENV['SKIP_CUSTOM_INIT']=='true' # explicitly set the variable to skip shit
+
+    boolean
+  end
+
   def self.url_routes
     Rails.application.routes.url_helpers
   end
 
+  def self.app_name
+    if ::Rails::VERSION::MAJOR >= 6
+      ::Rails.application.class.module_parent_name
+    else
+      ::Rails.application.class.parent_name
+    end
+  end
+
   def self.route_exist?(path)
     Rails.application.routes.recognize_path(path)
     true
@@ -35,7 +56,7 @@ module RailsBase
   end
 
   def self.config
-    @config ||= RailsBase::Config.new
+    @config ||= RailsBase::Config.instance
   end
 
   def self.appearance

data/lib/velocity_limiter.rb

@@ -9,7 +9,7 @@ module VelocityLimiter
 		if metadata[:velocity_reached]
 			log(level: :warn, msg: "#{cache_key} has been velocity limited. #{metadata[:within_attempts_count]} attempts since #{metadata[:threshold]}. MAX allowed is #{velocity_max}")
 			log(level: :warn, msg: "#{cache_key} may try again in #{metadata[:to_words]} :: #{metadata[:attempt_again_at]}. Will fully reset at #{metadata[:fully_reset_time]}")
-			msg = "Velocity limit reached for SMS verification. You may try again in #{metadata[:to_words]}"
+			msg = velocity_limit_message(metadata: metadata)
 			return {reached: true, msg: msg}
 		end
 
@@ -35,6 +35,10 @@ module VelocityLimiter
 	def velocity_frame
 	end
 
+	def velocity_limit_message(metadata:)
+		"Velocity limit reached for SMS verification. You may try again in #{metadata[:to_words]}"
+	end
+
 	def cache_delineator
 		','
 	end
@@ -57,6 +61,7 @@ module VelocityLimiter
 		obj[:velocity_reached] = within_attempts.count >= velocity_max
 		obj[:within_attempts_arr] = within_attempts
 		obj[:within_attempts_count] = within_attempts.count
+		obj[:attempts_remaining] = velocity_max - obj[:vl_write].count
 		obj[:threshold] = threshold
 		obj[:velocity_max] = velocity_max
 		obj[:velocity_frame] = velocity_frame

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.54.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -409,7 +409,6 @@ files:
 - app/assets/images/rails_base/favicon.ico
 - app/assets/javascripts/rails_base/admin.js
 - app/assets/javascripts/rails_base/application.js
-- app/assets/javascripts/rails_base/cable.js
 - app/assets/javascripts/rails_base/mfa_auth.coffee
 - app/assets/javascripts/rails_base/secondary_authentication.coffee
 - app/assets/javascripts/rails_base/sessions.js
@@ -568,7 +567,9 @@ files:
 - lib/rails_base/configuration/appearance.rb
 - lib/rails_base/configuration/authentication.rb
 - lib/rails_base/configuration/base.rb
+- lib/rails_base/configuration/display/back_to_top.rb
 - lib/rails_base/configuration/display/background_color.rb
+- lib/rails_base/configuration/display/bg_light.rb
 - lib/rails_base/configuration/display/btn_danger.rb
 - lib/rails_base/configuration/display/btn_dark.rb
 - lib/rails_base/configuration/display/btn_info.rb
@@ -577,6 +578,7 @@ files:
 - lib/rails_base/configuration/display/btn_secondary.rb
 - lib/rails_base/configuration/display/btn_success.rb
 - lib/rails_base/configuration/display/btn_warning.rb
+- lib/rails_base/configuration/display/card.rb
 - lib/rails_base/configuration/display/footer.rb
 - lib/rails_base/configuration/display/navbar.rb
 - lib/rails_base/configuration/display/table_body.rb
@@ -613,7 +615,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Rails engine that takes care of the stuff you dont want to!

data/app/assets/javascripts/rails_base/cable.js

@@ -1,13 +0,0 @@
-// Action Cable provides the framework to deal with WebSockets in Rails.
-// You can generate new channels where WebSocket features live using the `rails generate channel` command.
-//
-//= require action_cable
-//= require_self
-//= require_tree ./channels
-
-(function() {
-  this.App || (this.App = {});
-
-  App.cable = ActionCable.createConsumer();
-
-}).call(this);