activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/lib/active_admin/resource/action_items.rb

@@ -64,7 +64,8 @@ module ActiveAdmin
       def add_default_new_action_item
         add_action_item :new, only: :index do
           if controller.action_methods.include?('new') && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
-            link_to I18n.t('active_admin.new_model', model: active_admin_config.resource_label), new_resource_path
+            localizer = ActiveAdmin::Localizers.resource(active_admin_config)
+            link_to localizer.t(:new_model), new_resource_path
           end
         end
       end
@@ -73,7 +74,8 @@ module ActiveAdmin
       def add_default_edit_action_item
         add_action_item :edit, only: :show do
           if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
-            link_to I18n.t('active_admin.edit_model', model: active_admin_config.resource_label), edit_resource_path(resource)
+            localizer = ActiveAdmin::Localizers.resource(active_admin_config)
+            link_to localizer.t(:edit_model), edit_resource_path(resource)
           end
         end
       end
@@ -82,8 +84,9 @@ module ActiveAdmin
       def add_default_show_action_item
         add_action_item :destroy, only: :show do
           if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
-            link_to I18n.t('active_admin.delete_model', model: active_admin_config.resource_label), resource_path(resource),
-              method: :delete, data: {confirm: I18n.t('active_admin.delete_confirmation')}
+            localizer = ActiveAdmin::Localizers.resource(active_admin_config)
+            link_to localizer.t(:delete_model), resource_path(resource), method: :delete,
+              data: {confirm: localizer.t(:delete_confirmation)}
           end
         end
       end

data/lib/active_admin/resource/belongs_to.rb

@@ -39,6 +39,10 @@ module ActiveAdmin
       def required?
         !optional?
       end
+
+      def to_param
+        :"#{@target_name}_id"
+      end
     end
   end
 end

data/lib/active_admin/resource/menu.rb

@@ -26,7 +26,7 @@ module ActiveAdmin
         {
           id: resource_name.plural,
           label: proc{ resource.plural_resource_label },
-          url:   proc{ resource.route_collection_path(params) },
+          url:   proc{ resource.route_collection_path(params, url_options) },
           if:    proc{ authorized?(Auth::READ, menu_resource_class) }
         }
       end

data/lib/active_admin/resource/ordering.rb

@@ -0,0 +1,11 @@
+module ActiveAdmin
+  class Resource
+    module Ordering
+
+      def ordering
+        @ordering ||= {}.with_indifferent_access
+      end
+
+    end
+  end
+end

data/lib/active_admin/resource/routes.rb

@@ -4,19 +4,23 @@ module ActiveAdmin
       # @param params [Hash] of params: { study_id: 3 }
       # @return [String] the path to this resource collection page
       # @example "/admin/posts"
-      def route_collection_path(params = {})
-        RouteBuilder.new(self).collection_path(params)
+      def route_collection_path(params = {}, additional_params = {})
+        route_builder.collection_path(params, additional_params)
+      end
+
+      def route_batch_action_path(params = {}, additional_params = {})
+        route_builder.batch_action_path(params, additional_params)
       end
 
       # @param resource [ActiveRecord::Base] the instance we want the path of
       # @return [String] the path to this resource collection page
       # @example "/admin/posts/1"
-      def route_instance_path(resource)
-        RouteBuilder.new(self).instance_path(resource)
+      def route_instance_path(resource, additional_params = {})
+        route_builder.instance_path(resource, additional_params)
       end
 
-      def route_edit_instance_path(resource)
-        RouteBuilder.new(self).edit_instance_path(resource)
+      def route_edit_instance_path(resource, additional_params = {})
+        route_builder.edit_instance_path(resource, additional_params)
       end
 
       # Returns the routes prefix for this config
@@ -24,6 +28,10 @@ module ActiveAdmin
         namespace.module_name.try(:underscore)
       end
 
+      def route_builder
+        @route_builder ||= RouteBuilder.new(self)
+      end
+
       def route_uncountable?
         config = resources_configuration[:self]
 
@@ -37,32 +45,45 @@ module ActiveAdmin
           @resource = resource
         end
 
-        def collection_path(params)
+        def collection_path(params, additional_params = {})
+          route_name = route_name(
+            resource.resources_configuration[:self][:route_collection_name],
+            suffix: (resource.route_uncountable? ? "index_path" : "path")
+          )
+
+          routes.public_send route_name, *route_collection_params(params), additional_params
+        end
+
+        def batch_action_path(params, additional_params = {})
           route_name = route_name(
             resource.resources_configuration[:self][:route_collection_name],
+            action: :batch_action,
             suffix: (resource.route_uncountable? ? "index_path" : "path")
           )
 
-          routes.public_send route_name, *route_collection_params(params)
+          query = params.slice(:q, :scope)
+          query = query.permit! if query.respond_to? :permit!
+          query = query.to_h if Rails::VERSION::MAJOR >= 5
+          routes.public_send route_name, *route_collection_params(params), additional_params.merge(query)
         end
 
         # @return [String] the path to this resource collection page
         # @param instance [ActiveRecord::Base] the instance we want the path of
         # @example "/admin/posts/1"
-        def instance_path(instance)
+        def instance_path(instance, additional_params = {})
           route_name = route_name(resource.resources_configuration[:self][:route_instance_name])
 
-          routes.public_send route_name, *route_instance_params(instance)
+          routes.public_send route_name, *route_instance_params(instance), additional_params
         end
 
         # @return [String] the path to the edit page of this resource
         # @param instance [ActiveRecord::Base] the instance we want the path of
         # @example "/admin/posts/1/edit"
-        def edit_instance_path(instance)
+        def edit_instance_path(instance, additional_params = {})
           path = resource.resources_configuration[:self][:route_instance_name]
           route_name = route_name(path, action: :edit)
 
-          routes.public_send route_name, *route_instance_params(instance)
+          routes.public_send route_name, *route_instance_params(instance), additional_params
         end
 
         private
@@ -73,7 +94,7 @@ module ActiveAdmin
           suffix = options[:suffix] || "path"
           route = []
 
-          route << options[:action]           # "edit" or "new"
+          route << options[:action]           # "batch_action", "edit" or "new"
           route << resource.route_prefix      # "admin"
           route << belongs_to_name if nested? # "category"
           route << resource_path_name         # "posts" or "post"

data/lib/active_admin/resource/scopes.rb

@@ -31,6 +31,7 @@ module ActiveAdmin
         title = args[0] rescue nil
         method = args[1] rescue nil
 
+        options[:localizer] ||= ActiveAdmin::Localizers.resource(self)
         scope = ActiveAdmin::Scope.new(title, method, options, &block)
 
         # Finds and replaces a scope by the same name if it already exists

data/lib/active_admin/resource_controller/data_access.rb

@@ -209,11 +209,10 @@ module ActiveAdmin
 
       def apply_sorting(chain)
         params[:order] ||= active_admin_config.sort_order
-
-        order_clause = OrderClause.new params[:order]
+        order_clause = active_admin_config.order_clause.new(active_admin_config, params[:order])
 
         if order_clause.valid?
-          chain.reorder(order_clause.to_sql(active_admin_config))
+          order_clause.apply(chain)
         else
           chain # just return the chain
         end
@@ -222,16 +221,10 @@ module ActiveAdmin
       # Applies any Ransack search methods to the currently scoped collection.
       # Both `search` and `ransack` are provided, but we use `ransack` to prevent conflicts.
       def apply_filtering(chain)
-        @search = chain.ransack clean_search_params
+        @search = chain.ransack(params[:q] || {})
         @search.result
       end
 
-      def clean_search_params
-        q = params[:q] || {}
-        q = q.to_unsafe_h if q.respond_to? :to_unsafe_h
-        q.delete_if{ |key, value| value.blank? }
-      end
-
       def apply_scoping(chain)
         @collection_before_scope = chain
 

data/lib/active_admin/resource_dsl.rb

@@ -8,6 +8,25 @@ module ActiveAdmin
 
     private
 
+    # Redefine sort behaviour for column
+    #
+    # For example:
+    #
+    #   # nulls last
+    #   order_by(:age) do |order_clause|
+    #     [order_clause.to_sql, 'NULLS LAST'].join(' ')  if order_clause.order == 'desc'
+    #   end
+    #
+    #   # by last_name but in the case that there is no last name, by first_name.
+    #   order_by(:full_name) do |order_clause|
+    #     ['COALESCE(NULLIF(last_name, ''), first_name), first_name', order_clause.order].join(' ')
+    #   end
+    #
+    #
+    def order_by(column, &block)
+      config.ordering[column] = block
+    end
+
     def belongs_to(target, options = {})
       config.belongs_to(target, options)
     end
@@ -49,10 +68,11 @@ module ActiveAdmin
     #
     def permit_params(*args, &block)
       param_key = config.param_key.to_sym
+      belongs_to_param = config.belongs_to_param
 
       controller do
         define_method :permitted_params do
-          params.permit *active_admin_namespace.permitted_params,
+          params.permit *(active_admin_namespace.permitted_params + Array.wrap(belongs_to_param)),
             param_key => block ? instance_exec(&block) : args
         end
       end
@@ -130,6 +150,13 @@ module ActiveAdmin
       action config.collection_actions, name, options, &block
     end
 
+    def decorate_with(decorator_class)
+      # Force storage as a string. This will help us with reloading issues.
+      # Assuming decorator_class.to_s will return the name of the class allows
+      # us to handle a string or a class.
+      config.decorator_class_name = "::#{ decorator_class }"
+    end
+
     # Defined Callbacks
     #
     # == After Build

data/lib/active_admin/router.rb

@@ -23,7 +23,7 @@ module ActiveAdmin
           if namespace.root?
             root namespace.root_to_options.merge(to: namespace.root_to)
           else
-            namespace namespace.name do
+            namespace namespace.name, namespace.route_options.dup do
               root namespace.root_to_options.merge(to: namespace.root_to, as: :root)
             end
           end
@@ -57,7 +57,7 @@ module ActiveAdmin
           unless config.namespace.root?
             nested = routes
             routes = Proc.new do
-              namespace config.namespace.name do
+              namespace config.namespace.name, config.namespace.route_options.dup do
                 instance_exec &nested
               end
             end
@@ -94,7 +94,9 @@ module ActiveAdmin
           page = config.underscored_resource_name
           get "/#{page}" => "#{page}#index"
           config.page_actions.each do |action|
-            build_route.call action.http_verb, "/#{page}/#{action.name}" => "#{page}##{action.name}"
+            Array.wrap(action.http_verb).each do |verb|
+              build_route.call verb, "/#{page}/#{action.name}" => "#{page}##{action.name}"
+            end
           end
         else
           raise "Unsupported config class: #{config.class}"

data/lib/active_admin/scope.rb

@@ -38,6 +38,7 @@ module ActiveAdmin
       @scope_method               = nil        if @scope_method == :all
       @scope_method, @scope_block = nil, block if block_given?
 
+      @localizer        = options[:localizer]
       @show_count       = options.fetch(:show_count, true)
       @display_if_block = options[:if]      || proc{ true }
       @default_block    = options[:default] || proc{ false }
@@ -45,10 +46,9 @@ module ActiveAdmin
 
     def name
       case @name
-        when Proc   then @name.call.to_s
         when String then @name
-        when Symbol then @name.to_s.titleize
-        else             @name.to_s
+        when Symbol then @localizer ? @localizer.t(@name, scope: 'scopes') : @name.to_s.titleize
+        else             @name
       end
     end
 

data/lib/active_admin/version.rb

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

@@ -42,9 +42,14 @@ 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)
+          Arbre::Context.new { status_tag value }
+        else
+          pretty_format value
+        end
       end
 
       def find_value(resource, attr)

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -18,6 +18,8 @@ module MethodOrProcHelper
       send(symbol_or_proc, *args)
     when Proc
       instance_exec(*args, &symbol_or_proc)
+    else
+      symbol_or_proc
     end
   end
 
@@ -60,6 +62,8 @@ module MethodOrProcHelper
       else
         symbol_or_proc.call(receiver, *args)
       end
+    else
+      symbol_or_proc
     end
   end
 
@@ -71,7 +75,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/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,7 +27,7 @@ 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
 
@@ -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
@@ -95,14 +95,15 @@ module ActiveAdmin
 
     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 +121,4 @@ module ActiveAdmin
       end
     end
   end
-end
+end

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

@@ -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