tb_core 1.4.6 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: df57df79c7de9d2b469be1b10dbf13768c0618fc
-  data.tar.gz: dcfad21bb4faad94fa53f152d377fe8d894cb9a8
+SHA256:
+  metadata.gz: b601ae30b70478a2a908e9d8bc6dbf9b5ba8641edfd1768687f5472c5fd0b641
+  data.tar.gz: 0102a18e4e539fbe985e32c87eb38df5f6a68e9397316ff578d6bf9f86bd908b
 SHA512:
-  metadata.gz: 6c0b426a055515c34d662e6275dc4b24f09ee6caec1d8e12587fd54c51ca360c437b3277daf43eb1422c0f706c017270eeab6ed697579a6760ac4145dca97c40
-  data.tar.gz: 334d22e9f1e97cf378d256b1fa34e28609589c311bba1b952d3aa526801060249830702582aa66a4610b1510418ee3f047203c047ed79c703b33c797e716ef40
+  metadata.gz: bd894b75ba13119b6be69e1ce826d729333fd08f74f60ddd6393a666edc9fc7953449a58e6fce6b05e312625bc34e74afa8feac528932436d0f1488170184379
+  data.tar.gz: e4493e6a565cb75c8c0730bd220e4702ee7a19ab22bc371295cc84629ecab0a4012b4a6d81837ebaa5a8df63dfc46d3e6b8a0a7a18abcfdae24e419c760f779d

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://semaphoreci.com/api/v1/moser-it/tb_core/branches/dev/shields_badge.svg)](https://semaphoreci.com/moser-it/tb_core)
+[![CircleCI](https://circleci.com/bb/moser-inc/tb_core.svg?style=svg)](https://circleci.com/bb/moser-inc/tb_core)
 
 Twice Baked Core
 ================
@@ -105,7 +105,7 @@ Create a file in your app at `app/views/admin/users/_form_additions.html.erb`.
       <%= f.label :avatar, :class=>"control-label"%>
       <div class="controls">
         <%= f.file_field :avatar %>
-      </div>  
+      </div>
     </div>
 
 ### Adding fields to the user show action

data/app/assets/javascripts/admin/core/application.js

@@ -12,7 +12,9 @@ window.spud = { admin: window.tb };
 
 document.addEventListener('DOMContentLoaded', function() {
 
-  tb.editor.init();
+  if (typeof tinymce != "undefined") {
+    tb.editor.init();
+  }
 
   $("#modal_window .modal-footer .form-submit").bind('click', function() {
     $("#modal_window .modal-body form").submit();

data/app/assets/javascripts/admin/core/editor.js

@@ -14,62 +14,28 @@ tb.editor = {};
     'undo', 'redo', '|',
     'bold','italic','underline','strikethrough','|',
     'formatselect','|',
-    'cut','copy','paste', 'pasteword','pastetext','|',
+    'cut','copy','paste', '|',
     'bullist','numlist','outdent','indent','|',
     'link','unlink','image', '|', 'code', '|'
   ];
 
-  var validElements = "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|" +
-    "onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|" +
-    "onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|" +
-    "name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u," +
-    "#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|" +
-    "src|border|alt=|title|hspace|vspace|width|height|align|hidpi_src],-sub,-sup," +
-    "-blockquote,-table[border=0|cellspacing|cellpadding|width|frame|rules|" +
-    "height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|" +
-    "height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot," +
-    "#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor" +
-    "|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div," +
-    "-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face" +
-    "|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite]," +
-    "object[classid|width|height|codebase|*],param[name|value|_value],embed[type|width" +
-    "|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo," +
-    "button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|" +
-    "valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method]," +
-    "input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value]," +
-    "kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value]," +
-    "q[cite],samp,select[disabled|multiple|name|size],small," +
-    "textarea[cols|rows|disabled|name|readonly],tt,var,big";
-
   var extendedValidElements = [
     "iframe[src|width|height|name|align|frameborder|allowfullscreen]"
   ];
 
   editor.init = function(options) {
     editor.unload();
-    editor.checkAndCallTinyMce(options);
-  };
 
-  editor.initMCEWithOptions = function(element, options){
-    var theme = options.theme || 'modern';
-    var height = options.height || 400;
-    var width = options.width || $(element).width();
-    var buttons = options.buttons || registeredButtons;
-    var plugins = options.plugins || registeredPlugins;
+    options = options || { selector: 'textarea.tinymce' };
 
-    $(element).tinymce({
-      theme: theme,
-      language: 'en',
+    tinymce.init({
+      selector: options.selector,
+      height: 400,
       menubar: false,
-      plugins: plugins.join(' '),
-      toolbar: buttons.join(' '),
-      convert_urls: false,
-      valid_elements: validElements,
-      media_strict: false,
-      extended_valid_elements: extendedValidElements.join(","),
-      width: width,
-      height: height
-    });
+      toolbar: registeredButtons.join(' '),
+      plugins: registeredPlugins.join(' '),
+      extended_valid_elements: extendedValidElements.join(",")
+    })
   };
 
   editor.unload = function() {
@@ -111,32 +77,4 @@ tb.editor = {};
     }
   };
 
-  var loadScript = null;
-
-  editor.checkAndCallTinyMce = function(options){
-    options = options || {};
-    var selector = options.selector || 'textarea.tinymce';
-    var $elements = $(selector);
-
-    if($elements.length === 0){
-      return;
-    }
-
-    if(loadScript === null){
-      loadScript = $.when(
-        $.ajax({url: '//cdn.tinymce.com/4.3/tinymce.min.js', dataType: 'script', cache: true}),
-        $.ajax({url: '//cdn.tinymce.com/4.3/jquery.tinymce.min.js', dataType: 'script', cache: true})
-      ).done(function(){
-        $('body').trigger("tb:tinymce-loaded");
-        editor.tinymce.loaded = true;
-      });
-    }
-
-    loadScript.done(function(){
-      $elements.each(function(){
-        editor.initMCEWithOptions(this, options);
-      });
-    });
-  };
-
 })();

data/app/controllers/admin/password_resets_controller.rb

@@ -43,6 +43,7 @@ private
   def load_user_using_perishable_token
     @user = SpudUser.find_using_perishable_token(params[:id])
     return if @user
+
     flash[:notice] = "We're sorry, but we could not locate your account. " +
     'If you are having issues try copying and pasting the URL ' +
     'from your email into your browser or restarting the ' +

data/app/controllers/admin/users_controller.rb

@@ -8,8 +8,8 @@ class Admin::UsersController < Admin::ApplicationController
   respond_to :html, :csv
 
   sortable_by :email, :current_login_at,
-              name: [:last_name, :first_name],
-              default: :email
+    name: [:last_name, :first_name],
+    default: :email
 
   def index
     @spud_users = SpudUser.order(sortable_query).paginate(page: params[:page], per_page: 15)

data/app/controllers/concerns/tb_core/error_handling.rb

@@ -29,6 +29,7 @@ module TbCore
           render template: error.template,
                  layout: nil,
                  formats: [:html],
+                 locals: { },
                  status: error.code,
                  content_type: 'text/html'
         end

data/app/controllers/concerns/tb_core/redirection.rb

@@ -14,6 +14,7 @@ module TbCore
       if params[:return_to]
         uri = URI.parse(params[:return_to].to_s)
         return "#{uri.path}?#{uri.query}" if uri.query
+
         return uri.path
       end
       default

data/app/controllers/concerns/tb_core/user_authentication.rb

@@ -10,27 +10,32 @@ module TbCore
 
     def current_user_session
       return @current_user_session if defined?(@current_user_session)
+
       @current_user_session = SpudUserSession.find
     end
 
     def current_user
       return @current_user if defined?(@current_user)
+
       @current_user = current_user_session&.spud_user
     end
 
     def current_user_id
       return 0 unless @current_user
+
       @current_user.id
     end
 
     def require_user
       raise UnauthorizedError.new unless current_user
+
       true
     end
 
     def require_admin_user
       raise UnauthorizedError.new unless current_user
       raise AccessDeniedError.new unless current_user.admin_rights?
+
       true
     end
 

data/app/helpers/forgot_password_mailer_helper.rb

@@ -0,0 +1,9 @@
+module ForgotPasswordMailerHelper
+  def perishable_token_link_expiration_time_text(user)
+    return if user.class.perishable_token_valid_for.blank?
+
+    expiration_time = user.updated_at + user.class.perishable_token_valid_for
+
+    "This link will expire in #{distance_of_time_in_words(Time.current, expiration_time)}."
+  end
+end

data/app/helpers/tb_core/application_helper.rb

@@ -13,6 +13,21 @@ module TbCore::ApplicationHelper
     return form_for(record, options, &block)
   end
 
+  def tb_form_with(record, **options, &block)
+    options[:builder] = TbCore::FormBuilder
+
+    options[:html] ||= {}
+    if options[:html][:class]
+      options[:html][:class] += ' form-horizontal'
+    else
+      options[:html][:class] = 'form-horizontal'
+    end
+
+    options[:model] = record
+
+    return form_with(options, &block)
+  end
+
   def tb_form_errors(record, *fields_to_display)
     if record.errors.any?
       content_tag :div, class: 'form-errors test' do
@@ -56,6 +71,7 @@ module TbCore::ApplicationHelper
     end
   end
 
+  # rubocop:disable Rails/HelperInstanceVariable
   def tb_page_title
     if content_for?(:title)
       title = content_for(:title) + ' | ' + TbCore.site_name
@@ -66,6 +82,7 @@ module TbCore::ApplicationHelper
     end
     return content_tag :title, title
   end
+  # rubocop:enable Rails/HelperInstanceVariable
 
   def current_site_name
     return TbCore.config.site_name

data/app/mailers/tb_core_mailer.rb

@@ -1,4 +1,6 @@
 class TbCoreMailer < ActionMailer::Base
+  helper ForgotPasswordMailerHelper
+
   default from: TbCore.from_address
   layout 'mailer'
 

data/app/models/concerns/tb_core/user_model.rb

@@ -1,27 +1,40 @@
 module TbCore
+
+  module Regex
+    EMAIL = /
+      \A
+      [A-Z0-9_.&%+\-']+   # mailbox
+      @
+      (?:[A-Z0-9\-]+\.)+  # subdomains
+      (?:[A-Z]{2,25})     # TLD
+      \z
+    /ix.freeze
+  end
+
   module UserModel
     extend ActiveSupport::Concern
 
+    # rubocop:disable Metrics/BlockLength
     included do
       self.table_name = 'spud_users'
 
       acts_as_authentic do |c|
-        c.transition_from_crypto_providers = Authlogic::CryptoProviders::Sha512
         c.crypto_provider = Authlogic::CryptoProviders::SCrypt
         c.logged_in_timeout = 24.hours
         c.login_field = :email if TbCore.config.use_email_as_login
-        if TbCore.config.user_password_length
-          c.merge_validates_length_of_password_field_options(minimum: TbCore.config.user_password_length)
-        end
+        c.require_password_confirmation = true
       end
 
+      attr_accessor :password_confirmation
+
       belongs_to :role,
-        class_name: SpudRole.to_s, foreign_key: :spud_role_id, required: false
+        class_name: 'SpudRole', foreign_key: :spud_role_id, optional: true
       has_many :spud_user_settings,
         dependent: :destroy, foreign_key: :spud_user_id
 
       validates :first_name, :last_name, presence: true
       before_validation :set_login_to_email, if: -> { TbCore.config.use_email_as_login }
+
       before_update :unset_requires_password_change
 
       scope :admins, lambda {
@@ -29,7 +42,37 @@ module TbCore
       }
 
       scope :ordered, -> { order('last_name asc, first_name asc, email asc') }
+
+      # These used to be built in to Authlogic
+      # See: https://github.com/binarylogic/authlogic/blob/5986e1bd056ccecc519d9f49cc83a0ba757668b4/doc/use_normal_rails_validation.md
+      validates :email,
+        format: {
+          with: ::TbCore::Regex::EMAIL,
+          message: proc {
+            ::Authlogic::I18n.t(
+              'error_messages.email_invalid',
+              default: 'should look like an email address.'
+            )
+          }
+        },
+        length: { maximum: 100 },
+        uniqueness: {
+          case_sensitive: false,
+          if: :will_save_change_to_email?
+        }
+      validates :password,
+        confirmation: { if: :require_password? },
+        length: {
+          minimum: 8,
+          if: :require_password?
+        }
+      validates :password_confirmation,
+        length: {
+          minimum: 8,
+          if: :require_password?
+        }
     end
+    # rubocop:enable Metrics/BlockLength
 
     module ClassMethods
 
@@ -69,6 +112,7 @@ module TbCore
 
     def full_name
       return login if first_name.blank? && last_name.blank?
+
       [first_name, last_name].reject(&:blank?).join(' ')
     end
 
@@ -79,12 +123,14 @@ module TbCore
     # Returns true if user can view at least one dashboard app
     def admin_rights?
       return true if super_admin
+
       TbCore.admin_applications.find { |app| can_view_app?(app) }.present?
     end
 
     # Returns true if the user can view a spud app based on it's key
     def can_view_app?(admin_application)
       return true if super_admin?
+
       key = admin_application[:key]
       permissions.find { |p| p.apps.include?(key) }.present?
     end
@@ -95,6 +141,7 @@ module TbCore
     # * if multiple tags are supplied, return true if ALL tags match
     def permission?(*tags)
       return true if super_admin?
+
       my_tags = permissions.collect(&:tag)
       tags.find { |tag| !my_tags.include?(tag) }.blank?
     end
@@ -105,12 +152,14 @@ module TbCore
     # * if multiple tags are supplied, return true if ANY tag matches
     def any_permission?(*tags)
       return true if super_admin?
+
       permissions.find { |p| tags.include?(p.tag) }.present?
     end
 
     # Return a list of SpudPermission objects for the user's SpudRole
     def permissions
       return [] if role.blank?
+
       role.permissions
     end
 

data/app/models/spud_role.rb

@@ -14,14 +14,9 @@ class SpudRole < ActiveRecord::Base
   end
 
   def permission_tags=(tags)
-    self.spud_role_permissions.each do |role_permission|
-      if role_permission.permission.nil? || !tags.include?(role_permission.permission.tag)
-        role_permission.destroy()
-      else
-        tags.delete(role_permission.permission.tag)
-      end
+    self.spud_role_permissions = tags.map do |tag|
+      SpudRolePermission.new(spud_permission_tag: tag)
     end
-    self.spud_role_permissions += tags.collect{ |tag| SpudRolePermission.new(spud_permission_tag: tag) }
   end
 
   def permission_tags

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

@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
   <title><%= TbCore.config.site_name %> Admin</title>
+  <%= tinymce_assets unless ENV['TB_SKIP_TINYMCE'] %>
   <%= stylesheet_link_tag *TbCore.config.admin_stylesheets %>
   <%= javascript_include_tag *TbCore.config.admin_javascripts %>
   <%= csrf_meta_tags %>
@@ -49,7 +50,7 @@
         <h3 class="modal-title"></h3>
       </div>
       <div class="modal-body">
-        <p>One fine body&hellip;</p>
+        <p>...</p>
       </div>
       <div class="modal-footer modal-footer-default">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

data/app/views/tb_core_mailer/forgot_password_notification.html.erb

@@ -1,6 +1,10 @@
 <h1>Hello <%= @user.full_name %>,</h1>
 
-<p>A password reset has recently been requested for your user account on <strong><%= TbCore.config.site_name %></strong>. Click the link below to set your new password.</p>
+<p>
+  A password reset has recently been requested for your user account on <strong><%= TbCore.config.site_name %></strong>.
+  Click the link below to set your new password.
+  <%= perishable_token_link_expiration_time_text(@user) %>
+</p>
 
 <p><%= link_to @url, @url %></p>
 

data/lib/generators/spud/module_generator.rb

@@ -79,7 +79,7 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
           resources :#{module_name_formatted}
         end
         resources :#{module_name_formatted}, :only => [:index, :show]
-RUBY
+    RUBY
   end
 
   def create_specs
@@ -136,7 +136,7 @@ RUBY
     inject_into_file "app/models/#{module_name.singularize.underscore}.rb", after: "ApplicationRecord\n" do <<-RUBY
   scope :ordered, -> { order(#{sort_field}: :desc) }
   scope :search, ->(term) { where('#{search_field} LIKE ?', "%\#{term}%") }
-RUBY
+    RUBY
     end
   end
 
@@ -156,7 +156,7 @@ RUBY
 
   validates #{string_attrs_as_symbols}, :length => {:maximum => 255}
 
-  RUBY
+      RUBY
       end
     end
   end

data/lib/generators/spud/setup_generator.rb

@@ -47,7 +47,7 @@ private
             config.site_name = "#{site_name}"
             config.from_address = "no-reply@#{domain_name}.com"
           end
-RUBY
+    RUBY
   end
 
   def application_name

data/lib/tb_core/belongs_to_app.rb

@@ -38,6 +38,7 @@ module TbCore
       elsif !current_user.can_view_app?(@page_application)
         raise AccessDeniedError.new(item: 'module', template: '/layouts/admin/error_page')
       end
+
       @page_thumbnail = @page_application[:thumbnail]
       @page_name = determine_page_name(page_title || @page_application[:name], action_name)
     end

data/lib/tb_core/engine.rb

@@ -7,6 +7,7 @@ require 'will_paginate-bootstrap'
 require 'breadcrumbs_on_rails'
 require 'rails-ujs'
 require 'sortable_by'
+require 'tinymce-rails'
 
 module Spud
 end

data/lib/tb_core/form_builder.rb

@@ -219,7 +219,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   # Builds a file field group
   #
   def tb_file_field(attribute, options={})
-    tb_input_field(attribute) do
+    tb_input_field(attribute, nil, options) do
       file_field(attribute)
     end
   end

data/lib/tb_core/test_helper.rb

@@ -1,29 +1,31 @@
 require 'authlogic/test_case'
 
-module TbCore::SessionHelper
-  include Authlogic::TestCase
+module TbCore
+  module TestHelper
+    include Authlogic::TestCase
 
-  # Use this helper in controller specs to establish a login session
-  # - admin: Set to true to create a super_admin
-  # - permissions: One or more permissions you want to assign to the user (a role will be auto generated)
-  #
-  def activate_session(admin: false, permissions: nil)
-    activate_authlogic()
-    if permissions
-      permissions = [permissions] unless permissions.is_a?(Array)
-      role = SpudRole.create(name: 'New Role', permission_tags: permissions)
-    else
-      role = nil
+    # Use this helper in controller specs to establish a login session
+    # - admin: Set to true to create a super_admin
+    # - permissions: One or more permissions you want to assign to the user (a role will be auto generated)
+    #
+    def activate_session(admin: false, permissions: nil)
+      activate_authlogic()
+      if permissions
+        permissions = [permissions] unless permissions.is_a?(Array)
+        role = SpudRole.create(name: 'New Role', permission_tags: permissions)
+      else
+        role = nil
+      end
+      @user = FactoryBot.create(:spud_user, super_admin: admin, role: role)
+      SpudUserSession.create(@user)
+      return @user
     end
-    @user = FactoryBot.create(:spud_user, super_admin: admin, role: role)
-    SpudUserSession.create(@user)
-    return @user
-  end
 
-  # Returns the current user
-  #
-  def current_user
-    return @user
+    # Returns the current user
+    #
+    def current_user
+      return @user
+    end
   end
 end
 
@@ -31,7 +33,7 @@ end
 #
 if defined?(RSpec)
   RSpec.configure do |config|
-    config.include TbCore::SessionHelper
+    config.include TbCore::TestHelper
   end
 end
 

data/lib/tb_core/version.rb

@@ -1,3 +1,3 @@
 module TbCore
-  VERSION = '1.4.6'.freeze
+  VERSION = '1.5.2'.freeze
 end

data/spec/controllers/admin/application_controller_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Admin::ApplicationController, type: :controller do
     it 'should respond successfully if the current user is a super admin' do
       @user.update(super_admin: true)
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should respond successfully if the current user has admin permissions' do
@@ -28,7 +28,7 @@ RSpec.describe Admin::ApplicationController, type: :controller do
       @user.role = @role
       @user.save
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should redirect to the login if the current user is not logged in' do

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe Admin::DashboardController, type: :controller do
     it 'should contain data array in reponse' do
       get :badges
       json = JSON.parse(response.body)
-      expect(response.content_type).to eq('application/json')
+      expect(response.media_type).to eq('application/json')
       expect(json).to have_key('data')
     end
 

data/spec/controllers/admin/password_reset_controller_spec.rb

@@ -8,7 +8,7 @@ describe Admin::PasswordResetsController, type: :controller do
     describe 'index' do
       it 'should return success' do
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -17,7 +17,7 @@ describe Admin::PasswordResetsController, type: :controller do
         it 'should render the edit form' do
           allow(SpudUser).to receive(:find_using_perishable_token).and_return(user)
           get :show, params: { id: 1 }
-          expect(response).to be_success
+          expect(response).to be_successful
         end
       end
 

data/spec/controllers/admin/settings_controller_spec.rb

@@ -8,7 +8,7 @@ describe Admin::SettingsController, type: :controller do
   describe 'edit' do
     it 'should respond with success' do
       get :edit
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

data/spec/controllers/admin/setup_controller_spec.rb

@@ -6,7 +6,7 @@ describe Admin::SetupController, type: :controller do
     it 'should be successful' do
       get :new
 
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should redirect to the admin login form when there is already a user' do

data/spec/controllers/admin/user_sessions_controller_spec.rb

@@ -16,7 +16,7 @@ describe Admin::UserSessionsController, type: :controller do
       u = FactoryBot.create(:spud_user)
       u.save
       get :new
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

data/spec/controllers/admin/users_controller_spec.rb

@@ -39,7 +39,7 @@ describe Admin::UsersController, type: :controller do
       SpudUserSession.create(u)
       get :index
 
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should not allow access to users without a role,
@@ -82,14 +82,14 @@ describe Admin::UsersController, type: :controller do
     it 'should respond successfully' do
       user = FactoryBot.create(:spud_user)
       get :show, params: { id: user.id }
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 
   describe 'new' do
     it 'should render the form' do
       get :new, format: :html
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/config/application.rb

@@ -12,51 +12,6 @@ module Dummy
       config.from_address = 'no-reply@dummy.com'
     end
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-    config.i18n.enforce_available_locales = true
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = 'utf-8'
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    # config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    # config.assets.version = '1.0'
-
+    config.load_defaults '6.0'
   end
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,5 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'f89bbe176924c011473e15af21c4e8b72c3fd12f887f26014c24ea32e1e3d2bf0250a671a30232047d5c5431e67c7361aca07b10d847405b99fce4543589e117'
 Dummy::Application.config.secret_key_base = 'b43711419c807b9c9efe9365dd79f87ebe31e9f72e1aa6744c1ecac68aace664c0a3a4f791d92bd2fa324fce1d6d09701a54b88453f131b7c460eeb9c530bd72'

data/spec/factories/spud_admin_permission_factories.rb

@@ -5,6 +5,6 @@ FactoryBot.define do
   
   factory :spud_admin_permission do
     name { FactoryBot.generate(:permission_name) }
-    access true
+    access { true }
   end
 end

data/spec/factories/spud_user_factories.rb

@@ -24,8 +24,8 @@ FactoryBot.define do
     last_name { FactoryBot.generate(:last_name) }
     login { FactoryBot.generate(:login) }
     email { FactoryBot.generate(:email) }
-    password 'password'
-    password_confirmation 'password'
+    password { 'password' }
+    password_confirmation { 'password' }
     single_access_token { FactoryBot.generate(:single_access_token) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.2
 platform: ruby
 authors:
 - Greg Woods
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tinymce-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta2
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +277,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -324,6 +366,7 @@ files:
 - app/controllers/user_sessions_controller.rb
 - app/helpers/admin/application_helper.rb
 - app/helpers/admin/roles_helper.rb
+- app/helpers/forgot_password_mailer_helper.rb
 - app/helpers/tb_core/application_helper.rb
 - app/mailers/tb_core_mailer.rb
 - app/models/concerns/tb_core/user_model.rb
@@ -435,6 +478,7 @@ files:
 - spec/controllers/tb_core/application_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/admin/application.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/admin/application.scss
@@ -481,7 +525,7 @@ files:
 homepage: http://bitbucket.org/moser-inc/tb_core
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -496,15 +540,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Twice Baked Core Engine
 test_files:
 - spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/admin/application.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.scss