casein 5.3.0.0 → 5.5.1.0

data/app/mailers/casein/casein_notification.rb

@@ -1,31 +1,31 @@
+# frozen_string_literal: true
+
 module Casein
-  
   class CaseinNotification < ActionMailer::Base
-	
-  	self.prepend_view_path File.join(File.dirname(__FILE__), '..', 'views', 'casein')
-	
-  	def generate_new_password from, casein_admin_user, host, pass
-  		@name = casein_admin_user.name
-  		@host = host
-  		@login = casein_admin_user.login
-  		@pass = pass
-  		@from_text = casein_config_website_name
-  		
-  		mail(to: casein_admin_user.email, from: from, subject: "[#{casein_config_website_name}] New password")
-  	end
-  
-  	def new_user_information from, casein_admin_user, host, pass
+    prepend_view_path File.join(File.dirname(__FILE__), '..', 'views', 'casein')
+
+    def generate_new_password(from, casein_admin_user, host, pass)
+      @name = casein_admin_user.name
+      @host = host
+      @login = casein_admin_user.login
+      @pass = pass
+      @from_text = casein_config_website_name
+
+      mail(to: casein_admin_user.email, from: from, subject: "[#{casein_config_website_name}] New password")
+    end
+
+    def new_user_information(from, casein_admin_user, host, pass)
       @name = casein_admin_user.name
-  		@host = host
-  		@login = casein_admin_user.login
-  		@pass = pass
-  		@from_text = casein_config_website_name
-  		
-  		mail(to: casein_admin_user.email, from: from, subject: "[#{casein_config_website_name}] New user account")
-  	end
-  	
-  	def password_reset_instructions from, casein_admin_user, host
-  	  ActionMailer::Base.default_url_options[:host] = host.gsub("http://", "")
+      @host = host
+      @login = casein_admin_user.login
+      @pass = pass
+      @from_text = casein_config_website_name
+
+      mail(to: casein_admin_user.email, from: from, subject: "[#{casein_config_website_name}] New user account")
+    end
+
+    def password_reset_instructions(from, casein_admin_user, host)
+      ActionMailer::Base.default_url_options[:host] = host.gsub('http://', '')
       @name = casein_admin_user.name
       @host = host
       @login = casein_admin_user.login
@@ -34,6 +34,5 @@ module Casein
 
       mail(to: casein_admin_user.email, from: from, subject: "[#{casein_config_website_name}] Password reset instructions")
     end
-
   end
-end
+end

data/app/models/casein.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module Casein
 end

data/app/models/casein/admin_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Casein::ConfigHelper
 
 $CASEIN_USER_ACCESS_LEVEL_ADMIN = 0
@@ -5,55 +7,79 @@ $CASEIN_USER_ACCESS_LEVEL_USER = 10
 
 module Casein
   class AdminUser < ActiveRecord::Base
-
-	  def self.table_name
-      self.to_s.gsub("::", "_").tableize
+    def self.table_name
+      to_s.gsub('::', '_').tableize
     end
 
     acts_as_authentic do |c|
-        c.validate_email_field = false
-        c.transition_from_crypto_providers = [Authlogic::CryptoProviders::Sha512]
-        c.crypto_provider = Authlogic::CryptoProviders::SCrypt
+      c.transition_from_crypto_providers = [Authlogic::CryptoProviders::Sha512]
+      c.crypto_provider = Authlogic::CryptoProviders::SCrypt
     end
 
     attr_accessor :notify_of_new_password
-	 
+
     after_create :send_create_notification
     after_update :send_update_notification
     before_validation :check_time_zone
-    
+
     validates_presence_of :login, :name, :email
     validates_uniqueness_of :login
     validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
     validates_presence_of :time_zone
-	  
-  	def self.has_more_than_one_admin
+
+    # These default validations come from authlogic:
+    # https://github.com/binarylogic/authlogic/blob/master/doc/use_normal_rails_validation.md
+    # Note that Casein uses a case-sensitive uniqueness validation for :login, so we remove that config
+    validates :login,
+              format: {
+                with: /\A[a-zA-Z0-9_][a-zA-Z0-9\.+\-_@ ]+\z/,
+                message: proc {
+                  ::Authlogic::I18n.t(
+                    'error_messages.login_invalid',
+                    default: 'should use only letters, numbers, spaces, and .-_@+ please.'
+                  )
+                }
+              },
+              length: { within: 3..100 }
+
+    validates :password,
+              confirmation: { if: :require_password? },
+              length: {
+                minimum: 8,
+                if: :require_password?
+              }
+    validates :password_confirmation,
+              length: {
+                minimum: 8,
+                if: :require_password?
+              }
+
+    def self.has_more_than_one_admin
       Casein::AdminUser.where(access_level: $CASEIN_USER_ACCESS_LEVEL_ADMIN).count > 1
     end
-	
-  	def send_create_notification
+
+    def send_create_notification
       Casein::CaseinNotification.new_user_information(casein_config_email_from_address, self, casein_config_hostname, @password).deliver
     end
-  
+
     def send_update_notification
       if notify_of_new_password
         notify_of_new_password = false
         Casein::CaseinNotification.generate_new_password(casein_config_email_from_address, self, casein_config_hostname, @password).deliver
       end
     end
-    
+
     def send_password_reset_instructions
       reset_perishable_token!
       Casein::CaseinNotification.password_reset_instructions(casein_config_email_from_address, self, casein_config_hostname).deliver
     end
-    
+
     def check_time_zone
-      self.time_zone = Rails.configuration.time_zone unless self.time_zone
+      self.time_zone = Rails.configuration.time_zone unless time_zone
+    end
+
+    def is_admin?
+      access_level == $CASEIN_USER_ACCESS_LEVEL_ADMIN
     end
-	
-  	def is_admin?
-  	  access_level == $CASEIN_USER_ACCESS_LEVEL_ADMIN
-  	end
-  
   end
 end

data/app/models/casein/admin_user_session.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Casein
   class AdminUserSession < ::Authlogic::Session::Base
-    include ActiveModel::Conversion 
+    include ActiveModel::Conversion
     extend ActiveModel::Naming
-    def persisted? 
-      false 
+    def persisted?
+      false
     end
   end
 end

data/config/initializers/will_paginate.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # config/initializers/will_paginate.rb
-# 
+#
 # This extension code was written by Isaac Bowen, originally found
 # at http://isaacbowen.com/blog/using-will_paginate-action_view-and-bootstrap/
 
@@ -7,20 +9,22 @@ require 'will_paginate/view_helpers/action_view'
 
 module WillPaginate
   module ActionView
-    
     def will_paginate(collection = nil, options = {})
-      options, collection = collection, nil if collection.is_a? Hash
+      if collection.is_a? Hash
+        options = collection
+        collection = nil
+      end
       # Taken from original will_paginate code to handle if the helper is not passed a collection object.
-      collection ||= infer_collection_from_controller 
+      collection ||= infer_collection_from_controller
       options[:renderer] ||= BootstrapLinkRenderer
       super.try :html_safe
     end
 
     class BootstrapLinkRenderer < LinkRenderer
       protected
-      
+
       def html_container(html)
-        tag :div, tag(:ul, html, class: "pagination"), container_attributes
+        tag :div, tag(:ul, html, class: 'pagination'), container_attributes
       end
 
       def page_number(page)
@@ -33,8 +37,8 @@ module WillPaginate
 
       def previous_or_next_page(page, text, classname)
         tag :li, link(text, page || '#'),
-	    class: [(classname[0..3] if  @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page)].join(' ')
+            class: [(classname[0..3] if @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page)].join(' ')
       end
     end
   end
-end
+end

data/config/routes.rb

@@ -1,20 +1,19 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
-  
-  match "/admin" => redirect("/casein"), via: :get
-  
+  match '/admin' => redirect('/casein'), via: :get
+
   namespace :casein do
-  
     resources :admin_users do
       member do
         patch :update_password, :reset_password
       end
     end
-    
-    resource :admin_user_session, only: [:new, :create, :destroy]
-    resource :password_reset, only: [:create, :edit, :update]
-        
-    match "/blank" => "casein#blank", via: :get
-    root to: "casein#index"
+
+    resource :admin_user_session, only: %i[new create destroy]
+    resource :password_reset, only: %i[create edit update]
+
+    match '/blank' => 'casein#blank', via: :get
+    root to: 'casein#index'
   end
-  
 end

data/lib/casein.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 if defined?(Rails) && Rails::VERSION::MAJOR >= 5
-	require 'casein/engine'
-	require 'casein/version'
-	require 'will_paginate'
-	require 'authlogic'
+  require 'casein/engine'
+  require 'casein/version'
+  require 'will_paginate'
+  require 'authlogic'
 else
-	puts("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
-	puts("!!! WARNING! This version of Casein requires Rails >= 5.x !!!")
-	puts("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
-end
+  puts('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
+  puts('!!! WARNING! This version of Casein requires Rails >= 5.x !!!')
+  puts('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
+end

data/lib/casein/engine.rb

@@ -1,17 +1,18 @@
-require "casein"
-require "rails"
+# frozen_string_literal: true
+
+require 'casein'
+require 'rails'
 require 'bootstrap-sass'
 require 'jquery-rails'
 
 module Casein
   class Engine < Rails::Engine
-    
-    initializer "casein.assets.precompile" do |app|
-      app.config.assets.precompile += %w(casein/login.css casein/casein.css casein/casein.js casein/html5shiv.js casein/custom.css casein/custom.js casein/auth_custom.css casein/auth_custom.js casein/*.png)
+    initializer 'casein.assets.precompile' do |app|
+      app.config.assets.precompile += %w[casein/login.css casein/casein.css casein/casein.js casein/html5shiv.js casein/custom.css casein/custom.js casein/auth_custom.css casein/auth_custom.js casein/*.png]
     end
 
     rake_tasks do
-      load "railties/tasks.rake"
+      load 'railties/tasks.rake'
     end
 
     config.generators do |g|
@@ -20,16 +21,14 @@ module Casein
       g.assets false
       g.helper false
     end
-      
   end
-  
-  class RouteConstraint
 
-     def matches?(request)
-       return false if request.fullpath.include?("/casein")
-       return false if request.fullpath.include?("/admin")
-       true
-     end
+  class RouteConstraint
+    def matches?(request)
+      return false if request.fullpath.include?('/casein')
+      return false if request.fullpath.include?('/admin')
 
+      true
+    end
    end
 end

data/lib/casein/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Casein
-  VERSION_HASH = { major: 5, minor: 3, patch: 0, build: 0 }
-  VERSION = VERSION_HASH.values.join(".")
+  VERSION_HASH = { major: 5, minor: 5, patch: 1, build: 0 }
+  VERSION = VERSION_HASH.values.join('.')
 end

data/lib/casein/version.rb.orig

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Casein
+<<<<<<< HEAD
+  VERSION_HASH = { major: 5, minor: 4, patch: 0, build: 0 }
+=======
+  VERSION_HASH = { major: 5, minor: 5, patch: 0, build: 0 }.freeze
+>>>>>>> e30a2164a5c79f1cf607075d5e6a99dc014b74b6
+  VERSION = VERSION_HASH.values.join('.')
+end

data/lib/generators/casein/install/install_generator.rb

@@ -1,39 +1,40 @@
+# frozen_string_literal: true
+
 module Casein
   class InstallGenerator < Rails::Generators::Base
-    
-      include Rails::Generators::Migration
-      source_root File.expand_path('../templates', __FILE__)
-  
-     def self.next_migration_number dirname
-        if ActiveRecord::Base.timestamped_migrations
-          Time.now.utc.strftime("%Y%m%d%H%M%S")
-        else
-          "%.3d" % (current_migration_number(dirname) + 1)
-        end
+    include Rails::Generators::Migration
+    source_root File.expand_path('templates', __dir__)
+
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        Time.now.utc.strftime('%Y%m%d%H%M%S')
+      else
+        format('%.3d', (current_migration_number(dirname) + 1))
       end
-  
-      def generate_files
-        puts "*** WARNING - Generating configuration files. Make sure you have backed up any files before overwriting them. ***"
-  
-        #config helper
-        copy_file "app/helpers/casein/config_helper.rb", "app/helpers/casein/config_helper.rb"
-      
-        #initial view partials
-        copy_file "app/views/casein/layouts/_tab_navigation.html.erb", "app/views/casein/layouts/_tab_navigation.html.erb"
-        copy_file "app/views/casein/layouts/_top_navigation.html.erb", "app/views/casein/layouts/_top_navigation.html.erb"
-      
-        #robots.txt
-        puts " ** Overwrite if you haven't yet modified your robots.txt, otherwise add disallow rules for /casein and /admin manually **"
-        copy_file "public/robots.txt", "public/robots.txt"
-      
-        #blank stylesheets and JavaScript files
-  			copy_file "app/assets/stylesheets/casein/custom.scss", "app/assets/stylesheets/casein/custom.scss"
-  			copy_file "app/assets/javascripts/casein/custom.js", "app/assets/javascripts/casein/custom.js"
-				copy_file "app/assets/stylesheets/casein/auth_custom.scss", "app/assets/stylesheets/casein/auth_custom.scss"
-				copy_file "app/assets/javascripts/casein/auth_custom.js", "app/assets/javascripts/casein/auth_custom.js"
-
-  			#migrations
-  			migration_template 'db/migrate/casein_create_admin_users.rb', "db/migrate/casein_create_admin_users.rb"
-      end  
+    end
+
+    def generate_files
+      puts '*** WARNING - Generating configuration files. Make sure you have backed up any files before overwriting them. ***'
+
+      # config helper
+      copy_file 'app/helpers/casein/config_helper.rb', 'app/helpers/casein/config_helper.rb'
+
+      # initial view partials
+      copy_file 'app/views/casein/layouts/_tab_navigation.html.erb', 'app/views/casein/layouts/_tab_navigation.html.erb'
+      copy_file 'app/views/casein/layouts/_top_navigation.html.erb', 'app/views/casein/layouts/_top_navigation.html.erb'
+
+      # robots.txt
+      puts " ** Overwrite if you haven't yet modified your robots.txt, otherwise add disallow rules for /casein and /admin manually **"
+      copy_file 'public/robots.txt', 'public/robots.txt'
+
+      # blank stylesheets and JavaScript files
+      copy_file 'app/assets/stylesheets/casein/custom.scss', 'app/assets/stylesheets/casein/custom.scss'
+      copy_file 'app/assets/javascripts/casein/custom.js', 'app/assets/javascripts/casein/custom.js'
+      copy_file 'app/assets/stylesheets/casein/auth_custom.scss', 'app/assets/stylesheets/casein/auth_custom.scss'
+      copy_file 'app/assets/javascripts/casein/auth_custom.js', 'app/assets/javascripts/casein/auth_custom.js'
+
+      # migrations
+      migration_template 'db/migrate/casein_create_admin_users.rb', 'db/migrate/casein_create_admin_users.rb'
+    end
   end
-end
+end

data/lib/generators/casein/install/templates/app/helpers/casein/config_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Casein
   module ConfigHelper
-    
     # Name of website or client — used throughout Casein.
     def casein_config_website_name
       'Casein'
@@ -24,32 +25,31 @@ module Casein
     def casein_config_email_from_address
       'donotreply@caseincms.com'
     end
-  
+
     # The initial page the user is shown after they sign in or click the logo. Probably this should be set to the first tab.
     # Do not point this at casein/index!
     def casein_config_dashboard_url
       url_for controller: :casein, action: :blank
     end
-  
+
     # A list of stylesheets to include. Do not remove the core casein/casein, but you can change the load order, if required.
     def casein_config_stylesheet_includes
       %w[casein/casein casein/custom]
     end
-  
+
     # A list of JavaScript files to include. Do not remove the core casein/casein, but you can change the load order, if required.
     def casein_config_javascript_includes
       %w[casein/casein casein/custom]
     end
 
-     # A list of stylesheets to include in the authentication layout. Do not remove the core casein/login, but you can change the load order, if required.
+    # A list of stylesheets to include in the authentication layout. Do not remove the core casein/login, but you can change the load order, if required.
     def casein_config_auth_stylesheet_includes
       %w[casein/login casein/auth_custom]
     end
-  
+
     # A list of JavaScript files to includein the authentication layout. Do not remove the core casein/casein, but you can change the load order, if required.
     def casein_config_auth_javascript_includes
       %w[casein/casein casein/auth_custom]
     end
-    
   end
-end
+end