activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/lib/active_admin.rb

@@ -36,6 +36,7 @@ module ActiveAdmin
   autoload :Event,                    'active_admin/event'
   autoload :FormBuilder,              'active_admin/form_builder'
   autoload :Inputs,                   'active_admin/inputs'
+  autoload :Localizers,               'active_admin/localizers'
   autoload :Menu,                     'active_admin/menu'
   autoload :MenuCollection,           'active_admin/menu_collection'
   autoload :MenuItem,                 'active_admin/menu_item'

data/lib/active_admin/application.rb

@@ -41,6 +41,9 @@ module ActiveAdmin
     # Set the site title image displayed in the main layout (has precendence over :site_title)
     inheritable_setting :site_title_image, ""
 
+    # Set the site footer text (defaults to Powered by ActiveAdmin text with version)
+    inheritable_setting :footer, ""
+
     # Set a favicon
     inheritable_setting :favicon, false
 
@@ -80,6 +83,9 @@ module ActiveAdmin
     # Options that a passed to root_to.
     inheritable_setting :root_to_options, {}
 
+    # Options passed to the routes, i.e. { path: '/custom' }
+    inheritable_setting :route_options, {}
+
     # Display breadcrumbs
     inheritable_setting :breadcrumb, true
 
@@ -101,6 +107,9 @@ module ActiveAdmin
     # Whether to display 'Current Filters' on search screen
     inheritable_setting :current_filters, true
 
+    # class to handle ordering
+    inheritable_setting :order_clause, ActiveAdmin::OrderClause
+
     # Request parameters that are permitted by default
     inheritable_setting :permitted_params, [
       :utf8, :_method, :authenticity_token, :commit, :id
@@ -117,6 +126,8 @@ module ActiveAdmin
 
     # Active Admin makes educated guesses when displaying objects, this is
     # the list of methods it tries calling in order
+    # Note that Formtastic also has 'collection_label_methods' similar to this
+    # used by auto generated dropdowns in filter or belongs_to field of Active Admin
     setting :display_name_methods, [ :display_name,
                                       :full_name,
                                       :name,

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -51,14 +51,6 @@ module ActiveAdmin
         @batch_actions = {}
       end
 
-      # Path to the batch action itself
-      def batch_action_path(params = {})
-        path = [route_collection_path(params), "batch_action"].join("/")
-        query = params.slice(:q, :scope)
-        query = query.permit!.to_h if query.respond_to? :permit!
-        [path, query.to_param].reject(&:blank?).join("?")
-      end
-
       private
 
       # @return [ActiveAdmin::BatchAction] The default "delete" action

data/lib/active_admin/batch_actions/views/batch_action_form.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
         # Open a form with two hidden input fields:
         # batch_action        => name of the specific action called
         # batch_action_inputs => a JSON string of any requested confirmation values
-        text_node form_tag active_admin_config.batch_action_path(params), id: options[:id]
+        text_node form_tag active_admin_config.route_batch_action_path(params, url_options), id: options[:id]
         input name: :batch_action,        id: :batch_action,        type: :hidden
         input name: :batch_action_inputs, id: :batch_action_inputs, type: :hidden
 

data/lib/active_admin/batch_actions/views/batch_action_selector.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
       end
 
       # We don't want to wrap the action list (or any other children) in
-      # an unecessary div, so instead we just return the children
+      # an unnecessary div, so instead we just return the children
       def to_s
         children.to_s
       end

data/lib/active_admin/dsl.rb

@@ -163,11 +163,5 @@ module ActiveAdmin
       config.sidebar_sections << ActiveAdmin::SidebarSection.new(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
   end
 end

data/lib/active_admin/filters/active.rb

@@ -8,13 +8,21 @@ module ActiveAdmin
 
       def initialize(resource_class, params)
         @resource_class = resource_class
-        @params = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
+        @params = normalize_params(params)
         @scope = humanize_scope
         @filters = build_filters
       end
 
       private
 
+      def normalize_params(params)
+        if params.is_a?(HashWithIndifferentAccess)
+          params
+        else
+          params.to_unsafe_h
+        end
+      end
+
       def build_filters
         filters = @params[:q] || []
         filters.map{ |param| Humanized.new(param) }

data/lib/active_admin/filters/formtastic_addons.rb

@@ -54,7 +54,7 @@ module ActiveAdmin
       end
 
       def seems_searchable?
-        has_predicate? || ransacker? || scope?
+        has_predicate? || scope?
       end
 
       # If the given method has a predicate (like _eq or _lteq), it's pretty

data/lib/active_admin/filters/humanized.rb

@@ -43,7 +43,7 @@ module ActiveAdmin
       end
 
       def current_predicate
-        @current_predicate ||= predicates.detect { |p| @body.include?(p) }
+        @current_predicate ||= predicates.detect { |p| @body.end_with?("_#{p}") }
       end
 
       def predicates

data/lib/active_admin/filters/resource_extension.rb

@@ -157,13 +157,11 @@ module ActiveAdmin
       end
 
       def add_search_status_sidebar_section
-        if current_filters_enabled?
-          self.sidebar_sections << search_status_section
-        end
+        self.sidebar_sections << search_status_section
       end
 
       def search_status_section
-        ActiveAdmin::SidebarSection.new I18n.t("active_admin.search_status.headline"), only: :index, if: -> { params[:q] || params[:scope] } do
+        ActiveAdmin::SidebarSection.new I18n.t("active_admin.search_status.headline"), only: :index, if: -> {active_admin_config.current_filters_enabled? && (params[:q] || params[:scope]) } do
           active = ActiveAdmin::Filters::Active.new(resource_class, params)
 
           span do

data/lib/active_admin/form_builder.rb

@@ -13,6 +13,8 @@ end
 
 module ActiveAdmin
   class FormBuilder < ::Formtastic::FormBuilder
+    include MethodOrProcHelper
+
     self.input_namespaces = [::Object, ::ActiveAdmin::Inputs, ::Formtastic::Inputs]
 
     # TODO: remove both class finders after formtastic 4 (where it will be default)
@@ -53,14 +55,16 @@ module ActiveAdmin
       end
 
       html << template.capture do
-        contents = "".html_safe
         form_block = proc do |has_many_form|
           index    = parent_child_index options[:parent] if options[:parent]
-          block.call has_many_form, index
+          block_contents = template.capture do
+            block.call(has_many_form, index)
+          end
+          template.concat(block_contents)
           template.concat has_many_actions(has_many_form, builder_options, "".html_safe)
         end
-        
-        template.assign(has_many_block: true)
+
+        template.assigns[:has_many_block] = true
         contents = without_wrapper { inputs(options, &form_block) } || "".html_safe
 
         if builder_options[:new_record]
@@ -83,7 +87,10 @@ module ActiveAdmin
         contents << template.content_tag(:li) do
           template.link_to I18n.t('active_admin.has_many_remove'), "#", class: 'button has_many_remove'
         end
-      elsif builder_options[:allow_destroy]
+      elsif call_method_or_proc_on(has_many_form.object,
+                                   builder_options[:allow_destroy],
+                                   exec: false)
+
         has_many_form.input(:_destroy, as: :boolean,
                             wrapper_html: {class: 'has_many_delete'},
                             label: I18n.t('active_admin.has_many_delete'))
@@ -136,6 +143,5 @@ module ActiveAdmin
         html: CGI.escapeHTML(html).html_safe, placeholder: placeholder
       }
     end
-
   end
 end

data/lib/active_admin/helpers/collection.rb

@@ -4,6 +4,8 @@ module ActiveAdmin
       # 1. removes `select` and `order` to prevent invalid SQL
       # 2. correctly handles the Hash returned when `group by` is used
       def collection_size(c = collection)
+        return c.count if c.is_a?(Array)
+
         c = c.except :select, :order
 
         c.group_values.present? ? c.count.count : c.count

data/lib/active_admin/inputs.rb

@@ -9,6 +9,7 @@ module ActiveAdmin
 
       autoload :Base
       autoload :StringInput
+      autoload :TextInput
       autoload :DatePickerInput
       autoload :DateRangeInput
       autoload :NumericInput

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -15,20 +15,25 @@ module ActiveAdmin
         end
 
         def gt_input_name
-          "#{method}_gteq_date"
+          column && column.type == :date ? "#{method}_gteq" : "#{method}_gteq_datetime"
         end
         alias :input_name :gt_input_name
 
         def lt_input_name
-          "#{method}_lteq_date"
+          column && column.type == :date ? "#{method}_lteq" : "#{method}_lteq_datetime"
         end
 
         def input_html_options(input_name = gt_input_name)
-          current_value = @object.public_send input_name
+          current_value = begin
+            #cast value to date object before rendering input
+            @object.public_send(input_name).to_s.to_date
+          rescue 
+            nil
+          end
           { size: 12,
             class: "datepicker",
             maxlength: 10,
-            value: current_value.respond_to?(:strftime) ? current_value.strftime("%Y-%m-%d") : "" }
+            value: current_value ? current_value.strftime("%Y-%m-%d") : "" }
         end
       end
     end

data/lib/active_admin/inputs/filters/text_input.rb

@@ -0,0 +1,26 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      class TextInput < ::Formtastic::Inputs::TextInput
+        include Base
+        include Base::SearchMethodSelect
+
+        def input_html_options
+          {
+            :cols => builder.default_text_area_width,
+            :rows => builder.default_text_area_height
+          }.merge(super)
+        end
+
+        def to_html
+          input_wrapping do
+            label_html <<
+            builder.text_area(method, input_html_options)
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/lib/active_admin/localizers.rb

@@ -0,0 +1,11 @@
+require 'active_admin/localizers/resource_localizer'
+
+module ActiveAdmin
+  module Localizers
+    class << self
+      def resource(active_admin_config)
+        ResourceLocalizer.from_resource(active_admin_config)
+      end
+    end
+  end
+end

data/lib/active_admin/localizers/resource_localizer.rb

@@ -0,0 +1,35 @@
+module ActiveAdmin
+  module Localizers
+    class ResourceLocalizer
+      class << self
+        def from_resource(resource_config)
+          new(resource_config.resource_name.i18n_key, resource_config.resource_label)
+        end
+
+        def translate(key, options)
+          new(options.delete(:model_name), options.delete(:model)).translate(key, options)
+        end
+        alias_method :t, :translate
+      end
+
+      def initialize(model_name, model = nil)
+        @model_name = model_name
+        @model = model || model_name.to_s.titleize
+      end
+
+      def translate(key, options = {})
+        scope = options.delete(:scope)
+        specific_key = array_to_key('resources', @model_name, scope, key)
+        defaults = [array_to_key(scope, key), key.to_s.titleize]
+        ::I18n.t specific_key, options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
+      end
+      alias_method :t, :translate
+
+      protected
+
+      def array_to_key(*arr)
+        arr.flatten.compact.join('.').to_sym
+      end
+    end
+  end
+end

data/lib/active_admin/namespace.rb

@@ -194,7 +194,7 @@ module ActiveAdmin
       resources.each do |resource|
         parent = (module_name || 'Object').constantize
         name   = resource.controller_name.split('::').last
-        parent.send(:remove_const, name) if parent.const_defined? name
+        parent.send(:remove_const, name) if parent.const_defined?(name, false)
 
         # Remove circular references
         resource.controller.active_admin_config = nil

data/lib/active_admin/order_clause.rb

@@ -1,13 +1,13 @@
 module ActiveAdmin
   class OrderClause
-    attr_reader :field, :order
+    attr_reader :field, :order, :active_admin_config
 
-    def initialize(clause)
+    def initialize(active_admin_config, clause)
       clause =~ /^([\w\_\.]+)(->'\w+')?_(desc|asc)$/
       @column = $1
       @op = $2
       @order = $3
-
+      @active_admin_config = active_admin_config
       @field = [@column, @op].compact.join
     end
 
@@ -15,12 +15,34 @@ module ActiveAdmin
       @field.present? && @order.present?
     end
 
-    def to_sql(active_admin_config)
-      table = active_admin_config.resource_column_names.include?(@column) ? active_admin_config.resource_table_name : nil
-      table_column = (@column =~ /\./) ? @column :
-        [table, active_admin_config.resource_quoted_column_name(@column)].compact.join(".")
+    def apply(chain)
+      chain.reorder(sql)
+    end
 
+    def to_sql
       [table_column, @op, ' ', @order].compact.join
     end
+
+    def table
+      active_admin_config.resource_column_names.include?(@column) ? active_admin_config.resource_table_name : nil
+    end
+
+    def table_column
+      (@column =~ /\./) ? @column :
+        [table, active_admin_config.resource_quoted_column_name(@column)].compact.join(".")
+    end
+
+    def sql
+      custom_sql || to_sql
+    end
+
+    protected
+
+    def custom_sql
+      if active_admin_config.ordering[@column].present?
+        active_admin_config.ordering[@column].call(self)
+      end
+    end
+
   end
 end

data/lib/active_admin/page.rb

@@ -73,10 +73,6 @@ module ActiveAdmin
       false
     end
 
-    def belongs_to?
-      false
-    end
-
     def add_default_action_items
     end
 
@@ -88,5 +84,23 @@ module ActiveAdmin
       @page_actions = []
     end
 
+    def belongs_to(target, options = {})
+      @belongs_to = Resource::BelongsTo.new(self, target, options)
+      self.navigation_menu_name = target unless @belongs_to.optional?
+      controller.send :belongs_to, target, options.dup
+    end
+
+    def belongs_to_config
+      @belongs_to
+    end
+
+    # Do we belong to another resource?
+    def belongs_to?
+      !!belongs_to_config
+    end
+
+    def breadcrumb
+      instance_variable_defined?(:@breadcrumb) ? @breadcrumb : namespace.breadcrumb
+    end
   end
 end

data/lib/active_admin/page_dsl.rb

@@ -24,5 +24,9 @@ module ActiveAdmin
         define_method(name, &block || Proc.new{})
       end
     end
+
+    def belongs_to(target, options = {})
+      config.belongs_to(target, options)
+    end
   end
 end

data/lib/active_admin/resource.rb

@@ -10,6 +10,7 @@ require 'active_admin/resource/includes'
 require 'active_admin/resource/scope_to'
 require 'active_admin/resource/sidebars'
 require 'active_admin/resource/belongs_to'
+require 'active_admin/resource/ordering'
 
 module ActiveAdmin
 
@@ -50,6 +51,9 @@ module ActiveAdmin
     # Set breadcrumb builder
     attr_writer :breadcrumb
 
+    #Set order clause
+    attr_writer :order_clause
+
     # Store a reference to the DSL so that we can dereference it during garbage collection.
     attr_accessor :dsl
 
@@ -82,6 +86,7 @@ module ActiveAdmin
     include ScopeTo
     include Sidebars
     include Routes
+    include Ordering
 
     # The class this resource wraps. If you register the Post model, Resource#resource_class
     # will point to the Post class
@@ -129,6 +134,12 @@ module ActiveAdmin
       @belongs_to
     end
 
+    def belongs_to_param
+      if belongs_to? && belongs_to_config.required?
+        belongs_to_config.to_param
+      end
+    end
+
     # Do we belong to another resource?
     def belongs_to?
       !!belongs_to_config
@@ -143,9 +154,13 @@ module ActiveAdmin
       instance_variable_defined?(:@breadcrumb) ? @breadcrumb : namespace.breadcrumb
     end
 
+    def order_clause
+      @order_clause || namespace.order_clause
+    end
+
     def find_resource(id)
       resource = resource_class.public_send *method_for_find(id)
-      decorator_class ? decorator_class.new(resource) : resource
+      (decorator_class && resource) ? decorator_class.new(resource) : resource
     end
 
     private