allow -a master to rename admin path, fixes padrino#854

padrino-admin/lib/padrino-admin/generators/actions.rb

@@ -41,16 +41,16 @@ def supported_ext
         # Add access_control permission in our app.rb.
         #
         def add_project_module(controller)
-          permission = "    role.project_module :#{controller}, '/#{controller}'\n"
-          inject_into_file destination_root('/admin/app.rb'),  permission, :after => "access_control.roles_for :admin do |role|\n"
+          permission = "      role.project_module :#{controller}, '/#{controller}'\n"
+          inject_into_file destination_root(@admin_path+'/app.rb'),  permission, :after => "access_control.roles_for :admin do |role|\n"
         end
 
         ##
         # Remove from access_control permissions.
         #
         def remove_project_module(controller)
-          path = destination_root('/admin/app.rb')
-          say_status :replace, 'admin/app.rb', :red
+          path = destination_root(@admin_path+'/app.rb')
+          say_status :replace, @admin_path+'/app.rb', :red
           content = File.binread(path)
           content.gsub!(/^\s+role\.project_module :#{controller}, '\/#{controller}'\n/, '')
           File.open(path, 'wb') { |f| f.write content }

padrino-admin/lib/padrino-admin/generators/admin_app.rb

@@ -31,14 +31,12 @@ def source_paths
       desc "Description:\n\n\tpadrino-gen admin generates a new Padrino Admin application"
 
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
-      # TODO FIXME Review these and implement accordingly.
-      # See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
-      # class_option :app,     :desc => 'The application destination path', :aliases => '-a', :default => '/app', :type => :string
       # class_option :models_path,     :desc => 'The models destination path', :default => '.', :type => :string
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
       class_option :renderer, :aliases => '-e', :desc => "Rendering engine (erb, haml)", :type => :string
       class_option :admin_model, :aliases => '-m', :desc => "The name of model for access controlling", :default => 'Account', :type => :string
+      class_option :admin_name,  :aliases => '-a', :desc => 'The admin application name and path', :default => 'admin', :type => :string
 
       # Copies over the Padrino base admin application.
       def create_admin
@@ -58,23 +56,27 @@ def create_admin
           # Get the app's namespace.
           @app_name = fetch_app_name
 
+          # setup admin app name
+          @admin_name = options[:admin_name].classify
+          @admin_path = options[:admin_name].underscore
+
           store_component_choice(:admin_renderer, tmp_ext)
 
           self.behavior = :revoke if options[:destroy]
 
-          empty_directory destination_root("admin")
+          empty_directory destination_root(@admin_path)
 
           # Setup Admin Model
           @model_name     = options[:admin_model].classify
           @model_singular = @model_name.underscore
           @model_plural   = @model_singular.pluralize
 
-          directory "templates/app",       destination_root("admin")
-          directory "templates/assets",    destination_root("public", "admin")
-          template  "templates/app.rb.tt", destination_root("admin/app.rb")
-          inject_into_file destination_root('config/apps.rb'),  "\nPadrino.mount(\"#{@app_name}::Admin\", :app_file => File.expand_path('../../admin/app.rb', __FILE__)).to(\"/admin\")\n", :before => /^Padrino.mount.*\.to\('\/'\)$/
+          directory "templates/app",       destination_root(@admin_path)
+          directory "templates/assets",    destination_root("public", @admin_path)
+          template  "templates/app.rb.tt", destination_root(@admin_path + "/app.rb")
+          inject_into_file destination_root('config/apps.rb'), "\nPadrino.mount(\"#{@app_name}::#{@admin_name}\", :app_file => Padrino.root('#{@admin_path}/app.rb')).to(\"/#{@admin_path}\")\n", :before => /^Padrino.mount.*\.to\('\/'\)$/
           unless options[:destroy]
-            insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:minirecord, :activerecord].include?(orm)
+            insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
           end
 
           params = [
@@ -98,7 +100,7 @@ def create_admin
           ]
 
           unless options[:destroy]
-            admin_app = Padrino::Generators::AdminPage.new([@model_singular], :root => options[:root], :destroy => options[:destroy], :admin_model => @model_singular)
+            admin_app = Padrino::Generators::AdminPage.new([@model_singular], :root => options[:root], :destroy => options[:destroy], :admin_model => @model_singular, :admin_name => @admin_name)
             admin_app.default_orm = Padrino::Admin::Generators::Orm.new(@model_singular, orm, columns, column_fields)
             admin_app.invoke_all
           end
@@ -111,21 +113,21 @@ def create_admin
           end
           template "templates/account/seeds.rb.tt", destination_root("db/seeds.rb")
 
-          empty_directory destination_root("admin/controllers")
-          empty_directory destination_root("admin/views")
-          empty_directory destination_root("admin/views/base")
-          empty_directory destination_root("admin/views/layouts")
-          empty_directory destination_root("admin/views/sessions")
-          empty_directory destination_root("admin/views/errors")
-
-          template "templates/#{ext}/app/base/index.#{ext}.tt",          destination_root("admin/views/base/index.#{ext}")
-          template "templates/#{ext}/app/layouts/application.#{ext}.tt", destination_root("admin/views/layouts/application.#{ext}")
-          template "templates/#{ext}/app/layouts/error.#{ext}.tt", destination_root("admin/views/layouts/error.#{ext}")
-          template "templates/#{ext}/app/sessions/new.#{ext}.tt",        destination_root("admin/views/sessions/new.#{ext}")
+          empty_directory destination_root(@admin_path+"/controllers")
+          empty_directory destination_root(@admin_path+"/views")
+          empty_directory destination_root(@admin_path+"/views/base")
+          empty_directory destination_root(@admin_path+"/views/layouts")
+          empty_directory destination_root(@admin_path+"/views/sessions")
+          empty_directory destination_root(@admin_path+"/views/errors")
+
+          template "templates/#{ext}/app/base/index.#{ext}.tt",          destination_root(@admin_path+"/views/base/index.#{ext}")
+          template "templates/#{ext}/app/layouts/application.#{ext}.tt", destination_root(@admin_path+"/views/layouts/application.#{ext}")
+          template "templates/#{ext}/app/layouts/error.#{ext}.tt",       destination_root(@admin_path+"/views/layouts/error.#{ext}")
+          template "templates/#{ext}/app/sessions/new.#{ext}.tt",        destination_root(@admin_path+"/views/sessions/new.#{ext}")
           # Custom error.
-          template "templates/#{ext}/app/errors/403.#{ext}.tt",        destination_root("admin/views/errors/403.#{ext}")
-          template "templates/#{ext}/app/errors/404.#{ext}.tt",        destination_root("admin/views/errors/404.#{ext}")
-          template "templates/#{ext}/app/errors/500.#{ext}.tt",        destination_root("admin/views/errors/500.#{ext}")
+          template "templates/#{ext}/app/errors/403.#{ext}.tt",          destination_root(@admin_path+"/views/errors/403.#{ext}")
+          template "templates/#{ext}/app/errors/404.#{ext}.tt",          destination_root(@admin_path+"/views/errors/404.#{ext}")
+          template "templates/#{ext}/app/errors/500.#{ext}.tt",          destination_root(@admin_path+"/views/errors/500.#{ext}")
 
           unless options[:destroy]
             add_project_module @model_plural
@@ -137,15 +139,15 @@ def create_admin
           # gsub_file destination_root("admin/views/#{@model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
 
           # Destroy account only if not logged in.
-          gsub_file destination_root("admin/controllers/#{@model_plural}.rb"), "if #{@model_singular}.destroy", "if #{@model_singular} != current_account && #{@model_singular}.destroy"
+          gsub_file destination_root(@admin_path+"/controllers/#{@model_plural}.rb"), "if #{@model_singular}.destroy", "if #{@model_singular} != current_account && #{@model_singular}.destroy"
           return if self.behavior == :revoke
 
           instructions = []
           instructions << "Run 'bundle'"
           instructions << "Run 'bundle exec rake db:migrate'" if (orm == :activerecord || orm == :datamapper || orm == :sequel)
           instructions << "Now repeat after me... 'ohm mani padme hum', 'ohm mani padme hum'... :)" if orm == :ohm
           instructions << "Run 'bundle exec rake db:seed'"
-          instructions << "Visit the admin panel in the browser at '/admin'"
+          instructions << "Visit the admin panel in the browser at '/#{@admin_path}'"
           instructions.map! { |i| "  #{instructions.index(i)+1}) #{i}" }
 
           say

padrino-admin/lib/padrino-admin/generators/admin_page.rb

@@ -32,32 +32,30 @@ def source_paths
       desc "Description:\n\n\tpadrino-gen admin_page model(s)"
       argument :models, :desc => "The name(s) of your model(s)", :type => :array
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
-      # TODO FIXME Review these and implement accordingly.
-      # See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
-      # class_option :app,     :desc => 'The application destination path', :aliases => '-a', :default => '/app', :type => :string
       class_option :root, :desc => "The root destination", :aliases => '-r', :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
+      class_option :admin_name,  :aliases => '-a', :desc => 'The admin application name and path', :default => 'admin', :type => :string
       # Show help if no argv given.
       require_arguments!
 
       # Create controller for admin.
       def create_controller
         self.destination_root = options[:root]
-        # TODO FIXME ??? Review
-        # self.source_paths.unshift Padrino.root("vendor/padrino-admin/generators")
         if in_app_root?
           @app_name = fetch_app_name
+          @admin_name = options[:admin_name].classify
+          @admin_path = options[:admin_name].underscore
           @admin_model = options[:admin_model]
           models.each do |model|
             @orm = default_orm || Padrino::Admin::Generators::Orm.new(model, adapter)
             self.behavior = :revoke if options[:destroy]
-            empty_directory destination_root("/admin/views/#{@orm.name_plural}")
+            empty_directory destination_root(@admin_path+"/views/#{@orm.name_plural}")
 
-            template "templates/page/controller.rb.tt",       destination_root("/admin/controllers/#{@orm.name_plural}.rb")
-            template "templates/#{ext}/page/_form.#{ext}.tt", destination_root("/admin/views/#{@orm.name_plural}/_form.#{ext}")
-            template "templates/#{ext}/page/edit.#{ext}.tt",  destination_root("/admin/views/#{@orm.name_plural}/edit.#{ext}")
-            template "templates/#{ext}/page/index.#{ext}.tt", destination_root("/admin/views/#{@orm.name_plural}/index.#{ext}")
-            template "templates/#{ext}/page/new.#{ext}.tt",   destination_root("/admin/views/#{@orm.name_plural}/new.#{ext}")
+            template "templates/page/controller.rb.tt",       destination_root(@admin_path+"/controllers/#{@orm.name_plural}.rb")
+            template "templates/#{ext}/page/_form.#{ext}.tt", destination_root(@admin_path+"/views/#{@orm.name_plural}/_form.#{ext}")
+            template "templates/#{ext}/page/edit.#{ext}.tt",  destination_root(@admin_path+"/views/#{@orm.name_plural}/edit.#{ext}")
+            template "templates/#{ext}/page/index.#{ext}.tt", destination_root(@admin_path+"/views/#{@orm.name_plural}/index.#{ext}")
+            template "templates/#{ext}/page/new.#{ext}.tt",   destination_root(@admin_path+"/views/#{@orm.name_plural}/new.#{ext}")
 
             options[:destroy] ? remove_project_module(@orm.name_plural) : add_project_module(@orm.name_plural)
           end

padrino-admin/lib/padrino-admin/generators/templates/app.rb.tt

@@ -1,5 +1,5 @@
 module <%= @app_name %>
-  class Admin < Padrino::Application
+  class <%= @admin_name %> < Padrino::Application
     register Padrino::Rendering
     register Padrino::Mailer
     register Padrino::Helpers

padrino-admin/lib/padrino-admin/generators/templates/app/controllers/base.rb.tt

@@ -1,4 +1,4 @@
-<%= @app_name %>::Admin.controllers :base do
+<%= @app_name %>::<%= @admin_name %>.controllers :base do
   get :index, :map => "/" do
     render "base/index"
   end

padrino-admin/lib/padrino-admin/generators/templates/app/controllers/sessions.rb.tt

@@ -1,4 +1,4 @@
-<%= @app_name %>::Admin.controllers :sessions do
+<%= @app_name %>::<%= @admin_name %>.controllers :sessions do
   get :new do
     render "/sessions/new", nil, :layout => false
   end

padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt

@@ -31,7 +31,7 @@
               <%% else %>
                 <li class=navbar-module>
               <%% end %>
-                <%%= link_to project_module.human_name, project_module.path("/admin") %>
+                <%%= link_to project_module.human_name, url(project_module.path) %>
                 </li>
             <%% end %>
           </ul>

padrino-admin/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt

@@ -26,7 +26,7 @@
           %ul.nav.navbar-nav.pull-left
             - project_modules.each do |project_module|
               %li{:class => "navbar-module #{('active' if request.path_info =~ /^#{project_module.path}/)}"}
-                =link_to project_module.human_name, project_module.path('/admin')
+                =link_to project_module.human_name, url(project_module.path)
 
     .container.main
       .main-wrapper

padrino-admin/lib/padrino-admin/generators/templates/page/controller.rb.tt

@@ -1,4 +1,4 @@
-<%= @app_name %>::Admin.controllers :<%= @orm.name_plural %> do
+<%= @app_name %>::<%= @admin_name %>.controllers :<%= @orm.name_plural %> do
   get :index do
     @title = "<%= @orm.name_plural.capitalize %>"
     @<%= @orm.name_plural %> = <%= @orm.all %>

padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt

@@ -26,7 +26,7 @@ html lang='en'
           ul class='nav navbar-nav pull-left'
             - project_modules.each do |project_module|
               li class=("navbar-module #{'active' if request.path_info =~ /^#{project_module.path}/}")
-                = link_to project_module.human_name, project_module.path('/admin')
+                = link_to project_module.human_name, url(project_module.path)
 
     div class='container main'
       div class='main-wrapper'

padrino-admin/test/generators/test_admin_app_generator.rb

@@ -47,12 +47,18 @@
       assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_accounts.rb")
-      assert_match_in_file 'Padrino.mount("SampleProject::Admin", :app_file => File.expand_path(\'../../admin/app.rb\', __FILE__)).to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
+      assert_match_in_file 'Padrino.mount("SampleProject::Admin", :app_file => Padrino.root(\'admin/app.rb\')).to("/admin")', "#{@apptmp}/sample_project/config/apps.rb"
       assert_match_in_file 'module SampleProject', "#{@apptmp}/sample_project/admin/app.rb"
       assert_match_in_file 'class Admin < Padrino::Application', "#{@apptmp}/sample_project/admin/app.rb"
       assert_match_in_file 'role.project_module :accounts, \'/accounts\'', "#{@apptmp}/sample_project/admin/app.rb"
     end
 
+    it "should generate the master app" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+      capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project", '--admin-name=master') }
+      assert_file_exists("#{@apptmp}/sample_project/master/app.rb")
+    end
+
     # users can override certain templates from a generators/templates folder in the destination_root
     it "should use custom generator templates from the project root, if they exist" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }