activeadmin 0.6.6 → 1.0.0.pre1

data/lib/generators/active_admin/assets/templates/active_admin.js.coffee

@@ -0,0 +1 @@
+#= require active_admin/base

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

@@ -1,19 +1,28 @@
+require "active_admin/error"
+
 module ActiveAdmin
   module Generators
-    class Error < Rails::Generators::Error
-    end
-
     class DeviseGenerator < Rails::Generators::NamedBase
       desc "Creates an admin user and uses Devise for authentication"
-      argument :name, :type => :string, :default => "AdminUser"
+      argument :name, type: :string, default: "AdminUser"
 
-      class_option  :registerable, :type => :boolean, :default => false,
-                    :desc => "Should the generated resource be registerable?"
+      class_option  :registerable, type: :boolean, default: false,
+                    desc: "Should the generated resource be registerable?"
 
       RESERVED_NAMES = [:active_admin_user]
 
+      class_option  :default_user, :type => :boolean, :default => true,
+                    :desc => "Should a default user be created inside the migration?"
+
       def install_devise
+        begin
+          Dependency.devise! Dependency::DEVISE
+        rescue DependencyError => e
+          raise ActiveAdmin::GeneratorError, "#{e.message} If you don't want to use devise, run the generator with --skip-users."
+        end
+
         require 'devise'
+
         if File.exists?(File.join(destination_root, "config", "initializers", "devise.rb"))
           log :generate, "No need to install devise, already done."
         else
@@ -24,7 +33,7 @@ module ActiveAdmin
 
       def create_admin_user
         if RESERVED_NAMES.include?(name.underscore)
-          raise Error, "The name #{name} is reserved by Active Admin"
+          raise ActiveAdmin::GeneratorError, "The name #{name} is reserved by Active Admin"
         end
         invoke "devise", [name]
       end
@@ -36,39 +45,28 @@ module ActiveAdmin
         end
       end
 
-      # This fixes a bug in the 3.0.0 release of Devise. For more info:
-      # https://github.com/plataformatec/devise/issues/2515
-      def add_attr_accessible_if_missing
-        require 'devise/version'
-        if ::Devise::VERSION == '3.0.0'
-          if Rails::VERSION::MAJOR == 3 && !defined?(ActionController::StrongParameters)
-            model = File.join(destination_root, "app", "models", "#{file_path}.rb")
-            inject_into_file model, "\n  attr_accessible :email, :password, :password_confirmation, :remember_me\n",
-                             :before => /end\s*\z/
-          end
-        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"
+        gsub_file routes_file, /devise_for :#{plural_table_name}$/, "devise_for :#{plural_table_name}, ActiveAdmin::Devise.config"
       end
 
       def add_default_user_to_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?
+        return if devise_migration_file.nil? || !options[:default_user]
 
         devise_migration_content = File.read(devise_migration_file)
 
+        create_user_code = "#{class_name}.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password')"
+
         if devise_migration_content["def change"]
           inject_into_file  devise_migration_file,
-                            "def migrate(direction)\n    super\n    # Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up\n  end\n\n  ",
-                            :before => "def change"
+                            "def migrate(direction)\n    super\n    # Create a default user\n    #{create_user_code} if direction == :up\n  end\n\n  ",
+                            before: "def change"
         elsif devise_migration_content[/def (self.)?up/]
           inject_into_file  devise_migration_file,
-                            "# Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password')\n\n    ",
-                            :before => "add_index :#{table_name}, :email"
+                            "# Create a default user\n    #{create_user_code}\n\n    ",
+                            before: "add_index :#{table_name}, :email"
         else
           puts devise_migration_content
           raise "Failed to add default admin user to migration."

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

@@ -4,16 +4,15 @@ 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
 
@@ -27,10 +26,10 @@ module ActiveAdmin
       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
 

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -1,5 +1,4 @@
 ActiveAdmin.setup do |config|
-
   # == Site Title
   #
   # Set the title that is displayed on the main layout
@@ -15,9 +14,9 @@ ActiveAdmin.setup do |config|
   # Set an optional image to be displayed for the header
   # instead of a string (overrides :site_title)
   #
-  # Note: Recommended image height is 21px to properly fit in the header
+  # Note: Aim for an image that's 21px high so it fits in the header.
   #
-  # config.site_title_image = "/images/logo.png"
+  # config.site_title_image = "logo.png"
 
   # == Default Namespace
   #
@@ -54,8 +53,8 @@ ActiveAdmin.setup do |config|
   # ensure that there is a currently logged in admin user.
   #
   # This setting changes the method which Active Admin calls
-  # within the controller.
-  config.authentication_method = :authenticate_<%= @underscored_user_name %>!
+  # within the application controller.
+  <% unless @use_authentication_method %># <% end %>config.authentication_method = :authenticate_<%= @underscored_user_name %>!
 
   # == User Authorization
   #
@@ -65,6 +64,11 @@ ActiveAdmin.setup do |config|
   # CanCanAdapter or make your own. Please refer to documentation.
   # config.authorization_adapter = ActiveAdmin::CanCanAdapter
 
+  # In case you prefer Pundit over other solutions you can here pass
+  # the name of default policy class. This policy will be used in every
+  # case when Pundit is unable to find suitable policy.
+  # config.pundit_default_policy = "MyDefaultPunditPolicy"
+
   # You can customize your CanCan Ability class name here.
   # config.cancan_ability_class = "Ability"
 
@@ -81,9 +85,8 @@ ActiveAdmin.setup do |config|
   # user performing them.
   #
   # This setting changes the method which Active Admin calls
-  # to return the currently logged in user.
-  config.current_user_method = :current_<%= @underscored_user_name %>
-
+  # (within the application controller) to return the currently logged in user.
+  <% unless @use_authentication_method %># <% end %>config.current_user_method = :current_<%= @underscored_user_name %>
 
   # == Logging Out
   #
@@ -103,7 +106,6 @@ ActiveAdmin.setup do |config|
   # Default:
   # config.logout_link_method = :get
 
-
   # == Root
   #
   # Set the action to call for the root path. You can set different
@@ -112,13 +114,12 @@ ActiveAdmin.setup do |config|
   # Default:
   # config.root_to = 'dashboard#index'
 
-
   # == Admin Comments
   #
   # This allows your users to comment on any resource registered with Active Admin.
   #
   # You can completely disable comments:
-  # config.allow_comments = false
+  # config.comments = false
   #
   # You can disable the menu item for the comments index page:
   # config.show_comments_in_menu = false
@@ -126,26 +127,29 @@ ActiveAdmin.setup do |config|
   # You can change the name under which comments are registered:
   # config.comments_registration_name = 'AdminComment'
 
-
   # == Batch Actions
   #
   # Enable and disable Batch Actions
   #
   config.batch_actions = true
 
-
   # == Controller Filters
   #
   # You can add before, after and around filters to all of your
   # Active Admin resources and pages from here.
   #
   # config.before_filter :do_something_awesome
-  
-  
+
   # == Setting a Favicon
   #
-  # config.favicon = '/assets/favicon.ico'
+  # config.favicon = 'favicon.ico'
 
+  # == Removing Breadcrumbs
+  #
+  # Breadcrumbs are enabled by default. You can customize them for individual
+  # resources or you can disable them globally from here.
+  #
+  # config.breadcrumb = false
 
   # == Register Stylesheets & Javascripts
   #
@@ -157,20 +161,18 @@ ActiveAdmin.setup do |config|
   #   config.register_stylesheet 'my_stylesheet.css'
   #
   # You can provide an options hash for more control, which is passed along to stylesheet_link_tag():
-  #   config.register_stylesheet 'my_print_stylesheet.css', :media => :print
+  #   config.register_stylesheet 'my_print_stylesheet.css', media: :print
   #
   # To load a javascript file:
   #   config.register_javascript 'my_javascript.js'
 
-
   # == CSV options
   #
   # Set the CSV builder separator
-  # config.csv_options = { :col_sep => ';' }
+  # config.csv_options = { col_sep: ';' }
   #
   # Force the use of quotes
-  # config.csv_options = { :force_quotes => true }
-
+  # config.csv_options = { force_quotes: true }
 
   # == Menu System
   #
@@ -193,7 +195,6 @@ ActiveAdmin.setup do |config|
   #     end
   #   end
 
-
   # == Download Links
   #
   # You can disable download links on resource listing pages,
@@ -209,9 +210,12 @@ ActiveAdmin.setup do |config|
   #     # Only show XML & PDF options
   #     admin.download_links = [:xml, :pdf]
   #
+  #     # Enable/disable the links based on block
+  #     #   (for example, with cancan)
+  #     admin.download_links = proc { can?(:view_download_links) }
+  #
   #   end
 
-
   # == Pagination
   #
   # Pagination is enabled by default for all resources.
@@ -219,13 +223,11 @@ ActiveAdmin.setup do |config|
   #
   # config.default_per_page = 30
 
-
   # == Filters
   #
-  # By default the index screen includes a “Filters” sidebar on the right
+  # By default the index screen includes a "Filters" sidebar on the right
   # hand side with a filter for each attribute of the registered model.
   # You can enable or disable them for all resources here.
   #
   # config.filters = true
-
 end

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

@@ -1,13 +1,22 @@
 ActiveAdmin.register <%= @user_class %> do
+<% unless Rails::VERSION::MAJOR < 4 -%>
+  permit_params :email, :password, :password_confirmation
+
+<% end -%>
   index do
+    selectable_column
+    id_column
     column :email
     column :current_sign_in_at
-    column :last_sign_in_at
     column :sign_in_count
-    default_actions
+    column :created_at
+    actions
   end
 
   filter :email
+  filter :current_sign_in_at
+  filter :sign_in_count
+  filter :created_at
 
   form do |f|
     f.inputs "Admin Details" do
@@ -17,4 +26,5 @@ ActiveAdmin.register <%= @user_class %> do
     end
     f.actions
   end
+
 end

data/lib/generators/active_admin/install/templates/dashboard.rb

@@ -1,10 +1,10 @@
 ActiveAdmin.register_page "Dashboard" do
 
-  menu :priority => 1, :label => proc{ I18n.t("active_admin.dashboard") }
+  menu priority: 1, label: proc{ I18n.t("active_admin.dashboard") }
 
-  content :title => proc{ I18n.t("active_admin.dashboard") } do
-    div :class => "blank_slate_container", :id => "dashboard_default_message" do
-      span :class => "blank_slate" do
+  content title: proc{ I18n.t("active_admin.dashboard") } do
+    div class: "blank_slate_container", id: "dashboard_default_message" do
+      span class: "blank_slate" do
         span I18n.t("active_admin.dashboard_welcome.welcome")
         small I18n.t("active_admin.dashboard_welcome.call_to_action")
       end

data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb

@@ -3,9 +3,9 @@ class CreateActiveAdminComments < ActiveRecord::Migration
     create_table :active_admin_comments do |t|
       t.string :namespace
       t.text   :body
-      t.string :resource_id,   :null => false
-      t.string :resource_type, :null => false 
-      t.references :author, :polymorphic => true
+      t.string :resource_id,   null: false
+      t.string :resource_type, null: false
+      t.references :author, polymorphic: true
       t.timestamps
     end
     add_index :active_admin_comments, [:namespace]

data/lib/generators/active_admin/page/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Registers pages with Active Admin
+
+Example:
+    rails generate active_admin:page Thing
+
+    This will create:
+        app/admin/thing.rb

data/lib/generators/active_admin/page/page_generator.rb

@@ -0,0 +1,12 @@
+module ActiveAdmin
+  module Generators
+    class PageGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+
+      def generate_config_file
+        template "page.rb", "app/admin/#{file_path.tr('/', '_')}.rb"
+      end
+
+    end
+  end
+end

data/lib/generators/active_admin/page/templates/page.rb

@@ -0,0 +1,5 @@
+ActiveAdmin.register_page <%= class_name %> do
+  content do
+    # your content
+  end
+end

data/lib/generators/active_admin/resource/resource_generator.rb

@@ -1,14 +1,12 @@
 module ActiveAdmin
   module Generators
     class ResourceGenerator < Rails::Generators::NamedBase
-      desc "Installs ActiveAdmin in a rails 3 application"
+      desc "Registers resources with Active Admin"
 
-      def self.source_root
-        @_active_admin_source_root ||= File.expand_path("../templates", __FILE__)
-      end
+      source_root File.expand_path("../templates", __FILE__)
 
       def generate_config_file
-        template "admin.rb", "app/admin/#{file_path.gsub('/', '_')}.rb"
+        template "admin.rb", "app/admin/#{file_path.tr('/', '_')}.rb"
       end
 
     end

data/lib/generators/active_admin/resource/templates/admin.rb

@@ -1,3 +1,18 @@
 ActiveAdmin.register <%= class_name %> do
 
+<% if Rails::VERSION::MAJOR == 4 || defined?(ActionController::StrongParameters) %>
+  # See permitted parameters documentation:
+  # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
+  #
+  # permit_params :list, :of, :attributes, :on, :model
+  #
+  # or
+  #
+  # permit_params do
+  #   permitted = [:permitted, :attributes]
+  #   permitted << :other if resource.something?
+  #   permitted
+  # end
+<% end %>
+
 end

data/lib/ransack_ext.rb

@@ -0,0 +1,12 @@
+# This sets up aliases for old Metasearch query methods so they behave
+# identically to the versions given in Ransack.
+#
+Ransack.configure do |config|
+  {'contains'=>'cont', 'starts_with'=>'start', 'ends_with'=>'end'}.each do |old,current|
+    config.add_predicate old, Ransack::Constants::DERIVED_PREDICATES.detect{ |q, _| q == current }[1]
+  end
+
+  {'equals'=>'eq', 'greater_than'=>'gt', 'less_than'=>'lt'}.each do |old,current|
+    config.add_predicate old, arel_predicate: current
+  end
+end

data/script/local

@@ -19,7 +19,7 @@ Examples:
 end
 
 # Set up some variables
-rails_version = detect_rails_version || '3.0.0'
+rails_version = detect_rails_version!
 
 test_app_dir = ".test-rails-apps"
 test_app_path = "#{test_app_dir}/test-rails-app-#{rails_version}"
@@ -29,7 +29,7 @@ system "mkdir #{test_app_dir}" unless File.exists?(test_app_dir)
 
 # Create the sample rails app if it doesn't already exist
 unless File.exists? test_app_path
-  system "RAILS='#{rails_version}' bundle exec rails new #{test_app_path} -m spec/support/rails_template_with_data.rb"
+  system "RAILS='#{rails_version}' bundle exec rails new #{test_app_path} -m spec/support/rails_template_with_data.rb --skip-bundle"
 end
 
 # Link this rails app