activeadmin 1.0.0.pre4 → 2.4.0

data/lib/active_admin/settings_node.rb

@@ -0,0 +1,19 @@
+module ActiveAdmin
+
+  class SettingsNode
+    class << self
+      # Never instantiated.  Variables are stored in the singleton_class.
+      private_class_method :new
+
+      # @return anonymous class with same accessors as the superclass.
+      def build(superclass = self)
+        Class.new(superclass)
+      end
+
+      def register(name, value)
+        class_attribute name
+        send "#{name}=", value
+      end
+    end
+  end
+end

data/lib/active_admin/sidebar_section.rb

@@ -6,7 +6,9 @@ module ActiveAdmin
     attr_accessor :name, :options, :block
 
     def initialize(name, options = {}, &block)
-      @name, @options, @block = name.to_s, options, block
+      @name = name.to_s
+      @options = options
+      @block = block
       normalize_display_options!
     end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.0.pre4'
+  VERSION = '2.4.0'
 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

@@ -12,9 +12,9 @@ module ActiveAdmin
           # 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
+            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

data/lib/active_admin/view_helpers/display_helper.rb

@@ -2,8 +2,9 @@ module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
-      DISPLAY_NAME_FALLBACK = ->{
-        name, klass = "", self.class
+      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
@@ -15,7 +16,7 @@ module ActiveAdmin
       # 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) unless resource.nil?
+        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
@@ -42,16 +43,19 @@ module ActiveAdmin
 
       def format_attribute(resource, attr)
         value = find_value resource, attr
-        value = pretty_format value                    if attr.is_a? Symbol
-        value = Arbre::Context.new{ status_tag value } if boolean_attr? resource, attr
-        value
+
+        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 attr =~ /\A(.+)_id\z/ && reflection_for(resource, $1.to_sym)
-          resource.public_send $1
         elsif resource.respond_to? attr
           resource.public_send attr
         elsif resource.respond_to? :[]
@@ -65,25 +69,33 @@ module ActiveAdmin
         when String, Numeric, Symbol, Arbre::Element
           object.to_s
         when Date, Time
-          localize object, format: active_admin_application.localize_format
+          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)
             auto_link object
+          elsif defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Relation)
+            format_collection(object)
           else
             display_name object
           end
         end
       end
 
-      def reflection_for(resource, method)
-        klass = resource.class
-        klass.reflect_on_association method if klass.respond_to? :reflect_on_association
+      def format_collection(collection)
+        safe_join(collection.map { |item| pretty_format(item) }, ', ')
       end
 
-      def boolean_attr?(resource, attr)
-        if resource.class.respond_to? :columns_hash
-          column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+      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
 

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -1,6 +1,19 @@
 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

data/lib/active_admin/view_helpers/fields_for.rb

@@ -16,7 +16,6 @@ module ActiveAdmin
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
         except    = Array.wrap(options[:except]).map &:to_s
-        params    = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
 
         params.flat_map do |k, v|
           next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
@@ -39,7 +38,7 @@ module ActiveAdmin
             end
           when nil
             { k => '' }
-          when TrueClass,FalseClass
+          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,7 +78,7 @@ 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

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,7 +2,7 @@ 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
@@ -14,6 +14,7 @@ module ActiveAdmin
     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"')
@@ -43,7 +43,7 @@ module ActiveAdmin
 
       def inputs(*args, &block)
         if block_given?
-          form_builder.template.assign(has_many_block: true)
+          form_builder.template.assigns[:has_many_block] = true
         end
         if block_given? && block.arity == 0
           wrapped_block = proc do
@@ -57,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
@@ -72,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
@@ -91,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
 
@@ -120,4 +152,4 @@ module ActiveAdmin
       end
     end
   end
-end
+end

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

@@ -7,7 +7,7 @@ module ActiveAdmin
       def build(obj, *attrs)
         @collection     = Array.wrap(obj)
         @resource_class = @collection.first.class
-        options = { }
+        options = {}
         options[:for] = @collection.first if single_record?
         super(options)
         @table = table
@@ -16,7 +16,7 @@ module ActiveAdmin
       end
 
       def rows(*attrs)
-        attrs.each {|attr| row(attr) }
+        attrs.each { |attr| row(attr) }
       end
 
       def row(*args, &block)
@@ -26,7 +26,7 @@ module ActiveAdmin
         if options[:class]
           classes << options[:class]
         elsif title.present?
-          classes << "row-#{ActiveAdmin::Dependency.rails.parameterize(title.to_s)}"
+          classes << "row-#{title.to_s.parameterize(separator: "_")}"
         end
         options[:class] = classes.join(' ')
 
@@ -79,7 +79,7 @@ module ActiveAdmin
       end
 
       def content_for(record, attr)
-        value = format_attribute record, attr
+        value = helpers.format_attribute record, attr
         value.blank? && current_arbre_element.children.to_s.empty? ? empty_value : value
         # 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

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

@@ -14,7 +14,7 @@ module ActiveAdmin
     #
     # To create a two column layout:
     #
-    #     colums do
+    #     columns do
     #       column do
     #         span "Column # 1
     #       end
@@ -28,7 +28,7 @@ module ActiveAdmin
     #
     # To make a column span multiple, pass the :span option to the column method:
     #
-    #     colums do
+    #     columns do
     #       column span: 2 do
     #         span "Column # 1
     #       end
@@ -49,7 +49,7 @@ module ActiveAdmin
     #
     # To overcome this, columns include a :max_width and :min_width option.
     #
-    #     colums do
+    #     columns do
     #       column max_width: "200px", min_width: "100px" do
     #         span "Column # 1
     #       end

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

@@ -7,7 +7,7 @@ module ActiveAdmin
     #
     #     dropdown_menu "Administration" do
     #       item "Edit Details", edit_details_path
-    #       item "Edit My Account", edit_my_acccount_path
+    #       item "Edit My Account", edit_my_account_path
     #     end
     #
     # This will create a button with the label "Administration" and
@@ -26,10 +26,10 @@ module ActiveAdmin
         options = options.dup
 
         # Easily set options for the button or menu
-        button_options  = options.delete(:button) || {}
+        button_options = options.delete(:button) || {}
         menu_options = options.delete(:menu) || {}
 
-        @button  = build_button(name, button_options)
+        @button = build_button(name, button_options)
         @menu = build_menu(menu_options)
 
         super(options)
@@ -58,7 +58,7 @@ module ActiveAdmin
 
         menu_list = nil
 
-        div :class => 'dropdown_menu_list_wrapper' do
+        div class: 'dropdown_menu_list_wrapper' do
           menu_list = ul(options)
         end
 

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

@@ -36,7 +36,10 @@ module ActiveAdmin
       # @param [Class] index_class The class on which to build the link and html classes
       def build_index_list(index_class)
         li class: classes_for_index(index_class) do
-          a href: url_for(as: index_class.index_name.to_sym), class: "table_tools_button" do
+          params = request.query_parameters.except :page, :commit, :format
+          url_with_params = url_for(params.merge(as: index_class.index_name.to_sym))
+
+          a href: url_with_params, class: "table_tools_button" do
             name = index_class.index_name
             I18n.t("active_admin.index_list.#{name}", default: name.to_s.titleize)
           end
@@ -64,5 +67,3 @@ module ActiveAdmin
     end
   end
 end
-
-

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

@@ -0,0 +1,32 @@
+module ActiveAdmin
+  module Views
+
+    # Renders an ActiveAdmin::Menu as a set of unordered list items.
+    #
+    # This component takes cares of deciding which items should be
+    # displayed given the current context and renders them appropriately.
+    #
+    # The entire component is rendered within one ul element.
+    class Menu < Component
+      attr_reader :menu
+      builder_method :menu
+
+      # @param [ActiveAdmin::Menu] menu the Menu to render
+      # @param [Hash] options the options as passed to the underlying ul element.
+      #
+      def build(menu, options = {})
+        @menu = menu
+        super(options)
+
+        menu.items.each do |item|
+          menu_item(item) if helpers.render_in_context self, item.should_display
+        end
+        children.sort!
+      end
+
+      def tag_name
+        'ul'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+module ActiveAdmin
+  module Views
+
+    # Arbre component used to render ActiveAdmin::MenuItem
+    class MenuItem < Component
+      builder_method :menu_item
+      attr_reader :label
+      attr_reader :url
+      attr_reader :priority
+
+      def build(item, options = {})
+        super(options.merge(id: item.id))
+        @label = helpers.render_in_context self, item.label
+        @url = helpers.render_in_context self, item.url
+        @priority = item.priority
+        @submenu = nil
+
+        add_class "current" if item.current? assigns[:current_tab]
+
+        if url
+          text_node link_to label, url, item.html_options
+        else
+          span label, item.html_options
+        end
+
+        if item.items.any?
+          add_class "has_nested"
+          @submenu = menu(item)
+        end
+      end
+
+      def tag_name
+        'li'
+      end
+
+      # Sorts by priority first, then alphabetically by label if needed.
+      def <=>(other)
+        result = priority <=> other.priority
+        result == 0 ? label <=> other.label : result
+      end
+
+      def visible?
+        url.nil? || real_url? || @submenu && @submenu.children.any?
+      end
+
+      def to_s
+        visible? ? super : ''
+      end
+
+      private
+
+      # URL is not nil, empty, or '#'
+      def real_url?
+        url && url.present? && url != '#'
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'active_admin/helpers/collection'
+require 'active_admin/view_helpers/download_format_links_helper'
 
 module ActiveAdmin
   module Views
@@ -70,19 +71,14 @@ module ActiveAdmin
           build_pagination
           div(page_entries_info(options).html_safe, class: "pagination_information")
 
-          download_links = @download_links.is_a?(Proc) ? instance_exec(&@download_links) : @download_links
-
-          if download_links.is_a?(Array) && !download_links.empty?
-            build_download_format_links download_links
-          else
-            build_download_format_links unless download_links == false
-          end
+          formats = build_download_formats @download_links
+          build_download_format_links formats if formats.any?
         end
       end
 
       def build_per_page_select
         div class: "pagination_per_page" do
-          text_node "Per page:"
+          text_node I18n.t("active_admin.pagination.per_page")
           select do
             @per_page.each do |per_page|
               option(
@@ -96,17 +92,17 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = {}
+        options = { theme: @display_total ? 'active_admin' : 'active_admin_countless' }
         options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 
-        if !@display_total && collection.respond_to?(:offset)
+        if !@display_total
           # 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
+          offset = collection.offset(collection.current_page * collection.limit_value).limit(1).count
           options[:total_pages] = collection.current_page + offset
           options[:right] = 0
         end