beautiful_scaffold 1.0.2 → 2.0.0.pre

data/lib/beautiful_scaffold/version.rb

@@ -0,0 +1,3 @@
+module BeautifulScaffold
+  VERSION = '2.0.0.pre'
+end

data/lib/generators/beautiful_jointable_generator.rb

@@ -6,6 +6,8 @@ class BeautifulJointableGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   argument :join_models, :type => :array, :default => [], :banner => "model model"
+
+  class_option :mountable_engine, default: nil
   
   def create_join_table
     if join_models.length != 2 then
@@ -13,14 +15,21 @@ class BeautifulJointableGenerator < Rails::Generators::Base
     else
       sorted_model = join_models.sort
 
+      prefix_str = ''
+      if engine_name.present?
+        prefix_str = "#{engine_opt}_"
+      end
+
+      join_table_name = "#{prefix_str}#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}"
+
       # Generate migration
       migration_content = "
-      create_table :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, :id => false do |t|
+      create_table :#{join_table_name}, :id => false do |t|
         t.integer :#{sorted_model[0]}_id
         t.integer :#{sorted_model[1]}_id
       end
 
-      add_index :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, [:#{sorted_model[0]}_id, :#{sorted_model[1]}_id]
+      add_index :#{join_table_name}, [:#{sorted_model[0]}_id, :#{sorted_model[1]}_id]
       "
 
       migration_name = "create_join_table_for_#{sorted_model[0]}_and_#{sorted_model[1]}"
@@ -31,11 +40,35 @@ class BeautifulJointableGenerator < Rails::Generators::Base
       inject_into_file(filename, migration_content, :after => "def change")
 
       # Add habtm relation
-      inject_into_file("app/models/#{sorted_model[0]}.rb", "\n  has_and_belongs_to_many :#{sorted_model[1].pluralize}", :after => "ActiveRecord::Base")
-      inject_into_file("app/models/#{sorted_model[1]}.rb", "\n  has_and_belongs_to_many :#{sorted_model[0].pluralize}", :after => "ActiveRecord::Base")
-      inject_into_file("app/models/#{sorted_model[0]}.rb", ":#{sorted_model[1]}_ids, ", :after => "attr_accessible ")
-      inject_into_file("app/models/#{sorted_model[1]}.rb", ":#{sorted_model[0]}_ids, ", :after => "attr_accessible ")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[0]}.rb", "\n  #{engine_name.present? ? '  ' : ''}has_and_belongs_to_many :#{sorted_model[1].pluralize}", :after => "ApplicationRecord")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[1]}.rb", "\n  #{engine_name.present? ? '  ' : ''}has_and_belongs_to_many :#{sorted_model[0].pluralize}", :after => "ApplicationRecord")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[0]}.rb", "{ :#{sorted_model[1]}_ids => [] }, ", :after => "permitted_attributes
+      return ")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[1]}.rb", "{ :#{sorted_model[0]}_ids => [] }, ", :after => "permitted_attributes
+      return ")
     end
   end
 
+  def add_habtm_field_in_forms
+    models = join_models.sort
+
+    2.times do
+      html = "<%=
+    render :partial => 'layouts/#{engine_name}form_habtm_tag', :locals => {
+      :model_class => @#{models[0]},
+      :model_name => '#{models[0]}',
+      :plural_model_name => '#{models[0].pluralize}',
+      :linked_model_name => '#{models[1]}',
+      :plural_linked_model_name => '#{models[1].pluralize}',
+      :namespace_bs => '',
+      :engine_bs => '#{engine_opt}',
+      :field_to_search_for_linked_model => 'name',
+      :attr_to_show => 'caption',
+      :f => f
+  } %>"
+
+      inject_into_file("app/views/#{engine_name}#{models[0].pluralize}/_form.html.erb", html, :before => "<!-- Beautiful_scaffold - AddField - Do not remove -->")
+      models = models.reverse
+    end
+  end
 end

data/lib/generators/beautiful_migration_generator.rb

@@ -7,14 +7,15 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :name, :type => :string, :desc => "Name of the migration CamelCase AddXxxToYyy (Yyy must be plural)"
-  argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type (for bt relation model:references)"
+  argument :name, type: :string, desc: "Name of the migration (in CamelCase) AddXxxTo[Engine]Yyy (Yyy must be plural)"
+  argument :myattributes, type: :array, default: [], banner: "field:type field:type (for bt relation model:references)"
 
-  class_option :namespace, :default => nil
-  class_option :donttouchgem, :default => nil
+  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
   end
@@ -24,7 +25,7 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
     @fulltext_field = []
     myattributes.each{ |attr|
       a,t = attr.split(':')
-      if ['richtext', 'wysiwyg'].include?(t) then
+      if ['richtext', 'wysiwyg'].include?(t)
         # _typetext = {bbcode|html|text|wiki|textile|markdown}
         # _fulltext = text without any code
         @fulltext_field << [a + '_typetext', 'string'].join(':')
@@ -34,24 +35,15 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
   end
 
   def generate_model
-    generate("migration", "#{name} #{beautiful_attr_to_rails_attr(true).join(' ')} #{@fulltext_field.join(' ')}")
+    generate("migration", "#{name} #{beautiful_attr_to_rails_attr.join(' ')} #{@fulltext_field.join(' ')}")
   end
 
   def add_to_model
-    myattributes.each{ |attr|
-      a,t = attr.split(':')
-      if ['references', 'reference'].include?(t) then
-        inject_into_file("app/models/#{model}.rb", "\n  belongs_to :#{a}", :after => "ApplicationRecord")
-        inject_into_file("app/models/#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ApplicationRecord")
-        a += "_id"
-      end
-
-      inject_into_file("app/models/#{model}.rb", ":#{a},", :after => "def self.permitted_attributes\n    return ")
-    }
+    add_relation
   end
 
   def generate_views
-    commonpath = "app/views/#{namespace_for_url}#{model_pluralize}/"
+    commonpath = "app/views/#{engine_name}#{namespace_for_url}#{model_pluralize}/"
     
     # Form
     inject_into_file("#{commonpath}_form.html.erb", render_partial("app/views/partials/_form_field.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Do not remove -->\n" )
@@ -68,7 +60,7 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
   private
 
   def model
-    return name.scan(/^Add(.*)To(.*)$/).flatten[1].underscore.singularize
+    return name.scan(/^Add(.*)To(.*)$/).flatten[1].underscore.singularize.gsub("#{options[:mountable_engine].underscore}_",'')
   end
 
 end

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -8,7 +8,7 @@ module BeautifulScaffoldCommonMethods
   #############
 
   def engine_opt
-    options[:mountable_engine].to_s
+    options[:mountable_engine].to_s.downcase
   end
 
   def engine_name
@@ -16,38 +16,38 @@ module BeautifulScaffoldCommonMethods
   end
 
   def engine_camel
-    options[:mountable_engine].camelize
+    options[:mountable_engine].to_s.camelize
   end
 
   #############
   # Namespace
   #############
-  
+
   def namespace_for_class
     str = namespace_alone
     str = str.camelcase + '::' if not str.blank?
     return str
   end
-  
+
   def namespace_for_route
     str = namespace_alone
     str = str.downcase + '_' if not str.blank?
     return str
   end
-  
+
   def namespace_for_url
     str = namespace_alone
     str = str.downcase + '/' if not str.blank?
     return str
   end
-  
+
   def namespace_alone
     return options[:namespace].to_s.downcase
   end
 
   def render_partial(path)
     source  = File.expand_path(find_in_source_paths(path.to_s))
-    result = ERB.new(::File.binread(source), nil, '-').result(binding)
+    result = ERB.new(::File.binread(source), trim_mode: '-').result(binding)
     return result
   end
 
@@ -74,7 +74,7 @@ module BeautifulScaffoldCommonMethods
   def model_class
     model.camelize
   end
-  
+
   ############
   # Table
   ############
@@ -117,7 +117,7 @@ module BeautifulScaffoldCommonMethods
   def available_views
     %w(index edit show new _form)
   end
-  
+
   def attributes
     # https://raw.github.com/rails/rails/master/railties/lib/rails/generators/generated_attribute.rb
     require 'rails/generators/generated_attribute'
@@ -127,19 +127,21 @@ module BeautifulScaffoldCommonMethods
     }
   end
 
-  def beautiful_attr_to_rails_attr(for_migration = false)
+  def beautiful_attr_to_rails_attr #(for_migration = false)
     newmyattributes = []
     myattributes.each{ |attr|
       a,t = attr.split(':')
       newt = t
-      if ['wysiwyg'].include?(t) then
+
+      # Special columns
+      if ['wysiwyg'].include?(t)
         newt = 'text'
-      elsif t == 'price' then
+      elsif t == 'price'
         newt = 'float'
-      elsif ['references', 'reference'].include?(t) and for_migration then
-        a = a + '_id'
+      elsif ['references', 'reference'].include?(t) # Because Rails generate corrupted files (migrations)
+        a = "#{a}_id"
         newt = 'integer:index'
-      elsif t == 'color' then
+      elsif t == 'color'
         newt = 'string'
       end
 
@@ -154,10 +156,15 @@ module BeautifulScaffoldCommonMethods
     myattributes.each{ |attr|
       a,t = attr.split(':')
 
-      if ['references', 'reference'].include?(t) then
+      if ['references', 'reference'].include?(t)
         a = a + '_id'
       end
 
+      # Add the typetext to permitted_attr
+      if t == 'wysiwyg'
+        newmyattributes << "#{a}_typetext"
+      end
+
       newmyattributes << a
     }
 
@@ -168,7 +175,7 @@ module BeautifulScaffoldCommonMethods
     fulltext_field = []
     myattributes.each{ |attr|
       a,t = attr.split(':')
-      if ['wysiwyg'].include?(t) then
+      if ['wysiwyg'].include?(t)
         fulltext_field << a
       end
     }
@@ -182,18 +189,18 @@ module BeautifulScaffoldCommonMethods
   def require_gems
     gems = {
       'will_paginate' => nil, # v 3.1.5
-      'ransack' => '1.8.4',
-      'polyamorous' => '1.3.1',
+      'ransack' => nil, #'2.3.2',
       'jquery-ui-rails' => nil,
-      'prawn' => '2.1.0',
-      'prawn-table' => '0.2.2',
+      'prawn' => nil, #'2.1.0',
+      'prawn-table' => nil, #'0.2.2',
       'sanitize' => nil,
-      'twitter-bootstrap-rails' => '3.2.2',
-      'font-awesome-rails' => '4.7.0.2',
-      'chardinjs-rails' => nil,
+      #'twitter-bootstrap-rails' => '3.2.2', # Bootstrap 3 for Rails 6+
+      'bootstrap' => '~> 4.3.1', # Bootstrap 4 for Rails 6+
+      'font-awesome-sass' => '~> 5.13.0',
       'momentjs-rails' => '>= 2.9.0',
-      'bootstrap3-datetimepicker-rails' => '~> 4.17.47',
-      'jquery-rails' => '4.3.1'
+      'bootstrap4-datetime-picker-rails' => nil,
+      'jquery-rails' => '4.3.1',
+      'jstree-rails-4' => '3.3.8'
     }
 
     # Si engine il faut mettre les gems dans le gemspec et faire le require
@@ -206,4 +213,22 @@ module BeautifulScaffoldCommonMethods
     }
   end
 
+  def add_relation
+    myattributes.each{ |attr|
+      a,t = attr.split(':')
+
+      foreign_key = a
+
+      if ['references', 'reference'].include?(t)
+        foreign_key = "#{a}_id"
+
+        # question (model) belongs_to user (a)
+        inject_into_file("app/models/#{engine_name}#{model}.rb", "\n  belongs_to :#{a}, optional: true", :after => "ApplicationRecord")
+        inject_into_file("app/models/#{engine_name}#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ApplicationRecord")
+      end
+
+      inject_into_file("app/models/#{engine_name}#{model}.rb", ":#{foreign_key},", :after => "def self.permitted_attributes\n    return ")
+    }
+  end
+
 end

data/lib/generators/beautiful_scaffold_generator.rb

@@ -21,12 +21,12 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   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,8 +46,8 @@ 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 !"
@@ -60,9 +60,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     stylesheetspath_dest = "#{stylesheetspath}#{engine_name}"
 
     # Css
-    reset            = "reset.css"
     bc_css           = [
-                        "application-bs.css",
                         "beautiful-scaffold.css.scss",
                         "tagit-dark-grey.css",
                         "colorpicker.css",
@@ -72,17 +70,38 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     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',
+      'colorpicker',
+      '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",
@@ -94,8 +113,19 @@ 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-colorpicker',
+      '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"
@@ -103,34 +133,59 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     directory dir_image, dir_image_dest
 
     # 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/faq .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"
+    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"
 
-    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 -->")
+    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"
 
-    directory  "app/models/concerns", "app/models/concerns"
+    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
+
+      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",'
@@ -147,27 +202,26 @@ 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
@@ -194,9 +248,12 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       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
@@ -210,13 +267,13 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   def routes
     myroute = <<EOF
   root :to => 'beautiful#dashboard'
-  match ':model_sym/select_fields' => 'beautiful#select_fields', :via => [:get, :post]
+  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
@@ -229,9 +286,9 @@ EOF
     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