yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/lib/active_admin/views/pages/form.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
       class Form < Base
 
         def title
-          assigns[:page_title] || I18n.t("active_admin.#{params[:action]}_model",
+          assigns[:page_title] || I18n.t("active_admin.#{normalized_action}_model",
                                          model: active_admin_config.resource_label)
         end
 
@@ -19,9 +19,7 @@ module ActiveAdmin
           if options[:partial]
             render options[:partial]
           else
-            active_admin_form_for resource, options do |f|
-              instance_exec f, &form_presenter.block
-            end
+            active_admin_form_for resource, options, &form_presenter.block
           end
         end
 
@@ -29,8 +27,8 @@ module ActiveAdmin
 
         def default_form_options
           {
-            :url => default_form_path,
-            :as => active_admin_config.resource_name.singular
+            url: default_form_path,
+            as: active_admin_config.param_key
           }
         end
 
@@ -40,10 +38,22 @@ module ActiveAdmin
 
         def default_form_config
           ActiveAdmin::PagePresenter.new do |f|
+            f.semantic_errors # show errors on :base by default
             f.inputs
             f.actions
           end
         end
+
+        def normalized_action
+          case params[:action]
+          when "create"
+            "new"
+          when "update"
+            "edit"
+          else
+            params[:action]
+          end
+        end
       end
 
     end

data/lib/active_admin/views/pages/index.rb

@@ -7,11 +7,10 @@ module ActiveAdmin
       class Index < Base
 
         def title
-          case config[:title]
-          when Proc then controller.instance_eval(&config[:title])
-          when String then config[:title]
+          if Proc === config[:title]
+            controller.instance_exec &config[:title]
           else
-            active_admin_config.plural_resource_label
+            config[:title] || assigns[:page_title] || active_admin_config.plural_resource_label
           end
         end
 
@@ -61,7 +60,7 @@ module ActiveAdmin
         include ::ActiveAdmin::ViewHelpers::DownloadFormatLinksHelper
 
         def build_table_tools
-          div :class => "table_tools" do
+          div class: "table_tools" do
             build_batch_actions_selector
             build_scopes
             build_index_list
@@ -83,7 +82,7 @@ module ActiveAdmin
         def build_scopes
           if active_admin_config.scopes.any?
             scope_options = {
-              :scope_count => config[:scope_count].nil? ? true : config[:scope_count]
+              scope_count: config.fetch(:scope_count, true)
             }
 
             scopes_renderer active_admin_config.scopes, scope_options
@@ -111,37 +110,54 @@ module ActiveAdmin
         end
 
         def render_blank_slate
-          blank_slate_content = I18n.t("active_admin.blank_slate.content", :resource_name => active_admin_config.plural_resource_label)
+          blank_slate_content = I18n.t("active_admin.blank_slate.content", resource_name: active_admin_config.plural_resource_label)
           if controller.action_methods.include?('new') && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
-            blank_slate_content += " " + link_to(I18n.t("active_admin.blank_slate.link"), new_resource_path)
+            blank_slate_content = [blank_slate_content, blank_slate_link].compact.join(" ")
           end
           insert_tag(view_factory.blank_slate, blank_slate_content)
         end
 
         def render_empty_results
-          empty_results_content = I18n.t("active_admin.pagination.empty", :model => active_admin_config.plural_resource_label)
+          empty_results_content = I18n.t("active_admin.pagination.empty", model: active_admin_config.plural_resource_label)
           insert_tag(view_factory.blank_slate, empty_results_content)
         end
 
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
-          paginator      = config[:paginator].nil?      ? true : config[:paginator]
-          download_links = config[:download_links].nil? ? active_admin_config.namespace.download_links : config[:download_links]
-          pagination_total = config[:pagination_total].nil? ? true : config[:pagination_total]
-
-          paginated_collection(collection, :entry_name     => active_admin_config.resource_label,
-                                           :entries_name   => active_admin_config.plural_resource_label(:count => collection_size),
-                                           :download_links => download_links,
-                                           :paginator      => paginator,
-                                           :pagination_total => pagination_total) do
-            div :class => 'index_content' do
+          paginator        = config.fetch(:paginator, true)
+          download_links   = config.fetch(:download_links, active_admin_config.namespace.download_links)
+          pagination_total = config.fetch(:pagination_total, true)
+          per_page         = config.fetch(:per_page, active_admin_config.per_page)
+
+          paginated_collection(collection, entry_name:       active_admin_config.resource_label,
+                                           entries_name:     active_admin_config.plural_resource_label(count: collection_size),
+                                           download_links:   download_links,
+                                           paginator:        paginator,
+                                           per_page:         per_page,
+                                           pagination_total: pagination_total) do
+            div class: 'index_content' do
               insert_tag(renderer_class, config, collection)
             end
           end
         end
 
+        private
+
+        def blank_slate_link
+          if config.options.has_key?(:blank_slate_link)
+            blank_slate_link = config.options[:blank_slate_link]
+            if blank_slate_link.is_a?(Proc)
+              instance_exec(&blank_slate_link)
+            end
+          else
+            default_blank_slate_link
+          end
+        end
+
+        def default_blank_slate_link
+          link_to(I18n.t("active_admin.blank_slate.link"), new_resource_path)
+        end
       end
     end
   end
 end
-

data/lib/active_admin/views/pages/layout.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
       class Layout < Base
 
         def title
-          assigns[:page_title] || I18n.t("active_admin.#{params[:action]}", :default => params[:action].to_s.titleize)
+          assigns[:page_title] || I18n.t("active_admin.#{params[:action]}", default: params[:action].to_s.titleize)
         end
 
         # Render the content_for(:layout) into the main content area

data/lib/active_admin/views/pages/show.rb

@@ -11,7 +11,7 @@ module ActiveAdmin
           if config[:title]
             render_or_call_method_or_proc_on(resource, config[:title])
           else
-            default_title
+            assigns[:page_title] || default_title
           end
         end
 
@@ -25,7 +25,7 @@ module ActiveAdmin
         end
 
         def attributes_table(*args, &block)
-          panel(I18n.t('active_admin.details', :model => active_admin_config.resource_label)) do
+          panel(I18n.t('active_admin.details', model: active_admin_config.resource_label)) do
             attributes_table_for resource, *args, &block
           end
         end
@@ -43,8 +43,8 @@ module ActiveAdmin
         end
 
         module DefaultMainContent
-          def default_main_content
-            attributes_table *default_attribute_table_rows
+          def default_main_content(&block)
+            attributes_table(*default_attribute_table_rows, &block)
           end
 
           def default_attribute_table_rows

data/lib/active_admin/views/tabbed_navigation.rb

@@ -40,10 +40,14 @@ module ActiveAdmin
       end
 
       def build_menu_item(item)
-        li :id => item.id do |li|
+        li id: item.id do |li|
           li.add_class "current" if item.current? assigns[:current_tab]
 
-          text_node link_to item.label(self), item.url(self), item.html_options
+          if url = item.url(self)
+            text_node link_to item.label(self), url, item.html_options
+          else
+            span item.label(self), item.html_options
+          end
 
           if children = item.items(self).presence
             li.add_class "has_nested"
@@ -55,7 +59,7 @@ module ActiveAdmin
       end
 
       def default_options
-        { :id => "tabs" }
+        { id: "tabs" }
       end
     end
   end

data/lib/active_admin/views/title_bar.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     class TitleBar < Component
 
       def build(title, action_items)
-        super(:id => "title_bar")
+        super(id: "title_bar")
         @title = title
         @action_items = action_items
         build_titlebar_left
@@ -13,35 +13,37 @@ module ActiveAdmin
       private
 
       def build_titlebar_left
-        div :id => "titlebar_left" do
+        div id: "titlebar_left" do
           build_breadcrumb
           build_title_tag
         end
       end
 
       def build_titlebar_right
-        div :id => "titlebar_right" do
+        div id: "titlebar_right" do
           build_action_items
         end
       end
 
       def build_breadcrumb(separator = "/")
-        links = if active_admin_config && active_admin_config.breadcrumb.present?
+        breadcrumb_config = active_admin_config && active_admin_config.breadcrumb
+
+        links = if breadcrumb_config.is_a?(Proc)
           instance_exec(controller, &active_admin_config.breadcrumb)
-        else
+        elsif breadcrumb_config.present?
           breadcrumb_links
         end
         return unless links.present? && links.is_a?(::Array)
-        span :class => "breadcrumb" do
+        span class: "breadcrumb" do
           links.each do |link|
             text_node link
-            span(separator, :class => "breadcrumb_sep")
+            span(separator, class: "breadcrumb_sep")
           end
         end
       end
 
       def build_title_tag
-        h2(@title, :id => 'page_title')
+        h2(@title, id: 'page_title')
       end
 
       def build_action_items

data/lib/generators/active_admin/assets/assets_generator.rb

@@ -2,9 +2,7 @@ module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base
 
-      def self.source_root
-        @_active_admin_source_root ||= File.expand_path("../templates", __FILE__)
-      end
+      source_root File.expand_path("../templates", __FILE__)
 
       def install_assets
         template 'active_admin.js.coffee', 'app/assets/javascripts/active_admin.js.coffee'

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

@@ -5,15 +5,25 @@ module ActiveAdmin
 
     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 Error, "#{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
@@ -36,26 +46,6 @@ 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 add_attr_accessible_if_needed
-        unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
-          model_file = File.join(destination_root, "app", "models", "#{file_path}.rb")
-          inject_into_file model_file, "  attr_accessible :email, :password, :password_confirmation, :remember_me\n", before: /end\n*\z/
-        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"
@@ -64,18 +54,20 @@ module ActiveAdmin
       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
@@ -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,10 +85,9 @@ ActiveAdmin.setup do |config|
   # user performing them.
   #
   # This setting changes the method which Active Admin calls
-  # to return the currently logged in user.
+  # (within the application controller) to return the currently logged in user.
   config.current_user_method = :current_<%= @underscored_user_name %>
 
-
   # == Logging Out
   #
   # Active Admin displays a logout link on each screen. These
@@ -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'
 
+  # == 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,
@@ -215,7 +216,6 @@ ActiveAdmin.setup do |config|
   #
   #   end
 
-
   # == Pagination
   #
   # Pagination is enabled by default for all resources.
@@ -223,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