activeadmin 1.0.0.pre1 → 2.9.0

data/lib/active_admin/sidebar_section.rb

@@ -6,31 +6,25 @@ module ActiveAdmin
     attr_accessor :name, :options, :block
 
     def initialize(name, options = {}, &block)
-      @name, @options, @block = name, options, block
+      @name = name.to_s
+      @options = options
+      @block = block
       normalize_display_options!
     end
 
     # The id gets used for the div in the view
     def id
-      "#{name.to_s.downcase.underscore}_sidebar_section".parameterize
-    end
-
-    def icon?
-      !!options[:icon]
-    end
-
-    def icon
-      options[:icon] if icon?
+      "#{name.downcase.underscore}_sidebar_section".parameterize
     end
 
     # The title gets displayed within the section in the view
     def title
-      I18n.t("active_admin.sidebars.#{name.to_s}", default: name.to_s.titlecase)
+      I18n.t("active_admin.sidebars.#{name}", default: name.titlecase)
     end
 
     # If a block is not passed in, the name of the partial to render
     def partial_name
-      options[:partial] || "#{name.to_s.downcase.tr(' ', '_')}_sidebar"
+      options[:partial] || "#{name.downcase.tr(' ', '_')}_sidebar"
     end
 
     def custom_class

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.0.pre1'
+  VERSION = "2.9.0"
 end

data/lib/active_admin/view_factory.rb

@@ -1,28 +1,27 @@
-require 'active_admin/abstract_view_factory'
+require "active_admin/abstract_view_factory"
 
 module ActiveAdmin
   class ViewFactory < AbstractViewFactory
 
     # Register Helper Renderers
-    register  global_navigation:   ActiveAdmin::Views::TabbedNavigation,
-              utility_navigation:  ActiveAdmin::Views::TabbedNavigation,
-              site_title:          ActiveAdmin::Views::SiteTitle,
-              unsupported_browser: ActiveAdmin::Views::UnsupportedBrowser,
-              action_items:        ActiveAdmin::Views::ActionItems,
-              title_bar:           ActiveAdmin::Views::TitleBar,
-              header:              ActiveAdmin::Views::Header,
-              footer:              ActiveAdmin::Views::Footer,
-              index_scopes:        ActiveAdmin::Views::Scopes,
-              blank_slate:         ActiveAdmin::Views::BlankSlate,
-              action_list_popover: ActiveAdmin::Views::ActionListPopover
+    register global_navigation: ActiveAdmin::Views::TabbedNavigation,
+             utility_navigation: ActiveAdmin::Views::TabbedNavigation,
+             site_title: ActiveAdmin::Views::SiteTitle,
+             unsupported_browser: ActiveAdmin::Views::UnsupportedBrowser,
+             action_items: ActiveAdmin::Views::ActionItems,
+             title_bar: ActiveAdmin::Views::TitleBar,
+             header: ActiveAdmin::Views::Header,
+             footer: ActiveAdmin::Views::Footer,
+             index_scopes: ActiveAdmin::Views::Scopes,
+             blank_slate: ActiveAdmin::Views::BlankSlate
 
     # Register All The Pages
-    register  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 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/auto_link_helper.rb

@@ -26,10 +26,10 @@ module ActiveAdmin
 
         if config.controller.action_methods.include?("show") &&
           authorized?(ActiveAdmin::Auth::READ, resource)
-          url_for config.route_instance_path resource
+          url_for config.route_instance_path resource, url_options
         elsif config.controller.action_methods.include?("edit") &&
           authorized?(ActiveAdmin::Auth::UPDATE, resource)
-          url_for config.route_edit_instance_path resource
+          url_for config.route_edit_instance_path resource, url_options
         end
       end
 

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -6,22 +6,22 @@ module ActiveAdmin
       def breadcrumb_links(path = request.path)
         # remove leading "/" and split up the URL
         # and remove last since it's used as the page title
-        parts = path.split('/').select(&:present?)[0..-2]
+        parts = path.split("/").select(&:present?)[0..-2]
 
         parts.each_with_index.map do |part, index|
           # 1. try using `display_name` if we can locate a DB object
           # 2. try using the model name translation
           # 3. default to calling `titlecase` on the URL fragment
-          if part =~ /\A(\d+|[a-f0-9]{24})\z/ && parts[index-1]
+          if part =~ /\A(\d+|[a-f0-9]{24}|(?:[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}))\z/ && parts[index - 1]
             parent = active_admin_config.belongs_to_config.try :target
-            config = parent && parent.resource_name.route_key == parts[index-1] ? parent : active_admin_config
-            name   = display_name config.find_resource part
+            config = parent && parent.resource_name.route_key == parts[index - 1] ? parent : active_admin_config
+            name = display_name config.find_resource part
           end
           name ||= I18n.t "activerecord.models.#{part.singularize}", count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT, default: part.titlecase
 
           # Don't create a link if the resource's show action is disabled
           if !config || config.defined_actions.include?(:show)
-            link_to name, '/' + parts[0..index].join('/')
+            link_to name, "/" + parts[0..index].join("/")
           else
             name
           end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -2,20 +2,21 @@ module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
-      DISPLAY_NAME_FALLBACK = ->{
-        name, klass = "", self.class
-        name << klass.model_name.human         if klass.respond_to? :model_name
+      DISPLAY_NAME_FALLBACK = -> {
+        name = ""
+        klass = self.class
+        name << klass.model_name.human if klass.respond_to? :model_name
         name << " ##{send(klass.primary_key)}" if klass.respond_to? :primary_key
         name.present? ? name : to_s
       }
       def DISPLAY_NAME_FALLBACK.inspect
-        'DISPLAY_NAME_FALLBACK'
+        "DISPLAY_NAME_FALLBACK"
       end
 
       # Attempts to call any known display name methods on the resource.
       # See the setting in `application.rb` for the list of methods and their priority.
       def display_name(resource)
-        render_in_context resource, display_name_method_for(resource) if resource
+        ERB::Util.html_escape(render_in_context(resource, display_name_method_for(resource))) unless resource.nil?
       end
 
       # Looks up and caches the first available display name method.
@@ -25,7 +26,7 @@ module ActiveAdmin
         @@display_name_methods_cache ||= {}
         @@display_name_methods_cache[resource.class] ||= begin
           methods = active_admin_application.display_name_methods - association_methods_for(resource)
-          method  = methods.detect{ |method| resource.respond_to? method }
+          method = methods.detect { |method| resource.respond_to? method }
 
           if method != :to_s || resource.method(method).source_location
             method
@@ -40,23 +41,64 @@ module ActiveAdmin
         resource.class.reflect_on_all_associations.map(&:name)
       end
 
+      def format_attribute(resource, attr)
+        value = find_value resource, attr
+
+        if value.is_a?(Arbre::Element)
+          value
+        elsif boolean_attr?(resource, attr, value)
+          Arbre::Context.new { status_tag value }
+        else
+          pretty_format value
+        end
+      end
+
+      def find_value(resource, attr)
+        if attr.is_a? Proc
+          attr.call resource
+        elsif resource.respond_to? attr
+          resource.public_send attr
+        elsif resource.respond_to? :[]
+          resource[attr]
+        end
+      end
+
       # Attempts to create a human-readable string for any object
       def pretty_format(object)
         case object
-        when String, Numeric, Arbre::Element
+        when String, Numeric, Symbol, Arbre::Element
           object.to_s
         when Date, Time
-          localize object, format: :long
+          I18n.localize object, format: active_admin_application.localize_format
+        when Array
+          format_collection(object)
         else
           if defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Base) ||
-             defined?(::Mongoid)      && object.class.include?(Mongoid::Document)
+             defined?(::Mongoid) && object.class.include?(Mongoid::Document)
             auto_link object
+          elsif defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Relation)
+            format_collection(object)
           else
             display_name object
           end
         end
       end
 
+      def format_collection(collection)
+        safe_join(collection.map { |item| pretty_format(item) }, ", ")
+      end
+
+      def boolean_attr?(resource, attr, value)
+        case value
+        when TrueClass, FalseClass
+          true
+        else
+          if resource.class.respond_to? :columns_hash
+            column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+          end
+        end
+      end
+
     end
   end
 end

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -1,11 +1,24 @@
 module ActiveAdmin
   module ViewHelpers
     module DownloadFormatLinksHelper
+      private
+
+      def build_download_formats(download_links)
+        download_links = instance_exec(&download_links) if download_links.is_a?(Proc)
+
+        if download_links.is_a?(Array) && !download_links.empty?
+          download_links
+        elsif download_links == false
+          []
+        else
+          self.class.formats
+        end
+      end
 
       def build_download_format_links(formats = self.class.formats)
         params = request.query_parameters.except :format, :commit
         div class: "download_links" do
-          span I18n.t('active_admin.download')
+          span I18n.t("active_admin.download")
           formats.each do |format|
             a format.upcase, href: url_for(params: params, format: format)
           end

data/lib/active_admin/view_helpers/fields_for.rb

@@ -15,11 +15,11 @@ module ActiveAdmin
       #
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
-        except = options[:except].is_a?(Array) ? options[:except] : [options[:except]]
+        except = Array.wrap(options[:except]).map &:to_s
 
         params.flat_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)
+          next if except.include?(k.to_s)
 
           if namespace
             k = "#{namespace}[#{k}]"
@@ -37,8 +37,8 @@ module ActiveAdmin
               { "#{k}[]" => v }
             end
           when nil
-            { k => '' }
-          when TrueClass,FalseClass
+            { k => "" }
+          when TrueClass, FalseClass
             { k => v }
           else
             raise "I don't know what to do with #{v.class} params: #{v.inspect}"

data/lib/active_admin/view_helpers/form_helper.rb

@@ -8,8 +8,8 @@ module ActiveAdmin
         end.content
       end
 
-      def hidden_field_tags_for(params, options={})
-        fields_for_params(params, options).map do |kv|
+      def hidden_field_tags_for(params, options = {})
+        fields_for_params(params.to_unsafe_hash, options).map do |kv|
           k, v = kv.first
           hidden_field_tag k, v, id: sanitize_to_id("hidden_active_admin_#{k}")
         end.join("\n").html_safe

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,4 +1,7 @@
+# Utility methods for internal use.
+# @private
 module MethodOrProcHelper
+  extend self
 
   # This method will either call the symbol on self or instance_exec the Proc
   # within self. Any args will be passed along to the method dispatch.
@@ -18,6 +21,8 @@ module MethodOrProcHelper
       send(symbol_or_proc, *args)
     when Proc
       instance_exec(*args, &symbol_or_proc)
+    else
+      symbol_or_proc
     end
   end
 
@@ -60,6 +65,8 @@ module MethodOrProcHelper
       else
         symbol_or_proc.call(receiver, *args)
       end
+    else
+      symbol_or_proc
     end
   end
 
@@ -71,16 +78,16 @@ module MethodOrProcHelper
     case string_symbol_or_proc
     when Symbol, Proc
       call_method_or_proc_on(obj, string_symbol_or_proc, options)
-    when String
+    else
       string_symbol_or_proc
     end
   end
 
-  # This method is different from the others in that it calls `instance_exec` on the reciever,
-  # passing it the proc. This evaluates the proc in the context of the reciever, thus changing
+  # This method is different from the others in that it calls `instance_exec` on the receiver,
+  # passing it the proc. This evaluates the proc in the context of the receiver, thus changing
   # what `self` means inside the proc.
   def render_in_context(context, obj, *args)
-    context ||= self # default to `self`
+    context = self if context.nil? # default to `self` only when nil
     case obj
     when Proc
       context.instance_exec *args, &obj

data/lib/active_admin/view_helpers/scope_name_helper.rb

@@ -0,0 +1,16 @@
+module ActiveAdmin
+  module ViewHelpers
+    module ScopeNameHelper
+
+      def scope_name(scope)
+        case scope.name
+        when Proc then
+          self.instance_exec(&scope.name).to_s
+        else
+          scope.name.to_s
+        end
+      end
+
+    end
+  end
+end

data/lib/active_admin/view_helpers.rb

@@ -2,19 +2,19 @@ module ActiveAdmin
   module ViewHelpers
 
     # Require all ruby files in the view helpers dir
-    Dir[File.expand_path('../view_helpers', __FILE__) + "/*.rb"].each{|f| require f }
+    Dir[File.expand_path("view_helpers", __dir__) + "/*.rb"].each { |f| require f }
 
     include ActiveAdminApplicationHelper
     include AutoLinkHelper
     include BreadcrumbHelper
     include DisplayHelper
-    include IconHelper
     include MethodOrProcHelper
     include SidebarHelper
     include FormHelper
     include TitleHelper
     include ViewFactoryHelper
     include FlashHelper
+    include ScopeNameHelper
 
   end
 end

data/lib/active_admin/views/action_items.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
 
       def build(action_items)
         action_items.each do |action_item|
-          span class: "action_item" do
+          span class: action_item.html_class do
             instance_exec(&action_item.block)
           end
         end

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

@@ -19,7 +19,7 @@ module ActiveAdmin
         opening_tag << children.to_s << closing_tag
       end
     end
-    
+
     class ActiveAdminForm < FormtasticProxy
       builder_method :active_admin_form_for
 
@@ -27,14 +27,14 @@ module ActiveAdmin
         @resource = resource
         options = options.deep_dup
         options[:builder] ||= ActiveAdmin::FormBuilder
-        form_string = semantic_form_for(resource, options) do |f|
+        form_string = helpers.semantic_form_for(resource, options) do |f|
           @form_builder = f
         end
 
         @opening_tag, @closing_tag = split_string_on(form_string, "</form>")
         instance_eval(&block) if block_given?
 
-        # Rails 4 sets multipart automatically if a file field is present,
+        # Rails sets multipart automatically if a file field is present,
         # but the form tag has already been rendered before the block eval.
         if multipart? && @opening_tag !~ /multipart/
           @opening_tag.sub!(/<form/, '<form enctype="multipart/form-data"')
@@ -42,11 +42,13 @@ module ActiveAdmin
       end
 
       def inputs(*args, &block)
+        if block_given?
+          form_builder.template.assigns[: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
@@ -55,6 +57,12 @@ module ActiveAdmin
           end
           insert_tag(SemanticInputsProxy, form_builder, *args, &wrapped_block)
         else
+          # Set except option to prevent sensitive fields from being shown in forms by default.
+          opts = args.extract_options!
+          opts[:except] ||= []
+          ActiveAdmin.application.filter_attributes.each { |e| opts[:except] << e }
+          args << opts
+
           proxy_call_to_form(:inputs, *args, &block)
         end
       end
@@ -70,10 +78,17 @@ module ActiveAdmin
       end
 
       def commit_action_with_cancel_link
+        add_create_another_checkbox
         action(:submit)
         cancel_link
       end
 
+      def add_create_another_checkbox
+        if %w(new create).include?(helpers.action_name) && active_admin_config && active_admin_config.create_another
+          current_arbre_element.add_child(create_another_checkbox)
+        end
+      end
+
       def has_many(*args, &block)
         insert_tag(HasManyProxy, form_builder, *args, &block)
       end
@@ -89,18 +104,37 @@ module ActiveAdmin
       def form_buffers
         raise "'form_buffers' has been removed from ActiveAdmin::FormBuilder, please read https://github.com/activeadmin/activeadmin/blob/master/docs/5-forms.md for details."
       end
+
+      private
+
+      def create_another_checkbox
+        create_another = params[:create_another]
+        label = @resource.class.model_name.human
+        Arbre::Context.new do
+          li class: "create_another" do
+            input(
+              checked: create_another,
+              id: "create_another",
+              name: "create_another",
+              type: "checkbox"
+            )
+            label(I18n.t("active_admin.create_another", model: label), for: "create_another")
+          end
+        end
+      end
     end
 
     class SemanticInputsProxy < FormtasticProxy
       def build(form_builder, *args, &block)
-        options = args.extract_options!
-        legend = args.shift
+        html_options = args.extract_options!
+        html_options[:class] ||= "inputs"
+        legend = args.shift if args.first.is_a?(::String)
+        legend = html_options.delete(:name) if html_options.key?(:name)
         legend_tag = legend ? "<legend><span>#{legend}</span></legend>" : ""
-        klasses = ["inputs"]
-        klasses << options[:class] if options[:class]
-        @opening_tag = "<fieldset class=\"#{klasses.join(" ")}\">#{legend_tag}<ol>"
+        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
+        @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
-        super(*(args << options), &block)
+        super(*(args << html_options), &block)
       end
     end
 
@@ -114,10 +148,8 @@ 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
   end
-end
+end

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

@@ -5,9 +5,9 @@ module ActiveAdmin
       builder_method :attributes_table_for
 
       def build(obj, *attrs)
-        @collection     = is_array?(obj) ? obj : [obj]
+        @collection = Array.wrap(obj)
         @resource_class = @collection.first.class
-        options = { }
+        options = {}
         options[:for] = @collection.first if single_record?
         super(options)
         @table = table
@@ -16,19 +16,19 @@ module ActiveAdmin
       end
 
       def rows(*attrs)
-        attrs.each {|attr| row(attr) }
+        attrs.each { |attr| row(attr) }
       end
 
       def row(*args, &block)
-        title   = args[0]
+        title = args[0]
         options = args.extract_options!
         classes = [:row]
         if options[:class]
           classes << options[:class]
         elsif title.present?
-          classes << "row-#{title.to_s.parameterize('_')}"
+          classes << "row-#{title.to_s.parameterize(separator: "_")}"
         end
-        options[:class] = classes.join(' ')
+        options[:class] = classes.join(" ")
 
         @table << tr(options) do
           th do
@@ -45,7 +45,7 @@ module ActiveAdmin
       protected
 
       def default_id_for_prefix
-        'attributes_table'
+        "attributes_table"
       end
 
       # Build Colgroups
@@ -75,37 +75,19 @@ module ActiveAdmin
       end
 
       def empty_value
-        span I18n.t('active_admin.empty'), class: "empty"
+        span I18n.t("active_admin.empty"), class: "empty"
       end
 
       def content_for(record, attr)
-        value = pretty_format find_attr_value(record, attr)
+        value = helpers.format_attribute record, attr
         value.blank? && current_arbre_element.children.to_s.empty? ? empty_value : value
-      end
-
-      def find_attr_value(record, attr)
-        if attr.is_a?(Proc)
-          attr.call(record)
-        elsif attr =~ /\A(.+)_id\z/ && reflection_for(record.class, $1.to_sym)
-          record.public_send $1
-        elsif record.respond_to? attr
-          record.public_send attr
-        elsif record.respond_to? :[]
-          record[attr]
-        end
-      end
-
-      def reflection_for(klass, method)
-        klass.reflect_on_association method if klass.respond_to? :reflect_on_association
+        # Don't add the same Arbre twice, while still allowing format_attribute to call status_tag
+        current_arbre_element << value unless current_arbre_element.children.include? value
       end
 
       def single_record?
         @single_record ||= @collection.size == 1
       end
-      
-      def is_array?(obj)
-        obj.respond_to?(:each) && obj.respond_to?(:first) && !obj.is_a?(Hash)
-      end
     end
 
   end

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

@@ -5,7 +5,7 @@ module ActiveAdmin
       builder_method :blank_slate
 
       def default_class_name
-        'blank_slate_container'
+        "blank_slate_container"
       end
 
       def build(content)