casein 5.3.2.0 → 5.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f01916840b0d47269226af15abc90fa54953c9
-  data.tar.gz: efb0cdb4004770b1e862e216d8e2975c1afc8a83
+  metadata.gz: 5593657521856e0cc5c485ccadfd5da19a32a1c5
+  data.tar.gz: 94a2463ffd23fd6a5bdae71b31bb72aaedaf87a5
 SHA512:
-  metadata.gz: d7ac41dde954da19b923d3f29d58f7f76dfc1831251253c99c69c78661d06850d96f577b44e5267b0ddaedd46fe4af90aebdafacd2f4cddd46e51681a9becb8d
-  data.tar.gz: da779e84c9ae58589314bc47f8a36ff3b04b6e8413eeabc985108e42135143cc72ec2e616280f59799994873bbb5c49ca89580ce7c46ea285fb673277377f8e2
+  metadata.gz: 76fdbb218db0cde4dfbd6bc45178fdd3d7bbd73c2b6e00d2e2ccbfd5b005eae4a14e6cd2dc29d280fd67bed0a189ecdc00e10d2c4171ae6b7a96def67f7efde0
+  data.tar.gz: 233a733c1c0668aa5436d3cdb4c337d0f0eb05835cda7ea3ebc01730604fa1495fb9b98d452fb931fb1b57e7d0dd6e912c646bb1dbb546412d904007fe66940d

data/README.rdoc

@@ -10,16 +10,16 @@ Screenshots at: http://www.caseincms.com
 
 ==Requirements
 
-This version of Casein is designed for Ruby on Rails 5.x and Ruby 2.3.1 or later.
+This version of Casein is designed for Ruby on Rails 5.x and Ruby 2.3.3 or later.
 
 Casein 5.1.1.5 was the last gem release compatible with Rails 4.x.
 
-==What’s New in 5.3.2
+==What’s New in 5.4.0
 
-* Updates minimum version of Ruby to 2.3.1
-* Relaxes restriction on Scrypt gem
-* Uses Capybara 3.x for tests
-* Titleizes human attribute names by default ('My Attribute Name', instead of 'My attribute name')
+* Bug fix for breaking AuthLogic changes
+* Updates minimum version of Ruby to 2.3.3
+* Some gem dependencies have been updated, including a bump to AuthLogic 5.0.x
+* Codebase tidying up
 
 Thanks to @brchristian for this release.
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -18,16 +20,15 @@ end
 Bundler::GemHelper.install_tasks
 
 begin
-  APP_RAKEFILE=File.expand_path('../spec/rails_test_app/Rakefile', __FILE__)
+  APP_RAKEFILE = File.expand_path('spec/rails_test_app/Rakefile', __dir__)
   load 'rails/tasks/engine.rake'
 
   Bundler::GemHelper.install_tasks
-  Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each{|f| load f}
+  Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |f| load f }
   require 'rspec/core'
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec)
 rescue LoadError => ex
-  puts "RSpec tasks were unavailable"
+  puts 'RSpec tasks were unavailable'
   puts "*** #{ex}"
 end
-

data/app/controllers/casein/admin_user_sessions_controller.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 module Casein
   class AdminUserSessionsController < Casein::CaseinController
-    
-    skip_before_action :authorise, only: [:new, :create]
+    skip_before_action :authorise, only: %i[new create]
     before_action :requires_no_session_user, except: [:destroy]
-  
+
     layout 'casein_auth'
-  
+
     def new
       @admin_user_session = Casein::AdminUserSession.new
     end
-  
+
     def create
       @admin_user_session = Casein::AdminUserSession.new(casein_admin_user_session_params.to_h)
       if @admin_user_session.save
@@ -18,23 +19,20 @@ module Casein
         render action: :new
       end
     end
-  
+
     def destroy
       current_admin_user_session.destroy
       redirect_back_or_default new_casein_admin_user_session_url
     end
 
-  private
-  
+    private
+
     def requires_no_session_user
-      if current_user
-        redirect_to controller: :casein, action: :index
-      end
+      redirect_to controller: :casein, action: :index if current_user
     end
-    
+
     def casein_admin_user_session_params
       params.require(:casein_admin_user_session).permit(:login, :password, :remember_me)
     end
-
   end
-end
+end

data/app/controllers/casein/admin_users_controller.rb

@@ -1,95 +1,95 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 module Casein
   class AdminUsersController < Casein::CaseinController
+    before_action :needs_admin, except: %i[show destroy update update_password]
+    before_action :needs_admin_or_current_user, only: %i[show destroy update update_password]
 
-    before_action :needs_admin, except: [:show, :destroy, :update, :update_password]
-    before_action :needs_admin_or_current_user, only: [:show, :destroy, :update, :update_password]
- 
     def index
-      @casein_page_title = "Users"
+      @casein_page_title = 'Users'
       @users = Casein::AdminUser.order(sort_order(:login)).paginate page: params[:page]
     end
- 
+
     def new
-      @casein_page_title = "Add a new user"
-    	@casein_admin_user = Casein::AdminUser.new
-    	@casein_admin_user.time_zone = Rails.configuration.time_zone
+      @casein_page_title = 'Add a new user'
+      @casein_admin_user = Casein::AdminUser.new
+      @casein_admin_user.time_zone = Rails.configuration.time_zone
     end
-  
-    def create
 
+    def create
       generate_random_password if params[:generate_random_password]
 
       @casein_admin_user = Casein::AdminUser.new casein_admin_user_params
-    
+
       if @casein_admin_user.save
-        flash[:notice] = "An email has been sent to " + @casein_admin_user.name + " with the new account details"
+        flash[:notice] = "An email has been sent to #{@casein_admin_user.name} with the new account details"
         redirect_to casein_admin_users_path
       else
-        flash.now[:warning] = "There were problems when trying to create a new user"
+        flash.now[:warning] = 'There were problems when trying to create a new user'
         render action: :new
       end
     end
-  
+
     def show
-    	@casein_admin_user = Casein::AdminUser.find params[:id]
-    	@casein_page_title = @casein_admin_user.name + " > View user"
+      @casein_admin_user = Casein::AdminUser.find params[:id]
+      @casein_page_title = @casein_admin_user.name + ' > View user'
     end
- 
+
     def update
       @casein_admin_user = Casein::AdminUser.find params[:id]
-      @casein_page_title = @casein_admin_user.name + " > Update user"
+      @casein_page_title = "#{@casein_admin_user.name} > Update user"
 
       if @casein_admin_user.update_attributes casein_admin_user_params
-        flash[:notice] = @casein_admin_user.name + " has been updated"
+        flash[:notice] = "#{@casein_admin_user.name} has been updated"
       else
-        flash.now[:warning] = "There were problems when trying to update this user"
+        flash.now[:warning] = 'There were problems when trying to update this user'
         render action: :show
         return
       end
-      
+
       if @session_user.is_admin?
         redirect_to casein_admin_users_path
       else
         redirect_to controller: :casein, action: :index
       end
     end
- 
+
     def update_password
       @casein_admin_user = Casein::AdminUser.find params[:id]
-      @casein_page_title = @casein_admin_user.name + " > Update password"
-       
+      @casein_page_title = "#{@casein_admin_user.name} > Update password"
+
       if @casein_admin_user.valid_password? params[:form_current_password]
         if params[:casein_admin_user][:password].blank? && params[:casein_admin_user][:password_confirmation].blank?
-          flash[:warning] = "New password cannot be blank"
+          flash[:warning] = 'New password cannot be blank'
         elsif @casein_admin_user.update_attributes casein_admin_user_params
-          flash[:notice] = "Your password has been changed"
+          flash[:notice] = 'Your password has been changed'
         else
-          flash[:warning] = "There were problems when trying to change your password"
+          flash[:warning] = 'There were problems when trying to change your password'
         end
       else
-        flash[:warning] = "The current password is incorrect"
+        flash[:warning] = 'The current password is incorrect'
       end
-      
+
       redirect_to action: :show
     end
- 
+
     def reset_password
       @casein_admin_user = Casein::AdminUser.find params[:id]
-      @casein_page_title = @casein_admin_user.name + " > Reset password"
-       
+      @casein_page_title = "#{@casein_admin_user.name} > Reset password"
+
       if params[:generate_random_password].blank? && params[:casein_admin_user][:password].blank? && params[:casein_admin_user][:password_confirmation].blank?
-        flash[:warning] = "New password cannot be blank"
+        flash[:warning] = 'New password cannot be blank'
       else
         generate_random_password if params[:generate_random_password]
-        @casein_admin_user.notify_of_new_password = true unless (@casein_admin_user.id == @session_user.id && params[:generate_random_password].blank?)
+        @casein_admin_user.notify_of_new_password = true unless @casein_admin_user.id == @session_user.id && params[:generate_random_password].blank?
 
         if @casein_admin_user.update_attributes casein_admin_user_params
-          unless @casein_admin_user.notify_of_new_password
-            flash[:notice] = "Your password has been reset"
-          else    
-            flash[:notice] = "Password has been reset and " + @casein_admin_user.name + " has been notified by email"
+          if @casein_admin_user.notify_of_new_password
+            flash[:notice] = "Password has been reset and #{@casein_admin_user.name} has been notified by email"
+          else
+            flash[:notice] = 'Your password has been reset'
           end
         else
           flash[:warning] = "There were problems when trying to reset this user's password"
@@ -98,27 +98,26 @@ module Casein
 
       redirect_to action: :show
     end
- 
+
     def destroy
       user = Casein::AdminUser.find params[:id]
       if user.is_admin? == false || Casein::AdminUser.has_more_than_one_admin
         user.destroy
-        flash[:notice] = user.name + " has been deleted"
+        flash[:notice] = "#{user.name} has been deleted"
       end
       redirect_to casein_admin_users_path
     end
 
     private
 
-      def generate_random_password
-        random_password = random_string = SecureRandom.hex
-        params[:casein_admin_user] = Hash.new if params[:casein_admin_user].blank?
-        params[:casein_admin_user].merge! ({ password: random_password, password_confirmation: random_password })
-      end
+    def generate_random_password
+      random_password = random_string = SecureRandom.hex
+      params[:casein_admin_user] = {} if params[:casein_admin_user].blank?
+      params[:casein_admin_user].merge! ({ password: random_password, password_confirmation: random_password })
+    end
 
-      def casein_admin_user_params
-        params.require(:casein_admin_user).permit(:login, :name, :email, :time_zone, :access_level, :password, :password_confirmation)
-      end
- 
+    def casein_admin_user_params
+      params.require(:casein_admin_user).permit(:login, :name, :email, :time_zone, :access_level, :password, :password_confirmation)
+    end
   end
-end
+end

data/app/controllers/casein/casein_controller.rb

@@ -1,76 +1,78 @@
+# frozen_string_literal: true
+
 require 'authlogic'
 
 module Casein
   class CaseinController < ApplicationController
-
     require 'casein/casein_helper'
     include Casein::CaseinHelper
 
-  	require 'casein/config_helper'
-  	include Casein::ConfigHelper
+    require 'casein/config_helper'
+    include Casein::ConfigHelper
 
     layout 'casein_main'
-   
+
     helper_method :current_admin_user_session, :current_user
     before_action :authorise
     before_action :set_time_zone
-    
-    ActionView::Base.field_error_proc = proc { |input, instance| "#{input}".html_safe }
 
-    def index		
-  		redirect_to casein_config_dashboard_url
+    ActionView::Base.field_error_proc = proc { |input, _instance| input.to_s.html_safe }
+
+    def index
+      redirect_to casein_config_dashboard_url
     end
 
-  	def blank
-  		@casein_page_title = "Welcome"
-  	end
+    def blank
+      @casein_page_title = 'Welcome'
+    end
+
+    private
 
-  private
-  
-    def authorise    
+    def authorise
       unless current_user
         session[:return_to] = request.fullpath
         redirect_to new_casein_admin_user_session_url
-        return false
+        false
       end
     end
-    
+
     def set_time_zone
       Time.zone = current_user.time_zone if current_user
     end
-  
+
     def current_admin_user_session
       return @current_admin_user_session if defined?(@current_admin_user_session)
+
       @current_admin_user_session = Casein::AdminUserSession.find
     end
 
     def current_user
       return @session_user if defined?(@session_user)
-      @session_user = current_admin_user_session && current_admin_user_session.admin_user
+
+      @session_user = current_admin_user_session&.admin_user
     end
-  
+
     def needs_admin
       unless @session_user.is_admin?
         redirect_to controller: :casein, action: :index
       end
     end
-  
+
     def needs_admin_or_current_user
       unless @session_user.is_admin? || params[:id].to_i == @session_user.id
         redirect_to controller: :casein, action: :index
       end
     end
-    
+
     def redirect_back_or_default(default)
       redirect_to(session[:return_to] || default)
       session[:return_to] = nil
     end
 
     def sort_order(default)
-      column = (params[:c] || default.to_s).gsub(/[\s;'\"]/,'')
+      column = (params[:c] || default.to_s).gsub(/[\s;'\"]/, '')
       direction = params[:d] == 'down' ? 'DESC' : 'ASC'
       { column => direction }
     end
-
   end
-end
+end

data/app/controllers/casein/password_resets_controller.rb

@@ -1,26 +1,25 @@
+# frozen_string_literal: true
+
 module Casein
   class PasswordResetsController < Casein::CaseinController
-  
     skip_before_action :authorise
-    before_action :load_user_using_perishable_token, only: [:edit, :update]
+    before_action :load_user_using_perishable_token, only: %i[edit update]
 
     layout 'casein_auth'
-    
+
     def create
       users = Casein::AdminUser.where(email: params[:recover_email]).all
 
-      if users.length > 0
-        users.each do |user|
-          user.send_password_reset_instructions
-        end
+      if !users.empty?
+        users.each(&:send_password_reset_instructions)
 
         if users.length > 1
-          flash[:notice] = "Multiple accounts were found. Emails have been sent to " + params[:recover_email] + " with instructions on how to reset your passwords"
+          flash[:notice] = "Multiple accounts were found. Emails have been sent to #{params[:recover_email]} with instructions on how to reset your passwords"
         else
-          flash[:notice] = "An email has been sent to " + params[:recover_email] + " with instructions on how to reset your password"
+          flash[:notice] = "An email has been sent to #{params[:recover_email]} with instructions on how to reset your password"
         end
       else
-        flash[:warning] = "There is no user with that email"
+        flash[:warning] = 'There is no user with that email'
       end
 
       redirect_to new_casein_admin_user_session_url
@@ -31,34 +30,32 @@ module Casein
     end
 
     def update
-      
       if params[:casein_admin_user][:password].empty? || params[:casein_admin_user][:password_confirmation].empty?
-        flash.now[:warning] = "A field has been left empty"
+        flash.now[:warning] = 'A field has been left empty'
       else
-      
+
         @reset_user.password = params[:casein_admin_user][:password]
         @reset_user.password_confirmation = params[:casein_admin_user][:password_confirmation]
-      
+
         if @reset_user.save
-          flash[:notice] = "Password successfully updated"
+          flash[:notice] = 'Password successfully updated'
           redirect_to new_casein_admin_user_session_url
           return
         end
       end
-      
+
       render action: :edit
     end
 
-  private
-    
+    private
+
     def load_user_using_perishable_token
-      
       @reset_user = Casein::AdminUser.find_using_perishable_token params[:token]
-      
+
       unless @reset_user
         flash[:warning] = "Your account could not be located. This can happen if you wait more than 10 minutes to click the link or if you select 'Forgotten Password' multiple times, which invalidates all previous reset links."
         redirect_to new_casein_admin_user_session_url
       end
     end
   end
-end
+end