lalala 4.0.0.dev.165 → 4.0.0.dev.168

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d09f6cbd3bc0bf378e619fc8fec19048a28690f
-  data.tar.gz: a5821336b7851714566f7c848f90630eeeebfa0b
+  metadata.gz: 1b5f31ad479a2cdad90fdcfd6fda2733024dd1c3
+  data.tar.gz: 6a3c7d2ec51583cfc9e8a83ed0f19d0ef84dd74b
 SHA512:
-  metadata.gz: 492462e6f2cf0ded49d860a6d9654a1936b73f67193f610d878651a5fe4002cc4f71519d75c2872d7404ce4ae3d4aa26eadd793f3f90321f4e9785a27b3b0433
-  data.tar.gz: 7d7307073c1f0e35881d5639d24b676b3271414734181e539a6345b5faf9c38343bb47e7d4a565fea82129b6111d40394f22427a8ad3a9c3af59b39cdb7e081d
+  metadata.gz: 040befd4fb4361625f2dcffe2f3a29bfb7603f00902f7e1c54ae7168f7f932ed5da4c36ac2f6d587ce024b5a0705022153a249f386ffbea6919eb1b8e2ae142f
+  data.tar.gz: 73132af6063adc89d770c241b8d40a6f69664fccc5c8807c960e4f88c874220d7c8e38de5983de13e33480e7c0ce44fdde5df08d838cf765641943c489acb902

data/app/models/lalala/admin_user.rb

@@ -0,0 +1,19 @@
+class Lalala::AdminUser < ActiveRecord::Base
+  self.table_name     = 'admin_users'
+  self.abstract_class = true
+
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :confirmable,
+  # :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :name, :email, :password, :password_confirmation, :remember_me
+  # attr_accessible :title, :body
+
+  validates :name,
+    presence:   true,
+    uniqueness: true
+
+end

data/config/initializers/devise.rb

@@ -0,0 +1,240 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  config.mailer_sender = "hello@mrhenry.be"
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = "Devise::Mailer"
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [ :email ]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [ :email ]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:token]` will
+  # enable it only for token authentication.
+  # config.http_authenticatable = false
+
+  # If http headers should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. "Application" by default.
+  # config.http_authentication_realm = "Application"
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # :http_auth and :token_auth by adding those symbols to the array below.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+  # using other encryptors, it sets how many times you want the password re-encrypted.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments.
+  config.stretches = Rails.env.test? ? 1 : 10
+
+  # Setup a pepper to generate the encrypted password.
+  # config.pepper = "37ce281d9639297d9717165f5edf58bda617dea1502ed99bcbae0d5164da3f46d53fcd4f76168c1e768fedffb57a73cc06b94676cfda86674ef796c0b806d7a4"
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming his account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming his account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming his account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed new email is stored in
+  # unconfirmed email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # :secure => true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length. Default is 8..128.
+  config.password_length = 8..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # an one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # If true, expires auth token on session timeout.
+  # config.expire_auth_token_on_timeout = false
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper)
+  # config.encryptor = :sha512
+
+  # ==> Configuration for :token_authenticatable
+  # Defines name of the authentication token params key
+  # config.token_authentication_key = :auth_token
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ["*/*", :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: "/my_engine"
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = "/my_engine/users/auth"
+end

data/db/migrate/20130321140345_devise_create_admin_users.rb

@@ -2,7 +2,7 @@ class DeviseCreateAdminUsers < ActiveRecord::Migration
   def migrate(direction)
     super
     # Create a default user
-    AdminUser.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up
+    AdminUser.create!(:name => 'Admin', :email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up
   end
 
   def change

data/db/migrate/20130524155010_add_name_to_admin_users.rb

@@ -0,0 +1,7 @@
+class AddNameToAdminUsers < ActiveRecord::Migration
+  def change
+    change_table :admin_users do |t|
+      t.string :name
+    end
+  end
+end

data/lib/generators/lalala/install/install_generator.rb

@@ -9,8 +9,6 @@ module Lalala
       desc "Installs Active Admin and generates the necessary migrations"
       argument :name, :type => :string, :default => "AdminUser"
 
-      hook_for :users, :default => "devise", :desc => "Admin user generator to run. Skip with --skip-users"
-
       def self.source_root
         @_active_admin_source_root ||= File.expand_path("../templates", __FILE__)
       end
@@ -36,9 +34,16 @@ module Lalala
         copy_file "models/image_asset.rb", "app/models/image_asset.rb"
       end
 
+      def setup_admin_users
+        empty_directory "app/models"
+        template 'models/admin_user.rb', 'app/models/admin_user.rb'
+        empty_directory "app/admin"
+        template 'admin_users.rb', 'app/admin/admin_users.rb'
+      end
+
       def setup_pages
         empty_directory "app/pages"
-        template 'application_page.rb', 'app/pages/application_page.rb'
+        template 'models/application_page.rb', 'app/pages/application_page.rb'
         empty_directory "app/controllers"
         template 'pages_controller.rb', 'app/controllers/pages_controller.rb'
         empty_directory "app/admin"
@@ -48,16 +53,12 @@ module Lalala
       def setup_directory
         empty_directory "app/admin"
         template 'dashboard.rb', 'app/admin/dashboard.rb'
-        if options[:users].present?
-          @user_class = name
-          template 'admin_user.rb.erb', "app/admin/#{name.underscore.pluralize}.rb"
-        end
       end
 
       def setup_uploaders
         empty_directory "app/uploaders"
-        copy_file "uploaders/file.rb", "app/uploaders/file.rb"
-        copy_file "uploaders/image.rb", "app/uploaders/image.rb"
+        copy_file "uploaders/file_uploader.rb", "app/uploaders/file_uploader.rb"
+        copy_file "uploaders/image_uploader.rb", "app/uploaders/image_uploader.rb"
       end
 
       def create_assets

data/lib/generators/lalala/install/templates/admin_pages.rb

@@ -1,11 +1,6 @@
 ActiveAdmin.register ApplicationPage, :as => 'Page' do
   # Customize the pages resource
 
-  menu :priority => 2
-
-  # Disable pagination
-  config.paginate = false
-
   # Enable the filter
   # config.filters = false
 

data/lib/generators/lalala/install/templates/admin_users.rb

@@ -0,0 +1,2 @@
+ActiveAdmin.register AdminUser do
+end

data/lib/generators/lalala/install/templates/models/admin_user.rb

@@ -0,0 +1,2 @@
+class AdminUser < Lalala::AdminUser
+end

data/lib/lalala/admin/admin_users.rb

@@ -0,0 +1,29 @@
+if defined?(ActiveAdmin) and defined?(AdminUser)
+  ActiveAdmin.register AdminUser do
+
+    menu priority: 90, html_options: { class: 'icon-user_gray' }
+
+    filter :name
+    filter :email
+
+    index do
+      column :name
+      column :email
+      column :current_sign_in_at
+      column :last_sign_in_at
+      column :sign_in_count
+      default_actions
+    end
+
+    form do |f|
+      f.inputs "Admin Details" do
+        f.input :name
+        f.input :email
+        f.input :password
+        f.input :password_confirmation
+      end
+      f.actions
+    end
+
+  end
+end

data/lib/lalala/admin/pages.rb

@@ -1,7 +1,10 @@
 if defined?(ActiveAdmin) and defined?(ApplicationPage)
   ActiveAdmin.register ApplicationPage, :as => 'Page' do
 
-    config.filters = false
+    menu priority: 20, html_options: { class: 'icon-page' }
+
+    config.filters  = false
+    config.paginate = false
 
     index as: :tree_table, paginator: false, download_links: false do
       selectable_column

data/lib/lalala/engine.rb

@@ -1,4 +1,6 @@
 module Lalala
+  require 'lalala'
+
   class Engine < Rails::Engine
 
     config.i18n.fallbacks = true
@@ -86,11 +88,13 @@ module Lalala
     Lalala::ExtWithAdvisoryLock.patch!
   end
 
-  Formtastic::FormBuilder.send(
-    :include, Lalala::Markdown::InputHelper)
+  if defined?(Formtastic)
+    Formtastic::FormBuilder.send(
+      :include, Lalala::Markdown::InputHelper)
 
-  Formtastic::FormBuilder.send(
-    :include, Lalala::ExtI18n::InputHelper)
+    Formtastic::FormBuilder.send(
+      :include, Lalala::ExtI18n::InputHelper)
+  end
 
   ActiveSupport.on_load :active_record do
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "165"
+  BUILD   = "168"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/lib/lalala.rb

@@ -24,7 +24,6 @@ module Lalala
   require 'stringex'
   require 'activeadmin'
 
-
   if groups.include?(:assets)
     require 'lalala/assets'
   end

data/test/dummy/app/admin/admin_pages.rb

@@ -1,8 +1,6 @@
 ActiveAdmin.register ApplicationPage, :as => 'Page' do
   # Customize the pages resource
 
-  menu :priority => 2
-
   # Enable the filter
   # config.filters = false
 

data/test/dummy/app/admin/admin_users.rb

@@ -1,20 +1,2 @@
 ActiveAdmin.register AdminUser do
-  index do
-    column :email
-    column :current_sign_in_at
-    column :last_sign_in_at
-    column :sign_in_count
-    default_actions
-  end
-
-  filter :email
-
-  form do |f|
-    f.inputs "Admin Details" do
-      f.input :email
-      f.input :password
-      f.input :password_confirmation
-    end
-    f.actions
-  end
 end

data/test/dummy/app/models/admin_user.rb

@@ -1,11 +1,2 @@
-class AdminUser < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable,
-  # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, 
-         :recoverable, :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-  # attr_accessible :title, :body
+class AdminUser < Lalala::AdminUser
 end

data/test/dummy/config/initializers/devise.rb

@@ -4,7 +4,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
+  config.mailer_sender = "hello@mrhenry.be"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130506155010) do
+ActiveRecord::Schema.define(:version => 20130524155010) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -41,6 +41,7 @@ ActiveRecord::Schema.define(:version => 20130506155010) do
     t.string   "last_sign_in_ip"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
+    t.string   "name"
   end
 
   add_index "admin_users", ["email"], :name => "index_admin_users_on_email", :unique => true

data/test/integration/admin_users_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AdminUsersTest < ActionDispatch::IntegrationTest
+
+  def setup
+    login_as_admin!
+  end
+
+  test 'list users' do
+    click_on('Admin Users')
+    assert page.has_text?('admin@example.com')
+  end
+
+  test 'create user' do
+    click_on('Admin Users')
+    click_on('New Admin User')
+    assert_equal('/lalala/admin_users/new', current_path)
+
+    fill_in('Name',                              with: 'Mr. Manager')
+    fill_in('Email',                             with: 'manager@example.com')
+    fill_in('admin_user[password]',              with: 'foobarbaz!')
+    fill_in('admin_user[password_confirmation]', with: 'foobarbaz!')
+    click_on('Create Admin user')
+    assert_equal('/lalala/admin_users/2', current_path)
+
+    assert page.has_text?('manager@example.com')
+    assert page.has_text?('Mr. Manager')
+  end
+
+private
+
+  def login_as_admin!
+    AdminUser.create! name: 'Admin', email: 'admin@example.com', password: 'password', password_confirmation: 'password'
+
+    visit('/lalala')
+    assert_equal(new_admin_user_session_path, current_path)
+    fill_in('Email',    with: 'admin@example.com')
+    fill_in('Password', with: 'password')
+    click_on('Login')
+    assert_equal('/lalala', current_path)
+  end
+
+end

data/test/integration/login_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class LoginIntegrationTest < ActionDispatch::IntegrationTest
 
   def setup
-    AdminUser.create! email: 'admin@example.com', password: 'password', password_confirmation: 'password'
+    AdminUser.create! name: 'Admin', email: 'admin@example.com', password: 'password', password_confirmation: 'password'
   end
 
   test 'when not loged in whe should be redirected to the login page' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.165
+  version: 4.0.0.dev.168
 platform: ruby
 authors:
 - Simon Menke
@@ -1320,6 +1320,7 @@ files:
 - app/controllers/lalala/public/errors_controller.rb
 - app/controllers/lalala/public/pages_controller.rb
 - app/models/lalala/abstract_asset.rb
+- app/models/lalala/admin_user.rb
 - app/models/lalala/file_asset.rb
 - app/models/lalala/image_asset.rb
 - app/models/lalala/page.rb
@@ -1332,6 +1333,7 @@ files:
 - app/views/layouts/lalala/markdown.html.erb
 - config/initializers/active_admin.rb
 - config/initializers/carrierwave.rb
+- config/initializers/devise.rb
 - config/routes.rb
 - db/migrate/20130321140345_devise_create_admin_users.rb
 - db/migrate/20130321140351_create_admin_notes.rb
@@ -1340,6 +1342,7 @@ files:
 - db/migrate/20130328171232_create_images.rb
 - db/migrate/20130423142125_replace_images_with_assets.rb
 - db/migrate/20130506155010_add_locale_to_asset_translations.rb
+- db/migrate/20130524155010_add_name_to_admin_users.rb
 - lalala-assets.gemspec
 - lalala-development.gemspec
 - lalala-test.gemspec
@@ -1349,14 +1352,14 @@ files:
 - lib/generators/lalala/assets/assets_generator.rb
 - lib/generators/lalala/assets/templates/active_admin.css.scss
 - lib/generators/lalala/assets/templates/active_admin.js
-- lib/generators/lalala/devise/devise_generator.rb
 - lib/generators/lalala/install/install_generator.rb
 - lib/generators/lalala/install/templates/active_admin.rb.erb
 - lib/generators/lalala/install/templates/admin_pages.rb
-- lib/generators/lalala/install/templates/admin_user.rb.erb
-- lib/generators/lalala/install/templates/application_page.rb
+- lib/generators/lalala/install/templates/admin_users.rb
 - lib/generators/lalala/install/templates/dashboard.rb
 - lib/generators/lalala/install/templates/errors_controller.rb
+- lib/generators/lalala/install/templates/models/admin_user.rb
+- lib/generators/lalala/install/templates/models/application_page.rb
 - lib/generators/lalala/install/templates/models/file_asset.rb
 - lib/generators/lalala/install/templates/models/image_asset.rb
 - lib/generators/lalala/install/templates/pages_controller.rb
@@ -1368,6 +1371,7 @@ files:
 - lib/generators/lalala/resource/USAGE
 - lib/generators/lalala/resource/resource_generator.rb
 - lib/lalala.rb
+- lib/lalala/admin/admin_users.rb
 - lib/lalala/admin/pages.rb
 - lib/lalala/assets.rb
 - lib/lalala/cache.rb
@@ -1470,6 +1474,7 @@ files:
 - test/dummy/test/unit/admin_user_test.rb
 - test/dummy/tmp/cache/.gitkeep
 - test/i18n/router_test.rb
+- test/integration/admin_users_test.rb
 - test/integration/login_test.rb
 - test/lalala_test.rb
 - test/test_helper.rb
@@ -1548,6 +1553,7 @@ test_files:
 - test/dummy/test/unit/admin_user_test.rb
 - test/dummy/tmp/cache/.gitkeep
 - test/i18n/router_test.rb
+- test/integration/admin_users_test.rb
 - test/integration/login_test.rb
 - test/lalala_test.rb
 - test/test_helper.rb

data/lib/generators/lalala/devise/devise_generator.rb

@@ -1,44 +0,0 @@
-module Lalala
-  module Generators
-    class DeviseGenerator < Rails::Generators::NamedBase
-      desc "Creates an admin user and uses Devise for authentication"
-      argument :name, :type => :string, :default => "AdminUser"
-
-      class_option  :registerable, :type => :boolean, :default => false,
-                    :desc => "Should the generated resource be registerable?"
-
-      def install_devise
-        require 'devise'
-        if File.exists?(File.join(destination_root, "config", "initializers", "devise.rb"))
-          log :generate, "No need to install devise, already done."
-        else
-          log :generate, "devise:install"
-          invoke "devise:install"
-        end
-      end
-
-      def create_admin_user
-        invoke "devise", [name]
-      end
-
-      def remove_registerable_from_model
-        unless options[:registerable]
-          model_file = File.join(destination_root, "app", "models", "#{file_path}.rb")
-          gsub_file model_file, /\:registerable([.]*,)?/, ""
-        end
-      end
-
-      def set_namespace_for_path
-        routes_file = File.join(destination_root, "config", "routes.rb")
-        gsub_file routes_file, /devise_for :#{plural_table_name}/, "devise_for :#{plural_table_name}, ActiveAdmin::Devise.config"
-      end
-
-      def remove_migration
-        # Don't assume that we have a migration!
-        devise_migration_file = Dir["db/migrate/*_devise_create_#{table_name}.rb"].first
-        return if devise_migration_file.nil?
-        File.unlink(devise_migration_file)
-      end
-    end
-  end
-end

data/lib/generators/lalala/install/templates/admin_user.rb.erb

@@ -1,20 +0,0 @@
-ActiveAdmin.register <%= @user_class %> do
-  index do
-    column :email
-    column :current_sign_in_at
-    column :last_sign_in_at
-    column :sign_in_count
-    default_actions
-  end
-
-  filter :email
-
-  form do |f|
-    f.inputs "Admin Details" do
-      f.input :email
-      f.input :password
-      f.input :password_confirmation
-    end
-    f.actions
-  end
-end