padrino-admin 0.10.7 → 0.11.0

data/lib/padrino-admin/bootstrap-less/wells.less

@@ -0,0 +1,29 @@
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: @well-background;
+  border: 1px solid darken(@well-background, 7%);
+  border-radius: @border-radius-base;
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-large {
+  padding: 24px;
+  border-radius: @border-radius-large;
+}
+.well-small {
+  padding: 9px;
+  border-radius: @border-radius-small;
+}

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

@@ -27,14 +27,14 @@ module Padrino
         # Tell us for now wich orm we support
         #
         def supported_orm
-          [:mini_record, :datamapper, :activerecord, :mongomapper, :mongoid, :couchrest, :sequel]
+          [:minirecord, :datamapper, :activerecord, :mongomapper, :mongoid, :couchrest, :sequel, :ohm]
         end
 
         ##
         # Tell us for now wich rendering engine we support
         #
         def supported_ext
-          [:haml, :erb, :slim]
+          [:haml, :slim, :erb]
         end
 
         ##
@@ -55,6 +55,22 @@ module Padrino
           content.gsub!(/^\s+role\.project_module :#{controller}, '\/#{controller}'\n/, '')
           File.open(path, 'wb') { |f| f.write content }
         end
+
+        # Returns the app_name for the application at root.
+        #
+        # @param [String] app
+        #   folder name of application.
+        #
+        # @return [String] module name for application.
+        #
+        # @example
+        #   fetch_app_name('subapp')
+        #
+        # @api public
+        def fetch_app_name(app='app')
+          app_path = destination_root(app, 'app.rb')
+          @app_name ||= File.read(app_path).scan(/module\s(.*?)\n/).flatten[0]
+        end
       end # Actions
     end # Admin
   end # Generators

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Padrino
   module Generators
     ##
@@ -8,12 +9,10 @@ module Padrino
       # Add this generator to our padrino-gen
       Padrino::Generators.add_generator(:admin, self)
 
-      # Define the source template root and themes.
+      # Define the source template root
       def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       # Defines the "banner" text for the CLI.
       def self.banner; "padrino-gen admin"; end
-      # Defines the theme names for admin based on available.
-      def self.themes; Dir[File.dirname(__FILE__) + "/templates/assets/stylesheets/themes/*"].map { |t| File.basename(t) }.sort; end
 
       # Include related modules
       include Thor::Actions
@@ -23,10 +22,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
-      class_option :app, :aliases => "-a", :desc => "The model destination path", :default => '.', :type => :string
+      # 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 :theme, :desc => "Your admin theme: (#{self.themes.join(", ")})", :default => "default", :type => :string
       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
 
@@ -39,17 +40,15 @@ module Padrino
             raise SystemExit
           end
 
-          unless self.class.themes.include?(options[:theme])
-            say "<= You need to choose a theme from: #{self.class.themes.join(", ")}", :yellow
-            raise SystemExit
-          end
-
           tmp_ext = options[:renderer] || fetch_component_choice(:renderer)
           unless supported_ext.include?(tmp_ext.to_sym)
             say "<= Your are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use -e haml or -e erb or -e slim", :yellow
             raise SystemExit
           end
 
+          # Get the app's namespace
+          @app_name = fetch_app_name
+
           store_component_choice(:admin_renderer, tmp_ext)
 
           self.behavior = :revoke if options[:destroy]
@@ -64,12 +63,14 @@ module Padrino
           directory "templates/app",       destination_root("admin")
           directory "templates/assets",    destination_root("public", "admin")
           template  "templates/app.rb.tt", destination_root("admin/app.rb")
-          append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"Admin\").to(\"/admin\")"
-          insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:mini_record, :activerecord].include?(orm)
+          append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"#{@app_name}::Admin\", :app_file => File.expand_path('../../admin/app.rb', __FILE__)).to(\"/admin\")"
+          unless options[:destroy]
+            insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:minirecord, :activerecord].include?(orm)
+          end
 
           params = [
             @model_singular, "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
-            "-a=#{options[:app]}",
+            "-a=#{options[:models_path]}",
             "-r=#{options[:root]}"
           ]
           params << "-s" if options[:skip_migration]
@@ -87,11 +88,14 @@ module Padrino
             { :name => :role,                  :field_type => :text_field }
           ]
 
-          admin_app = Padrino::Generators::AdminPage.new([@model_singular], :root => options[:root], :destroy => options[:destroy])
-          admin_app.default_orm = Padrino::Admin::Generators::Orm.new(@model_singular, orm, columns, column_fields)
-          admin_app.invoke_all
+          unless options[:destroy]
+            admin_app = Padrino::Generators::AdminPage.new([@model_singular], :root => options[:root], :destroy => options[:destroy], :admin_model => @model_singular)
+            admin_app.default_orm = Padrino::Admin::Generators::Orm.new(@model_singular, orm, columns, column_fields)
+            admin_app.invoke_all
+          end
 
-          template "templates/account/#{orm}.rb.tt", destination_root(options[:app], "models", "#{@model_singular}.rb"), :force => true
+          # TODO See this, there's something wrong it's not being applied properly or something because test_account_model_generator last test fails.
+          template "templates/account/#{orm}.rb.tt", destination_root("models", "#{@model_singular}.rb"), :force => true
 
           if File.exist?(destination_root("db/seeds.rb"))
             run "mv #{destination_root('db/seeds.rb')} #{destination_root('db/seeds.old')}"
@@ -103,27 +107,35 @@ module Padrino
           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/_sidebar.#{ext}.tt",       destination_root("admin/views/base/_sidebar.#{ext}")
           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}")
-
-          add_project_module @model_plural
-          require_dependencies('bcrypt-ruby', :require => 'bcrypt')
+          # 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}")
+
+          unless options[:destroy]
+            add_project_module @model_plural
+            require_dependencies('bcrypt-ruby', :require => 'bcrypt')
+          end
 
           # A nicer select box
-          gsub_file destination_root("admin/views/#{@model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
+          # TODO FIXME This doesn't make much sense in here. Review.
+          # 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"
           return if self.behavior == :revoke
 
           instructions = []
-          instructions << "Run 'bundle install'"
-          instructions << "Run 'padrino rake ar:migrate'" if orm == :activerecord
-          instructions << "Run 'padrino rake dm:auto:upgrade'" if orm == :datamapper
-          instructions << "Run 'padrino rake seed'"
+          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.map! { |i| "  #{instructions.index(i)+1}) #{i}" }
 

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Padrino
   module Generators
     ##
@@ -22,16 +23,22 @@ 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
-
       # 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_model = options[:admin_model]
           models.each do |model|
             @orm = default_orm || Padrino::Admin::Generators::Orm.new(model, adapter)
             self.behavior = :revoke if options[:destroy]

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

@@ -22,12 +22,12 @@ module Padrino
           @orm            = orm.to_sym
           @columns        = columns
           @column_fields  = column_fields
-          raise OrmError, "Model '#{klass_name}' could not be found!" if @columns.nil? && @klass.nil?
+          raise OrmError, "Model '#{klass_name}' could not be found!\nPerhaps you would like to run 'bundle exec padrino g model #{klass_name}' to create it first?" if @columns.nil? && @klass.nil?
         end
 
         def activerecord?
           case orm
-          when :activerecord, :mini_record then true
+          when :activerecord, :minirecord then true
           else false
           end
         end
@@ -49,12 +49,13 @@ module Padrino
         def columns
           @columns ||= case orm
             when :activerecord then @klass.columns
-            when :mini_record  then @klass.columns
+            when :minirecord   then @klass.columns
             when :datamapper   then @klass.properties.map { |p| dm_column(p) }
             when :couchrest    then @klass.properties
-            when :mongoid      then @klass.fields.values
+            when :mongoid      then @klass.fields.values.reject { |col| %w[_id _type].include?(col.name) }
             when :mongomapper  then @klass.keys.values.reject { |key| key.name == "_id" } # On MongoMapper keys are an hash
             when :sequel       then @klass.db_schema.map { |k,v| v[:type] = :text if v[:db_type] =~ /^text/i; Column.new(k, v[:type]) }
+            when :ohm          then @klass.attributes.map { |a| Column.new(a.to_s, :string) } # ohm has strings
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -79,7 +80,12 @@ module Padrino
         end
 
         def column_fields
-          excluded_columns = %w[id created_at updated_at]
+          excluded_columns = %w[created_at updated_at]
+          case orm
+            when :mongoid then excluded_columns << '_id'
+            else excluded_columns << 'id'
+          end
+
           column_fields    = columns.dup
           column_fields.reject! { |column| excluded_columns.include?(column.name.to_s) }
           @column_fields ||= column_fields.map do |column|
@@ -93,9 +99,10 @@ module Padrino
 
         def find(params=nil)
           case orm
-            when :activerecord, :mini_record, :mongomapper, :mongoid then "#{klass_name}.find(#{params})"
-            when :datamapper, :couchrest   then "#{klass_name}.get(#{params})"
-            when :sequel then "#{klass_name}[#{params}]"
+            when :activerecord, :minirecord, :mongomapper, :mongoid then "#{klass_name}.find(#{params})"
+            when :datamapper then "#{klass_name}.get(#{params}.to_i)"
+            when :couchrest then "#{klass_name}.get(#{params})"
+            when :sequel, :ohm then "#{klass_name}[#{params}]"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -117,16 +124,56 @@ module Padrino
 
         def update_attributes(params=nil)
           case orm
-            when :activerecord, :mini_record, :mongomapper, :mongoid, :couchrest then "@#{name_singular}.update_attributes(#{params})"
-            when :datamapper then "@#{name_singular}.update(#{params})"
+            when :activerecord, :minirecord, :mongomapper, :mongoid, :couchrest then "@#{name_singular}.update_attributes(#{params})"
+            when :datamapper, :ohm then "@#{name_singular}.update(#{params})"
             when :sequel then "@#{name_singular}.modified! && @#{name_singular}.update(#{params})"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
 
         def destroy
-          "#{name_singular}.destroy"
+          case orm
+            when :ohm then "#{name_singular}.delete"
+            else "#{name_singular}.destroy"
+          end
+        end
+
+        def find_by_ids(params=nil)
+          case orm
+            when :ohm then "#{klass_name}.fetch(#{params})"
+            when :datamapper then "#{klass_name}.all(:id => #{params})"
+            when :sequel then "#{klass_name}.where(:id => #{params})"
+            when :mongoid then "#{klass_name}.find(#{params})"
+            when :couchrest then "#{klass_name}.all(:keys => #{params})"
+            else find(params)
+          end
+        end
+
+        def parse_many_ids_on_params
+          base = "params[:#{@name_singular}_ids].split(',').map(&:strip)"
+          case orm
+            when :activerecord, :minirecord, :datamapper, :sequel then "#{base}.map(&:to_i)"
+            else base
+          end
+        end
+
+        def multiple_destroy(params=nil)
+          case orm
+            when :ohm then "#{params}.each(&:delete)"
+            when :sequel then  "#{params}.destroy"
+            when :datamapper then "#{params}.destroy"
+            when :couchrest, :mongoid, :mongomapper then "#{params}.each(&:destroy)"
+            else "#{klass_name}.destroy #{params}"
+          end
         end
+
+        def has_error(field)
+          case orm
+            when :datamapper, :ohm, :sequel then "@#{name_singular}.errors.key?(:#{field}) && @#{name_singular}.errors[:#{field}].count > 0"
+            else "@#{name_singular}.errors.include?(:#{field})"
+          end
+        end
+
       end # Orm
     end # Generators
   end # Admin

data/lib/padrino-admin/generators/templates/account/couchrest.rb.tt

@@ -22,7 +22,7 @@ class <%= @model_name %> < CouchRest::Model::Base
   validate                  :unique_email_validator
 
   # Callbacks
-  before_save :encrypt_password, :if => :password_required
+  after_validation :encrypt_password, :if => :password_required
 
   ##
   # This method is for authentication purpose

data/lib/padrino-admin/generators/templates/account/mongoid.rb.tt

@@ -27,7 +27,7 @@ class <%= @model_name %>
   # This method is for authentication purpose
   #
   def self.authenticate(email, password)
-    account = first(:conditions => { :email => email }) if email.present?
+    account = where(:email => email).first if email.present?
     account && account.has_password?(password) ? account : nil
   end
 

data/lib/padrino-admin/generators/templates/account/ohm.rb.tt

@@ -0,0 +1,61 @@
+class Account < Ohm::Model
+  attr_accessor :password, :password_confirmation
+
+  # Keys
+  attribute :name
+  attribute :surname
+  attribute :email
+  attribute :crypted_password
+  attribute :role
+
+  index  :email
+  unique :email
+
+  # Validations
+  def validate
+    assert_present  :email
+    assert_present  :role
+    if password_required
+      assert_present :password
+      assert_present :password_confirmation
+      assert_length  :password, 4..40
+      assert self.password == self.password_confirmation, [:password_not_confirmed]
+    end
+    assert_email :email
+    assert_format :role, /[A-Za-z]/
+  end
+
+  # Callbacks
+  def save!
+    encrypt_password
+    super
+  end
+
+  ##
+  # This method is for authentication purpose
+  #
+  def self.authenticate(email, password)
+    account = with(:email, email) if email.present?
+    account && account.has_password?(password) ? account : nil
+  end
+
+  ##
+  # This method is used by AuthenticationHelper
+  #
+  def self.find_by_id(id)
+    self[id]
+  end
+
+  def has_password?(password)
+    ::BCrypt::Password.new(crypted_password) == password
+  end
+
+  private
+  def encrypt_password
+    self.crypted_password = ::BCrypt::Password.create(password)  if password_required
+  end
+
+  def password_required
+    crypted_password.blank? || password.present?
+  end
+end

data/lib/padrino-admin/generators/templates/account/sequel.rb.tt

@@ -1,4 +1,4 @@
-class <%= @model_name %> < ::Sequel::Model
+class <%= @model_name %> < Sequel::Model
 
   plugin :validation_helpers
 

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

@@ -1,36 +1,43 @@
-class Admin < Padrino::Application
-  register Padrino::Rendering
-  register Padrino::Mailer
-  register Padrino::Helpers
-  register Padrino::Admin::AccessControl
+module <%= @app_name %>
+  class Admin < Padrino::Application
+    register Padrino::Rendering
+    register Padrino::Mailer
+    register Padrino::Helpers
+    register Padrino::Admin::AccessControl
 
-  ##
-  # Application configuration options
-  #
-  # set :raise_errors, true         # Raise exceptions (will stop application) (default for test)
-  # set :dump_errors, true          # Exception backtraces are written to STDERR (default for production/development)
-  # set :show_exceptions, true      # Shows a stack trace in browser (default for development)
-  # set :logging, true              # Logging in STDOUT for development and file for production (default only for development)
-  # set :public_folder, "foo/bar"   # Location for static assets (default root/public)
-  # set :reload, false              # Reload application files (default in development)
-  # set :default_builder, "foo"     # Set a custom form builder (default 'StandardFormBuilder')
-  # set :locale_path, "bar"         # Set path for I18n translations (default your_app/locales)
-  # disable :sessions               # Disabled sessions by default (enable if needed)
-  # disable :flash                  # Disables sinatra-flash (enabled by default if Sinatra::Flash is defined)
-  # layout  :my_layout              # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
-  #
+    ##
+    # Application configuration options
+    #
+    # set :raise_errors, true         # Raise exceptions (will stop application) (default for test)
+    # set :dump_errors, true          # Exception backtraces are written to STDERR (default for production/development)
+    # set :show_exceptions, true      # Shows a stack trace in browser (default for development)
+    # set :logging, true              # Logging in STDOUT for development and file for production (default only for development)
+    # set :public_folder, "foo/bar"   # Location for static assets (default root/public)
+    # set :reload, false              # Reload application files (default in development)
+    # set :default_builder, "foo"     # Set a custom form builder (default 'StandardFormBuilder')
+    # set :locale_path, "bar"         # Set path for I18n translations (default your_app/locales)
+    # disable :sessions               # Disabled sessions by default (enable if needed)
+    # disable :flash                  # Disables sinatra-flash (enabled by default if Sinatra::Flash is defined)
+    # layout  :my_layout              # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
+    #
 
-  set :admin_model, '<%= @model_name %>'
-  set :login_page, "/admin/sessions/new"
+    set :admin_model, '<%= @model_name %>'
+    set :login_page,  '/admin/sessions/new'
 
-  enable  :sessions
-  disable :store_location
+    enable  :sessions
+    disable :store_location
 
-  access_control.roles_for :any do |role|
-    role.protect "/"
-    role.allow "/sessions"
-  end
+    access_control.roles_for :any do |role|
+      role.protect '/'
+      role.allow   '/sessions'
+    end
+
+    access_control.roles_for :admin do |role|
+    end
 
-  access_control.roles_for :admin do |role|
+    # Custom error management 
+    error(403) { @title = "Error 403"; render('errors/403', :layout => :error) }
+    error(404) { @title = "Error 404"; render('errors/404', :layout => :error) }
+    error(500) { @title = "Error 500"; render('errors/500', :layout => :error) }
   end
 end