beautiful_scaffold 1.0.1 → 2.0.2

data/lib/generators/beautiful_scaffold_generator.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 class BeautifulScaffoldGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   # Resources
@@ -13,20 +13,20 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :model_opt, :type => :string, :desc => "Name of model (singular)"
-  argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type"
-  
-  class_option :namespace, :default => nil
-  class_option :donttouchgem, :default => nil
-  class_option :mountable_engine, :default => nil
+  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
+  class_option :donttouchgem, default: nil
+  class_option :mountable_engine, default: nil
 
   def install_gems
-    if options[:donttouchgem].blank? then
+    if options[:donttouchgem].blank?
       require_gems
     end
 
     #inside Rails.root do # Bug ?!
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       run "bundle install"
     end
   end
@@ -36,7 +36,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     @fulltext_field = []
     myattributes.each{ |attr|
       a,t = attr.split(':')
-      if ['wysiwyg'].include?(t) then
+      if ['wysiwyg'].include?(t)
         # _typetext = {html|text}
         # _fulltext = text without any code
         @fulltext_field << [a + '_typetext', 'string'].join(':')
@@ -46,45 +46,61 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   end
 
   def mimetype
-    if not File.exist?("app/controllers/beautiful_controller.rb") then
-      if File.exist?("config/initializers/mime_types.rb") then # For mountable engine
+    if !File.exist?("app/controllers/beautiful_controller.rb")
+      if File.exist?("config/initializers/mime_types.rb") # For mountable engine
         inject_into_file("config/initializers/mime_types.rb", 'Mime::Type.register_alias "application/pdf", :pdf' + "\n", :before => "# Be sure to restart your server when you modify this file." )
       else
         puts "============> Engine : You must add `Mime::Type.register_alias \"application/pdf\", :pdf` to your config/initializers/mime_types.rb main app !"
       end
     end
   end
-  
+
   def generate_assets
     stylesheetspath = "app/assets/stylesheets/"
     stylesheetspath_dest = "#{stylesheetspath}#{engine_name}"
-    
+
     # Css
-    reset            = "reset.css"
     bc_css           = [
-                        "application-bs.css",
                         "beautiful-scaffold.css.scss",
                         "tagit-dark-grey.css",
-                        "colorpicker.css",
                         "bootstrap-wysihtml5.css"
                        ]
 
     javascriptspath = "app/assets/javascripts/"
     javascriptspath_dest = "#{javascriptspath}#{engine_name}"
 
-    [reset, bc_css].flatten.each{ |path|
+    bc_css.each do |path|
       copy_file "#{stylesheetspath}#{path}", "#{stylesheetspath_dest}#{path}"
-    }
-    
+    end
+    copy_file "#{stylesheetspath}application-bs.css", "#{stylesheetspath_dest}application-bs.scss"
+
+    # Jstree theme
+    directory "#{stylesheetspath}themes", "#{stylesheetspath}#{engine_name}themes"
+
+    if !engine_name.blank?
+      ['beautiful-scaffold',
+      'tagit-dark-grey',
+      'bootstrap-wysihtml5'].each do |fileassets|
+        gsub_file File.join(stylesheetspath_dest, "application-bs.scss"), " *= require #{fileassets}", " *= require #{engine_name}#{fileassets}"
+      end
+
+      # Issue otherwise
+      gsub_file File.join(stylesheetspath_dest, "application-bs.scss"), '@import "tempusdominus-bootstrap-4.css";', '@import "../tempusdominus-bootstrap-4.css";'
+      gsub_file File.join(stylesheetspath_dest, "application-bs.scss"), 'require themes/default/style', "require #{engine_name}themes/default/style"
+
+      # treeview
+      gsub_file File.join(stylesheetspath_dest, 'themes', 'default', 'style.scss'), 'asset-url("themes', "asset-url(\"#{engine_name}themes"
+      gsub_file File.join(stylesheetspath_dest, 'themes', 'default-dark', 'style.scss'), 'asset-url("themes', "asset-url(\"#{engine_name}themes"
+    end
+
     # Js
     bc_js            = [
                         "application-bs.js",
                         "beautiful_scaffold.js",
                         "bootstrap-datetimepicker-for-beautiful-scaffold.js",
-                        "jquery.jstree.js",
                         "jquery-barcode.js",
+                        "jstree.min.js",
                         "tagit.js",
-                        "bootstrap-colorpicker.js",
                         "a-wysihtml5-0.3.0.min.js",
                         "bootstrap-wysihtml5.js",
                         "fixed_menu.js"
@@ -94,49 +110,78 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       copy_file "#{javascriptspath}#{path}", "#{javascriptspath_dest}#{path}"
     }
 
-    # Jstree theme
-    directory "#{stylesheetspath}themes", "#{stylesheetspath}themes"
+    if !engine_name.blank?
+      ['a-wysihtml5-0.3.0.min',
+      'bootstrap-datetimepicker-for-beautiful-scaffold',
+      'bootstrap-wysihtml5',
+      'tagit.js',
+      'jstree.min.js',
+      'jquery-barcode',
+      'beautiful_scaffold',
+      'fixed_menu'].each do |fileassets|
+        gsub_file File.join(javascriptspath_dest, "application-bs.js"), "//= require #{fileassets}", "//= require #{engine_name}#{fileassets}"
+      end
+    end
 
     # Images
     dir_image = "app/assets/images"
     dir_image_dest = "app/assets/images/#{engine_opt}"
     directory dir_image, dir_image_dest
 
-    # Old method
-    #generate("bootstrap:install","static")
-    # New method
-    copy_file "#{stylesheetspath}bootstrap_and_overrides.css.less",
-              "#{stylesheetspath_dest}bootstrap_and_overrides.css.less"
-
     # Precompile BS assets
-    if File.exist?("config/initializers/assets.rb") then # For mountable engine
-      inject_into_file("config/initializers/assets.rb", "Rails.application.config.assets.precompile += ['#{engine_name}application-bs.css','#{engine_name}application-bs.js']", after: /\z/m)
+    path_to_assets_rb = "config/initializers/assets.rb"
+    if !File.exist?(path_to_assets_rb) && !engine_name.blank? # Engine
+      path_to_assets_rb = File.join("test", "dummy", "config/initializers/assets.rb")
+    end
+
+    append_to_file(path_to_assets_rb, "Rails.application.config.assets.precompile += ['#{engine_name}application-bs.css','#{engine_name}application-bs.js']")
+    if !engine_name.blank?
+      manifest_prefix = "#{engine_opt}_"
     else
-      puts "============> Engine : You must add `Rails.application.config.assets.precompile += ['#{engine_name}application-bs.css','#{engine_name}application-bs.js']` to your config/initializers/assets.rb main app !"
+      manifest_prefix = ""
     end
+    #append_to_file("app/assets/config/#{manifest_prefix}manifest.js", '//= link_directory ../stylesheets/faq .css')
+    append_to_file("app/assets/config/#{manifest_prefix}manifest.js", '//= link_directory ../javascripts .js')
   end
-  
+
   def generate_layout
-    template  "app/views/layout.html.erb", "app/views/layouts/beautiful_layout.html.erb"
-    if not File.exist?("app/views/layouts/_beautiful_menu.html.erb") then
-      template  "app/views/_beautiful_menu.html.erb", "app/views/layouts/_beautiful_menu.html.erb"
+    template  "app/views/layout.html.erb", "app/views/layouts/#{engine_name}beautiful_layout.html.erb"
+
+    gsub_file "app/views/layouts/#{engine_name}beautiful_layout.html.erb", '"layouts/beautiful_menu"', "\"layouts/#{engine_name}beautiful_menu\""
+
+    if !File.exist?("app/views/layouts/#{engine_name}_beautiful_menu.html.erb")
+      template  "app/views/_beautiful_menu.html.erb", "app/views/layouts/#{engine_name}_beautiful_menu.html.erb"
     end
 
     empty_directory "app/views/#{engine_name}beautiful"
     template  "app/views/dashboard.html.erb", "app/views/#{engine_name}beautiful/dashboard.html.erb"
-    copy_file "app/views/_modal_columns.html.erb",  "app/views/layouts/_modal_columns.html.erb"
-    copy_file "app/views/_mass_inserting.html.erb", "app/views/layouts/_mass_inserting.html.erb"
-    
-    inject_into_file("app/views/layouts/_beautiful_menu.html.erb",'
-      <li class="<%= "active" if params[:controller] == "' + namespace_for_url + model.pluralize + '" %>">
-        <%= link_to ' + i18n_t_m_p(model) + '.capitalize, ' + namespace_for_route + model.pluralize + '_path %>
-      </li>', :after => "<!-- Beautiful Scaffold Menu Do Not Touch This -->")
+    copy_file "app/views/_modal_columns.html.erb",  "app/views/layouts/#{engine_name}_modal_columns.html.erb"
+    copy_file "app/views/_mass_inserting.html.erb", "app/views/layouts/#{engine_name}_mass_inserting.html.erb"
+
+    action_ctrl = "#{namespace_for_url}#{model.pluralize}"
+
+    inject_into_file("app/views/layouts/#{engine_name}_beautiful_menu.html.erb",
+                     "\n" + '<%= link_to ' + i18n_t_m_p(model) + '.capitalize, ' + namespace_for_route + model.pluralize + '_path, class: "nav-link #{(params[:controller] == "' + action_ctrl + '" ? "active" : "")}" %>',
+                     :after => "<!-- Beautiful Scaffold Menu Do Not Touch This -->")
   end
 
   def generate_model
     generate("model", "#{model} #{beautiful_attr_to_rails_attr.join(' ')} #{@fulltext_field.join(' ')}")
+    directory  "app/models/concerns", "app/models/concerns/#{engine_name}"
+
+    copy_file  "app/models/pdf_report.rb", "app/models/#{engine_name}pdf_report.rb"
+
+    if !engine_name.blank?
+      ['caption_concern', 'default_sorting_concern','fulltext_concern'].each do |f|
+        path_to_the_concern = "app/models/concerns/#{engine_name}#{f}.rb"
+        inject_into_file path_to_the_concern, "module #{engine_camel}\n", before: "module #{f.camelcase}"
+        append_to_file path_to_the_concern, "\nend #endofmodule \n"
+      end
 
-    directory  "app/models/concerns", "app/models/concerns"
+      path_to_the_pdf_report = "app/models/#{engine_name}pdf_report.rb"
+      inject_into_file path_to_the_pdf_report, "module #{engine_camel}\n", before: "class PdfReport"
+      append_to_file path_to_the_pdf_report, "\nend #endofmodule \n"
+    end
 
     gsub_file "app/models/#{engine_name}#{model}.rb", 'ActiveRecord::Base', 'ApplicationRecord' # Rails 4 -> 5
     inject_into_file("app/models/#{engine_name}#{model}.rb",'
@@ -153,31 +198,30 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     return ' + attributes_without_type.map{ |attr| ":#{attr}" }.join(",") + '
   end', :after => "class #{model_camelize} < ApplicationRecord")
 
-    copy_file  "app/models/pdf_report.rb", "app/models/pdf_report.rb"
   end
 
   def add_to_model
-    # Add relation
-    myattributes.each{ |attr|
-      a,t = attr.split(':')
-      if ['references', 'reference'].include?(t) then
-        begin
-          inject_into_file("app/models/#{engine_name}#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ApplicationRecord")
-        rescue
-        end
-      end
-    }
+    add_relation
   end
 
   def generate_controller
-    copy_file  "app/controllers/master_base.rb", "app/controllers/#{engine_name}beautiful_controller.rb"
+    beautiful_ctrl_path = "app/controllers/#{engine_name}beautiful_controller.rb"
+    copy_file  "app/controllers/master_base.rb", beautiful_ctrl_path
+    # beautiful_controller in the context of engine
+    if !engine_name.empty?
+      inject_into_file beautiful_ctrl_path, "module #{engine_camel}\n", before: "class BeautifulController"
+      #gsub_file beautiful_ctrl_path, '< ApplicationController', "< ::#{engine_camel}::ApplicationController" # Rails 4 -> 5 'BeautifulController < ApplicationController'
+      append_to_file beautiful_ctrl_path, "end #endofmodule \n"
+
+      gsub_file beautiful_ctrl_path, 'layout "beautiful_layout"', "layout \"#{engine_name}beautiful_layout\""
+    end
     dirs = ['app', 'controllers', engine_name, options[:namespace]].compact
     # Avoid to remove app/controllers directory (https://github.com/rivsc/Beautiful-Scaffold/issues/6)
-    empty_directory File.join(dirs) if not options[:namespace].blank?
+    empty_directory File.join(dirs) if !options[:namespace].blank?
     dest_ctrl_file = File.join([dirs, "#{model_pluralize}_controller.rb"].flatten)
     template "app/controllers/base.rb", dest_ctrl_file
   end
-  
+
   def generate_helper
     dest_bs_helper_file = "app/helpers/#{engine_name}beautiful_helper.rb"
     template "app/helpers/beautiful_helper.rb", dest_bs_helper_file
@@ -191,19 +235,21 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   def generate_views
     namespacedirs = ["app", "views", engine_name, options[:namespace]].compact
     empty_directory File.join(namespacedirs)
-    
+
     dirs = [namespacedirs, model_pluralize]
     empty_directory File.join(dirs)
-    
+
     [available_views, 'treeview'].flatten.each do |view|
       filename = view + ".html.erb"
       current_template_path = File.join([dirs, filename].flatten)
       empty_template_path   = File.join(["app", "views", filename].flatten)
-      
       template empty_template_path, current_template_path
+
+      gsub_file current_template_path, '"layouts/modal_columns"', "\"layouts/#{engine_name}modal_columns\""
+      gsub_file current_template_path, '"layouts/mass_inserting"', "\"layouts/#{engine_name}mass_inserting\""
     end
 
-    copy_file  "app/views/_form_habtm_tag.html.erb", "app/views/layouts/_form_habtm_tag.html.erb"
+    copy_file  "app/views/_form_habtm_tag.html.erb", "app/views/layouts/#{engine_name}_form_habtm_tag.html.erb"
   end
 
   def install_ransack_intializer
@@ -215,19 +261,15 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   end
 
   def routes
-    routes_in_text = File.read("config/routes.rb")
-
-    if not routes_in_text[/beautiful#dashboard/] and not routes_in_text[/beautiful#select_fields/] then
-
-      myroute = <<EOF
-root :to => 'beautiful#dashboard'
-  match ':model_sym/select_fields' => 'beautiful#select_fields', :via => [:get, :post]
+    myroute = <<EOF
+  root :to => 'beautiful#dashboard'
+  match ':model_sym/select_fields' => 'beautiful#select_fields', as: :select_fields, via: [:get, :post]
 
   concern :bs_routes do
     collection do
       post :batch
       get  :treeview
-      match :search_and_filter, :action => :index, :as => :search, :via => [:get, :post]
+      match :search_and_filter, action: :index, as: :search, via: [:get, :post]
     end
     member do
       post :treeview_update
@@ -237,16 +279,12 @@ root :to => 'beautiful#dashboard'
   # Add route with concerns: :bs_routes here # Do not remove
 EOF
 
-      route(myroute)
-    end
-
-    search_namespace = namespace_alone + "/" if not namespace_alone.blank?
-    search_namespace ||= ""
+    inject_into_file("config/routes.rb", myroute, :after => "routes.draw do\n")
 
     myroute =  "\n  "
-    myroute += "namespace :#{namespace_alone} do\n    " if not namespace_alone.blank?
+    myroute += "namespace :#{namespace_alone} do\n    " if !namespace_alone.blank?
     myroute += "resources :#{model_pluralize}, concerns: :bs_routes\n  "
-    myroute += "end\n"                                  if not namespace_alone.blank?
+    myroute += "end\n"                                  if !namespace_alone.blank?
 
     inject_into_file("config/routes.rb", myroute, :after => ":bs_routes here # Do not remove")
   end

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