activeadmin 0.6.6 → 1.0.0.pre1

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

@@ -14,7 +14,7 @@ module ActiveAdmin
 
         def add_classes_to_body
           @body.add_class(params[:action])
-          @body.add_class(params[:controller].gsub('/', '_'))
+          @body.add_class(params[:controller].tr('/', '_'))
           @body.add_class("active_admin")
           @body.add_class("logged_in")
           @body.add_class(active_admin_namespace.name.to_s + "_namespace")
@@ -22,7 +22,7 @@ module ActiveAdmin
 
         def build_active_admin_head
           within @head do
-            insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_application.site_title)].join(" | ")
+            insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_namespace.site_title)].compact.join(" | ")
             active_admin_application.stylesheets.each do |style, options|
               text_node stylesheet_link_tag(style, options).html_safe
             end
@@ -30,18 +30,19 @@ module ActiveAdmin
             active_admin_application.javascripts.each do |path|
               text_node(javascript_include_tag(path))
             end
-            
-            if active_admin_application.favicon
-              text_node(favicon_link_tag(active_admin_application.favicon))
+
+            if active_admin_namespace.favicon
+              text_node(favicon_link_tag(active_admin_namespace.favicon))
             end
-            
+
             text_node csrf_meta_tag
           end
         end
 
         def build_page
           within @body do
-            div :id => "wrapper" do
+            div id: "wrapper" do
+              build_unsupported_browser
               build_header
               build_title_bar
               build_page_content
@@ -50,6 +51,12 @@ module ActiveAdmin
           end
         end
 
+        def build_unsupported_browser
+          if active_admin_namespace.unsupported_browser_matcher =~ env["HTTP_USER_AGENT"]
+            insert_tag view_factory.unsupported_browser
+          end
+        end
+
         def build_header
           insert_tag view_factory.header, active_admin_namespace, current_menu
         end
@@ -58,35 +65,32 @@ module ActiveAdmin
           insert_tag view_factory.title_bar, title, action_items_for_action
         end
 
-
         def build_page_content
           build_flash_messages
-          div :id => "active_admin_content", :class => (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
+          div id: "active_admin_content", class: (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
             build_main_content_wrapper
             build_sidebar unless skip_sidebar?
           end
         end
 
         def build_flash_messages
-          if active_admin_flash_messages.any?
-            div :class => 'flashes' do
-              active_admin_flash_messages.each do |type, message|
-                div message, :class => "flash flash_#{type}"
-              end
+          div class: 'flashes' do
+            flash_messages.each do |type, message|
+              div message, class: "flash flash_#{type}"
             end
           end
         end
 
         def build_main_content_wrapper
-          div :id => "main_content_wrapper" do
-            div :id => "main_content" do
+          div id: "main_content_wrapper" do
+            div id: "main_content" do
               main_content
             end
           end
         end
 
         def main_content
-          I18n.t('active_admin.main_content', :model => self.class.name).html_safe
+          I18n.t('active_admin.main_content', model: title).html_safe
         end
 
         def title
@@ -117,7 +121,7 @@ module ActiveAdmin
 
         # Renders the sidebar
         def build_sidebar
-          div :id => "sidebar" do
+          div id: "sidebar" do
             sidebar_sections_for_action.collect do |section|
               sidebar_section(section)
             end

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

@@ -5,23 +5,21 @@ module ActiveAdmin
       class Form < Base
 
         def title
-          assigns[:page_title] || I18n.t("active_admin.#{params[:action]}_model",
-                                         :model => active_admin_config.resource_label)
+          assigns[:page_title] || I18n.t("active_admin.#{normalized_action}_model",
+                                         model: active_admin_config.resource_label)
         end
 
         def form_presenter
-            active_admin_config.get_page_presenter(:form) || default_form_config
+          active_admin_config.get_page_presenter(:form) || default_form_config
         end
 
         def main_content
-          form_options = default_form_options.merge(form_presenter.options)
+          options = default_form_options.merge form_presenter.options
 
-          if form_options[:partial]
-            render(form_options[:partial])
+          if options[:partial]
+            render options[:partial]
           else
-            active_admin_form_for(resource, form_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,19 +7,20 @@ 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
 
+        # Retrieves the given page presenter, or uses the default.
         def config
-          active_admin_config.get_page_presenter(:index, params[:as]) || default_index_config
+          active_admin_config.get_page_presenter(:index, params[:as]) ||
+          ActiveAdmin::PagePresenter.new(as: :table)
         end
 
-        # Render's the index configuration that was set in the
+        # Renders the index configuration that was set in the
         # controller. Defaults to rendering the ActiveAdmin::Pages::Index::Table
         def main_content
           wrap_with_batch_action_form do
@@ -59,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
@@ -81,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
@@ -101,19 +102,6 @@ module ActiveAdmin
           end
         end
 
-        # Creates a default configuration for the resource class. This is a table
-        # with each column displayed as well as all the default actions
-        def default_index_config
-          @default_index_config ||= ::ActiveAdmin::PagePresenter.new(:as => :table) do |display|
-            selectable_column
-            id_column
-            resource_class.content_columns.each do |col|
-              column col.name.to_sym
-            end
-            default_actions
-          end
-        end
-
         # Returns the actual class for renderering the main content on the index
         # page. To set this, use the :as option in the page_presenter block.
         def find_index_renderer_class(klass)
@@ -122,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,36 +2,11 @@ module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base
 
-      class_option :bourbon, :type => :boolean, :default => true,
-                   :desc => "Generate Bourbon scss files if using Rails 3.0.x"
-
-      class_option :jquery, :type => :boolean, :default => true,
-                   :desc => "Generate jQuery js files if using Rails 3.0.x"
-
-      def self.source_root
-        @_active_admin_source_root ||= File.expand_path("../templates", __FILE__)
-      end
+      source_root File.expand_path("../templates", __FILE__)
 
       def install_assets
-        require 'rails'
-        require 'active_admin'
-
-        if ActiveAdmin.use_asset_pipeline?
-          template '3.1/active_admin.js', 'app/assets/javascripts/active_admin.js'
-          template '3.1/active_admin.css.scss', 'app/assets/stylesheets/active_admin.css.scss'
-        else
-          template '3.0/active_admin.js', 'public/javascripts/active_admin.js'
-          directory '../../../../../app/assets/images/active_admin', 'public/images/active_admin'
-          generate "jquery:install --ui" if options.jquery?
-          install_bourbon if options.bourbon?
-        end
-      end
-
-      private
-
-      def install_bourbon
-        rake "bourbon:install"
-        create_file "public/stylesheets/sass/_bourbon.scss", '@import "bourbon/bourbon"'
+        template 'active_admin.js.coffee', 'app/assets/javascripts/active_admin.js.coffee'
+        template 'active_admin.css.scss',  'app/assets/stylesheets/active_admin.css.scss'
       end
 
     end