activeadmin 1.0.0.pre4 → 2.4.0

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

@@ -7,8 +7,11 @@ module ActiveAdmin
     class ResourceSelectionToggleCell < ActiveAdmin::Component
       builder_method :resource_selection_toggle_cell
 
-      def build
-        input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "toggle_all"
+      def build(label_text = '')
+        label do
+          input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "toggle_all"
+          text_node label_text if label_text.present?
+        end
       end
     end
 
@@ -27,10 +30,8 @@ module ActiveAdmin
 
       def build
         super(id: "collection_selection_toggle_panel")
-        resource_selection_toggle_cell
-        div(id: "collection_selection_toggle_explaination" ) { I18n.t('active_admin.batch_actions.selection_toggle_explanation', default: "(Toggle Selection)") }
+        resource_selection_toggle_cell(I18n.t('active_admin.batch_actions.selection_toggle_explanation', default: "(Toggle Selection)"))
       end
-
     end
 
   end

data/lib/active_admin/callbacks.rb

@@ -75,7 +75,7 @@ module ActiveAdmin
 
           # def run_create_callbacks
           define_method "run_#{name}_callbacks" do |*args, &block|
-            self.class.send("before_#{name}_callbacks").each{ |cbk| run_callback(cbk, *args) }
+            self.class.send("before_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
             value = block.try :call
             self.class.send("after_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
             return value

data/lib/active_admin/controller_action.rb

@@ -2,7 +2,8 @@ module ActiveAdmin
   class ControllerAction
     attr_reader :name
     def initialize(name, options = {})
-      @name, @options = name, options
+      @name = name
+      @options = options
     end
 
     def http_verb

data/lib/active_admin/csv_builder.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
     def self.default_for_resource(resource)
       new resource: resource do
         column :id
-        resource.content_columns.each { |c| column c.name.to_sym }
+        resource.content_columns.each { |c| column c }
       end
     end
 
@@ -30,33 +30,36 @@ module ActiveAdmin
 
     COLUMN_TRANSITIVE_OPTIONS = [:humanize_name].freeze
 
-    def initialize(options={}, &block)
+    def initialize(options = {}, &block)
       @resource = options.delete(:resource)
-      @columns, @options, @block = [], options, block
+      @columns = []
+      @options = ActiveAdmin.application.csv_options.merge options
+      @block = block
     end
 
-    def column(name, options={}, &block)
+    def column(name, options = {}, &block)
       @columns << Column.new(name, @resource, column_transitive_options.merge(options), block)
     end
 
     def build(controller, csv)
       @collection  = controller.send :find_collection, except: :pagination
       columns      = exec_columns controller.view_context
-      options      = ActiveAdmin.application.csv_options.merge self.options
       bom          = options.delete :byte_order_mark
       column_names = options.delete(:column_names) { true }
-      csv_options  = options.except :encoding_options
+      csv_options  = options.except :encoding_options, :humanize_name
 
       csv << bom if bom
 
       if column_names
-        csv << CSV.generate_line(columns.map{ |c| encode c.name, options }, csv_options)
+        csv << CSV.generate_line(columns.map { |c| encode c.name, options }, csv_options)
       end
 
-      (1..paginated_collection.total_pages).each do |page|
-        paginated_collection(page).each do |resource|
-          resource = controller.send :apply_decorator, resource
-          csv << CSV.generate_line(build_row(resource, columns, options), csv_options)
+      ActiveRecord::Base.uncached do
+        (1..paginated_collection.total_pages).each do |page|
+          paginated_collection(page).each do |resource|
+            resource = controller.send :apply_decorator, resource
+            csv << CSV.generate_line(build_row(resource, columns, options), csv_options)
+          end
         end
       end
 
@@ -105,7 +108,7 @@ module ActiveAdmin
 
       def humanize_name(name, resource, humanize_name_option)
         if humanize_name_option
-          name.is_a?(Symbol) && resource.present? ? resource.human_attribute_name(name) : name.to_s.humanize
+          name.is_a?(Symbol) && resource ? resource.resource_class.human_attribute_name(name) : name.to_s.humanize
         else
           name.to_s
         end

data/lib/active_admin/dependency.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   module Dependency
     module Requirements
-      DEVISE = '>= 3.2', '< 5'
+      DEVISE = '>= 4.0', '< 5'
     end
 
     # Provides a clean interface to check for gem dependencies at runtime.
@@ -21,11 +21,11 @@ module ActiveAdmin
     # ActiveAdmin::Dependency.draper? '~> 1.2.0'
     # => true
     #
-    # ActiveAdmin::Dependency.rails? '>= 4.1.0', '<= 4.1.1'
+    # ActiveAdmin::Dependency.rails? '>= 4.2.7', '<= 5.0.2'
     # => true
     #
-    # ActiveAdmin::Dependency.rails! '2'
-    # -> ActiveAdmin::DependencyError: You provided rails 3.2.18 but we need: 2.
+    # ActiveAdmin::Dependency.rails! '5'
+    # -> ActiveAdmin::DependencyError: You provided rails 4.2.7 but we need: 5.
     #
     # ActiveAdmin::Dependency.devise!
     # -> ActiveAdmin::DependencyError: To use devise you need to specify it in your Gemfile.
@@ -33,12 +33,12 @@ module ActiveAdmin
     #
     # All but the pessimistic operator (~>) can also be run using Ruby's comparison syntax.
     #
-    # ActiveAdmin::Dependency.rails >= '3.2.18'
+    # ActiveAdmin::Dependency.rails >= '4.2.7'
     # => true
     #
     # Which is especially useful if you're looking up a gem with dashes in the name.
     #
-    # ActiveAdmin::Dependency['jquery-ui-rails'] < 5
+    # ActiveAdmin::Dependency['jquery-rails'] < 5
     # => false
     #
     def self.method_missing(name, *args)
@@ -55,8 +55,8 @@ module ActiveAdmin
       Matcher.new name.to_s
     end
 
-    def self.rails5?
-      rails >= '5.x'
+    def self.supports_zeitwerk?
+      rails >= "6.0.0.beta3" && RUBY_ENGINE != "jruby"
     end
 
     class Matcher
@@ -94,74 +94,6 @@ module ActiveAdmin
         info = spec ? "#{spec.name} #{spec.version}" : '(missing)'
         "<ActiveAdmin::Dependency::Matcher for #{info}>"
       end
-
-      def adapter
-        @adapter ||= Adapter.const_get(@name.camelize).new self
-      end
-
-      def method_missing(method, *args, &block)
-        if respond_to_missing?(method)
-          adapter.send method, *args, &block
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        adapter.respond_to?(method) || super
-      rescue NameError
-        # 🐾
-      end
-    end
-
-    # Dependency adapters provide an easy way to wrap the conditional logic
-    # necessary to support multiple versions of a gem.
-    #
-    # ActiveAdmin::Dependency.rails.adapter.parameterize 'a b'
-    # => 'a_b'
-    #
-    # ActiveAdmin::Dependency.rails.parameterize 'a b'
-    # => 'a_b'
-    #
-    # ActiveAdmin::Dependency.devise.adapter
-    # -> NameError: uninitialized constant ActiveAdmin::Dependency::Adapter::Devise
-    #
-    module Adapter
-      class Base
-        def initialize(version)
-          @version = version
-        end
-      end
-
-      class Rails < Base
-        def strong_parameters?
-          @version >= 4 || defined?(ActionController::StrongParameters)
-        end
-
-        def parameterize(string)
-          if Dependency.rails5?
-            string.parameterize separator: '_'
-          else
-            string.parameterize '_'
-          end
-        end
-
-        def redirect_back(controller, fallback_location)
-          controller.instance_exec do
-            if Dependency.rails5?
-              redirect_back fallback_location: fallback_location
-            elsif controller.request.headers.key? 'HTTP_REFERER'
-              redirect_to :back
-            else
-              redirect_to fallback_location
-            end
-          end
-        end
-
-        def render_key
-          Dependency.rails5? ? :body : :text
-        end
-      end
     end
 
   end

data/lib/active_admin/deprecation.rb

@@ -6,30 +6,5 @@ module ActiveAdmin
       ActiveSupport::Deprecation.warn "Active Admin: #{message}", callstack
     end
 
-    # Deprecate a method.
-    #
-    # @param [Module] klass the Class or Module to deprecate the method on
-    # @param [Symbol] method the method to deprecate
-    # @param [String] message the message to display to the end user
-    #
-    # Example:
-    #
-    #     class MyClass
-    #       def my_method
-    #         # ...
-    #       end
-    #       ActiveAdmin::Deprecation.deprecate self, :my_method,
-    #         "MyClass#my_method is being removed in the next release"
-    #     end
-    #
-    def deprecate(klass, method, message)
-      klass.send :define_method, "deprecated_#{method}", klass.instance_method(method)
-
-      klass.send :define_method, method do |*args|
-        ActiveAdmin::Deprecation.warn "#{message}", caller
-        send "deprecated_#{method}", *args
-      end
-    end
-
   end
 end

data/lib/active_admin/devise.rb

@@ -43,7 +43,7 @@ module ActiveAdmin
                  "/#{namespace}"
                end
 
-        # NOTE: `relative_url_root` is deprecated by rails.
+        # NOTE: `relative_url_root` is deprecated by Rails.
         #       Remove prefix here if it is removed completely.
         prefix = Rails.configuration.action_controller[:relative_url_root] || ''
         prefix + path
@@ -63,11 +63,11 @@ module ActiveAdmin
     end
 
     class RegistrationsController < ::Devise::RegistrationsController
-       include ::ActiveAdmin::Devise::Controller
+      include ::ActiveAdmin::Devise::Controller
     end
 
     class ConfirmationsController < ::Devise::ConfirmationsController
-       include ::ActiveAdmin::Devise::Controller
+      include ::ActiveAdmin::Devise::Controller
     end
 
     def self.controllers_for_filters

data/lib/active_admin/dsl.rb

@@ -83,14 +83,7 @@ module ActiveAdmin
     #                         this action item on.
     #                 :except: A single or array of controller actions not to
     #                          display this action item on.
-    def action_item(name = nil, options = {}, &block)
-      if name.is_a?(Hash)
-        options = name
-        name = nil
-      end
-
-      Deprecation.warn "using `action_item` without a name is deprecated! Use `action_item(:edit)`." unless name
-
+    def action_item(name, options = {}, &block)
       config.add_action_item(name, options, &block)
     end
 
@@ -116,7 +109,7 @@ module ActiveAdmin
 
       # Either add/remove the batch action
       unless options == false
-        config.add_batch_action( sym, title, options, &block )
+        config.add_batch_action(sym, title, options, &block)
       else
         config.remove_batch_action sym
       end
@@ -137,7 +130,7 @@ module ActiveAdmin
     # Pass a block returning the name of a menu you want rendered for the request, being
     # executed in the context of the controller
     #
-    def navigation_menu(menu_name=nil, &block)
+    def navigation_menu(menu_name = nil, &block)
       config.navigation_menu_name = menu_name || block
     end
 
@@ -163,11 +156,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/dynamic_setting.rb

@@ -0,0 +1,38 @@
+module ActiveAdmin
+
+  class DynamicSetting
+    def self.build(setting, type)
+      (type ? klass(type) : self).new(setting)
+    end
+
+    def self.klass(type)
+      klass = "#{type.to_s.camelcase}Setting"
+      raise ArgumentError, "Unknown type: #{type}" unless ActiveAdmin.const_defined?(klass)
+      ActiveAdmin.const_get(klass)
+    end
+
+    def initialize(setting)
+      @setting = setting
+    end
+
+    def value(*_args)
+      @setting
+    end
+  end
+
+  # Many configuration options (Ex: site_title, title_image) could either be
+  # static (String), methods (Symbol) or procs (Proc). This wrapper takes care of
+  # returning the content when String or using instance_eval when Symbol or Proc.
+  #
+  class StringSymbolOrProcSetting < DynamicSetting
+    def value(context = self)
+      case @setting
+      when Symbol, Proc
+        context.instance_eval(&@setting)
+      else
+        @setting
+      end
+    end
+  end
+
+end

data/lib/active_admin/dynamic_settings_node.rb

@@ -0,0 +1,28 @@
+require 'active_admin/dynamic_setting'
+require 'active_admin/settings_node'
+
+module ActiveAdmin
+
+  class DynamicSettingsNode < SettingsNode
+    class << self
+      def register(name, value, type = nil)
+        class_attribute "#{name}_setting"
+        add_reader(name)
+        add_writer(name, type)
+        send "#{name}=", value
+      end
+
+      def add_reader(name)
+        define_singleton_method(name) do |*args|
+          send("#{name}_setting").value(*args)
+        end
+      end
+
+      def add_writer(name, type)
+        define_singleton_method("#{name}=") do |value|
+          send("#{name}_setting=", DynamicSetting.build(value, type))
+        end
+      end
+    end
+  end
+end

data/lib/active_admin/engine.rb

@@ -1,5 +1,10 @@
 module ActiveAdmin
   class Engine < ::Rails::Engine
+    initializer "active_admin.load_app_path" do |app|
+      ActiveAdmin::Application.setting :app_path, app.root
+      ActiveAdmin::Application.setting :load_paths, [File.expand_path('app/admin', app.root)]
+    end
+
     initializer "active_admin.precompile", group: :all do |app|
       ActiveAdmin.application.stylesheets.each do |path, _|
         app.config.assets.precompile << path

data/lib/active_admin/error.rb

@@ -5,8 +5,10 @@ module ActiveAdmin
   class AccessDenied < StandardError
     attr_reader :user, :action, :subject
 
-    def initialize(user, action, subject)
-      @user, @action, @subject = user, action, subject
+    def initialize(user, action, subject = nil)
+      @user = user
+      @action = action
+      @subject = subject
 
       super()
     end
@@ -22,7 +24,7 @@ module ActiveAdmin
   class ErrorLoading < Error
     # Locates the most recent file and line from the caught exception's backtrace.
     def find_cause(folder, backtrace)
-      backtrace.grep(/\/(#{folder}\/.*\.rb):(\d+)/){ [$1, $2] }.first
+      backtrace.grep(/\/(#{folder}\/.*\.rb):(\d+)/) { [$1, $2] }.first
     end
   end
 

data/lib/active_admin/filters/active.rb

@@ -1,29 +1,28 @@
-require 'active_admin/filters/humanized'
+require 'active_admin/filters/active_filter'
 
 module ActiveAdmin
   module Filters
 
     class Active
-      attr_accessor :filters, :scope
+      attr_accessor :filters, :resource
 
-      def initialize(resource_class, params)
-        @resource_class = resource_class
-        @params = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
-        @scope = humanize_scope
-        @filters = build_filters
+      # Instantiate a `Active` object containing collection of current active filters
+
+      # @param resource [ActiveAdmin::Resource] current resource
+      # @param search [Ransack::Search] search object
+      #
+      # @see ActiveAdmin::ResourceController::DataAcces#apply_filtering
+      def initialize(resource, search)
+        @resource = resource
+        @filters = build_filters(search.conditions)
       end
 
       private
 
-      def build_filters
-        filters = @params[:q] || []
-        filters.map{ |param| Humanized.new(param) }
+      def build_filters(conditions)
+        conditions.map { |condition| ActiveFilter.new(resource, condition.dup) }
       end
 
-      def humanize_scope
-        scope = @params['scope']
-        scope ? scope.humanize : "All"
-      end
     end
 
   end

data/lib/active_admin/filters/active_filter.rb

@@ -0,0 +1,124 @@
+module ActiveAdmin
+  module Filters
+
+    class ActiveFilter
+      include ActiveAdmin::ViewHelpers
+
+      attr_reader :resource, :condition, :related_class
+
+      # Instantiate a `ActiveFilter`
+      #
+      # @param resource [ActiveAdmin::Resource] current resource
+      # @param condition [Ransack::Nodes::Condition] applied ransack condition
+      def initialize(resource, condition)
+        @resource = resource
+        @condition = condition
+        @related_class = find_class if find_class?
+      end
+
+      def values
+        condition_values = condition.values.map(&:value)
+        if related_class
+          related_class.where(related_primary_key => condition_values)
+        else
+          condition_values
+        end
+      end
+
+      def label
+        translated_predicate = predicate_name.downcase
+        if filter_label && filter_label.is_a?(Proc)
+          "#{filter_label.call} #{translated_predicate}"
+        elsif filter_label
+          "#{filter_label} #{translated_predicate}"
+        elsif related_class
+          "#{related_class_name} #{translated_predicate}"
+        else
+          "#{attribute_name} #{translated_predicate}"
+        end.strip
+      end
+
+      def predicate_name
+        I18n.t("active_admin.filters.predicates.#{condition.predicate.name}",
+               default: ransack_predicate_name)
+      end
+
+      def html_options
+        { class: "current_filter current_filter_#{condition.key}" }
+      end
+
+      private
+
+      def resource_class
+        resource.resource_class
+      end
+
+      def attribute_name
+        resource_class.human_attribute_name(name)
+      end
+
+      def related_class_name
+        return unless related_class
+
+        related_class.model_name.human
+      end
+
+      def filter_label
+        return unless filter
+
+        filter[:label] || I18n.t(name, scope: ['formtastic', 'labels'], default: nil)
+      end
+
+      #@return Ransack::Nodes::Attribute
+      def condition_attribute
+        condition.attributes[0]
+      end
+
+      def name
+        condition_attribute.attr_name
+      end
+
+      def ransack_predicate_name
+        Ransack::Translate.predicate(condition.predicate.name)
+      end
+
+      def find_class?
+        ['eq', 'in'].include? condition.predicate.arel_predicate
+      end
+
+      # detect related class for Ransack::Nodes::Attribute
+      def find_class
+        if condition_attribute.klass != resource_class && condition_attribute.klass.primary_key == name.to_s
+          condition_attribute.klass
+        elsif predicate_association
+          predicate_association.klass
+        end
+      end
+
+      def filter
+        resource.filters[name.to_sym]
+      end
+
+      def related_primary_key
+        if predicate_association
+          predicate_association.association_primary_key
+        elsif related_class
+          related_class.primary_key
+        end
+      end
+
+      def predicate_association
+        @predicate_association = find_predicate_association unless defined?(@predicate_association)
+        @predicate_association
+      end
+
+      private
+
+      def find_predicate_association
+        condition_attribute.klass.reflect_on_all_associations.
+          reject { |r| r.options[:polymorphic] }. #skip polymorphic
+          detect { |r| r.foreign_key.to_s == name.to_s }
+      end
+    end
+  end
+end

data/lib/active_admin/filters/active_sidebar.rb

@@ -0,0 +1,54 @@
+require 'active_admin/filters/active'
+
+module ActiveAdmin
+  module Filters
+    class ActiveSidebar < ActiveAdmin::SidebarSection
+
+      def initialize
+        super 'search_status', sidebar_options
+      end
+
+      def block
+        -> do
+          active_filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
+          span do
+            if current_scope
+              h4 I18n.t("active_admin.search_status.current_scope"), style: 'display: inline'
+              b scope_name(current_scope), class: 'current_scope_name', style: "display: inline"
+            end
+            div style: "margin-top: 10px" do
+              h4 I18n.t("active_admin.search_status.current_filters"), style: 'margin-bottom: 10px'
+              ul do
+                if active_filters.filters.blank?
+                  li I18n.t("active_admin.search_status.no_current_filters")
+                else
+                  active_filters.filters.each do |filter|
+                    li filter.html_options do
+                      span do
+                        text_node filter.label
+                      end
+                      b do
+                        text_node to_sentence(filter.values.map { |v| pretty_format(v) })
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      def title
+        I18n.t("active_admin.search_status.headline")
+      end
+
+      protected
+
+      def sidebar_options
+        { only: :index, if: -> { active_admin_config.current_filters_enabled? && (params[:q] || params[:scope]) } }
+      end
+
+    end
+  end
+end