install_generator.rb in yousty-activeadmin-1.0.5.pre

- old
+ new

@@ -2,20 +2,19 @@
 
 module ActiveAdmin
   module Generators
     class InstallGenerator < ActiveRecord::Generators::Base
       desc "Installs Active Admin and generates the necessary migrations"
-      argument :name, :type => :string, :default => "AdminUser"
+      argument :name, type: :string, default: "AdminUser"
 
-      hook_for :users, :default => "devise", :desc => "Admin user generator to run. Skip with --skip-users"
+      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
+      source_root File.expand_path("../templates", __FILE__)
 
-			def copy_initializer
+      def copy_initializer
         @underscored_user_name = name.underscore
+        @use_authentication_method = options[:users].present?
         template 'active_admin.rb.erb', 'config/initializers/active_admin.rb'
       end
 
       def setup_directory
         empty_directory "app/admin"
@@ -25,13 +24,13 @@
           template 'admin_user.rb.erb', "app/admin/#{name.underscore}.rb"
         end
       end
 
       def setup_routes
-        if ARGV.include? "--skip-users"
+        if options[:users] # Ensure Active Admin routes occur after Devise routes so that Devise has higher priority
+          inject_into_file "config/routes.rb", "\n  ActiveAdmin.routes(self)", after: /devise_for .*, ActiveAdmin::Devise\.config/
+        else
           route "ActiveAdmin.routes(self)"
-        else # Ensure Active Admin routes occur after Devise routes so that Devise has higher priority
-          inject_into_file "config/routes.rb", "\n  ActiveAdmin.routes(self)", :after => /devise_for.*/
         end
       end
 
       def create_assets
         generate "active_admin:assets"