beautiful_scaffold 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1fe3aee750d2046a19d5f956820fb36e03a49ecac78cef8046d75e573e44e5e
-  data.tar.gz: aa521359c646d5171eeb3981f67ba5c7138ef9f422f2f88856e04280acc4b434
+  metadata.gz: f2c5cc9830b52e9bdc57663e3e93779e3457502e4f3656f0c541b8213775edca
+  data.tar.gz: 03260e7d438e1aa4c9161a5fdf1b221fd21c2acc4625857ac00eadf4686ac04c
 SHA512:
-  metadata.gz: a3816f89d26548eccf73546dd698a3606f739bd1637e70fc53b19eaa27e7455ce61ea65a18fdc504ec8a8bea5f24dfd2d3bf6d030480c84f077e427d1481a447
-  data.tar.gz: 1256a2a3b5534405148fb3a0f9f2c3a404703e4ea2ff521887e8bb5f61c6937da8793a69fcfa8e4a584c131cd6af44c9d14c8bc8886b0daf97bfb54be4f98ebe
+  metadata.gz: d95e8b02e11a731844977432a230d83b200da69018184d3583a3ade48f448face2799f8e76bcb01ee13b40b7166813f0921fe57442db6fa7f18ec23eb6b62f79
+  data.tar.gz: 7ab3d32603cf3c89f6c34a7d5798610b60ccbf701a3c8583eee89bdabadb0a090c96436e8e17c11f2c9d41d7ba4262820414b1096e54124df2b02cccaf9b777e

data/CHANGELOG

@@ -4,6 +4,19 @@
 
 * bugfix
 
+== 2.0.1
+
+* enhancement
+  * Replace Devise by Sorcery
+  * Tests Sorcery and Cancancan generators
+  * New generator for ActiveStorage
+
+* bugfix
+  * Locale : fix all locale in the same file.
+  * Visual fix ('-' in menu)
+  * Will_paginate right locales
+  * Avoid adding gems multiple times
+
 == 2.0.0
 
 * enhancement

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 6.0"
+gem "rails", "~> 6.1"
 
 group :test do
   gem 'sqlite3'
@@ -15,10 +15,11 @@ group :test do
       'prawn-table' => nil, #'0.2.2',
       'sanitize' => nil,
       'bootstrap' => '~> 4.3.1',
-      'font-awesome-rails' => '4.7.0.5',
+      'font-awesome-rails' => '4.7.0.7',
       'momentjs-rails' => '>= 2.9.0',
       'bootstrap4-datetime-picker-rails' => nil,
-      'jquery-rails' => '4.3.1'
+      'jquery-rails' => '4.3.1',
+      'sorcery' => '0.15.0'
   }
 
   gems.each{ |gem_to_add, version|

data/README.rdoc

@@ -2,6 +2,11 @@
 
 Beautiful Scaffold is a gem which propose generators for a complete scaffold with paginate, sort and filter.
 Fully customizable.
+
+Note : Avoid to change Beautiful-Scaffold version in your project (incompatibility between generated code).
+Note 2 : Be careful to have a clean git repository for your project because Beautiful-Scaffold change many files.
+It will be easier to revert changes.
+
 Info : https://github.com/rivsc/Beautiful-Scaffold
 Demo : http://beautiful-scaffold.rivsc.ovh/
 
@@ -70,10 +75,23 @@ Run `rake db:migrate` before `rails g beautiful_locale` (to get lastest attribut
 
     rails g beautiful_jointable model1 model2
 
-TODO replace Devise by Sorcery & Cancan by Cancancan
-=== Install et Configure Devise (authentification) and Cancan (authorization)
+=== Install et preconfigure Sorcery (authentification) (this generator doesn't work on engine)
+
+    # If it is not done yet
+    rails g beautiful_scaffold user email:string
+    rails g beautiful_sorcery
+
+=== Install et preconfigure Cancancan (authorization) (this generator doesn't work on engine)
+
+    # If it is not done yet
+    rails g beautiful_scaffold user email:string
+    # If it is not done yet
+    rails g beautiful_sorcery
+    rails g beautiful_cancancan
+
+=== Storage (ActiveStorage)
 
-    rails g beautiful_devisecancan model
+   rails g beautiful_storage model attachment_field
 
 === In views
 
@@ -103,7 +121,7 @@ Example : when you click on the #bs-help tag presentation tour display on screen
 
 If you want to add 'slide' :
 
-For add instruction to element, add this to your markup :
+For add instruction to DOM element, add this to your markup :
 
 id="myunique-id-in-the-page" data-present-title="Title for the slide" data-present-description="Short description" data-present-order="1"
 

data/lib/beautiful_scaffold/version.rb

@@ -1,3 +1,3 @@
 module BeautifulScaffold
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/lib/generators/USAGE

@@ -12,5 +12,7 @@ Example:
 
     rails generate beautiful_jointable product tag
 
-    rails generate beautiful_devisecancan user
+    rails generate beautiful_sorcery
+    rails generate beautiful_cancancan
+
        

data/lib/generators/beautiful_cancancan_generator.rb

@@ -0,0 +1,51 @@
+# encoding : utf-8
+class BeautifulCancancanGenerator < Rails::Generators::Base
+  require_relative 'beautiful_scaffold_common_methods'
+  include BeautifulScaffoldCommonMethods
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  #argument :model, :type => :string, :desc => "Name of model (ex: user)"
+
+  def install_cancancan
+    model = "user"
+
+    gem("cancancan", "3.2.1")
+
+    Bundler.with_unbundled_env do
+      run "bundle install"
+    end
+
+    # Because generators doesn't work !
+    copy_file("app/models/ability.rb")
+
+    # Why that doesn't work... boring...
+    #puts rails_command("generate cancan:ability", capture: true)
+    # Why that doesn't work too... boring...
+    #generate("cancan:ability")
+
+    # current_user method need for CanCan
+    current_user_method = ""
+    if model != "user" then
+      current_user_method = "
+  def current_user
+    current_#{model}
+  end"
+    end
+
+    # Exception for AccessDenied
+    inject_into_file("app/controllers/application_controller.rb", "
+  rescue_from CanCan::AccessDenied do |exception|
+    respond_to do |format|
+      format.json { head :forbidden, content_type: 'text/html' }
+      format.html { redirect_to root_url, :alert => exception.message }
+      format.js   { head :forbidden, content_type: 'text/html' }
+    end
+  end
+  #{current_user_method}
+  ", :after => "class ApplicationController < ActionController::Base\n")
+
+    # Access controlled by CanCanCan (in beautiful_scaffold)
+    inject_into_file("app/controllers/application_controller.rb", "#", :before => "before_action :authenticate_#{model}!, :except => [:dashboard]")
+  end
+end

data/lib/generators/beautiful_jointable_generator.rb

@@ -5,7 +5,7 @@ class BeautifulJointableGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :join_models, :type => :array, :default => [], :banner => "model model"
+  argument :join_models, :type => :array, :default => [], :banner => "Two model names singular downcase (ex: product family)"
 
   class_option :mountable_engine, default: nil
   

data/lib/generators/beautiful_locale_generator.rb

@@ -5,7 +5,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :name, :type => :string, :desc => "type of locale : fr OR en OR de OR ja all..."
+  argument :name, :type => :string, :desc => "type of locale : fr, en, de, all"
 
   class_option :mountable_engine, :default => nil
 
@@ -18,13 +18,15 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   
   def install_locale
     list_locales.each{ |temp_locale|
-      filename = "beautiful_scaffold.#{temp_locale}.yml"
-      gem_localepath = "app/locales/#{filename}"
-      app_localepath = "config/locales/#{filename}"
-      begin
-        copy_file gem_localepath, app_localepath
-      rescue
-        say_status("Error", "This beautiful_locale #{localestr} doesn't exist !", :red)
+
+      ["beautiful_scaffold.#{temp_locale}.yml"].each do |filename|
+        gem_localepath = "app/locales/#{filename}"
+        app_localepath = "config/locales/#{filename}"
+        begin
+          copy_file gem_localepath, app_localepath
+        rescue
+          say_status("Error", "This beautiful_locale #{temp_locale} doesn't exist !", :red)
+        end
       end
 
       rails_locale_file = "#{temp_locale}.yml"
@@ -36,7 +38,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
       end
 
       willpaginate_locale_file = "will_paginate.#{temp_locale}.yml"
-      download_path = "https://raw.github.com/mislav/will_paginate/master/lib/will_paginate/locale/en.yml"
+      download_path = "https://raw.githubusercontent.com/tigrish/will-paginate-i18n/master/config/locales/#{temp_locale}.yml"
       begin
         get download_path, "config/locales/#{willpaginate_locale_file}"
         say_status("Warning", "You must modify Will_paginate locale at : Rails.root/config/locale/#{willpaginate_locale_file}", :red)
@@ -51,8 +53,8 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   def regenerate_app_locale
     require 'net/http'
 
-    app_name = (Rails.root || engine_opt)
-    engine_or_apps = (Rails.application.class.parent_name || engine_opt).downcase
+    app_path = (Rails.root || engine_opt)
+    app_name = Rails.application.class.name.split('::').first.downcase
     prefix = engine_opt.blank? ? '' : "#{engine_opt.camelize}::"
 
     already_processed = {}
@@ -63,7 +65,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
 
       already_processed[locale] ||= {}
 
-      filepath = File.join(app_name, 'config', 'locales', "#{engine_or_apps}.#{locale}.yml")
+      filepath = File.join(app_path, 'config', 'locales', "#{app_name}.#{locale}.yml")
       begin
         if File.exist?(filepath)
           hi18n = YAML.load_file(filepath)
@@ -154,7 +156,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
       File.unlink(filepath) if File.exist?(filepath)
 
       file = File.open(filepath, "w")
-      file.write(hi18n.to_yaml)
+      file.write(hi18n[locale].to_yaml)
       file.close
     end
   end

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -208,8 +208,12 @@ module BeautifulScaffoldCommonMethods
       puts "============> Engine : You must add gems to your main app \n #{gems.to_a.map{ |a| "gem '#{a[0]}'#{(a[1].nil? ? '' : ", '#{a[1]}'")} " }.join("\n")}"
     end
 
+    gemfile_content = File.read('Gemfile')
     gems.each{ |gem_to_add, version|
-      gem(gem_to_add, version)
+      # Bug add at every times, need to check if already present
+      if !gemfile_content.include?(gem_to_add)
+        gem(gem_to_add, version)
+      end
     }
   end
 

data/lib/generators/beautiful_scaffold_generator.rb

@@ -13,7 +13,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :model_opt, type: :string, desc: "Name of model (singular)"
+  argument :model_opt, type: :string, desc: "Name of model singular downcase (ex: family)"
   argument :myattributes, type: :array, default: [], banner: "field:type field:type"
 
   class_option :namespace, default: nil

data/lib/generators/beautiful_sorcery_generator.rb

@@ -0,0 +1,137 @@
+# encoding : utf-8
+class BeautifulSorceryGenerator < Rails::Generators::Base
+  require_relative 'beautiful_scaffold_common_methods'
+  include BeautifulScaffoldCommonMethods
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  #argument :model, :type => :string, :desc => "Name of model (ex: User)"
+  
+  def install_sorcery
+    model = "User"
+    view_path = "app/views/"
+
+    if !File.read('Gemfile').include?("sorcery")
+      gem("sorcery", "0.16.0")
+    end
+
+    Bundler.with_unbundled_env do
+      run "bundle install"
+    end
+
+    raise "Model must be specified" if model.blank?
+
+    # Install sorcery
+    generate("sorcery:install", "remember_me reset_password user_activation brute_force_protection external --model #{model}")
+
+    # If exist users migration just add columns
+    create_user_migration = Dir.glob("db/migrate/*create_users.rb").first
+    if create_user_migration
+      already_email = File.read(create_user_migration).include?(":email")
+      sorcery_core_file = Dir.glob("db/migrate/*sorcery_core.rb").first
+      File.open(sorcery_core_file, "w+") do |f|
+        f.write("class SorceryCore < ActiveRecord::Migration[6.1]
+  def change
+    #{(already_email ? '' : 'add_column :users, :email, :string')}
+    add_column :users, :crypted_password, :string
+    add_column :users, :salt, :string
+
+    #{(already_email ? '' : 'add_index :users, :email, unique: true')}
+  end
+end")
+      end
+    end
+
+    # Generate mailer
+    copy_file("app/mailers/user_mailer.rb")
+
+    # Install controllers
+    copy_file("app/controllers/user_sessions_controller.rb")
+
+    # ===== Controller
+    inject_into_file("app/controllers/users_controller.rb",
+ "\n
+  skip_before_action :require_login, only: [:new, :create, :activate]
+\n", after: "< BeautifulController")
+
+    inject_into_file("app/controllers/users_controller.rb",
+   "def activate
+    if @user = User.load_from_activation_token(params[:id])
+      @user.activate!
+      redirect_to(login_path, :notice => 'User was successfully activated.')
+    else
+      not_authenticated
+    end
+  end\n\n  ", before: "private")
+
+    # ====== Model
+    # Add password & password_confirmation in model
+    inject_into_file("app/models/user.rb",
+    "\n
+  validates :password, length: { minimum: 3 }, if: -> { new_record? || changes[:crypted_password] }
+  validates :password, confirmation: true, if: -> { new_record? || changes[:crypted_password] }
+  validates :password_confirmation, presence: true, if: -> { new_record? || changes[:crypted_password] }
+
+  before_update :setup_activation, if: -> { email_changed? }
+  after_update :send_activation_needed_email!, if: -> { previous_changes['email'].present? }\n",
+                     after: "ApplicationRecord")
+
+    inject_into_file("app/models/user.rb", ":password,:password_confirmation,", :after => "def self.permitted_attributes\n    return ")
+
+    # ====== Views
+    inject_into_file("app/views/users/_form.html.erb",
+    '  <div class="form-group">
+    <%= f.label :password, t(\'app.models.user.bs_attributes.password\', :default => \'password\').capitalize, :class => "control-label" %><br />
+    <%= f.password_field :password, :class => "form-control" %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password_confirmation, t(\'app.models.user.bs_attributes.password_confirmation\', :default => \'password_confirmation\').capitalize, :class => "control-label" %><br />
+    <%= f.password_field :password_confirmation, :class => "form-control" %>
+  </div>', before: '<!-- Beautiful_scaffold - AddField - Do not remove -->')
+
+    # Install all views for login/logout
+    directory "app/views/login_logout", "app/views"
+
+    # Domain in action_mailer
+    for current_env in ['production', 'development', 'test']
+      inject_into_file("config/environments/#{current_env}.rb",  "  config.action_mailer.default_url_options = { :host => 'localhost:3000' }", :after => "Rails.application.configure do\n" )
+    end
+
+    # In model
+    #remove_file("app/models/user.rb") # remove generated by sorcery
+    #copy_file("app/models/user.rb") # copy BS version ;)
+
+    # Limited access
+    inject_into_file("app/controllers/beautiful_controller.rb",
+                     "\n  before_action :require_login, except: [:dashboard]\n",
+                     :after => 'layout "beautiful_layout"' + "\n")
+
+    inject_into_file("config/initializers/sorcery.rb",
+                     "\nuser.user_activation_mailer = UserMailer\n",
+                     :after => "# user.user_activation_mailer =\n")
+
+    # Routes (session)
+    inject_into_file("config/routes.rb",
+                     '
+  resources :user_sessions, only: [:create]
+  get "login" => "user_sessions#new", :as => :login
+  post "logout" => "user_sessions#destroy", :as => :logout' + "\n\n\n",
+                     :after => "Rails.application.routes.draw do\n")
+
+    # Activate
+    inject_into_file("config/routes.rb", " do
+    member do
+      get :activate
+    end
+  end", after: 'resources :users, concerns: :bs_routes')
+
+    copy_file("#{view_path}partials/_login_logout_register.html.erb", "#{view_path}layouts/_login_logout_register.html.erb")
+
+    # Sign in sign out
+    inject_into_file("#{view_path}layouts/beautiful_layout.html.erb",
+                     "\n<%= render :partial => 'layouts/login_logout_register' %>\n",
+                     :after => "<!-- Beautiful_scaffold - Signin - Do not remove -->")
+
+    say "Beautiful-Scaffold enable 'user_activation' sorcery module for you, so when you sign up, find in logs the activation link. You can't sign in yourself until you activate the account"
+  end
+end

data/lib/generators/beautiful_storage_generator.rb

@@ -0,0 +1,61 @@
+# encoding : utf-8
+class BeautifulStorageGenerator < Rails::Generators::Base
+  require_relative 'beautiful_scaffold_common_methods'
+  include BeautifulScaffoldCommonMethods
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  # TODO voir pour engine
+
+  argument :model, :type => :string, :desc => "Name of model (ex: user)"
+  argument :storage_name, :type => :string, :desc => "Storage's name (ex: picture_file)"
+
+  class_option :mountable_engine, default: nil
+  
+  def install_storage
+
+    #if !File.read('Gemfile').include?("image_processing")
+      gem("image_processing", '~> 1.2')
+    #end
+
+    Bundler.with_unbundled_env do
+      run "bundle install"
+    end
+
+    # Install activestorage
+    run "bin/rails active_storage:install"
+    #run "rake db:migrate"
+
+    raise "Model must be specified" if model.blank?
+    raise "Attachment must be specified" if storage_name.blank?
+
+    # ===== Model
+    inject_into_file("app/models/#{engine_name}#{model}.rb",
+ "\n
+  has_one_attached :#{storage_name}
+\n", after: "< ApplicationRecord")
+    inject_into_file("app/models/#{engine_name}#{model}.rb", ":#{storage_name},", :after => "def self.permitted_attributes\n    return ")
+
+    # ====== Views
+    inject_into_file("app/views/#{engine_name}#{model_pluralize}/_form.html.erb",
+"  <div class='form-group'>
+    <%= f.label :#{storage_name}, t('app.models.#{model}.bs_attributes.#{storage_name}', :default => '#{storage_name}').capitalize, :class => 'control-label' %><br />
+    <%= f.file_field :#{storage_name}, direct_upload: true, :class => 'form-control' %>
+  </div>\n", before: '<!-- Beautiful_scaffold - AddField - Do not remove -->')
+
+    inject_into_file("app/views/#{engine_name}#{model_pluralize}/_form.html.erb",
+                     ", multipart: true", after: "form_for(@#{model}")
+
+    inject_into_file("app/views/#{engine_name}#{model_pluralize}/show.html.erb",
+                     "<p><b><%= t('app.models.#{model}.bs_attributes.#{storage_name}', :default => '#{storage_name}') %>:</b><br><%= image_tag @#{model}.#{storage_name}.variant(resize_to_limit: [100, 100]) %></p>",
+                     before: "<!-- Beautiful_scaffold - AddField - Field - Do not remove -->")
+
+    # Controller
+    #inject_into_file("app/controllers/#{engine_name}#{model_pluralize}_controller.rb",
+    #                 "\n  before_action :require_login, except: [:dashboard]\n",
+    #                 :after => 'layout "beautiful_layout"' + "\n")
+
+    say "You must run 'rake db:migrate' to create activestorage migrations !"
+
+  end
+end

data/lib/generators/templates/app/controllers/user_sessions_controller.rb

@@ -0,0 +1,20 @@
+class UserSessionsController < BeautifulController
+
+  skip_before_action :require_login, only: [:new, :create]
+
+  def create
+    @user = login(params[:email], params[:password])
+
+    if @user
+      redirect_back_or_to(:users, notice: 'Login successful')
+    else
+      flash.now[:alert] = 'Login failed'
+      render action: 'new'
+    end
+  end
+
+  def destroy
+    logout
+    redirect_to(:users, notice: 'Logged out!')
+  end
+end

data/lib/generators/templates/app/locales/beautiful_scaffold.en.yml

@@ -47,3 +47,11 @@ en:
   register: "Register"
   search_and_filter: "Search and filter"
   more_options: "More options..."
+  edit_profile: "edit profile"
+  logout: "Logout"
+  register: "Register"
+  login: "Login"
+  logged_out: "Logged out"
+  login_failed: "Login failed"
+  login_successful: "Login successful"
+  crypted_password: "Crypted password"

data/lib/generators/templates/app/locales/beautiful_scaffold.fr.yml

@@ -46,4 +46,12 @@ fr:
   send_me_reset_password_instructions: "Me ré-envoyer les instructions de réinitialisation du mot de passe"
   register: "Inscription"
   search_and_filter: "Option de filtre"
-  more_options: "Plus d'options..."
+  more_options: "Plus d'options..."
+  edit_profile: "Editer mon profil"
+  logout: "Déconnexion"
+  register: "S'incrire"
+  login: "S'identifier"
+  logged_out: "déconnecté"
+  login_failed: "Erreur d'identification"
+  login_successful: "Identification réussie"
+  crypted_password: "Crypted password"

data/lib/generators/templates/app/locales/beautiful_scaffold.ja.yml

@@ -15,7 +15,7 @@ ja:
   cancel: "キャンセル"
   export: "エクスポート"
   search: "検索"
-  sort: "Sort"
+  sort: "トライ"
   download: "ダウンロード"
   "yes": "はい"
   "no": "いいえ"
@@ -47,4 +47,11 @@ ja:
   register: "登録"
   search_and_filter: "検索条件"
   more_options: "追加オプション..."
-
+  edit_profile: "プロファイル編集"
+  logout: "ログアウト"
+  register: "登録"
+  login: "ログイン"
+  logged_out: "ログアウトしました"
+  login_failed: "ログインに失敗しました"
+  login_successful: "ログイン成功"
+  crypted_password: "暗号化されたパスワード"

data/lib/generators/templates/app/mailers/user_mailer.rb

@@ -0,0 +1,13 @@
+class UserMailer < ApplicationMailer
+  def activation_needed_email(user)
+    @user = user
+    @url  = activate_user_url(@user.activation_token)
+    mail(to: user.email, subject: 'Welcome to My Awesome Site')
+  end
+
+  def activation_success_email(user)
+    @user = user
+    @url  = login_url
+    mail(to: user.email, subject: 'Your account is now activated')
+  end
+end

data/lib/generators/templates/app/models/ability.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+    if !user.nil?
+      if user.id == 1
+        can :manage, :all
+      end
+    end
+    # Define abilities for the passed in user here. For example:
+    #
+    #   user ||= User.new # guest user (not logged in)
+    #   if user.admin?
+    #     can :manage, :all
+    #   else
+    #     can :read, :all
+    #   end
+    #
+    # The first argument to `can` is the action you are giving the user
+    # permission to do.
+    # If you pass :manage it will apply to every action. Other common actions
+    # here are :read, :create, :update and :destroy.
+    #
+    # The second argument is the resource the user can perform the action on.
+    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
+    # class of the resource.
+    #
+    # The third argument is an optional hash of conditions to further filter the
+    # objects.
+    # For example, here the user can only update published articles.
+    #
+    #   can :update, Article, :published => true
+    #
+    # See the wiki for details:
+    # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
+  end
+end

data/lib/generators/templates/app/models/concerns/caption_concern.rb

@@ -3,6 +3,6 @@ module CaptionConcern
 
   # You can OVERRIDE this method used in model form and search form (in belongs_to relation)
   def caption
-    (self["name"] || self["label"] || self["description"] || "##{id}")
+    (self["name"] || self["label"] || self["description"] || self["email"] || "##{id}")
   end
 end

data/lib/generators/templates/app/models/user.rb

@@ -0,0 +1,11 @@
+class User < ApplicationRecord
+  authenticates_with_sorcery!
+
+  validates :password, length: { minimum: 3 }, if: -> { new_record? || changes[:crypted_password] }
+  validates :password, confirmation: true, if: -> { new_record? || changes[:crypted_password] }
+  validates :password_confirmation, presence: true, if: -> { new_record? || changes[:crypted_password] }
+
+  before_update :setup_activation, if: -> { email_changed? }
+  after_update :send_activation_needed_email!, if: -> { previous_changes["email"].present? }
+
+end

data/lib/generators/templates/app/views/layout.html.erb

@@ -30,11 +30,11 @@
       </div>
       <div class="navbar-collapse collapse">
         <nav class="nav navbar-nav">
-          <a href="/" class="nav-link">Home</a>-
+          <a href="/" class="nav-link">Home</a>
           <%%= render :partial => "layouts/beautiful_menu" %>
+          <!-- Beautiful_scaffold - Signin - Do not remove -->
         </nav>
         <i class="fa fa-question-circle text-white float-right" id="bs-help"></i>
-        <!-- Beautiful_scaffold - Signin - Do not remove -->
       </div>
     </div>
     <div class="container-fluid">
@@ -47,6 +47,13 @@
               <%%= flash[:notice] %>
             </div>
           <%% end %>
+          <%% if !flash[:alert].blank? %>
+            <div class="alert alert-warning">
+              <a class="close" data-dismiss="alert" href="#">×</a>
+              <h4 class="alert-heading">Warning : </h4>
+              <%%= flash[:alert] %>
+            </div>
+          <%% end %>
           <%% if !flash[:error].blank? %>
             <div class="alert alert-danger">
               <a class="close" data-dismiss="alert" href="#">×</a>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.en.html.erb

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1> Welcome <%= @user.email %> </h1>
+<p>
+  You have successfully signed up to www.example.com, and your username is: <%= @user.email %>.
+</p>
+<p>
+  To login to the site, just follow this link: <%= @url %> .
+</p>
+<p>Thanks for joining and have a great day!</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.en.text.erb

@@ -0,0 +1,9 @@
+Welcome to example.com, <%= @user.email %>
+===============================================
+
+You have successfully signed up to example.com,
+your username is: <%= @user.email %>.
+
+To login to the site, just follow this link: <%= @url %> .
+
+Thanks for joining and have a great day!

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.fr.html.erb

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1>Bienvenue <%= @user.email %> </h1>
+<p>
+  Vous vous êtes inscrit à www.example.com, votre identifiant est : <%= @user.email %>.
+</p>
+<p>
+  Pour activer votre compte, veuillez cliquer sur ce lien : <%= @url %> .
+</p>
+<p>Merci d'avoir créé votre compte, bonne journée !</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.fr.text.erb

@@ -0,0 +1,8 @@
+Bienvenue, <%= @user.email %>
+===============================================
+
+Vous vous êtes inscrit à www.example.com, votre identifiant est : <%= @user.email %>.
+
+Pour activer votre compte, veuillez cliquer sur ce lien : <%= @url %> .
+
+Merci d'avoir créé votre compte, bonne journée !

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.en.html.erb

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1>Congratulations, <%= @user.email %>!</h1>
+<p>
+  You have successfully activated your example.com account,
+  your username is: <%= @user.email %>.
+</p>
+<p>
+  To login to the site, just follow this link: <%= @url %>.
+</p>
+<p>
+  Thanks for joining and have a great day!
+</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.en.text.erb

@@ -0,0 +1,8 @@
+Congratulations, <%= @user.email %>!
+
+You have successfully activated your example.com account,
+your username is: <%= @user.email %>.
+
+To login to the site, just follow this link: <%= @url %>.
+
+Thanks for joining and have a great day!

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.fr.html.erb

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+</head>
+<body>
+<h1>Félicitations <%= @user.email %>!</h1>
+<p>
+  Vous avez activé votre compte sur www.example.com avec succès,
+  Votre identifiant est : <%= @user.email %>.
+</p>
+<p>
+  Pour ce connecter sur le site, veuillez suivre ce lien : <%= @url %>.
+</p>
+<p>
+  Merci de vous être inscrit, bonne journée !
+</p>
+</body>
+</html>

data/lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.fr.text.erb

@@ -0,0 +1,8 @@
+Félicitations <%= @user.email %>!
+
+Vous avez activé votre compte sur www.example.com avec succès,
+Votre identifiant est : <%= @user.email %>.
+
+Pour ce connecter sur le site, veuillez suivre ce lien : <%= @url %>.
+
+Merci de vous être inscrit, bonne journée !

data/lib/generators/templates/app/views/login_logout/user_sessions/_form.html.erb

@@ -0,0 +1,15 @@
+<%= form_with url: user_sessions_path, method: :post do |f| %>
+  <div class="form-group">
+    <%= f.label :email, :class => "control-label" %><br />
+    <%= f.text_field :email, :class => "form-control" %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password, :class => "control-label" %><br />
+    <%= f.password_field :password, :class => "form-control" %>
+  </div>
+  <div>
+    <%= link_to t(:back, :default => 'Back'), users_path, :class => "btn btn-light" %>
+    <%= f.submit :class => "btn btn-primary", :data => { :disable_with => t(:saving, :default => "Saving...") } %>
+  </div>
+<% end %>
+

data/lib/generators/templates/app/views/login_logout/user_sessions/new.html.erb

@@ -0,0 +1,3 @@
+<h2><%= t(:login, :default => 'Login') %></h2>
+
+<%= render 'form' %>

data/lib/generators/templates/app/views/partials/_login_logout_register.html.erb

@@ -0,0 +1,7 @@
+<% if current_user %>
+  <%= link_to "Edit Profile", edit_user_path(current_user.id), class: "nav-link" %>
+  <%= link_to "Logout", :logout, method: :post, class: "nav-link" %>
+<% else %>
+  <%= link_to "Register", new_user_path, class: "nav-link" %>
+  <%= link_to "Login", :login, class: "nav-link" %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://beautiful-scaffold.rivsc.ovh
@@ -27,12 +27,14 @@ files:
 - beautiful_scaffold.gemspec
 - lib/beautiful_scaffold/version.rb
 - lib/generators/USAGE
-- lib/generators/beautiful_devisecancan_generator.rb
+- lib/generators/beautiful_cancancan_generator.rb
 - lib/generators/beautiful_jointable_generator.rb
 - lib/generators/beautiful_locale_generator.rb
 - lib/generators/beautiful_migration_generator.rb
 - lib/generators/beautiful_scaffold_common_methods.rb
 - lib/generators/beautiful_scaffold_generator.rb
+- lib/generators/beautiful_sorcery_generator.rb
+- lib/generators/beautiful_storage_generator.rb
 - lib/generators/templates/app/assets/images/alpha.png
 - lib/generators/templates/app/assets/images/hue.png
 - lib/generators/templates/app/assets/images/saturation.png
@@ -65,6 +67,7 @@ files:
 - lib/generators/templates/app/controllers/base.rb
 - lib/generators/templates/app/controllers/master_base.rb
 - lib/generators/templates/app/controllers/registrations_controller.rb
+- lib/generators/templates/app/controllers/user_sessions_controller.rb
 - lib/generators/templates/app/helpers/beautiful_helper.rb
 - lib/generators/templates/app/helpers/model_helper.rb
 - lib/generators/templates/app/initializers/link_renderer.rb
@@ -72,10 +75,13 @@ files:
 - lib/generators/templates/app/locales/beautiful_scaffold.en.yml
 - lib/generators/templates/app/locales/beautiful_scaffold.fr.yml
 - lib/generators/templates/app/locales/beautiful_scaffold.ja.yml
+- lib/generators/templates/app/mailers/user_mailer.rb
+- lib/generators/templates/app/models/ability.rb
 - lib/generators/templates/app/models/concerns/caption_concern.rb
 - lib/generators/templates/app/models/concerns/default_sorting_concern.rb
 - lib/generators/templates/app/models/concerns/fulltext_concern.rb
 - lib/generators/templates/app/models/pdf_report.rb
+- lib/generators/templates/app/models/user.rb
 - lib/generators/templates/app/views/_beautiful_menu.html.erb
 - lib/generators/templates/app/views/_form.html.erb
 - lib/generators/templates/app/views/_form_habtm_tag.html.erb
@@ -85,6 +91,16 @@ files:
 - lib/generators/templates/app/views/edit.html.erb
 - lib/generators/templates/app/views/index.html.erb
 - lib/generators/templates/app/views/layout.html.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.en.html.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.en.text.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.fr.html.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_needed_email.fr.text.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.en.html.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.en.text.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.fr.html.erb
+- lib/generators/templates/app/views/login_logout/user_mailer/activation_success_email.fr.text.erb
+- lib/generators/templates/app/views/login_logout/user_sessions/_form.html.erb
+- lib/generators/templates/app/views/login_logout/user_sessions/new.html.erb
 - lib/generators/templates/app/views/new.html.erb
 - lib/generators/templates/app/views/partials/_forget_password.html.erb
 - lib/generators/templates/app/views/partials/_form_field.html.erb
@@ -93,13 +109,10 @@ files:
 - lib/generators/templates/app/views/partials/_index_header.html.erb
 - lib/generators/templates/app/views/partials/_index_search.html.erb
 - lib/generators/templates/app/views/partials/_index_search_default_fields.html.erb
-- lib/generators/templates/app/views/partials/_register_form.html.erb
+- lib/generators/templates/app/views/partials/_login_logout_register.html.erb
 - lib/generators/templates/app/views/partials/_show_field.html.erb
-- lib/generators/templates/app/views/partials/_sign_in_form.html.erb
-- lib/generators/templates/app/views/partials/_sign_in_sign_out.html.erb
 - lib/generators/templates/app/views/show.html.erb
 - lib/generators/templates/app/views/treeview.html.erb
-- lib/generators/templates/lib/custom_failure.rb
 homepage: https://blog.rivsc.ovh
 licenses:
 - MIT
@@ -121,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Beautiful Scaffold generate fully customizable scaffold

data/lib/generators/beautiful_devisecancan_generator.rb

@@ -1,128 +0,0 @@
-# encoding : utf-8
-class BeautifulDevisecancanGenerator < Rails::Generators::Base
-  require_relative 'beautiful_scaffold_common_methods'
-  include BeautifulScaffoldCommonMethods
-
-  source_root File.expand_path('../templates', __FILE__)
-
-  argument :model, :type => :string, :desc => "Name of model (downcase singular)"
-  
-  def install_devise
-    view_path = "app/views/"
-
-    gem("devise", "2.1.0")
-
-    inside Rails.root do
-      run "bundle install"
-    end
-
-    generate("devise:install")
-
-    for current_env in ['production', 'development', 'test']
-      inject_into_file("config/environments/#{current_env}.rb",  "  config.action_mailer.default_url_options = { :host => 'localhost:3000' }", :after => "::Application.configure do\n" )
-    end
-
-    # Install devise in the model
-    generate("devise", model)
-
-    # Add :token_authenticatable and :lockable
-    # In model
-    inject_into_file( "app/models/#{model}.rb",
-                      ":token_authenticatable, :lockable,",
-                      :after => "devise ")
-    # In migration
-    filename = Dir.glob("db/migrate/*_add_devise_to_#{model.pluralize}.rb")[0]
-    gsub_file filename, /#\s*(t\.integer\s+:failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts)/, '\1'
-    gsub_file filename, /#\s*(t\.string\s+:unlock_token # Only if unlock strategy is :email or :both)/, '\1'
-    gsub_file filename, /#\s*(t\.datetime\s+:locked_at)/, '\1'
-    gsub_file filename, /#\s*(t\.string\s+:authentication_token)/, '\1'
-
-
-    # Limited access (Must be commented if use cancan)
-    inject_into_file("app/controllers/beautiful_controller.rb","before_action :authenticate_#{model}!, :except => [:dashboard]", :after => 'layout "beautiful_layout"' + "\n")
-
-    # Custom redirect
-    inject_into_file("app/controllers/application_controller.rb","
-      def after_sign_out_path_for(resource_or_scope)
-        root_path
-      end
-      def after_sign_in_path_for(resource)
-        root_path
-      end
-      def after_sign_up_path_for(resource)
-        root_path
-      end
-      ", :after => "protect_from_forgery\n")
-    copy_file("lib/custom_failure.rb")
-    copy_file("app/controllers/registrations_controller.rb")
-    inject_into_file("config/initializers/devise.rb","
-      config.warden do |manager|
-        manager.failure_app = CustomFailure
-      end
-      ", :after => "Devise.setup do |config|\n")
-    inject_into_file("config/application.rb",' #{config.root}/lib', :after => '#{config.root}/app/modules')
-
-    # Use my register controller
-    inject_into_file("config/routes.rb",
-                     ', :controllers => {:registrations => "registrations"}',
-                     :after => "devise_for :#{model.pluralize}")
-
-
-    # Install partials dans layout (forget password, sign_in)
-    template("#{view_path}partials/_forget_password.html.erb",  "#{view_path}layouts/_forget_password.html.erb")
-    template("#{view_path}partials/_sign_in_sign_out.html.erb", "#{view_path}layouts/_sign_in_sign_out.html.erb")
-    template("#{view_path}partials/_sign_in_form.html.erb",     "#{view_path}layouts/_sign_in_form.html.erb")
-    template("#{view_path}partials/_register_form.html.erb",    "#{view_path}layouts/_register_form.html.erb")
-
-    # Sign in sign out
-    inject_into_file("#{view_path}layouts/beautiful_layout.html.erb",
-                     "<%= render :partial => 'layouts/sign_in_sign_out' %>",
-                     :after => "<!-- Beautiful_scaffold - Signin - Do not remove -->\n")
-
-    # Modal (forget password)
-    inject_into_file("#{view_path}layouts/beautiful_layout.html.erb",
-                     "    <%= render :partial => 'layouts/forget_password' %>",
-                     :after => "<!-- Beautiful_scaffold - Modal - Do not remove -->\n")
-    inject_into_file("#{view_path}layouts/beautiful_layout.html.erb",
-                     "    <%= render :partial => 'layouts/register_form' %>",
-                     :after => "<!-- Beautiful_scaffold - Modal - Do not remove -->\n")
-
-  end
-
-  def install_cancan
-    gem("cancan")
-
-    inside Rails.root do
-      run "bundle install"
-    end
-
-    generate("cancan:ability")
-
-    inject_into_file("app/models/ability.rb", "
-      if not user.nil? then
-        if user.id == 1 then
-          can :manage, :all
-        end
-      end\n", :after => "def initialize(user)\n")
-
-    # current_user method need for CanCan
-    current_user_method = ""
-    if model != "user" then
-      current_user_method = "
-  def current_user
-    current_#{model}
-  end"
-    end
-
-    # Exception for AccessDenied
-    inject_into_file("app/controllers/application_controller.rb", "
-  rescue_from CanCan::AccessDenied do |exception|
-    redirect_to root_url, :alert => exception.message
-  end
-  #{current_user_method}
-  ", :after => "class ApplicationController < ActionController::Base\n")
-
-    # Access controlled by CanCan (in beautiful_scaffold)
-    inject_into_file("app/controllers/application_controller.rb", "#", :before => "before_action :authenticate_#{model}!, :except => [:dashboard]")
-  end
-end

data/lib/generators/templates/app/views/partials/_register_form.html.erb

@@ -1,44 +0,0 @@
-
-<div class="modal fade" id="modal-register-form">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title"><%%= t(:register, :default => "Register") %></h5>
-        <button type="button" class="close" data-dismiss="modal">×</button>
-      </div>
-      <div class="modal-body">
-        <%% resource ||= <%= model.camelize %>.new %>
-        <%%= form_for(resource, :as => '<%= model %>', :url => registration_path('<%= model %>'), :html => { :class => "form-horizontal" }) do |f| %>
-          <%% begin %>
-            <%%= devise_error_messages! %>
-          <%% rescue %>
-          <%% end %>
-          <div class="form-group">
-            <%%= f.label :email, t(:email, :default => "Email"), :class => "control-label" %>
-            <div>
-              <%%= f.email_field :email %>
-            </div>
-          </div>
-          <div class="form-group">
-            <%%= f.label :password, t(:password, :default => "Password"), :class => "control-label" %>
-            <div>
-              <%%= f.password_field :password %>
-            </div>
-          </div>
-          <div class="form-group">
-            <%%= f.label :password_confirmation, t(:password_confirmation, :default => "Password confirmation"), :class => "control-label" %>
-            <div>
-              <%%= f.password_field :password_confirmation %>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <div>
-              <%%= f.submit t(:sign_up, :default => "Sign up"), :class => 'btn btn-light' %>
-            </div>
-          </div>
-        <%% end %>
-      </div>
-    </div>
-  </div>
-</div>

data/lib/generators/templates/app/views/partials/_sign_in_form.html.erb

@@ -1,18 +0,0 @@
-<div style="padding:10px;">
-  <%%= form_for("<%= model %>", :url => <%= model %>_session_path, :html => { :class => "form-horizontal" }) do |f| %>
-    <div class="form-group">
-      <%%= f.text_field :email, :placeholder => t(:email, :default => "Email") %>
-    </div>
-    <div class="form-group">
-      <%%= f.password_field :password, :placeholder => t(:password, :default => "Password") %>
-    </div>
-    <div class="form-group">
-      <label for="<%= model %>_remember_me">
-        <%%= f.check_box :remember_me %> <%%= t(:remember_me, :default => "Remember me") %>
-      </label>
-    </div>
-    <%%= f.submit t(:sign_in, :default => "Sign in"), :class => "btn btn-light" %>
-  <%% end %>
-  <a data-toggle="modal" href="#modal-forget-password"><%%= t(:forgot_your_password, :default => "Forgot your password?") %></a>
-  <a data-toggle="modal" href="#modal-register-form"><%%= t(:register, :default => "Register") %></a>
-</div>

data/lib/generators/templates/app/views/partials/_sign_in_sign_out.html.erb

@@ -1,19 +0,0 @@
-<%% if <%= model %>_signed_in? %>
-  <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-    <i class="icon-user"></i> <%%= current_<%= model %>.caption %>
-    <span class="caret"></span>
-  </a>
-  <ul class="dropdown-menu">
-    <li><a href="#"><%%= t(:profile, :default => "Profile") %></a></li>
-    <li class="dropdown-divider"></li>
-    <li><%%= link_to t(:sign_out, :default => "Sign Out"), destroy_<%= model %>_session_path, :method => :delete %></li>
-  </ul>
-<%% else %>
-  <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-    <i class="icon-user"></i> <%%= t(:login, :default => "Login") %>
-    <span class="caret"></span>
-  </a>
-  <ul class="dropdown-menu">
-    <li><%%= render :partial => "layouts/sign_in_form" %></li>
-  </ul>
-<%% end %>

data/lib/generators/templates/lib/custom_failure.rb

@@ -1,15 +0,0 @@
-class CustomFailure < Devise::FailureApp
-  def redirect_url
-    #return super unless [:worker, :employer, :user].include?(scope) #make it specific to a scope
-    root_path
-  end
-
-  # You need to override respond to eliminate recall
-  def respond
-    if http_auth?
-      http_auth
-    else
-      redirect
-    end
-  end
-end