activeadmin 1.0.0.pre1 → 1.0.0.pre2

data/lib/active_admin/views/components/active_admin_form.rb

@@ -42,11 +42,13 @@ module ActiveAdmin
       end
 
       def inputs(*args, &block)
+        if block_given?
+          form_builder.template.assign(has_many_block: true)
+        end
         if block_given? && block.arity == 0
           wrapped_block = proc do
             wrap_it = form_builder.already_in_an_inputs_block ? true : false
             form_builder.already_in_an_inputs_block = true
-            form_builder.template.assign('has_many_block'=> true)
             content = form_builder.template.capture do
               block.call
             end
@@ -114,8 +116,6 @@ module ActiveAdmin
 
     class HasManyProxy < FormtasticProxy
       def build(form_builder, *args, &block)
-        assoc = args[0]
-        builder_options = args[1] || {}
         text_node form_builder.has_many(*args, &block)
       end
     end

data/lib/active_admin/views/components/columns.rb

@@ -41,7 +41,7 @@ module ActiveAdmin
     # the first being 2 time bigger than the second.
     #
     #
-    # == Max and Mix Column Sizes
+    # == Max and Min Column Sizes
     #
     # Active Admin is a fluid width layout, which means that columns are all defined
     # using percentages. Sometimes this can cause issues if you don't want a column
@@ -93,19 +93,24 @@ module ActiveAdmin
         all_margins_width = margin_size * (span_count - 1)
         column_width = (100.00 - all_margins_width) / span_count
 
-        children.each_with_index do |col, i|
+        columns.each_with_index do |column, i|
           is_last_column = i == (columns_count - 1)
-          col.set_column_styles(column_width, margin_size, is_last_column)
+          column.set_column_styles(column_width, margin_size, is_last_column)
         end
       end
 
       def columns_span_count
         count = 0
-        children.each {|column| count += column.span_size }
+        columns.each do |column|
+          count += column.span_size
+        end
 
         count
       end
 
+      def columns
+        children.select { |child| child.is_a?(Column) }
+      end
     end
 
     class Column < ActiveAdmin::Component

data/lib/active_admin/views/components/dropdown_menu.rb

@@ -1,5 +1,3 @@
-require 'active_admin/views/components/popover'
-
 module ActiveAdmin
   module Views
 

data/lib/active_admin/views/components/paginated_collection.rb

@@ -32,11 +32,13 @@ module ActiveAdmin
       # collection => A paginated collection from kaminari
       # options    => These options will be passed to `page_entries_info`
       #   entry_name     => The name to display for this resource collection
+      #   params         => Extra parameters for pagination (e.g. { anchor: 'details' })
       #   param_name     => Parameter name for page number in the links (:page by default)
       #   download_links => Download links override (false or [:csv, :pdf])
       #
       def build(collection, options = {})
         @collection     = collection
+        @params         = options.delete(:params)
         @param_name     = options.delete(:param_name)
         @download_links = options.delete(:download_links)
         @display_total  = options.delete(:pagination_total) { true }
@@ -95,8 +97,20 @@ module ActiveAdmin
 
       def build_pagination
         options = {}
+        options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 
+        if !@display_total && collection.respond_to?(:offset)
+          # The #paginate method in kaminari will query the resource with a
+          # count(*) to determine how many pages there should be unless
+          # you pass in the :total_pages option. We issue a query to determine
+          # if there is another page or not, but the limit/offset make this
+          # query fast.
+          offset = collection.offset(collection.current_page * @per_page.to_i).limit(1).count
+          options[:total_pages] = collection.current_page + offset
+          options[:right] = 0
+        end
+
         text_node paginate collection, options
       end
 
@@ -117,22 +131,30 @@ module ActiveAdmin
           entries_name = I18n.translate key, count: collection.size, default: entry_name.pluralize
         end
 
-        if collection.num_pages < 2
-          case collection_size
-          when 0; I18n.t('active_admin.pagination.empty',    model: entries_name)
-          when 1; I18n.t('active_admin.pagination.one',      model: entry_name)
-          else;   I18n.t('active_admin.pagination.one_page', model: entries_name, n: collection.total_count)
+        if @display_total
+          if collection.num_pages < 2
+            case collection_size
+            when 0; I18n.t("active_admin.pagination.empty",    model: entries_name)
+            when 1; I18n.t("active_admin.pagination.one",      model: entry_name)
+            else;   I18n.t("active_admin.pagination.one_page", model: entries_name, n: collection.total_count)
+            end
+          else
+            offset = (collection.current_page - 1) * collection.limit_value
+            total  = collection.total_count
+            I18n.t "active_admin.pagination.multiple",
+                   model: entries_name,
+                   total: total,
+                   from: offset + 1,
+                   to: offset + collection_size
           end
         else
+          # Do not display total count, in order to prevent a `SELECT count(*)`.
+          # To do so we must not call `collection.num_pages`
           offset = (collection.current_page - 1) * collection.limit_value
-          if @display_total
-            total  = collection.total_count
-            I18n.t 'active_admin.pagination.multiple', model: entries_name, total: total,
-              from: offset + 1, to: offset + collection_size
-          else
-            I18n.t 'active_admin.pagination.multiple_without_total', model: entries_name,
-              from: offset + 1, to: offset + collection_size
-          end
+          I18n.t "active_admin.pagination.multiple_without_total",
+                 model: entries_name,
+                 from: offset + 1,
+                 to: offset + collection_size
         end
       end
 

data/lib/active_admin/views/components/panel.rb

@@ -5,11 +5,9 @@ module ActiveAdmin
       builder_method :panel
 
       def build(title, attributes = {})
-        icon_name = attributes.delete(:icon)
-        icn = icon_name ? icon(icon_name) : "".html_safe
         super(attributes)
         add_class "panel"
-        @title = h3(icn + title.to_s)
+        @title = h3(title.to_s)
         @contents = div(class: "panel_contents")
       end
 

data/lib/active_admin/views/components/sidebar_section.rb

@@ -7,12 +7,17 @@ module ActiveAdmin
       # Takes a ActiveAdmin::SidebarSection instance
       def build(section)
         @section = section
-        super(@section.title, icon: @section.icon)
+        super(@section.title)
         add_class @section.custom_class if @section.custom_class
         self.id = @section.id
         build_sidebar_content
       end
 
+      # Renders attributes_table_for current resource
+      def attributes_table(*args, &block)
+        attributes_table_for resource, *args, &block
+      end
+
       protected
 
       def build_sidebar_content

data/lib/active_admin/views/components/status_tag.rb

@@ -57,9 +57,10 @@ module ActiveAdmin
       protected
 
       def convert_to_boolean_status(status)
-        if status == 'true'
+        case status
+        when true, 'true'
           'Yes'
-        elsif ['false', nil].include?(status)
+        when false, 'false', nil
           'No'
         else
           status

data/lib/active_admin/views/components/table_for.rb

@@ -10,8 +10,9 @@ module ActiveAdmin
       def build(obj, *attrs)
         options         = attrs.extract_options!
         @sortable       = options.delete(:sortable)
-        @resource_class = options.delete(:i18n)
         @collection     = obj.respond_to?(:each) && !obj.is_a?(Hash) ? obj : [obj]
+        @resource_class = options.delete(:i18n)
+        @resource_class ||= @collection.klass if @collection.respond_to? :klass
         @columns        = []
         @row_class      = options.delete(:row_class)
 

data/lib/active_admin/views/index_as_table.rb

@@ -91,7 +91,7 @@ module ActiveAdmin
     # index do
     #   column :title
     #   actions do |post|
-    #     a link_to "View", admin_post_path(post)
+    #     a "View", href: admin_post_path(post)
     #   end
     # end
     # ```
@@ -277,7 +277,7 @@ module ActiveAdmin
         #
         # # Append some actions onto the end of the default actions using arbre dsl.
         # actions do |admin_user|
-        #   a link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        #   a 'Grant Admin', href: grant_admin_admin_user_path(admin_user)
         # end
         #
         # # Custom actions without the defaults.

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

@@ -35,6 +35,10 @@ module ActiveAdmin
               text_node(favicon_link_tag(active_admin_namespace.favicon))
             end
 
+            active_admin_namespace.meta_tags.each do |name, content|
+              text_node(tag(:meta, name: name, content: content))
+            end
+
             text_node csrf_meta_tag
           end
         end

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

@@ -35,7 +35,7 @@ module ActiveAdmin
         def default_title
           title = display_name(resource)
 
-          if title.nil? || title.empty? || title == resource.to_s
+          if title.blank?
             title = "#{active_admin_config.resource_label} ##{resource.id}"
           end
 

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

@@ -6,7 +6,7 @@ module ActiveAdmin
 
       def install_assets
         template 'active_admin.js.coffee', 'app/assets/javascripts/active_admin.js.coffee'
-        template 'active_admin.css.scss',  'app/assets/stylesheets/active_admin.css.scss'
+        template "active_admin.scss", "app/assets/stylesheets/active_admin.scss"
       end
 
     end

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

@@ -1,4 +1,5 @@
 require "active_admin/error"
+require "active_admin/dependency"
 
 module ActiveAdmin
   module Generators
@@ -16,7 +17,7 @@ module ActiveAdmin
 
       def install_devise
         begin
-          Dependency.devise! Dependency::DEVISE
+          Dependency.devise! Dependency::Requirements::DEVISE
         rescue DependencyError => e
           raise ActiveAdmin::GeneratorError, "#{e.message} If you don't want to use devise, run the generator with --skip-users."
         end
@@ -50,27 +51,14 @@ module ActiveAdmin
         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? || !options[:default_user]
-
-        devise_migration_content = File.read(devise_migration_file)
+      def add_default_user_to_seed
+        seeds_paths = Rails.application.paths["db/seeds.rb"] || Rails.application.paths["db/seeds"] # "db/seeds" => Rails 3.2 fallback
+        seeds_file = seeds_paths.existent.first
+        return if seeds_file.nil? || !options[:default_user]
 
         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    #{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    #{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."
-        end
+        append_to_file seeds_file, create_user_code
       end
     end
   end

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

@@ -126,6 +126,10 @@ ActiveAdmin.setup do |config|
   #
   # You can change the name under which comments are registered:
   # config.comments_registration_name = 'AdminComment'
+  #
+  # You can change the order for the comments and you can change the column
+  # to be used for ordering
+  # config.comments_order = 'created_at ASC'
 
   # == Batch Actions
   #
@@ -140,10 +144,31 @@ ActiveAdmin.setup do |config|
   #
   # config.before_filter :do_something_awesome
 
+  # == Localize Date/Time Format
+  #
+  # Set the localize format to display dates and times.
+  # To understand how to localize your app with I18n, read more at
+  # https://github.com/svenfuchs/i18n/blob/master/lib%2Fi18n%2Fbackend%2Fbase.rb#L52
+  #
+  config.localize_format = :long
+
   # == Setting a Favicon
   #
   # config.favicon = 'favicon.ico'
 
+  # == Meta Tags
+  #
+  # Add additional meta tags to the head element of active admin pages.
+  #
+  # Add tags to all pages logged in users see:
+  #   config.meta_tags = { author: 'My Company' }
+
+  # By default, sign up/sign in/recover password pages are excluded
+  # from showing up in search engine results by adding a robots meta
+  # tag. You can reset the hash of meta tags included in logged out
+  # pages:
+  #   config.meta_tags_for_logged_out_pages = {}
+
   # == Removing Breadcrumbs
   #
   # Breadcrumbs are enabled by default. You can customize them for individual
@@ -222,6 +247,10 @@ ActiveAdmin.setup do |config|
   # You can control the default per page count for all resources here.
   #
   # config.default_per_page = 30
+  #
+  # You can control the max per page count too.
+  #
+  # config.max_per_page = 10_000
 
   # == Filters
   #

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

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

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

@@ -1,11 +1,17 @@
+require 'active_admin/generators/boilerplate'
+
 module ActiveAdmin
   module Generators
     class ResourceGenerator < Rails::Generators::NamedBase
       desc "Registers resources with Active Admin"
 
+      class_option :include_boilerplate, type: :boolean, default: false,
+        desc: "Generate boilerplate code for your resource."
+
       source_root File.expand_path("../templates", __FILE__)
 
       def generate_config_file
+        @boilerplate = ActiveAdmin::Generators::Boilerplate.new(class_name)
         template "admin.rb", "app/admin/#{file_path.tr('/', '_')}.rb"
       end
 

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

@@ -1,18 +1,39 @@
 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
+# 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 %>
+<% if options.include_boilerplate? %>
+# Limit actions available to your users by adding them to the 'except' array
+# actions :all, except: []
+
+# Add or remove filters (you can use any ActiveRecord scope) to toggle their
+# visibility in the sidebar
+<%= @boilerplate.filters %>
+
+# Add or remove columns to toggle their visiblity in the index action
+# index do
+#   selectable_column
+#   id_column
+<%= @boilerplate.columns %>
+#   actions
+# end
 
+# Add or remove rows to toggle their visiblity in the show action
+# show do |<%= class_name.downcase %>|
+<%= @boilerplate.rows %>
+# end
+
+# Add or remove fields to toggle their visibility in the form
+<% end %>
 end

data/spec/rails_helper.rb

@@ -107,6 +107,10 @@ require ENV['RAILS_ROOT'] + '/config/environment'
 
 require 'rspec/rails'
 
+# Prevent Test::Unit's AutoRunner from executing during RSpec's rake task on
+# JRuby
+Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
+
 # Setup Some Admin stuff for us to play with
 include ActiveAdminIntegrationSpecHelper
 load_defaults!
@@ -133,9 +137,9 @@ end
 
 # All RSpec configuration needs to happen before any examples
 # or else it whines.
-require 'integration_example_group'
+require "support/active_admin_request_helpers"
 RSpec.configure do |c|
-  c.include RSpec::Rails::IntegrationExampleGroup, file_path: /\bspec\/requests\//
+  c.include ActiveAdminRequestHelpers, type: :request
   c.include Devise::TestHelpers, type: :controller
 end