beautiful_scaffold 0.3.5 → 2.0.0.pre

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -3,35 +3,51 @@ module BeautifulScaffoldCommonMethods
 
   private
 
+  #############
+  # Engine
+  #############
+
+  def engine_opt
+    options[:mountable_engine].to_s.downcase
+  end
+
+  def engine_name
+    engine_opt.blank? ? '' : "#{engine_opt}/"
+  end
+
+  def engine_camel
+    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
 
@@ -39,10 +55,18 @@ module BeautifulScaffoldCommonMethods
   # Models
   ############
 
+  def model
+    model_opt.underscore
+  end
+
   def model_camelize
     model.camelize
   end
 
+  def model_with_engine_camelize
+    (engine_name.blank? ? model.camelize : "#{engine_camel}::#{model_camelize}")
+  end
+
   def model_pluralize
     model.pluralize
   end
@@ -50,7 +74,7 @@ module BeautifulScaffoldCommonMethods
   def model_class
     model.camelize
   end
-  
+
   ############
   # Table
   ############
@@ -93,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'
@@ -103,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 ['richtext', '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
 
@@ -130,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
     }
 
@@ -144,7 +175,7 @@ module BeautifulScaffoldCommonMethods
     fulltext_field = []
     myattributes.each{ |attr|
       a,t = attr.split(':')
-      if ['richtext', 'wysiwyg'].include?(t) then
+      if ['wysiwyg'].include?(t)
         fulltext_field << a
       end
     }
@@ -152,24 +183,52 @@ module BeautifulScaffoldCommonMethods
   end
 
   def richtext_type
-    return ["bbcode","html","text","wiki","textile","markdown"]
+    return ["html","text"]
   end
 
   def require_gems
+    gems = {
+      'will_paginate' => nil, # v 3.1.5
+      'ransack' => nil, #'2.3.2',
+      'jquery-ui-rails' => nil,
+      'prawn' => nil, #'2.1.0',
+      'prawn-table' => nil, #'0.2.2',
+      'sanitize' => 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',
+      '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
+    if !Dir.glob('./*.gemspec').empty?
+      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
+
+    gems.each{ |gem_to_add, version|
+      gem(gem_to_add, version)
+    }
+  end
+
+  def add_relation
+    myattributes.each{ |attr|
+      a,t = attr.split(':')
+
+      foreign_key = a
 
-    gem('less-rails', :github => "CQQL/less-rails", :branch => 'less-2.5')
-    gem('will_paginate')
-    gem('ransack', :github => 'activerecord-hackery/ransack', :branch => 'rails-4.2')
-    gem('polyamorous', :github => 'activerecord-hackery/polyamorous')
-    gem('jquery-ui-rails')
-    gem('prawn', '1.0.0')
-    gem('RedCloth')
-    gem('bb-ruby')
-    gem('bluecloth')
-    gem('rdiscount')
-    gem('sanitize')
-    gem('twitter-bootstrap-rails', :github => 'seyhunak/twitter-bootstrap-rails', :branch => 'bootstrap3')
-    gem('chardinjs-rails')
+      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

@@ -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,19 +13,20 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :model, :type => :string, :desc => "Name of model (downcase singular)"
-  argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type"
-  
-  class_option :namespace, :default => nil
-  class_option :donttouchgem, :default => nil
+  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
 
   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
@@ -35,8 +36,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     @fulltext_field = []
     myattributes.each{ |attr|
       a,t = attr.split(':')
-      if ['richtext', 'wysiwyg'].include?(t) then
-        # _typetext = {bbcode|html|text|wiki|textile|markdown}
+      if ['wysiwyg'].include?(t)
+        # _typetext = {html|text}
         # _fulltext = text without any code
         @fulltext_field << [a + '_typetext', 'string'].join(':')
         @fulltext_field << [a + '_fulltext', 'text'].join(':')
@@ -45,96 +46,149 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   end
 
   def mimetype
-    if not File.exist?("app/controllers/beautiful_controller.rb") then
-      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." )
+    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            = "#{stylesheetspath}reset.css"
     bc_css           = [
-                        "#{stylesheetspath}application-bs.css",
-                        "#{stylesheetspath}datepicker.css",
-                        "#{stylesheetspath}timepicker.css",
-                        "#{stylesheetspath}beautiful-scaffold.css.scss",
-                        "#{stylesheetspath}tagit-dark-grey.css",
-                        "#{stylesheetspath}colorpicker.css",
-                        "#{stylesheetspath}bootstrap-wysihtml5.css"
+                        "beautiful-scaffold.css.scss",
+                        "tagit-dark-grey.css",
+                        "colorpicker.css",
+                        "bootstrap-wysihtml5.css"
                        ]
-        
+
     javascriptspath = "app/assets/javascripts/"
-    
+    javascriptspath_dest = "#{javascriptspath}#{engine_name}"
+
+    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            = [
-                        "#{javascriptspath}application-bs.js",
-                        "#{javascriptspath}beautiful_scaffold.js",
-                        "#{javascriptspath}bootstrap-datepicker.js",
-                        "#{javascriptspath}bootstrap-datetimepicker-for-beautiful-scaffold.js",
-                        "#{javascriptspath}bootstrap-timepicker.js",
-                        "#{javascriptspath}jquery.livequery.js",
-                        "#{javascriptspath}jquery.jstree.js",
-                        "#{javascriptspath}jquery-barcode.js",
-                        "#{javascriptspath}tagit.js",
-                        "#{javascriptspath}bootstrap-colorpicker.js",
-                        "#{javascriptspath}a-wysihtml5-0.3.0.min.js",
-                        "#{javascriptspath}bootstrap-wysihtml5.js",
-                        "#{javascriptspath}fixed_menu.js"
+                        "application-bs.js",
+                        "beautiful_scaffold.js",
+                        "bootstrap-datetimepicker-for-beautiful-scaffold.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"
                        ]
 
-    [reset, bc_css, bc_js].flatten.each{ |path|
-      copy_file path, path
+    [bc_js].flatten.each{ |path|
+      copy_file "#{javascriptspath}#{path}", "#{javascriptspath_dest}#{path}"
     }
 
-    # Jstree theme
-    directory "app/assets/stylesheets/themes", "app/assets/stylesheets/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"
-    directory dir_image, dir_image
+    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}bootstrap_and_overrides.css.less"
+    # Precompile BS assets
+    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
+      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/beautiful"
-    template  "app/views/dashboard.html.erb", "app/views/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 -->")
-  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/#{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}"
 
-  def install_markitup
-    # CSS
-    directory "markitup/skins",              "app/assets/stylesheets/markitup/skins"
-    # JS
-    copy_file "markitup/jquery.markitup.js", "app/assets/javascripts/jquery.markitup.js"
-    # JS and CSS
-    directory "markitup/sets",               "app/assets/stylesheets/markitup/sets"
-    directory "markitup/sets",               "app/assets/javascripts/markitup/sets"
+    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
 
-    inject_into_file("app/models/#{model}.rb",'
+    gsub_file "app/models/#{engine_name}#{model}.rb", 'ActiveRecord::Base', 'ApplicationRecord' # Rails 4 -> 5
+    inject_into_file("app/models/#{engine_name}#{model}.rb",'
 
   include DefaultSortingConcern
   include FulltextConcern
@@ -146,55 +200,64 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   def self.permitted_attributes
     return ' + attributes_without_type.map{ |attr| ":#{attr}" }.join(",") + '
-  end', :after => "class #{model_camelize} < ActiveRecord::Base")
+  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/#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ActiveRecord::Base")
-        rescue
-        end
-      end
-    }
+    add_relation
   end
 
   def generate_controller
-    copy_file  "app/controllers/master_base.rb", "app/controllers/beautiful_controller.rb"
-    dirs = ['app', 'controllers', options[:namespace]].compact
+    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?
-    template   "app/controllers/base.rb", File.join([dirs, "#{model_pluralize}_controller.rb"].flatten)
+    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
-    copy_file  "app/helpers/beautiful_helper.rb", "app/helpers/beautiful_helper.rb"
-    dirs = ['app', 'helpers', options[:namespace]].compact
+    dest_bs_helper_file = "app/helpers/#{engine_name}beautiful_helper.rb"
+    template "app/helpers/beautiful_helper.rb", dest_bs_helper_file
+
+    dirs = ['app', 'helpers', engine_name, options[:namespace]].compact
     empty_directory File.join(dirs)
-    template   "app/helpers/model_helper.rb", File.join([dirs, "#{model_pluralize}_helper.rb"].flatten)
+    dest_helper_file = File.join([dirs, "#{model_pluralize}_helper.rb"].flatten)
+    template "app/helpers/model_helper.rb", dest_helper_file
   end
 
   def generate_views
-    namespacedirs = ["app", "views", options[:namespace]].compact
+    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
+    copy_file  "app/initializers/ransack.rb", "config/initializers/ransack.rb"
   end
 
   def install_willpaginate_renderer_for_bootstrap
@@ -202,19 +265,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
@@ -224,16 +283,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