padrino-admin 0.12.0.rc1 → 0.12.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d3555e8e56082baba626251a152c8663016484
-  data.tar.gz: 6cd5f67e229164a70c9d34dc0a335da06e904824
+  metadata.gz: e983af1fb92a4c0ad9457128ec169c15ca4a9ccf
+  data.tar.gz: 22517aab5237143525fb7721e24a4246bc50415d
 SHA512:
-  metadata.gz: ec01231b86c0a2ebedd62a5bcfc7ceb82bacd0766ec933fa20e8ee8c95c908032252b4d8fccb50fcfff8fa655e05875262a4d082f63e51bed94437fd98ad326f
-  data.tar.gz: ed059febbc883daddac9d2d9c790a520e5cdbd14b1665d80d4abd69d54b4d417f90f1327f3fa539f6e44fe6fa39fbe9669195868a98d190c6d09442d22473c7f
+  metadata.gz: 382fdbf12184bf8873fd3556e04f8bc855189af9ed1c5f4a0ab2c51f418d6e3cfd35402b2a2d1c13eadb37a84450d9d22ce70bce9c055433c5d9fe319a18569d
+  data.tar.gz: 9cd98159c6583825ca5b179641c84fe78e80543547628f8ef95aa8b41fba292d0415979c5948d32cb5cdfebd750e0953de7310a0edfe9248f31bd986b81743bf

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

@@ -41,16 +41,16 @@ module Padrino
         # 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 }

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

@@ -21,7 +21,7 @@ module Padrino
 
       # Look for custom template files in a generators folder under the project root.
       def source_paths
-        if File.exists? destination_root('generators', 'templates')
+        if File.exist? destination_root('generators', 'templates')
           ["#{destination_root('generators')}", File.expand_path(File.dirname(__FILE__))]
         else
           [File.expand_path(File.dirname(__FILE__))]
@@ -31,14 +31,12 @@ module Padrino
       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 @@ module Padrino
           # 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 @@ module Padrino
           ]
 
           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 @@ module Padrino
           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,7 +139,7 @@ module Padrino
           # 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 = []
@@ -145,7 +147,7 @@ module Padrino
           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

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

@@ -22,7 +22,7 @@ module Padrino
 
       # Look for custom template files in a generators folder under the project root.
       def source_paths
-        if File.exists? destination_root('generators')
+        if File.exist? destination_root('generators')
           ["#{destination_root('generators')}", File.expand_path(File.dirname(__FILE__))]
         else
           [File.expand_path(File.dirname(__FILE__))]
@@ -32,32 +32,30 @@ module Padrino
       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

data/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
@@ -22,7 +22,7 @@ module <%= @app_name %>
     #
 
     set :admin_model, '<%= @model_name %>'
-    set :login_page,  '/admin/sessions/new'
+    set :login_page,  '/sessions/new'
 
     enable  :sessions
     disable :store_location

data/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

data/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

data/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>

data/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

data/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 %>

data/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'

data/lib/padrino-admin/helpers/authentication_helpers.rb

@@ -78,23 +78,19 @@ module Padrino
         private
 
         def access_denied
-          # If we have a login_page we redirect the user
-          if login_page
-            redirect(login_page)
+          if login_page.present?
+            redirect url(login_page)
           else
             halt 401, "You don't have permission for this resource"
           end
         end
 
         def login_page
-          login_page ||= settings.login_page rescue nil
-          return unless login_page
-          login_page = File.join(ENV['RACK_BASE_URI'].to_s, login_page) if ENV['RACK_BASE_URI']
-          login_page
+          settings.respond_to?(:login_page) && settings.login_page
         end
 
         def store_location
-          settings.store_location rescue nil
+          settings.respond_to?(:store_location) && settings.store_location
         end
 
         def login_from_session
@@ -104,7 +100,7 @@ module Padrino
         def admin_model_obj
           @_admin_model_obj ||= settings.admin_model.constantize
         rescue NameError
-          raise Padrino::Admin::AccessControlError, "You must define an #{settings.admin_model} Model!"
+          raise Padrino::Admin::AccessControlError, "You must define an #{settings.admin_model} Model"
         end
       end
     end

data/test/generators/test_admin_app_generator.rb

@@ -47,12 +47,18 @@ describe "AdminAppGenerator" do
       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') }

data/test/helper.rb

@@ -67,7 +67,7 @@ class MiniTest::Spec
   end
 
   def assert_no_match_in_file(pattern, file)
-    File.exists?(file) ? assert_no_match(pattern, File.read(file)) : assert_file_exists(file)
+    File.exist?(file) ? assert_no_match(pattern, File.read(file)) : assert_file_exists(file)
   end
 
   # Delegate other missing methods to response.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc1
+  version: 0.12.0.rc2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement