tb_core 1.4.5 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 119d2b18447e11794e3242645aacd697afa47258
-  data.tar.gz: 90fa0a23e723b28b1a597bed200157783252ed43
+SHA256:
+  metadata.gz: 6d872d85445d4c25392456def398ec02e4103b2d200272849c105063c75699e7
+  data.tar.gz: a4fa137374414a058fce80a9169518b3978587e968c7a9b21d0a8982db1b86f0
 SHA512:
-  metadata.gz: 66144e84faacb6b62cb9ee33ea90342b6cb426238a7d41ab75aa09c2b644be8a5e3fe48a0a767d2add4c82fb0b4222127bcce70ed60d7b9cb4e5b671f90def8f
-  data.tar.gz: 3fb79b93110d12782939307eee24776d1bc0f1cd7c424e7a90f2252aeb5bc9bdb345d6760a552afc1d5e086ff19f29af7ec4859d31a5349e6b4e5e4dfe16c5ae
+  metadata.gz: f7b229ce4e43d1012672432e6641005cc944926eef3a77fe5044cfc26ed591d0d572729ddbd7fb6a7c0ca27e9c559fe8aa05941815abcb2d29281af35637a9d0
+  data.tar.gz: 1939d6ab1f5e361a89b0dc79f3dea4c023413cad9bb870a4f711241cdcb7dd6b8c0474b2a49321e686de3bf64ee86571c6ffb706bf0d736991dd1713de76d4d9

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

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'

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/roles_controller.rb

@@ -34,9 +34,7 @@ class Admin::RolesController < Admin::ApplicationController
   
   def update
     #role_params[:permission_tags] ||= []
-    if @role.update_attributes(role_params)
-      flash[:notice] = 'SpudRole updated successfully'
-    end
+    flash[:notice] = 'SpudRole updated successfully' if @role.update(role_params)
     respond_with @role, location: admin_roles_path
   end
   

data/app/controllers/admin/settings_controller.rb

@@ -13,14 +13,14 @@ class Admin::SettingsController < Admin::ApplicationController
   end
 
   def update
-    if check_password && @current_user.update_attributes(user_params)
+    if check_password && @current_user.update(user_params)
       if user_params.include?(:password)
         SpudUserSession.create(@current_user)
       end
       flash[:notice] = 'User settings saved successfully.'
       respond_with @current_user, location: admin_settings_path
     else
-      render 'edit', status: 401
+      render 'edit', status: :unauthorized
     end
   end
 

data/app/controllers/admin/setup_controller.rb

@@ -18,7 +18,7 @@ class Admin::SetupController < Admin::ApplicationController
       SpudUserSession.create(@spud_user)
       redirect_to admin_root_path
     else
-      render 'new', status: 422
+      render 'new', status: :unprocessable_entity
     end
   end
 

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)
@@ -63,7 +63,7 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def update
-    if @user.update_attributes(user_params)
+    if @user.update(user_params)
       if @user == current_user && user_params[:password].present?
         SpudUserSession.create(@user)
       end
@@ -75,7 +75,7 @@ class Admin::UsersController < Admin::ApplicationController
     @user.destroy
     respond_with @user, location: admin_users_path do |format|
       format.js{
-        render nothing: true, status: 200
+        render nothing: true, status: :ok
       }
     end
   end

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

@@ -29,14 +29,15 @@ module TbCore
           render template: error.template,
                  layout: nil,
                  formats: [:html],
+                 locals: { },
                  status: error.code,
                  content_type: 'text/html'
         end
       end
     end
 
-    def handle_record_not_found(e)
-      error = NotFoundError.new(class_string(e.model))
+    def handle_record_not_found(exception)
+      error = NotFoundError.new(class_string(exception.model))
       handle_request_error(error)
     end
 
@@ -50,8 +51,8 @@ module TbCore
       string
     end
 
-    def handle_unknown_format_error(_e)
-      error = NotFoundError.new()
+    def handle_unknown_format_error(_exception)
+      error = NotFoundError.new
       handle_request_error(error)
     end
   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/controllers/user_sessions_controller.rb

@@ -14,7 +14,7 @@ class UserSessionsController < ApplicationController
   end
 
   def create
-    @user_session = SpudUserSession.new(user_session_params)
+    @user_session = SpudUserSession.new(user_session_params.to_h)
     if @user_session.save()
       respond_with @user_session do |format|
         format.html{
@@ -50,7 +50,7 @@ class UserSessionsController < ApplicationController
   end
 
   def set_change_password
-    current_user.update_attributes(change_password_params)
+    current_user.update(change_password_params)
     respond_with current_user do |format|
       format.html{
         if current_user.errors.any?

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
 
@@ -122,9 +171,7 @@ module TbCore
     end
 
     def unset_requires_password_change
-      if password_changed? && !requires_password_change_changed?(to: true)
-        self.requires_password_change = false
-      end
+      self.requires_password_change = false if password_changed? && !requires_password_change_changed?(to: true)
       true
     end
   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

@@ -49,7 +49,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/controller_spec_generator.rb

@@ -1,5 +1,5 @@
 class Spud::ControllerSpecGenerator < ::Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
+  source_root File.expand_path('templates', __dir__)
 
   argument :name, type: :string
   argument :string_attribute, type: :string