activeadmin 0.4.4 → 0.5.0.pre

data/lib/active_admin/resource_dsl.rb

@@ -68,8 +68,12 @@ module ActiveAdmin
     #     column("Author") { |post| post.author.full_name }
     #   end
     #
-    def csv(&block)
-      config.csv_builder = CSVBuilder.new(&block)
+    #   csv :separator => ";" do
+    #     column :name
+    #   end
+    #
+    def csv(options={}, &block)
+      config.csv_builder = CSVBuilder.new(options, &block)
     end
 
     # Member Actions give you the functionality of defining both the
@@ -93,14 +97,20 @@ module ActiveAdmin
     # 
     def member_action(name, options = {}, &block)
       config.member_actions << ControllerAction.new(name, options)
+      title = options.delete(:title)
+
       controller do
+        before_filter(:only => [name]) { @page_title = title } if title
         define_method(name, &block || Proc.new{})
       end
     end
 
     def collection_action(name, options = {}, &block)
       config.collection_actions << ControllerAction.new(name, options)
+      title = options.delete(:title)
+
       controller do
+        before_filter(:only => [name]){ @page_title = title } if title
         define_method(name, &block || Proc.new{})
       end
     end
@@ -135,10 +145,6 @@ module ActiveAdmin
     delegate :before_save,    :after_save,    :to => :controller
     delegate :before_destroy, :after_destroy, :to => :controller
 
-    # Filters
-    delegate :filter, :to => :controller
-
-
     # Standard rails filters
     delegate :before_filter, :skip_before_filter, :after_filter, :around_filter, :to => :controller
 

data/lib/active_admin/router.rb

@@ -14,14 +14,22 @@ module ActiveAdmin
     #   end
     #
     def apply(router)
-      # Define any necessary dashboard routes
+      # Define any necessary dashboard routes and root
       router.instance_exec(@application.namespaces.values) do |namespaces|
         namespaces.each do |namespace|
+          root_and_dashboard_routes = Proc.new do
+            root :to => (namespace.root_to || "dashboard#index")
+            if ActiveAdmin::Dashboards.built?
+              match '/dashboard' => 'dashboard#index', :as => 'dashboard'
+            end
+          end
+
           if namespace.root?
-            match '/' => 'dashboard#index', :as => 'dashboard'
+            instance_eval &root_and_dashboard_routes
           else
-            name = namespace.name
-            match name.to_s => "#{name}/dashboard#index", :as => "#{name.to_s}_dashboard"
+            namespace(namespace.name) do
+              instance_eval &root_and_dashboard_routes
+            end
           end
         end
       end
@@ -35,7 +43,7 @@ module ActiveAdmin
           route_definition_block = Proc.new do
             case config
             when Resource
-              resources config.underscored_resource_name.pluralize do
+              resources config.resource_name.route_key, :only => config.defined_actions do
                 # Define any member actions
                 member do
                   config.member_actions.each do |action|
@@ -49,9 +57,12 @@ module ActiveAdmin
                   config.collection_actions.each do |action|
                     send(action.http_verb, action.name)
                   end
+
+                  post :batch_action
                 end
               end
             when Page
+
               match "/#{config.underscored_resource_name}" => "#{config.underscored_resource_name}#index"
               config.page_actions.each do |action|
                 match "/#{config.underscored_resource_name}/#{action.name}" => "#{config.underscored_resource_name}##{action.name}", :via => action.http_verb
@@ -70,14 +81,23 @@ module ActiveAdmin
 
               # Make the nested belongs_to routes
               # :only is set to nothing so that we don't clobber any existing routes on the resource
-              resources config.belongs_to_config.target.underscored_resource_name.pluralize, :only => [] do
+              resources config.belongs_to_config.target.resource_name.plural, :only => [] do
                 instance_eval &routes_for_belongs_to
               end
+
+              # Batch action path is not nested.
+              if config.is_a?(Resource)
+                resources config.resource_name.route_key, :only => config.defined_actions do
+                  collection do
+                    post :batch_action
+                  end
+                end
+              end
             end
           end
 
           # Add on the namespace if required
-          if !config.namespace.root?
+          unless config.namespace.root?
             routes_in_namespace = route_definition_block.dup
             route_definition_block = Proc.new do
               namespace config.namespace.name do
@@ -90,6 +110,5 @@ module ActiveAdmin
         end
       end
     end
-
   end
 end

data/lib/active_admin/scope.rb

@@ -24,6 +24,7 @@ module ActiveAdmin
       @scope_method = method
       # Scope ':all' means no scoping
       @scope_method ||= name.to_sym unless name.to_sym == :all
+      @scope_method = nil if method && method.to_s == 'all'
       @id = @name.gsub(' ', '').underscore
       if block_given?
         @scope_method = nil

data/lib/active_admin/sidebar_section.rb

@@ -12,7 +12,7 @@ module ActiveAdmin
 
     # The id gets used for the div in the view
     def id
-      name.to_s.downcase.underscore + '_sidebar_section'
+      "#{name.to_s.downcase.underscore}_sidebar_section".parameterize
     end
 
     def icon?
@@ -25,11 +25,7 @@ module ActiveAdmin
 
     # The title gets displayed within the section in the view
     def title
-      begin
-        I18n.t!("active_admin.sidebars.#{name.to_s}")
-      rescue I18n::MissingTranslationData
-        name.to_s.titlecase
-      end
+      I18n.t("active_admin.sidebars.#{name.to_s}", :default => name.to_s.titlecase)
     end
 
     # If a block is not passed in, the name of the partial to render

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.4.4'
+  VERSION = '0.5.0.pre'
 end

data/lib/active_admin/view_factory.rb

@@ -4,21 +4,26 @@ module ActiveAdmin
   class ViewFactory < AbstractViewFactory
 
     # Register Helper Renderers
-    register  :global_navigation  => ActiveAdmin::Views::TabbedNavigation,
-              :action_items       => ActiveAdmin::Views::ActionItems,
-              :header             => ActiveAdmin::Views::HeaderRenderer,
-              :dashboard_section  => ActiveAdmin::Views::DashboardSection,
-              :index_scopes       => ActiveAdmin::Views::Scopes,
-              :blank_slate        => ActiveAdmin::Views::BlankSlate
+    register  :global_navigation    => ActiveAdmin::Views::TabbedNavigation,
+              :site_title           => ActiveAdmin::Views::SiteTitle,
+              :utility_navigation   => ActiveAdmin::Views::UtilityNav,
+              :action_items         => ActiveAdmin::Views::ActionItems,
+              :title_bar            => ActiveAdmin::Views::TitleBar,
+              :header               => ActiveAdmin::Views::Header,
+              :footer               => ActiveAdmin::Views::Footer,
+              :dashboard_section    => ActiveAdmin::Views::DashboardSection,
+              :index_scopes         => ActiveAdmin::Views::Scopes,
+              :blank_slate          => ActiveAdmin::Views::BlankSlate,
+              :action_list_popover  => ActiveAdmin::Views::ActionListPopover
 
     # Register All The Pages
-    register  :dashboard_page     => ActiveAdmin::Views::Pages::Dashboard,
-              :index_page         => ActiveAdmin::Views::Pages::Index,
-              :show_page          => ActiveAdmin::Views::Pages::Show,
-              :new_page           => ActiveAdmin::Views::Pages::Form,
-              :edit_page          => ActiveAdmin::Views::Pages::Form,
-              :layout             => ActiveAdmin::Views::Pages::Layout,
-              :page               => ActiveAdmin::Views::Pages::Page
+    register  :dashboard_page     	=> ActiveAdmin::Views::Pages::Dashboard,
+              :index_page         	=> ActiveAdmin::Views::Pages::Index,
+              :show_page          	=> ActiveAdmin::Views::Pages::Show,
+              :new_page           	=> ActiveAdmin::Views::Pages::Form,
+              :edit_page          	=> ActiveAdmin::Views::Pages::Form,
+              :layout             	=> ActiveAdmin::Views::Pages::Layout,
+              :page               	=> ActiveAdmin::Views::Pages::Page
 
   end
 end

data/lib/active_admin/view_helpers.rb

@@ -6,7 +6,6 @@ module ActiveAdmin
 
     include AssignsWithIndifferentAccessHelper
     include ActiveAdminApplicationHelper
-    include RendererHelper
     include AutoLinkHelper
     include BreadcrumbHelper
     include DisplayHelper
@@ -14,7 +13,6 @@ module ActiveAdmin
     include MethodOrProcHelper
     include SidebarHelper
     include FormHelper
-    include FilterFormHelper
     include TitleHelper
     include ViewFactoryHelper
 

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -13,10 +13,11 @@ module ActiveAdmin
       #
       def auto_link(resource, link_content = nil)
         content = link_content || display_name(resource)
-        if registration = active_admin_resource_for(resource.class)
+        if (registration = active_admin_resource_for(resource.class))
           begin
             content = link_to(content, send(registration.route_instance_path, resource))
           rescue
+            # ignored
           end
         end
         content

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -2,31 +2,30 @@ module ActiveAdmin
   module ViewHelpers
     module BreadcrumbHelper
 
-			# Returns an array of links to use in a breadcrumb
-			def breadcrumb_links(path = nil)
-				path ||= request.fullpath
-				parts = path.gsub(/^\//, '').split('/')
-				parts.pop unless %w{ create update }.include?(params[:action])
-				crumbs = []
-				parts.each_with_index do |part, index|
-					name = ""
-					if part =~ /^\d/ && parent = parts[index - 1]
-						begin
-							parent_class = parent.singularize.camelcase.constantize
-							obj = parent_class.find(part.to_i)
-							name = obj.display_name if obj.respond_to?(:display_name)
-						rescue
-						end
-					end
-					name = part.titlecase if name == ""
-					begin
-						crumbs << link_to( I18n.translate!("activerecord.models.#{part.singularize}", :count => 2), "/" + parts[0..index].join('/'))
-					rescue I18n::MissingTranslationData
-						crumbs << link_to( name, "/" + parts[0..index].join('/'))
-					end
-				end
-				crumbs
-			end
+      # Returns an array of links to use in a breadcrumb
+      def breadcrumb_links(path = nil)
+        path ||= request.fullpath
+        parts = path.gsub(/^\//, '').split('/')
+        parts.pop unless %w{ create update }.include?(params[:action])
+        crumbs = []
+        parts.each_with_index do |part, index|
+          name = nil
+          if part =~ /^\d|^[a-f0-9]{24}$/ && (parent = parts[index - 1])
+            begin
+              parent_class = parent.singularize.camelcase.constantize
+              obj = parent_class.find(part[/^[a-f0-9]{24}$/] ? part : part.to_i)
+              name = display_name(obj)
+            rescue
+              # ignored
+            end
+          end
+          
+          name ||= I18n.t("activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase)
+
+          crumbs << link_to( name, "/" + parts[0..index].join('/'))
+        end
+        crumbs
+      end
 
     end
   end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
         case object
         when String
           object
-        when Arbre::HTML::Element
+        when Arbre::Element
           object
         when Date, Time
           localize(object, :format => :long)

data/lib/active_admin/view_helpers/fields_for.rb

@@ -0,0 +1,44 @@
+module ActiveAdmin
+  module ViewHelpers
+    module FormHelper
+
+      # Flatten a params Hash to an array of fields.
+      #
+      # @param params [Hash]
+      # @param options [Hash] :namespace and :except
+      #
+      # @return [Array] of [Hash] with one element.
+      #
+      # @example
+      #   fields_for_params(scope: "all", users: ["greg"])
+      #     => [ {"scope" => "all"} , {"users[]" => "greg"} ]
+      #
+      def fields_for_params(params, options = {})
+        namespace = options[:namespace]
+        except = options[:except].is_a?(Array) ? options[:except] : [options[:except]]
+
+        params.map do |k, v|
+          next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
+          next if except.map(&:to_s).include?(k.to_s)
+
+          if namespace
+            k = "#{namespace}[#{k}]"
+          end
+
+          case v
+          when String
+            { k => v }
+          when Hash
+            fields_for_params(v, :namespace => k)
+          when Array
+            v.map do |v|
+              { "#{k}[]" => v }
+            end
+          else
+            raise "I don't know what to do with #{v.class} params: #{v.inspect}"
+          end
+        end.flatten.compact
+      end
+    end
+  end
+end

data/lib/active_admin/view_helpers/form_helper.rb

@@ -8,6 +8,12 @@ module ActiveAdmin
         semantic_form_for resource, options, &block
       end
 
+      def hidden_field_tags_for(params, options={})
+        fields_for_params(params, options).map do |kv|
+          k, v = kv.first
+          hidden_field_tag k, v
+        end.join("\n").html_safe
+      end
     end
   end
 end

data/lib/active_admin/view_helpers/view_factory_helper.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     module ViewFactoryHelper
 
       def view_factory
-        active_admin_application.view_factory
+        active_admin_namespace.view_factory
       end
 
     end

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

@@ -0,0 +1,29 @@
+require 'active_admin/views/components/popover'
+
+module ActiveAdmin
+  module Views
+    # Build an ActionListPopover
+    class ActionListPopover < ActiveAdmin::Views::Popover
+      builder_method :action_list_popover
+      
+      
+      def build(*args, &block)
+        @contents = ul :class => "popover_contents"
+        
+        options = args.extract_options!
+        
+        super(options)
+      end
+      
+      def action(title, url, *args)
+        options = args.extract_options!
+        within @contents do
+          li do
+            text_node link_to( title, url, options )
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -35,7 +35,11 @@ module ActiveAdmin
       end
 
       def header_content_for(attr)
-        @record.class.respond_to?(:human_attribute_name) ? @record.class.human_attribute_name(attr).titleize : attr.to_s.titleize
+        if @record.class.respond_to?(:human_attribute_name)
+          @record.class.human_attribute_name(attr, :default => attr.to_s.titleize)
+        else
+          attr.to_s.titleize
+        end
       end
 
       def empty_value
@@ -50,7 +54,7 @@ module ActiveAdmin
                   content_for_attribute(attr_or_proc)
                 end
         value = pretty_format(value)
-        value == "" || value == nil ? empty_value : value
+        value == "" || value.nil? ? empty_value : value
       end
 
       def content_for_attribute(attr)

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

@@ -0,0 +1,73 @@
+require 'active_admin/views/components/popover'
+
+module ActiveAdmin
+  module Views
+
+    # Action List - A button with a drop down menu of links
+    #
+    # Creating a new action list:
+    #
+    #     dropdown_menu "Administration" do
+    #       item "Edit Details", edit_details_path
+    #       item "Edit My Account", edit_my_acccount_path
+    #     end
+    #
+    # This will create a button with the label "Administration" and
+    # a drop down once clicked with 2 options.
+    #
+    class DropdownMenu < ActiveAdmin::Component
+      builder_method :dropdown_menu
+
+      # Build a new action list
+      #
+      # @param [String] name  The name to display in the button
+      #
+      # @param [Hash] options A set of options that get passed along to
+      #                       to the parent dom element.
+      def build(name, options = {})
+        options = options.dup
+
+        # Easily set options for the button or menu
+        button_options  = options.delete(:button) || {}
+        menu_options = options.delete(:menu) || {}
+
+        @button  = build_button(name, button_options)
+        @menu = build_menu(menu_options)
+
+        super(options)
+      end
+
+      def item(*args)
+        within @menu do
+          li link_to(*args)
+        end
+      end
+
+      private
+
+      def build_button(name, button_options)
+        button_options[:class] ||= ""
+        button_options[:class] << " dropdown_menu_button"
+
+        button_options[:href] = "#"
+
+        a name, button_options
+      end
+
+      def build_menu(options)
+        options[:class] ||= ""
+        options[:class] << " dropdown_menu_list"
+
+        menu_list = nil
+
+        div :class => "dropdown_menu_list_wrapper", :style => "display:none;" do
+          menu_list = ul(options)
+        end
+
+        menu_list
+      end
+
+    end
+
+  end
+end