casein 5.1.1.5 → 5.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c056fc8726b1cae9e895561887d19fb2f28d12
-  data.tar.gz: 2ac86be0149be73abc718bcba22b57716834dd8a
+  metadata.gz: 5d4b37234ce457806986bdfafc8297cec5a044a0
+  data.tar.gz: 7eaffb7741b722eae3ee27912f71660afe1c90ba
 SHA512:
-  metadata.gz: 090dad924de5925152a286b03bb5342ccf47667d28197351283544c3047d691e154a1efa1f74ec2e0308a33464acb52b40e3b61ffe7b95577ccc03a5934a89a3
-  data.tar.gz: 5685c038441e5b816fef21259556d012ebecdb64a9ffdf6a97b1d26802d510d4a8ddd728a4a24532da9a91fd8ce0a3e0d5bed4d9182cdd4e05120673836b1e92
+  metadata.gz: d40b856a88a4dffb826baaba75214e5b202c47b3f49c5e13af564e57f6770235199b36d929866a1e58c3b679c8cda9ac59a61c3faf9c3b9f7b0832db4c18ae6d
+  data.tar.gz: e83824b71af4253db9fada75768ff80c1685fb27b9ccb92a48e571395800bf822f2e0845372164dd2f12688f758a495b5e03a3ced4e662b8f5de7541a414c1ee

data/README.rdoc

@@ -1,8 +1,6 @@
 =Casein - a lightweight CMS toolkit for Ruby on Rails, based on Bootstrap
 
-** ALL-NEW CASEIN 5.1.1 — featuring new responsive UI based on Bootstrap 3.3! **
-
-Casein is a Rails 4.x gem that provides scaffolding generators and helper functions to quickly create a clean and minimal CRUD interface for your data.
+Casein is a Rails 5.x gem that provides scaffolding generators and helper functions to quickly create a clean and minimal CRUD interface for your data.
 
 It comes with a pre-rolled user-authentication system, supports user-based timezones, and is mobile ready.
 
@@ -12,38 +10,21 @@ Screenshots at: http://www.caseincms.com
 
 ==Requirements
 
-This version of Casein is designed for Ruby on Rails 4.x and Ruby 2.x.
-
-==What’s New in 5.1.1
-
-Casein 5.1.1 has the following updates:
-
-* Fixes for Rails 4.2 compatibility
-* Added new Casein helpers for HTML5 form helpers (see “Changing form elements” below)
-* First steps in building a test suite
-* Switched from Jeweler to Bundler for gem distribution
-
-Version 5.1.1 should be a drop-in replacement for 5.1.0
+This version of Casein is designed for Ruby on Rails 5.x and Ruby 2.1.x.
 
-Thanks to @bunnymatic for this release.
+Casein 5.1.1.5 was the last gem release compatible with Rails 4.x.
 
-==What Was New in 5.1.0
+==What’s New in 5.2.0
 
-* Finally updated to Boostrap 3.3 (all bundled Bootstrap files removed in favor of bootstrap-sass gem)
-* Rake task to create admin user now takes an optional password
-* Authlogic version bumped to 3.4.3
-* UI tweaks
+Casein 5.2.0 has the following updates:
 
-Version 5.1.0 should be a drop-in replacement for 5.0.0
+* Compatible with Rails 5.x
+* Added auth_custom.js and auth_custom.scss for customizing JavaScript and CSS in the authentication layout
+* Deprecation updates and small improvements
 
-==What Was New in 5.0.0
+Version 5.2.0 should be a drop-in replacement for 5.1.1, but requires Rails 5.x and Ruby 2.1.x.
 
-* Now based on Bootstrap 3
-* Complete UI overhaul, now mobile-first
-* Support for strong parameters
-* Support for asset pipeline
-* Rails 4 compatibility fixes
-* Many other tweaks and improvements over Casein 3.x and 4.x
+Thanks to @brchristian and @mkunkel for this release.
 
 ==Installation
 
@@ -51,7 +32,7 @@ Version 5.1.0 should be a drop-in replacement for 5.0.0
 
 — Add the Casein gem to your Gemfile:
 
-  gem 'casein', '~>5.1.1'
+  gem 'casein', '~>5.2.0'
 
 — Then use bundler to install Casein and its dependencies:
 
@@ -74,6 +55,8 @@ Version 5.1.0 should be a drop-in replacement for 5.0.0
 
   rake casein:users:create_admin email=you@yourdomain.com [password=your_password]
 
+(square brackets indicate an optional parameter, do not include)
+
 — Run your app! (rebooting the web server if applicable)
 
 — You can access Casein at http://yourdomain.com/casein or http://yourdomain.com/admin
@@ -94,6 +77,8 @@ The command to run the scaffolding generator is:
 
   rails g casein:scaffold ModelName [field:type, field:type]
 
+(square brackets indicate an optional parameter, do not include)
+
 Where:
 
 * ModelName – The *singular* name of your model, e.g. Customer
@@ -143,10 +128,14 @@ An ERB partial for the the left navigation tabs. Note that using the scaffolding
 
 An ERB partial for adding items to the top navigation.
 
-<b>/assets/javascripts/casein/custom.js & /assets/stylesheets/casein/custom.css.scss</b>
+<b>/assets/javascripts/casein/custom.js & /assets/stylesheets/casein/custom.scss</b>
 
 These files are added to your app’s /assets directory. They allow you to add custom JavaScript or CSS to your Casein deployment.
 
+<b>/assets/javascripts/casein/auth_custom.js & /assets/stylesheets/casein/auth_custom.scss</b>
+
+These files are added to your app’s /assets directory. They allow you to add custom JavaScript or CSS to the authentication layout in your Casein deployment.
+
 ==Customising
 
 Once you have the Casein core installed and configured, and have added support for your models with the scaffolding generator, you’ll want to extend it so that it actually has some functionality for your project!
@@ -268,11 +257,11 @@ Help is set on a page by adding a content_for block to a view:
 
 ===Routes
 
-Casein adds the routes for the scaffolded models to the top of your application’s routes.rb file. It also adds default routes for basic Casein functionality <b>after</b> your application’s routes. If you have a catch-all style route defined, then these defaults won’t be run. You can solve this be using Rails’ constraint feature and the supplied Casein::RouteConstraint, which will stop your catch-all from matching if the request is for a Casein resource.
+Casein adds the routes for the scaffolded models to the top of your application’s routes.rb file. It also adds default routes for basic Casein functionality <b>after</b> your application’s routes. If you have a catch-all style route defined, then these defaults won’t be run. You can solve this using Rails’ constraint feature and the supplied Casein::RouteConstraint, which will stop your catch-all from matching if the request is for a Casein resource.
 
 e.g.
 
-  match ':controller(/:action(/:id(.:format)))', :constraints => Casein::RouteConstraint.new
+  match ':controller(/:action(/:id(.:format)))', constraints: Casein::RouteConstraint.new
 
 ===Default Timezone
 
@@ -291,4 +280,4 @@ To run tests:
 
 Casein was created and is maintained by Russell Quinn. http://www.russellquinn.com
 
-Casein is available to use under the terms of the MIT License. See the LICENSE file for more details.
+Casein is available to use under the terms of the MIT License. See the LICENSE file for more details.

data/app/assets/javascripts/casein/casein.js

@@ -4,7 +4,7 @@
 
 jQuery(document).ready(function() {
 
-	if (current_controller) {
+	if ("current_controller" in window) {
 		active_tab = $("#tab-" + current_controller);
 		if (active_tab) {
 			active_tab.addClass("active");

data/app/assets/stylesheets/casein/login.scss

@@ -0,0 +1,74 @@
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "casein-bootstrap-overrides";
+
+body.casein-login {
+  padding-top: 0px;
+  padding-bottom: 0px;
+
+  .container-narrow {
+    margin: 0 auto;
+    max-width: 400px;
+  }
+
+  .alert {
+    text-align: center;
+  }
+
+  .brand {
+    margin-top: 20px;
+    margin-bottom: 40px;
+  }
+
+  .form-group .checkbox-inline label {
+    margin-top: 5px;
+    margin-bottom: 20px;
+    font-weight: normal;
+  }
+
+  .form-group .checkbox-inline input[type="checkbox"] {
+    margin-top: 1px;
+  }
+
+  .form-group input {
+    text-align: center;
+  }
+
+  .jumbotron {
+    padding: 20px;
+    margin-bottom: 20px;
+    font-size: 14px;
+    line-height: 1;
+    background-color: #eeeeee;
+    text-align: center;
+    border-bottom: 1px solid #e5e5e5;
+  }
+
+  footer p {
+    font-size: 13px;
+    text-align: center;
+    color: #888;
+  }
+
+  footer p a {
+    color: #555;
+  }
+
+  footer p a:hover {
+    color: #000;
+    text-decoration: none;
+  }
+}
+
+@media screen and (min-width: 768px) {
+  body.casein-login {
+    padding-top: 40px;
+    padding-bottom: 20px;
+
+    .jumbotron {
+      border-bottom: 0;
+      padding: 20px;
+      border-radius: 6px;
+    }
+  }
+}

data/app/controllers/casein/admin_user_sessions_controller.rb

@@ -1,8 +1,8 @@
 module Casein
   class AdminUserSessionsController < Casein::CaseinController
     
-    skip_before_filter :authorise, :only => [:new, :create]
-    before_filter :requires_no_session_user, :except => [:destroy]
+    skip_before_action :authorise, only: [:new, :create]
+    before_action :requires_no_session_user, except: [:destroy]
   
     layout 'casein_auth'
   
@@ -11,11 +11,11 @@ module Casein
     end
   
     def create
-      @admin_user_session = Casein::AdminUserSession.new params[:casein_admin_user_session]
+      @admin_user_session = Casein::AdminUserSession.new casein_admin_user_session_params
       if @admin_user_session.save
-        redirect_back_or_default :controller => :casein, :action => :index
+        redirect_back_or_default controller: :casein, action: :index
       else
-        render :action => :new
+        render action: :new
       end
     end
   
@@ -28,9 +28,13 @@ module Casein
   
     def requires_no_session_user
       if current_user
-        redirect_to :controller => :casein, :action => :index
+        redirect_to controller: :casein, action: :index
       end
     end
+    
+    def casein_admin_user_session_params
+      params.require(:casein_admin_user_session).permit(:login, :password, :remember_me)
+    end
 
   end
 end

data/app/controllers/casein/admin_users_controller.rb

@@ -3,12 +3,12 @@ require 'securerandom'
 module Casein
   class AdminUsersController < Casein::CaseinController
 
-    before_filter :needs_admin, :except => [:show, :destroy, :update, :update_password]
-    before_filter :needs_admin_or_current_user, :only => [: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"
-      @users = Casein::AdminUser.order(sort_order(:login)).paginate :page => params[:page]
+      @users = Casein::AdminUser.order(sort_order(:login)).paginate page: params[:page]
     end
  
     def new
@@ -28,7 +28,7 @@ module Casein
         redirect_to casein_admin_users_path
       else
         flash.now[:warning] = "There were problems when trying to create a new user"
-        render :action => :new
+        render action: :new
       end
     end
   
@@ -45,14 +45,14 @@ module Casein
         flash[:notice] = @casein_admin_user.name + " has been updated"
       else
         flash.now[:warning] = "There were problems when trying to update this user"
-        render :action => :show
+        render action: :show
         return
       end
       
       if @session_user.is_admin?
         redirect_to casein_admin_users_path
       else
-        redirect_to :controller => :casein, :action => :index
+        redirect_to controller: :casein, action: :index
       end
     end
  
@@ -72,7 +72,7 @@ module Casein
         flash[:warning] = "The current password is incorrect"
       end
       
-      redirect_to :action => :show
+      redirect_to action: :show
     end
  
     def reset_password
@@ -96,7 +96,7 @@ module Casein
         end
       end
 
-      redirect_to :action => :show
+      redirect_to action: :show
     end
  
     def destroy
@@ -113,7 +113,7 @@ module Casein
       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})
+        params[:casein_admin_user].merge! ({ password: random_password, password_confirmation: random_password })
       end
 
       def casein_admin_user_params

data/app/controllers/casein/casein_controller.rb

@@ -12,8 +12,8 @@ module Casein
     layout 'casein_main'
    
     helper_method :current_admin_user_session, :current_user
-    before_filter :authorise
-    before_filter :set_time_zone
+    before_action :authorise
+    before_action :set_time_zone
     
     ActionView::Base.field_error_proc = proc { |input, instance| "#{input}".html_safe }
 
@@ -51,13 +51,13 @@ module Casein
   
     def needs_admin
       unless @session_user.is_admin?
-        redirect_to :controller => :casein, :action => :index
+        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
+        redirect_to controller: :casein, action: :index
       end
     end
     
@@ -67,7 +67,9 @@ module Casein
     end
 
     def sort_order(default)
-      "#{(params[:c] || default.to_s).gsub(/[\s;'\"]/,'')} #{'ASC' if params[:d] == 'up'} #{'DESC' if params[:d] == 'down'}"
+      column = (params[:c] || default.to_s).gsub(/[\s;'\"]/,'')
+      direction = params[:d] == 'down' ? 'DESC' : 'ASC'
+      { column => direction }
     end
 
   end

data/app/controllers/casein/password_resets_controller.rb

@@ -1,13 +1,13 @@
 module Casein
   class PasswordResetsController < Casein::CaseinController
   
-    skip_before_filter :authorise
-    before_filter :load_user_using_perishable_token, :only => [:edit, :update]
+    skip_before_action :authorise
+    before_action :load_user_using_perishable_token, only: [:edit, :update]
 
     layout 'casein_auth'
     
     def create
-      users = Casein::AdminUser.where(:email => params[:recover_email]).all
+      users = Casein::AdminUser.where(email: params[:recover_email]).all
 
       if users.length > 0
         users.each do |user|
@@ -46,7 +46,7 @@ module Casein
         end
       end
       
-      render :action => :edit
+      render action: :edit
     end
 
   private

data/app/helpers/casein/casein_helper.rb

@@ -53,7 +53,7 @@ module Casein
   	def casein_table_cell_link contents, link, options = {}
 
   	  if options.key? :casein_truncate
-  	    contents = truncate(contents, :length => options[:casein_truncate], :omission => "...")
+  	    contents = truncate(contents, length: options[:casein_truncate], omission: "...")
   	  end
 
     	link_to "#{contents}".html_safe, link, options
@@ -62,7 +62,7 @@ module Casein
     def casein_table_cell_no_link contents, options = {}
 
   	  if options.key? :casein_truncate
-  	    contents = truncate(contents, :length => options[:casein_truncate], :omission => "...")
+  	    contents = truncate(contents, length: options[:casein_truncate], omission: "...")
   	  end
 
     	"<div class='no-link'>#{contents}</div>".html_safe
@@ -100,7 +100,7 @@ module Casein
         icon_to_show_html = "<div class='table-header-icon glyphicon glyphicon-#{icon_to_show}'></div>".html_safe
       end
       sort_dir = params[:d] == 'down' ? 'up' : 'down'
-      link_to_unless(condition, title, request.parameters.merge({:c => column, :d => sort_dir})) + icon_to_show_html
+      link_to_unless(condition, title, request.parameters.merge({ c: column, d: sort_dir })) + icon_to_show_html
     end
 
     def casein_yes_no_label value
@@ -180,7 +180,7 @@ module Casein
   	  casein_form_tag_wrapper(form.time_zone_select(attribute, option_tags, strip_casein_options(options), merged_class_hash(options, 'form-control')), form, obj, attribute, options).html_safe
   	end
 
-    #e.g. casein_collection_select f, f.object, :article, :author_id, Author.all, :id, :name, {:prompt => 'Select author'}
+    #e.g. casein_collection_select f, f.object, :article, :author_id, Author.all, :id, :name, { prompt: 'Select author' }
   	def casein_collection_select form, obj, object_name, attribute, collection, value_method, text_method, options = {}
   		casein_form_tag_wrapper(collection_select(object_name, attribute, collection, value_method, text_method, strip_casein_options(options), merged_class_hash(options, 'form-control')), form, obj, attribute, options).html_safe
   	end
@@ -271,7 +271,7 @@ module Casein
     protected
 
     def strip_casein_options options
-      options.reject {|key, value| key.to_s.include? "casein_" }
+      options.reject { |key, value| key.to_s.include? "casein_" }
     end
 
     def merged_class_hash options, new_class
@@ -279,7 +279,7 @@ module Casein
         new_class += " #{options[:class]}"
       end
 
-      {:class => new_class}
+      { class: new_class }
     end
 
     def options_hash_with_merged_classes options, new_class
@@ -307,10 +307,10 @@ module Casein
 
       if obj && obj.errors[attribute].any?
         html += "<div class='form-group has-error'>"
-    		html += form.label(attribute, "#{human_attribute_name} #{obj.errors[attribute].first}".html_safe, :class => "control-label")
+    		html += form.label(attribute, "#{human_attribute_name} #{obj.errors[attribute].first}".html_safe, class: "control-label")
     	else
         html += "<div class='form-group'>"
-    		html += form.label(attribute, "#{human_attribute_name}#{sublabel}".html_safe, :class => "control-label")
+    		html += form.label(attribute, "#{human_attribute_name}#{sublabel}".html_safe, class: "control-label")
     	end
 
     	html += "<div class='well'>#{form_tag}</div></div>"