rails_base 0.53.0 → 0.53.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9e5642a22977c5cae3b9de0ff97843756c80ae5570ed79c180d1b5f2563c14
-  data.tar.gz: 8b26fbf0624bc4334b0793872dd2a2ffd73dca21651c5082073e925a92fb7012
+  metadata.gz: d20109ef6d422bfe9f2d9ea381e0bae71bfd9cb9a3585554f97fb378baf00d50
+  data.tar.gz: '08666f477b07d62d5fffd6505785b12b643bc9164ccd1c038585f7d895fa78c7'
 SHA512:
-  metadata.gz: a04d3da65692ffd59dc41961ffae4a7a292043731df480a683d9387997d65812af378a3276401696b7e8f1c8c4568f90caa1118ed1035c89a8be563e0ff3eb25
-  data.tar.gz: 2ae5996b21c71bf4ac95b5b7ef774b6e0867aa3b08f8128a6ca97dfbc28ecb1846d8d6bba2d9390bc25d422365cb006ce737f4369ee4a817f618a1ae93dfaa0d
+  metadata.gz: b67025f0a012ed6c7024671a048f74026f30b9870115f13f5c2ff047f1a5fed7e5b31e61c2074a8f193d5cdd8392465deaa816c6a651d9cfb6f2788de4bcfeb0
+  data.tar.gz: 3b44a97ffc9ebd160941fe29b517d1ab114b61250562a6a51d4cf72cb29702233b31b39c6aa550664527b1e78a787600549dba4c06e96c9b9c2feb2b838b30e3

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/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/views/layouts/rails_base/application.html.erb

@@ -126,6 +126,7 @@
       </footer>
     <% 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">

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/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

@@ -211,8 +211,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/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 = '53'
-  PATCH = '0'
+  PATCH = '1'
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.53.1
 platform: ruby
 authors:
 - Matt Taylor
@@ -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

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);