casein 5.3.0.0 → 5.5.1.0

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/generators/casein/scaffold/templates/controller.rb

@@ -38,7 +38,7 @@ module Casein
 
       @<%= singular_name %> = <%= class_name %>.find params[:id]
 
-      if @<%= singular_name %>.update_attributes <%= singular_name %>_params
+      if @<%= singular_name %>.update <%= singular_name %>_params
         flash[:notice] = '<%= singular_name.humanize.capitalize %> has been updated'
         redirect_to casein_<%= @plural_route %>_path
       else

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

metadata

@@ -1,101 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: casein
 version: !ruby/object:Gem::Version
-  version: 5.3.0.0
+  version: 5.5.1.0
 platform: ruby
 authors:
 - Russell Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: authlogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: authlogic
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: scrypt
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: scrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara-rails
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,6 +207,7 @@ files:
 - lib/casein.rb
 - lib/casein/engine.rb
 - lib/casein/version.rb
+- lib/casein/version.rb.orig
 - lib/generators/casein/install/USAGE
 - lib/generators/casein/install/install_generator.rb
 - lib/generators/casein/install/templates/app/assets/javascripts/casein/auth_custom.js
@@ -234,8 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: A lightweight CMS toolkit for Ruby on Rails, based on Bootstrap.