casein 5.1.1.5 → 5.2.0.0

data/app/mailers/casein/casein_notification.rb

@@ -11,7 +11,7 @@ module Casein
   		@pass = pass
   		@from_text = casein_config_website_name
   		
-  		mail(:to => casein_admin_user.email, :from => from, :subject => "[#{casein_config_website_name}] New password")
+  		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
@@ -21,7 +21,7 @@ module Casein
   		@pass = pass
   		@from_text = casein_config_website_name
   		
-  		mail(:to => casein_admin_user.email, :from => from, :subject => "[#{casein_config_website_name}] New user account")
+  		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
@@ -32,7 +32,7 @@ module Casein
       @reset_password_url = edit_casein_password_reset_url + "/?token=#{casein_admin_user.perishable_token}"
       @from_text = casein_config_website_name
 
-      mail(:to => casein_admin_user.email, :from => from, :subject => "[#{casein_config_website_name}] Password reset instructions")
+      mail(to: casein_admin_user.email, from: from, subject: "[#{casein_config_website_name}] Password reset instructions")
     end
 
   end

data/app/models/casein/admin_user.rb

@@ -24,11 +24,11 @@ module Casein
     
     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_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
-      Casein::AdminUser.where(:access_level => $CASEIN_USER_ACCESS_LEVEL_ADMIN).count > 1
+      Casein::AdminUser.where(access_level: $CASEIN_USER_ACCESS_LEVEL_ADMIN).count > 1
     end
 	
   	def send_create_notification

data/app/views/casein/admin_user_sessions/new.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @admin_user_session, :url => casein_admin_user_session_path do |f| %>
+<%= form_for @admin_user_session, url: casein_admin_user_session_path do |f| %>
 	<% if @admin_user_session.errors.any? %>
 		<div id="error_messages" class="alert alert-danger">
 			<% @admin_user_session.errors.keys.each do |key| %>
@@ -20,10 +20,10 @@
     <% end %>
 	
 	<div class="form-group">
-		<%= f.text_field :login, :placeholder => "Username", :class => "form-control input-lg" %>
+		<%= f.text_field :login, placeholder: "Username", class: "form-control input-lg" %>
 	</div>
 	<div class="form-group">
-		<%= f.password_field :password, :placeholder => "Password", :class => "form-control input-lg" %>
+		<%= f.password_field :password, placeholder: "Password", class: "form-control input-lg" %>
 	</div>
 
 	<div class="form-group">
@@ -35,7 +35,7 @@
 	</div>
 
 	<div class="form-group">
-		<%= f.submit "Sign in", :class => "btn btn-success btn-lg btn-block" %>
+		<%= f.submit "Sign in", class: "btn btn-success btn-lg btn-block" %>
 	</div>
 
 	<div class="form-group">
@@ -47,10 +47,10 @@
 <%= form_tag casein_password_reset_url do %>
 	<div id="recover" style="display:none;">
 		<div class="form-group">
-			<%= text_field_tag :recover_email, params[:recover_email], :placeholder => "Your email address", :class => "form-control input-lg" %>
+			<%= text_field_tag :recover_email, params[:recover_email], placeholder: "Your email address", class: "form-control input-lg" %>
 		</div>
 		<div class="form-group">
-			<%= submit_tag "Reset password", :class => "btn btn-primary btn-lg btn-block" %>
+			<%= submit_tag "Reset password", class: "btn btn-primary btn-lg btn-block" %>
 		</div>
 	</div>
 <% end %>

data/app/views/casein/admin_users/index.html.erb

@@ -23,7 +23,7 @@
 						<% confirm_message += "\n\nWARNING: This is your user account. You will be signed out if you proceed." %>
 					<% end %>
 				
-					<%= link_to(casein_show_row_icon("trash"), casein_admin_user_path(user), :method => :delete, :data => { :confirm => confirm_message }) %>
+					<%= link_to(casein_show_row_icon("trash"), casein_admin_user_path(user), method: :delete, data: { confirm: confirm_message }) %>
 				<% end %>
 			</td>
 		</tr>

data/app/views/casein/admin_users/new.html.erb

@@ -4,7 +4,7 @@
 
 	<div class="row">
   		<div class="col-lg-6">
-			<%= casein_text_field form, @casein_admin_user, :login, {:size => 30, :casein_label => "Username"} %>
+			<%= casein_text_field form, @casein_admin_user, :login, { size: 30, casein_label: "Username" } %>
 		</div>
 		<div class="col-lg-6">
 			<%= casein_text_field form, @casein_admin_user, :name %>
@@ -23,7 +23,7 @@
 
 	<div class="row">
   		<div class="col-lg-6">
-			<%= casein_select form, @casein_admin_user, :access_level, casein_get_access_level_array, {:casein_label => "Role"} %>
+			<%= casein_select form, @casein_admin_user, :access_level, casein_get_access_level_array, { casein_label: "Role" } %>
 		</div>
 		<div class="col-lg-6">
 		</div>
@@ -31,23 +31,23 @@
 
 	<div class="row">
   		<div class="col-lg-6">
-			<%= casein_password_field form, @casein_admin_user, :password, {:casein_label => "Password"} %>
+			<%= casein_password_field form, @casein_admin_user, :password, { casein_label: "Password" } %>
 		</div>
 		<div class="col-lg-6">
-			<%= casein_password_field form, @casein_admin_user, :password_confirmation, {:casein_label => "Repeat password"} %>
+			<%= casein_password_field form, @casein_admin_user, :password_confirmation, { casein_label: "Repeat password" } %>
 		</div>
 		<div class="col-lg-12 password-checkbox">
 			<div class="checkbox">
 	      		<label>
-	      			<%= check_box_tag :generate_random_password, "1", false, {:id => 'generate-random-password-checkbox'} %> Generate random password
+	      			<%= check_box_tag :generate_random_password, "1", false, { id: 'generate-random-password-checkbox' } %> Generate random password
 	      		</label>
 	    	</div>
 	    </div>
 	</div>
 
 	<p class="submits">
-		<%= link_to 'Cancel', casein_admin_users_path, :class => 'btn btn-mini btn-danger' %>
-		<%= form.submit "Add new user", :class => "btn btn-mini btn-primary" %>
+		<%= link_to 'Cancel', casein_admin_users_path, class: 'btn btn-mini btn-danger' %>
+		<%= form.submit "Add new user", class: "btn btn-mini btn-primary" %>
 	</p>
 
 <% end %>

data/app/views/casein/admin_users/show.html.erb

@@ -4,7 +4,7 @@
 
 	<div class="row">
   		<div class="col-lg-6">
-			<%= casein_text_field f, f.object, :login, {:size => 30, :casein_label => "Username"} %>
+			<%= casein_text_field f, f.object, :login, { size: 30, casein_label: "Username" } %>
 		</div>
 		<div class="col-lg-6">
 			<%= casein_text_field f, f.object, :name %>
@@ -23,7 +23,7 @@
 	<% if @session_user.is_admin? && (@casein_admin_user.is_admin? == false || Casein::AdminUser.has_more_than_one_admin) %>
 		<div class="row">
   			<div class="col-lg-6">
-				<%= casein_select f, f.object, :access_level, casein_get_access_level_array, {:casein_label => "Role"} %>
+				<%= casein_select f, f.object, :access_level, casein_get_access_level_array, { casein_label: "Role" } %>
 			</div>
 			<div class="col-lg-6">
 			</div>
@@ -31,8 +31,8 @@
 	<% end %>
 
 	<p class="submits">
-	  	<%= link_to 'Cancel', casein_admin_users_path, :class => 'btn btn-mini btn-danger' %>
-		<%= f.submit "Save changes", :class => "btn btn-mini btn-primary" %>
+	  	<%= link_to 'Cancel', casein_admin_users_path, class: 'btn btn-mini btn-danger' %>
+		<%= f.submit "Save changes", class: "btn btn-mini btn-primary" %>
 	</p>
 <% end %>
 
@@ -40,26 +40,26 @@
 
 	<h2>Reset password <small>(admin action &mdash; use carefully)</small></h2>
 
-	<%= form_for @casein_admin_user, :url => reset_password_casein_admin_user_path(@casein_admin_user) do |f| %>
+	<%= form_for @casein_admin_user, url: reset_password_casein_admin_user_path(@casein_admin_user) do |f| %>
 
 		<div class="row">
   			<div class="col-lg-6">
-				<%= casein_password_field f, f.object, :password, {:casein_label => "New password"} %>
+				<%= casein_password_field f, f.object, :password, { casein_label: "New password" } %>
 			</div>
 			<div class="col-lg-6">
-				<%= casein_password_field f, f.object, :password_confirmation, {:casein_label => "Repeat new password"} %>
+				<%= casein_password_field f, f.object, :password_confirmation, { casein_label: "Repeat new password" } %>
 			</div>
 			<div class="col-lg-12 password-checkbox">
 				<div class="checkbox">
 		      		<label>
-		      			<%= check_box_tag :generate_random_password, "1", false, {:id => 'generate-random-password-checkbox'} %> Generate random password
+		      			<%= check_box_tag :generate_random_password, "1", false, { id: 'generate-random-password-checkbox' } %> Generate random password
 		      		</label>
 		    	</div>
 		    </div>
 		</div>
 		
 		<p class="submits">
-			<%= f.submit "Reset", :class => "btn btn-mini btn-warning" %>
+			<%= f.submit "Reset", class: "btn btn-mini btn-warning" %>
 		</p>
 		
 	<% end %>
@@ -68,13 +68,13 @@
 
 	<h2>Change password</h2>
 
-	<%= form_for @casein_admin_user, :url => update_password_casein_admin_user_path(@casein_admin_user) do |f| %>
+	<%= form_for @casein_admin_user, url: update_password_casein_admin_user_path(@casein_admin_user) do |f| %>
 
 		<div class="row">
   			<div class="col-lg-6">
   				<div class="form-group">
 					<%= label_tag :form_current_password, "Current password" %>
-					<%= password_field_tag :form_current_password, "", {:class => 'form-control'} %>
+					<%= password_field_tag :form_current_password, "", { class: 'form-control' } %>
 				</div>
 			</div>
 			<div class="col-lg-6">
@@ -83,15 +83,15 @@
 
 		<div class="row">
   			<div class="col-lg-6">
-				<%= casein_password_field f, f.object, :password, {:casein_label => "New password"} %>
+				<%= casein_password_field f, f.object, :password, { casein_label: "New password" } %>
 			</div>
 			<div class="col-lg-6">
-				<%= casein_password_field f, f.object, :password_confirmation, {:casein_label => "Repeat new password"} %>
+				<%= casein_password_field f, f.object, :password_confirmation, { casein_label: "Repeat new password" } %>
 			</div>
 		</div>
 		
 		<p class="submits">
-			<%= f.submit "Change", :class => "btn btn-mini btn-primary" %>
+			<%= f.submit "Change", class: "btn btn-mini btn-primary" %>
 		</p>
 
 	<% end %>

data/app/views/casein/password_resets/edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @reset_user, :url => casein_password_reset_path do |f| %>
+<%= form_for @reset_user, url: casein_password_reset_path do |f| %>
 
 	<% if @reset_user.errors.any? %>
 		<div id="error_messages" class="alert alert-danger">
@@ -23,14 +23,14 @@
 	<%= hidden_field_tag :token, params[:token] %>
 
 	<div class="form-group">
-		<%= f.password_field :password, :autocomplete => :off, :placeholder => "New password", :class => "form-control input-lg" %>
+		<%= f.password_field :password, autocomplete: :off, placeholder: "New password", class: "form-control input-lg" %>
 	</div>
 	<div class="form-group">
-		<%= f.password_field :password_confirmation, :autocomplete => :off, :placeholder => "Confirm password", :class => "form-control input-lg" %>
+		<%= f.password_field :password_confirmation, autocomplete: :off, placeholder: "Confirm password", class: "form-control input-lg" %>
 	</div>
 
 	<div class="form-group">
-		<%= f.submit "Change password", :class => "btn btn-success btn-lg btn-block" %>
+		<%= f.submit "Change password", class: "btn btn-success btn-lg btn-block" %>
 	</div>
 
 <% end %>

data/app/views/layouts/casein_auth.html.erb

@@ -5,22 +5,28 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <title>Welcome to <%= casein_config_website_name %></title>
-    <%= stylesheet_link_tag "casein/login" %>
-	<%= javascript_include_tag "casein/casein" %>
-	<%= csrf_meta_tag %>
+    <% casein_config_auth_stylesheet_includes.each do |stylesheet| %>
+      <%= stylesheet_link_tag(stylesheet) %>
+    <% end %>
 
-	<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <% casein_config_auth_javascript_includes.each do |javascript| %>
+      <%= javascript_include_tag(javascript) %>
+    <% end %>
+
+    <%= csrf_meta_tag %>
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
       <%= javascript_include_tag("casein/html5shiv") %>
     <![endif]-->
 
   </head>
 
-  <body>
+  <body class="casein-login">
   	<div class="container-narrow">
 		<div class="jumbotron">
 			<div class="row brand">
-				<%= image_tag(casein_config_logo, :alt => casein_config_website_name) %>
+				<%= image_tag(casein_config_logo, alt: casein_config_website_name) %>
 			</div>
 			<%= yield %>
 		</div>

data/app/views/layouts/casein_main.html.erb

@@ -40,15 +40,15 @@
                 <li><%= link_to 'Users', casein_admin_users_path %></li>
               <% end %>
 
-              <%= render :partial => '/casein/layouts/top_navigation' %>
-              <li class="last-item signout"><%= link_to 'Sign out', casein_admin_user_session_path, :method => :delete %></li>
+              <%= render partial: '/casein/layouts/top_navigation' %>
+              <li class="last-item signout"><%= link_to 'Sign out', casein_admin_user_session_path, method: :delete %></li>
             </ul>
           </div>
         </div>
       <% end %>
 
       <div class="container container-navbar-brand">
-        <%= link_to(image_tag(casein_config_logo, :alt => casein_config_website_name), {:controller => :casein}, :class => "navbar-brand") %>   
+        <%= link_to(image_tag(casein_config_logo, alt: casein_config_website_name), { controller: :casein }, class: "navbar-brand") %>   
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
             <span class="icon-bar"></span>
@@ -61,7 +61,7 @@
       <div class="container">
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <%= render :partial => '/casein/layouts/tab_navigation' %>
+            <%= render partial: '/casein/layouts/tab_navigation' %>
           </ul>
         </div>
       </div>

data/config/initializers/will_paginate.rb

@@ -20,20 +20,20 @@ module WillPaginate
       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)
-        tag :li, link(page, page, :rel => rel_value(page)), :class => ('active' if page == current_page)
+        tag :li, link(page, page, rel: rel_value(page)), class: ('active' if page == current_page)
       end
 
       def gap
-        tag :li, link('…'.html_safe, '#'), :class => 'disabled'
+        tag :li, link('…'.html_safe, '#'), class: 'disabled'
       end
 
       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

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
   
-  match "/admin" => redirect("/casein"), :via => :get
+  match "/admin" => redirect("/casein"), via: :get
   
   namespace :casein do
   
@@ -10,11 +10,11 @@ Rails.application.routes.draw do
       end
     end
     
-    resource :admin_user_session, :only => [:new, :create, :destroy]
-    resource :password_reset, :only => [:create, :edit, :update]
+    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"
+    match "/blank" => "casein#blank", via: :get
+    root to: "casein#index"
   end
   
 end

data/lib/casein.rb

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

data/lib/casein/engine.rb

@@ -6,7 +6,7 @@ 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/*.png)
+      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

data/lib/casein/version.rb

@@ -1,4 +1,4 @@
 module Casein
-  VERSION_HASH = { major: 5, minor: 1, patch: 1, build: 5 }
+  VERSION_HASH = { major: 5, minor: 2, patch: 0, build: 0 }
   VERSION = VERSION_HASH.values.join(".")
 end

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

@@ -27,9 +27,11 @@ module Casein
         copy_file "public/robots.txt", "public/robots.txt"
       
         #blank stylesheets and JavaScript files
-  			copy_file "app/assets/stylesheets/casein/custom.css.scss", "app/assets/stylesheets/casein/custom.css.scss"
+  			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  

data/lib/generators/casein/install/templates/app/assets/javascripts/casein/auth_custom.js

@@ -0,0 +1,2 @@
+// CASEIN AUTH CUSTOM
+// Use this file for your project-specific Casein JavaScript in the authentication layout

data/lib/generators/casein/install/templates/app/assets/stylesheets/casein/auth_custom.scss

@@ -0,0 +1,2 @@
+/* CASEIN AUTH CUSTOM */
+/* Use this file for your project-specific Casein CSS in the authentication layout */

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

@@ -28,7 +28,7 @@ module Casein
     # 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
+      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.
@@ -40,6 +40,16 @@ module Casein
     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.
+    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