activeadmin 0.6.6 → 1.0.0.pre1

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

@@ -0,0 +1,28 @@
+module ActiveAdmin
+  module Views
+    class Tabs < ActiveAdmin::Component
+      builder_method :tabs
+
+      def tab(title, options = {}, &block)
+        title = title.to_s.titleize if title.is_a? Symbol
+        @menu << build_menu_item(title, options, &block)
+        @tabs_content << build_content_item(title, options, &block)
+      end
+
+      def build(&block)
+        @menu = ul(class: 'nav nav-tabs', role: "tablist")
+        @tabs_content = div(class: 'tab-content')
+      end
+
+      def build_menu_item(title, options, &block)
+        options = options.reverse_merge({})
+        li { link_to title, "##{title.parameterize}", options }
+      end
+
+      def build_content_item(title, options, &block)
+        options = options.reverse_merge(id: title.parameterize)
+        div(options, &block)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module ActiveAdmin
+  module Views
+    class UnsupportedBrowser < Component
+      def build
+        h1 I18n.t("active_admin.unsupported_browser.headline").html_safe
+        para I18n.t("active_admin.unsupported_browser.recommendation").html_safe
+        para I18n.t("active_admin.unsupported_browser.turn_off_compatibility_view").html_safe
+      end
+    end
+  end
+end

data/lib/active_admin/views/footer.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     class Footer < Component
 
       def build
-        super :id => "footer"
+        super id: "footer"
         powered_by_message
       end
 
@@ -11,8 +11,8 @@ module ActiveAdmin
 
       def powered_by_message
         para I18n.t('active_admin.powered_by',
-          :active_admin => link_to("Active Admin", "http://www.activeadmin.info"),
-          :version => ActiveAdmin::VERSION).html_safe
+          active_admin: link_to("Active Admin", "http://www.activeadmin.info"),
+          version: ActiveAdmin::VERSION).html_safe
       end
 
     end

data/lib/active_admin/views/header.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     class Header < Component
 
       def build(namespace, menu)
-        super(:id => "header")
+        super(id: "header")
 
         @namespace = namespace
         @menu = menu
@@ -20,11 +20,11 @@ module ActiveAdmin
       end
 
       def build_global_navigation
-        insert_tag view_factory.global_navigation, @menu, :class => 'header-item tabs'
+        insert_tag view_factory.global_navigation, @menu, class: 'header-item tabs'
       end
 
       def build_utility_navigation
-        insert_tag view_factory.utility_navigation, @utility_menu, :id => "utility_nav", :class => 'header-item tabs'
+        insert_tag view_factory.utility_navigation, @utility_menu, id: "utility_nav", class: 'header-item tabs'
       end
 
     end

data/lib/active_admin/views/index_as_block.rb

@@ -1,21 +1,21 @@
 module ActiveAdmin
   module Views
 
-    # = Index as a Block
+    # # Index as a Block
     #
     # If you want to fully customize the display of your resources on the index
     # screen, Index as a Block allows you to render a block of content for each
     # resource.
     #
-    #     index :as => :block do |product|
-    #       div :for => product do
-    #         resource_selection_cell product
-    #         h2 auto_link(product.title)
-    #         div do
-    #           simple_format product.description
-    #         end
-    #       end
-    #     end
+    # ```ruby
+    # index as: :block do |product|
+    #   div for: product do
+    #     resource_selection_cell product
+    #     h2  auto_link     product.title
+    #     div simple_format product.description
+    #   end
+    # end
+    # ```
     #
     class IndexAsBlock < ActiveAdmin::Component
 

data/lib/active_admin/views/index_as_blog.rb

@@ -1,65 +1,71 @@
 module ActiveAdmin
   module Views
 
-    # = Index as Blog
+    # # Index as Blog
     #
     # Render your index page as a set of posts. The post has two main options:
     # title and body.
     #
-    #     index :as => :blog do
-    #       title :my_title # Calls #my_title on each resource
-    #       body  :my_body  # Calls #my_body on each resource
-    #     end
+    # ```ruby
+    # index as: :blog do
+    #   title :my_title # Calls #my_title on each resource
+    #   body  :my_body  # Calls #my_body on each resource
+    # end
+    # ```
     #
-    # == Post Title
+    # ## Post Title
     #
     # The title is the content that will be rendered within a link to the
     # resource. There are two main ways to set the content for the title
     #
-    # First, you can pass in a method to be called on your
-    # resource. For example:
-    #
-    #     index :as => :blog do
-    #       title :a_method_to_call
-    #     end
+    # First, you can pass in a method to be called on your resource. For example:
     #
-    # This will result in the title of the post being the return value of
-    # Resource#a_method_to_call
+    # ```ruby
+    # index as: :blog do
+    #   title :a_method_to_call
+    # end
+    # ```
     #
     # Second, you can pass a block to the tile option which will then be
     # used as the contents fo the title. The resource being rendered
     # is passed in to the block. For Example:
     #
-    #     index :as => :blog do
-    #       title do |post|
-    #         span post.title, :class => 'title'
-    #         span post.created_at, :class => 'created_at'
-    #       end
-    #     end
+    # ```ruby
+    # index as: :blog do
+    #   title do |post|
+    #     span post.title,      class: 'title'
+    #     span post.created_at, class: 'created_at'
+    #   end
+    # end
+    # ```
     #
-    # == Post Body
+    # ## Post Body
     #
     # The body is rendered underneath the title of each post. The same two
     # style of options work as the Post Title above.
     #
     # Call a method on the resource as the body:
     #
-    #     index :as => :blog do
-    #       title :my_title
-    #       body :my_body # Return value of #my_body will be the body
-    #     end
+    # ```ruby
+    # index as: :blog do
+    #   title :my_title
+    #   body :my_body
+    # end
+    # ```
     #
     # Or, render a block as the body:
     #
-    #     index :as => :blog do
-    #       title :my_title
-    #       body do |post|
-    #         div truncate(post.title)
-    #         div :class => 'meta' do
-    #           span "Post in #{post.categories.join(', ')}"
-    #         end
-    #       end
+    # ```ruby
+    # index as: :blog do
+    #   title :my_title
+    #   body do |post|
+    #     div truncate post.title
+    #     div class: 'meta' do
+    #       span "Post in #{post.categories.join(', ')}"
     #     end
+    #   end
+    # end
+    # ```
     #
     class IndexAsBlog < ActiveAdmin::Component
 
@@ -69,7 +75,7 @@ module ActiveAdmin
 
         # Call the block passed in. This will set the
         # title and body methods
-        instance_eval &page_presenter.block if page_presenter.block
+        instance_exec &page_presenter.block if page_presenter.block
 
         add_class "index"
         build_posts
@@ -107,7 +113,7 @@ module ActiveAdmin
       end
 
       def build_post(post)
-        div :for => post do
+        div for: post do
           resource_selection_cell(post) if active_admin_config.batch_actions.any?
           build_title(post)
           build_body(post)
@@ -117,7 +123,7 @@ module ActiveAdmin
       def build_title(post)
         if @title
           h3 do
-            a(:href => resource_path(post)) do
+            a(href: resource_path(post)) do
              render_method_on_post_or_call_proc post, @title
             end
           end
@@ -130,7 +136,7 @@ module ActiveAdmin
 
       def build_body(post)
         if @body
-          div :class => 'content' do
+          div class: 'content' do
             render_method_on_post_or_call_proc post, @body
           end
         end
@@ -138,8 +144,8 @@ module ActiveAdmin
 
       def render_method_on_post_or_call_proc(post, proc)
         case proc
-        when String,Symbol
-          post.send proc
+        when String, Symbol
+          post.public_send proc
         else
           instance_exec post, &proc
         end

data/lib/active_admin/views/index_as_grid.rb

@@ -1,25 +1,29 @@
 module ActiveAdmin
   module Views
 
-     # = Index as a Grid
+     # # Index as a Grid
      #
      # Sometimes you want to display the index screen for a set of resources as a grid
      # (possibly a grid of thumbnail images). To do so, use the :grid option for the
      # index block.
      #
-     #     index :as => :grid do |product|
-     #       link_to(image_tag(product.image_path), admin_products_path(product))
-     #     end
+     # ```ruby
+     # index as: :grid do |product|
+     #   link_to image_tag(product.image_path), admin_product_path(product)
+     # end
+     # ```
      #
      # The block is rendered within a cell in the grid once for each resource in the
      # collection. The resource is passed into the block for you to use in the view.
      #
-     # You can customize the number of colums that are rendered using the columns
+     # You can customize the number of columns that are rendered using the columns
      # option:
      #
-     #     index :as => :grid, :columns => 5 do |product|
-     #       link_to(image_tag(product.image_path), admin_products_path(product))
-     #     end
+     # ```ruby
+     # index as: :grid, columns: 5 do |product|
+     #   link_to image_tag(product.image_path), admin_product_path(product)
+     # end
+     # ```
      #
      class IndexAsGrid < ActiveAdmin::Component
 
@@ -42,7 +46,7 @@ module ActiveAdmin
 
       def build_table
         resource_selection_toggle_panel if active_admin_config.batch_actions.any?
-        table :class => "index_grid" do
+        table class: "index_grid" do
           collection.in_groups_of(number_of_columns).each do |group|
             build_row(group)
           end
@@ -58,7 +62,7 @@ module ActiveAdmin
       end
 
       def build_item(item)
-        td :for => item do
+        td for: item do
           instance_exec(item, &@page_presenter.block)
         end
       end

data/lib/active_admin/views/index_as_table.rb

@@ -1,66 +1,114 @@
 module ActiveAdmin
   module Views
 
-    # = Index as a Table
+    # # Index as a Table
     #
     # By default, the index page is a table with each of the models content columns and links to
     # show, edit and delete the object. There are many ways to customize what gets
     # displayed.
     #
-    # == Defining Columns
+    # ## Defining Columns
     #
     # To display an attribute or a method on a resource, simply pass a symbol into the
     # column method:
     #
-    #     index do
-    #       selectable_column
-    #       column :title
-    #     end
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   column :title
+    # end
+    # ```
+    #
+    # For association columns we make an educated guess on what to display by
+    # calling the following methods in the following order:
+    #
+    # ```ruby
+    # :display_name, :full_name, :name, :username, :login, :title, :email, :to_s
+    # ```
+    #
+    # This can be customized in `config/initializers/active_admin.rb`.
     #
     # If the default title does not work for you, pass it as the first argument:
     #
-    #     index do
-    #       selectable_column
-    #       column "My Custom Title", :title
-    #     end
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   column "My Custom Title", :title
+    # end
+    # ```
+    #
+    # Sometimes that just isn't enough and you need to write some view-specific code.
+    # For example, say we wanted a "Title" column that links to the posts admin screen.
+    #
+    # `column` accepts a block that will be rendered for each of the objects in the collection.
+    # The block is called once for each resource, which is passed as an argument to the block.
+    #
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   column "Title" do |post|
+    #     link_to post.title, admin_post_path(post)
+    #   end
+    # end
+    # ```
     #
-    # Sometimes calling methods just isn't enough and you need to write some view
-    # specific code. For example, say we wanted a colum called Title which holds a
-    # link to the posts admin screen.
+    # To setup links to View, Edit and Delete a resource, use the `actions` method:
     #
-    # The column method accepts a block as an argument which will then be rendered
-    # within the context of the view for each of the objects in the collection.
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   column :title
+    #   actions
+    # end
+    # ```
     #
-    #     index do
-    #       selectable_column
-    #       column "Title" do |post|
-    #         link_to post.title, admin_post_path(post)
-    #       end
-    #     end
+    # You can also append custom links to the default links:
     #
-    # The block gets called once for each resource in the collection. The resource gets passed into
-    # the block as an argument.
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   column :title
+    #   actions do |post|
+    #     item "Preview", admin_preview_post_path(post), class: "member_link"
+    #   end
+    # end
+    # ```
     #
-    # To setup links to View, Edit and Delete a resource, use the default_actions method:
+    # Or forego the default links entirely:
     #
-    #     index do
-    #       selectable_column
-    #       column :title
-    #       default_actions
-    #     end
+    # ```ruby
+    # index do
+    #   column :title
+    #   actions defaults: false do |post|
+    #     item "View", admin_post_path(post)
+    #   end
+    # end
+    # ```
     #
-    # Alternatively, you can create a column with custom links:
+    # Or append custom action with custom html via arbre:
     #
-    #     index do
-    #       selectable_column
-    #       column :title
-    #       column "Actions" do |post|
-    #         link_to "View", admin_post_path(post)
-    #       end
-    #     end
+    # ```ruby
+    # index do
+    #   column :title
+    #   actions do |post|
+    #     a link_to "View", admin_post_path(post)
+    #   end
+    # end
+    # ```
     #
+    # In case you prefer to list actions links in a dropdown menu:
     #
-    # == Sorting
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   column :title
+    #   actions dropdown: true do |post|
+    #     item "Preview", admin_preview_post_path(post)
+    #   end
+    # end
+    # ```
+    #
+    # ## Sorting
     #
     # When a column is generated from an Active Record attribute, the table is
     # sortable by default. If you are creating a custom column, you may need to give
@@ -72,48 +120,89 @@ module ActiveAdmin
     # By default, this is the column on the resource's table that the attribute corresponds to.
     # Otherwise, any attribute that the resource collection responds to can be used.
     #
-    #     index do
-    #       column "Title", :sortable => :title do |post|
-    #         link_to post.title, admin_post_path(post)
-    #       end
-    #     end
+    # ```ruby
+    # index do
+    #   column :title, sortable: :title do |post|
+    #     link_to post.title, admin_post_path(post)
+    #   end
+    # end
+    # ```
     #
-    # You can also sort using an attribute on another table by passing the table name
-    # and the attribute separated by a dot:
+    # You can turn off sorting on any column by passing false:
     #
-    #     index do
-    #       column :title, :sortable => 'categories.name'
-    #     end
+    # ```ruby
+    # index do
+    #   column :title, sortable: false
+    # end
+    # ```
     #
-    # You can turn off sorting on any column by passing false:
+    # It's also possible to sort by PostgreSQL's hstore column key. You should set `sortable`
+    # option to a `column->'key'` value:
+    #
+    # ```ruby
+    # index do
+    #   column :keywords, sortable: "meta->'keywords'"
+    # end
+    # ```
+    #
+    # ## Associated Sorting
     #
-    #     index do
-    #       column :title, :sortable => false
-    #     end
+    # You're normally able to sort columns alphabetically, but by default you
+    # can't sort by associated objects. Though with a few simple changes, you can.
     #
-    # == Showing and Hiding Columns
+    # Assuming you're on the Books index page, and Book has_one Publisher:
+    #
+    # ```ruby
+    # controller do
+    #   def scoped_collection
+    #     super.includes :publisher # prevents N+1 queries to your database
+    #   end
+    # end
+    # ```
+    #
+    # Then it's simple to sort by any Publisher attribute from within the index table:
+    #
+    # ```ruby
+    # index do
+    #   column :publisher, sortable: 'publishers.name'
+    # end
+    # ```
+    #
+    # ## Showing and Hiding Columns
     #
     # The entire index block is rendered within the context of the view, so you can
     # easily do things that show or hide columns based on the current context.
     #
     # For example, if you were using CanCan:
     #
-    #     index do
-    #       column :title, :sortable => false
-    #       if can? :manage, Post
-    #         column :some_secret_data
-    #       end
-    #     end
+    # ```ruby
+    # index do
+    #   column :title, sortable: false
+    #   column :secret_data if can? :manage, Post
+    # end
+    # ```
+    #
+    # ## Custom row class
+    #
+    # In order to add special class to table rows pass the proc object as a `:row_class` option
+    # of the `index` method.
+    #
+    # ```ruby
+    # index row_class: ->elem { 'active' if elem.active? } do
+    #   # columns
+    # end
+    # ```
     #
     class IndexAsTable < ActiveAdmin::Component
 
       def build(page_presenter, collection)
         table_options = {
-          :id => "index_table_#{active_admin_config.resource_name.plural}",
-          :sortable => true,
-          :class => "index_table index",
-          :i18n => active_admin_config.resource_class,
-          :paginator => page_presenter[:paginator] != false
+          id: "index_table_#{active_admin_config.resource_name.plural}",
+          sortable: true,
+          class: "index_table index",
+          i18n: active_admin_config.resource_class,
+          paginator: page_presenter[:paginator] != false,
+          row_class: page_presenter[:row_class]
         }
 
         table_for collection, table_options do |t|
@@ -128,11 +217,12 @@ module ActiveAdmin
 
       def default_table
         proc do
-          id_column
+          selectable_column
+          id_column if resource_class.primary_key # View based Models have no primary_key
           resource_class.content_columns.each do |col|
             column col.name.to_sym
           end
-          default_actions
+          actions
         end
       end
 
@@ -149,90 +239,113 @@ module ActiveAdmin
         # Display a column for checkbox
         def selectable_column
           return unless active_admin_config.batch_actions.any?
-          column( resource_selection_toggle_cell, { :class => "selectable" } ) { |resource| resource_selection_cell( resource ) }
+          column resource_selection_toggle_cell, class: 'col-selectable', sortable: false do |resource|
+            resource_selection_cell resource
+          end
         end
 
         # Display a column for the id
         def id_column
-          column(resource_class.human_attribute_name(resource_class.primary_key), :sortable => resource_class.primary_key) do |resource|
-            link_to resource.id, resource_path(resource), :class => "resource_id_link"
+          raise "#{resource_class.name} as no primary_key!" unless resource_class.primary_key
+          column(resource_class.human_attribute_name(resource_class.primary_key), sortable: resource_class.primary_key) do |resource|
+            if controller.action_methods.include?('show')
+              link_to resource.id, resource_path(resource), class: "resource_id_link"
+            else
+              resource.id
+            end
           end
         end
 
+        def default_actions
+          raise '`default_actions` is no longer provided in ActiveAdmin 1.x. Use `actions` instead.'
+        end
+
         # Add links to perform actions.
         #
-        #   # Add default links.
-        #   actions
+        # ```ruby
+        # # Add default links.
+        # actions
+        #
+        # # Add default links with a custom column title (empty by default).
+        # actions name: 'A title!'
+        #
+        # # Append some actions onto the end of the default actions.
+        # actions do |admin_user|
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        #   item 'Grant User', grant_user_admin_user_path(admin_user)
+        # end
+        #
+        # # 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)
+        # end
+        #
+        # # Custom actions without the defaults.
+        # actions defaults: false do |admin_user|
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        # end
         #
-        #   # Append some actions onto the end of the default actions.
-        #   actions do |admin_user|
-        #     link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
-        #   end
+        # # Append some actions onto the end of the default actions displayed in a Dropdown Menu
+        # actions dropdown: true do |admin_user|
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        # end
         #
-        #   # Custom actions without the defaults.
-        #   actions :defaults => false do |admin_user|
-        #     link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
-        #   end
+        # # Custom actions without the defaults displayed in a Dropdown Menu.
+        # actions defaults: false, dropdown: true, dropdown_name: 'Additional actions' do |admin_user|
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        # end
+        #
+        # ```
         def actions(options = {}, &block)
-          options = {
-            :name => "",
-            :defaults => true
-          }.merge(options)
-          column options[:name] do |resource|
-            text_node default_actions(resource) if options[:defaults]
-            text_node instance_exec(resource, &block) if block_given?
-          end
-        end
+          name          = options.delete(:name)     { '' }
+          defaults      = options.delete(:defaults) { true }
+          dropdown      = options.delete(:dropdown) { false }
+          dropdown_name = options.delete(:dropdown_name) { I18n.t 'active_admin.dropdown_actions.button_label', default: 'Actions' }
 
-        def default_actions(*args)
-          links = proc do |resource|
-            links = ''.html_safe
-            if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
-              links << link_to(I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link")
-            end
-            if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
-              links << link_to(I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link")
-            end
-            if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
-              links << link_to(I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, 'data-confirm' => I18n.t('active_admin.delete_confirmation'), :class => "member_link delete_link")
+          options[:class] ||= 'col-actions'
+
+          column name, options do |resource|
+            if dropdown
+              dropdown_menu dropdown_name do
+                defaults(resource) if defaults
+                instance_exec(resource, &block) if block_given?
+              end
+            else
+              table_actions do
+                defaults(resource, css_class: :member_link) if defaults
+                if block_given?
+                  block_result = instance_exec(resource, &block)
+                  text_node block_result unless block_result.is_a? Arbre::Element
+                end
+              end
             end
-            links
           end
+        end
+
+      private
 
-          options = args.extract_options!
-          if options.present? || args.empty?
-            actions options
-          else
-            links.call(args.first)
+        def defaults(resource, options = {})
+          if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
+            item I18n.t('active_admin.view'), resource_path(resource), class: "view_link #{options[:css_class]}"
+          end
+          if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
+            item I18n.t('active_admin.edit'), edit_resource_path(resource), class: "edit_link #{options[:css_class]}"
+          end
+          if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
+            item I18n.t('active_admin.delete'), resource_path(resource), class: "delete_link #{options[:css_class]}",
+              method: :delete, data: {confirm: I18n.t('active_admin.delete_confirmation')}
           end
         end
 
-        # Display A Status Tag Column
-        #
-        #   index do |i|
-        #     i.status_tag :state
-        #   end
-        #
-        #   index do |i|
-        #     i.status_tag "State", :status_name
-        #   end
-        #
-        #   index do |i|
-        #     i.status_tag do |post|
-        #       post.published? ? 'published' : 'draft'
-        #     end
-        #   end
-        #
-        def status_tag(*args, &block)
-          col = Column.new(*args, &block)
-          data = col.data
-          col.data = proc do |resource|
-            status_tag call_method_or_proc_on(resource, data)
+        class TableActions < ActiveAdmin::Component
+          builder_method :table_actions
+
+          def item *args
+            text_node link_to *args
           end
-          add_column col
         end
-      end # TableBuilder
+      end # IndexTableFor
 
-    end # Table
+    end # IndexAsTable
   end
 end