casein 5.3.0.0 → 5.4.0.0

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/app/models/casein.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module Casein
 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/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: 4, patch: 0, 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/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/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

data/lib/generators/casein/install/templates/db/migrate/casein_create_admin_users.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 class CaseinCreateAdminUsers < ActiveRecord::Migration[5.1]
-  
   def change
-    create_table :casein_admin_users do |t|   
+    create_table :casein_admin_users do |t|
       t.string    :login, null: false
       t.string    :name
       t.string    :email
@@ -22,5 +23,4 @@ class CaseinCreateAdminUsers < ActiveRecord::Migration[5.1]
       t.timestamps
     end
   end
-    
-end
+end

data/lib/generators/casein/scaffold/scaffold_generator.rb

@@ -1,24 +1,25 @@
+# frozen_string_literal: true
+
 module Casein
   class ScaffoldGenerator < Rails::Generators::NamedBase
-
     include Casein::CaseinHelper
     include Rails::Generators::Migration
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
-    argument :attributes, type: :array, required: true, desc: "attribute list required"
+    argument :attributes, type: :array, required: true, desc: 'attribute list required'
 
     class_options create_model_and_migration: false, read_only: false, no_index: false
 
-    def self.next_migration_number dirname
+    def self.next_migration_number(dirname)
       if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
+        Time.now.utc.strftime('%Y%m%d%H%M%S')
       else
-        "%.3d" % (current_migration_number(dirname) + 1)
+        format('%.3d', (current_migration_number(dirname) + 1))
       end
     end
 
     def generate_files
-      @plural_route = (plural_name != singular_name) ? plural_name : "#{plural_name}_index"
+      @plural_route = plural_name
       @read_only = options[:read_only]
       @no_index = options[:no_index]
 
@@ -39,15 +40,15 @@ module Casein
       end
     end
 
-  protected
+    protected
 
-    #replacements for standard Rails generator route. This one only adds once
+    # replacements for standard Rails generator route. This one only adds once
     def add_namespace_to_routes
-      puts "   casein     adding namespace to routes.rb"
+      puts '   casein     adding namespace to routes.rb'
       file_to_update = Rails.root + 'config/routes.rb'
-      line_to_add = "namespace :casein do"
+      line_to_add = 'namespace :casein do'
       insert_sentinel = 'Application.routes.draw do'
-      if File.read(file_to_update).scan(/(#{Regexp.escape("#{line_to_add}")})/mi).blank?
+      if File.read(file_to_update).scan(/(#{Regexp.escape(line_to_add.to_s)})/mi).blank?
         gsub_add_once plural_name, file_to_update, "\n#Casein routes\n" + line_to_add + "\nend\n", insert_sentinel
       end
     end
@@ -56,18 +57,18 @@ module Casein
       puts "   casein     adding #{plural_name} resources to routes.rb"
       file_to_update = Rails.root + 'config/routes.rb'
 
-      if @no_index && @read_only
-        line_to_add = "resources :#{plural_name}, only: [:show]"
-      elsif @no_index
-        line_to_add = "resources :#{plural_name}, except: [:index]"
-      elsif @read_only
-        line_to_add = "resources :#{plural_name}, only: [:index, :show]"
-      else
-        line_to_add = "resources :#{plural_name}"
-      end
+      line_to_add = if @no_index && @read_only
+                      "resources :#{plural_name}, only: [:show]"
+                    elsif @no_index
+                      "resources :#{plural_name}, except: [:index]"
+                    elsif @read_only
+                      "resources :#{plural_name}, only: [:index, :show]"
+                    else
+                      "resources :#{plural_name}"
+                    end
 
       insert_sentinel = 'namespace :casein do'
-      gsub_add_once plural_name, file_to_update, "    " + line_to_add, insert_sentinel
+      gsub_add_once plural_name, file_to_update, '    ' + line_to_add, insert_sentinel
     end
 
     def add_to_navigation
@@ -78,9 +79,9 @@ module Casein
       gsub_add_once plural_name, file_to_update, line_to_add, insert_sentinel
     end
 
-    def gsub_add_once m, file, line, sentinel
+    def gsub_add_once(_m, file, line, sentinel)
       unless options[:pretend]
-        gsub_file file, /(#{Regexp.escape("\n#{line}")})/mi do |match|
+        gsub_file file, /(#{Regexp.escape("\n#{line}")})/mi do |_match|
           ''
         end
         gsub_file file, /(#{Regexp.escape(sentinel)})/mi do |match|
@@ -96,13 +97,13 @@ module Casein
 
     def field_type(type)
       case type.to_s.to_sym
-        when :integer, :float, :decimal   then :text_field
-        when :date                        then :date_select
-        when :time, :timestamp            then :time_select
-        when :datetime                    then :datetime_select
-        when :string                      then :text_field
-        when :text                        then :text_area
-        when :boolean                     then :check_box
+      when :integer, :float, :decimal   then :text_field
+      when :date                        then :date_select
+      when :time, :timestamp            then :time_select
+      when :datetime                    then :datetime_select
+      when :string                      then :text_field
+      when :text                        then :text_area
+      when :boolean                     then :check_box
       else
         :text_field
       end

data/lib/railties/tasks.rake

@@ -1,33 +1,31 @@
+# frozen_string_literal: true
+
 require 'authlogic'
 require 'securerandom'
 
 namespace :casein do
-
   namespace :users do
-
-    desc "Create default admin user"
+    desc 'Create default admin user'
     task create_admin: :environment do
+      raise 'Usage: specify email address, e.g. rake [task] email=mail@caseincms.com [(optional) password=mypassword]' unless ENV.include?('email')
 
-      raise "Usage: specify email address, e.g. rake [task] email=mail@caseincms.com [(optional) password=mypassword]" unless ENV.include?("email")
       password = ENV['password'] || SecureRandom.hex
-      admin = Casein::AdminUser.new({ login: 'admin', name: 'Admin', email: ENV['email'], access_level: $CASEIN_USER_ACCESS_LEVEL_ADMIN, password: password, password_confirmation: password })
+      admin = Casein::AdminUser.new(login: 'admin', name: 'Admin', email: ENV['email'], access_level: $CASEIN_USER_ACCESS_LEVEL_ADMIN, password: password, password_confirmation: password)
 
-      unless admin.save
-        puts "[Casein] Failed. Rails said:"
-        puts admin.errors.full_messages.join("\n")
-      else
+      if admin.save
         puts "[Casein] Created new admin user with username 'admin' and password '#{password}'"
+      else
+        puts '[Casein] Failed. Rails said:'
+        puts admin.errors.full_messages.join("\n")
       end
     end
 
-    desc "Remove all users"
+    desc 'Remove all users'
     task remove_all: :environment do
       users = Casein::AdminUser.all
       num_users = users.size
       users.destroy_all
       puts "[Casein] Removed #{num_users} user(s)"
     end
-
   end
-
 end