activeadmin 0.6.6 → 1.0.0.pre1

data/lib/active_admin/deprecation.rb

@@ -23,13 +23,12 @@ module ActiveAdmin
     #     end
     #
     def deprecate(klass, method, message)
-      klass.class_eval <<-EOC, __FILE__, __LINE__ + 1
-        alias_method :deprecated_#{method}, :#{method}
-        def #{method}(*args)
-          ActiveAdmin::Deprecation.warn('#{message}', caller)
-          send(:deprecated_#{method}, *args)
-        end
-      EOC
+      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

data/lib/active_admin/devise.rb

@@ -1,28 +1,26 @@
+ActiveAdmin::Dependency.devise! ActiveAdmin::Dependency::DEVISE
+
 require 'devise'
 
 module ActiveAdmin
   module Devise
 
     def self.config
-      config = {
-        :path => ActiveAdmin.application.default_namespace,
-        :controllers => ActiveAdmin::Devise.controllers,
-        :path_names => { :sign_in => 'login', :sign_out => "logout" }
+      {
+        path: ActiveAdmin.application.default_namespace || "/",
+        controllers: ActiveAdmin::Devise.controllers,
+        path_names: { sign_in: 'login', sign_out: "logout" },
+        sign_out_via: [*::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].uniq
       }
-
-      if ::Devise.respond_to?(:sign_out_via)
-        logout_methods = [::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].flatten.uniq
-        config.merge!( :sign_out_via => logout_methods)
-      end
-
-      config
     end
 
     def self.controllers
       {
-        :sessions => "active_admin/devise/sessions",
-        :passwords => "active_admin/devise/passwords",
-        :unlocks => "active_admin/devise/unlocks"
+        sessions: "active_admin/devise/sessions",
+        passwords: "active_admin/devise/passwords",
+        unlocks: "active_admin/devise/unlocks",
+        registrations: "active_admin/devise/registrations",
+        confirmations: "active_admin/devise/confirmations"
       }
     end
 
@@ -38,10 +36,8 @@ module ActiveAdmin
         namespace = ActiveAdmin.application.default_namespace.presence
         root_path_method = [namespace, :root_path].compact.join('_')
 
-        url_helpers = Rails.application.routes.url_helpers
-
-        path = if url_helpers.respond_to? root_path_method
-                 url_helpers.send root_path_method
+        path = if Helpers::Routes.respond_to? root_path_method
+                 Helpers::Routes.send root_path_method
                else
                  # Guess a root_path when url_helpers not helpful
                  "/#{namespace}"
@@ -66,5 +62,19 @@ module ActiveAdmin
       include ::ActiveAdmin::Devise::Controller
     end
 
+    class RegistrationsController < ::Devise::RegistrationsController
+       include ::ActiveAdmin::Devise::Controller
+    end
+
+    class ConfirmationsController < ::Devise::ConfirmationsController
+       include ::ActiveAdmin::Devise::Controller
+    end
+
+    def self.controllers_for_filters
+      [SessionsController, PasswordsController, UnlocksController,
+        RegistrationsController, ConfirmationsController
+      ]
+    end
+
   end
 end

data/lib/active_admin/dsl.rb

@@ -1,9 +1,8 @@
 module ActiveAdmin
 
-  #
   # The Active Admin DSL. This class is where all the registration blocks
-  # are instance eval'd. This is the central place for the API given to
-  # users of Active Admin
+  # are evaluated. This is the central place for the API given to
+  # users of Active Admin.
   #
   class DSL
 
@@ -13,10 +12,10 @@ module ActiveAdmin
 
     # Runs the registration block inside this object
     def run_registration_block(&block)
-      instance_eval &block if block_given?
+      instance_exec &block if block_given?
     end
 
-    # The instance of ActiveAdmin::Config that's being registered
+    # The instance of ActiveAdmin::Resource that's being registered
     # currently. You can use this within your registration blocks to
     # modify options:
     #
@@ -51,13 +50,13 @@ module ActiveAdmin
     #
     # @param [Module] mod A module to include
     #
-    # @returns [Nil]
+    # @return [Nil]
     def include(mod)
       mod.included(self)
     end
 
     # Returns the controller for this resource. If you pass a
-    # block, it will be eval'd in the controller
+    # block, it will be evaluated in the controller.
     #
     # Example:
     #
@@ -72,19 +71,27 @@ module ActiveAdmin
     #   end
     #
     def controller(&block)
-      @config.controller.class_eval(&block) if block_given?
+      @config.controller.class_exec(&block) if block_given?
       @config.controller
     end
 
     # Add a new action item to the resource
     #
+    # @param [Symbol] name
     # @param [Hash] options valid keys include:
     #                 :only:  A single or array of controller actions to display
     #                         this action item on.
     #                 :except: A single or array of controller actions not to
     #                          display this action item on.
-    def action_item(options = {}, &block)
-      config.add_action_item(options, &block)
+    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
+
+      config.add_action_item(name, options, &block)
     end
 
     # Add a new batch action item to the resource
@@ -101,7 +108,7 @@ module ActiveAdmin
     def batch_action(title, options = {}, &block)
       # Create symbol & title information
       if title.is_a? String
-        sym = title.titleize.gsub(' ', '').underscore.to_sym
+        sym = title.titleize.tr(' ', '').underscore.to_sym
       else
         sym = title
         title = sym.to_s.titleize

data/lib/active_admin/engine.rb

@@ -1,14 +1,16 @@
 module ActiveAdmin
   class Engine < ::Rails::Engine
-    if Rails.version > "3.1"
-      initializer "ActiveAdmin precompile hook", :group => :all do |app|
-        ActiveAdmin.application.stylesheets.each do |path, _|
-          app.config.assets.precompile << path
-        end
-        ActiveAdmin.application.javascripts.each do |path|
-          app.config.assets.precompile << path
-        end
+    initializer "active_admin.precompile", group: :all do |app|
+      ActiveAdmin.application.stylesheets.each do |path, _|
+        app.config.assets.precompile << path
       end
+      ActiveAdmin.application.javascripts.each do |path|
+        app.config.assets.precompile << path
+      end
+    end
+
+    initializer 'active_admin.routes' do
+      require 'active_admin/helpers/routes/url_helpers'
     end
   end
 end

data/lib/active_admin/error.rb

@@ -0,0 +1,62 @@
+module ActiveAdmin
+  # Exception class to raise when there is an authorized access
+  # exception thrown. The exception has a few goodies that may
+  # be useful for capturing / recognizing security issues.
+  class AccessDenied < StandardError
+    attr_reader :user, :action, :subject
+
+    def initialize(user, action, subject)
+      @user, @action, @subject = user, action, subject
+
+      super()
+    end
+
+    def message
+      I18n.t("active_admin.access_denied.message")
+    end
+  end
+
+  class Error < RuntimeError
+  end
+
+  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
+    end
+  end
+
+  class DatabaseHitDuringLoad < ErrorLoading
+    def initialize(exception)
+      file, line = find_cause(:app, exception.backtrace)
+
+      super "Your file, #{file} (line #{line}), caused a database error while Active Admin was loading. This " +
+            "is most common when your database is missing or doesn't have the latest migrations applied. To " +
+            "prevent this error, move the code to a place where it will only be run when a page is rendered. " +
+            "One solution can be, to wrap the query in a Proc." +
+            "Original error message: #{exception.message}"
+    end
+
+    def self.capture
+      yield
+    rescue *database_error_classes => exception
+      raise new exception
+    end
+
+    private
+
+    def self.database_error_classes
+      @classes ||= []
+    end
+  end
+
+  class DependencyError < ErrorLoading
+  end
+
+  class NoMenuError < KeyError
+  end
+
+  class GeneratorError < Error
+  end
+
+end

data/lib/active_admin/filters/dsl.rb

@@ -8,8 +8,8 @@ module ActiveAdmin
       end
 
       # For docs, please see ActiveAdmin::Filters::ResourceExtension#remove_filter
-      def remove_filter(attribute)
-        config.remove_filter(attribute)
+      def remove_filter(*attributes)
+        config.remove_filter(*attributes)
       end
 
       # For docs, please see ActiveAdmin::Filters::ResourceExtension#preserve_default_filters!

data/lib/active_admin/filters/forms.rb

@@ -1,19 +1,17 @@
 module ActiveAdmin
   module Filters
-
     # This form builder defines methods to build filter forms such
     # as the one found in the sidebar of the index page of a standard resource.
     class FormBuilder < ::ActiveAdmin::FormBuilder
       include ::ActiveAdmin::Filters::FormtasticAddons
+      self.input_namespaces = [::Object, ::ActiveAdmin::Inputs::Filters, ::ActiveAdmin::Inputs, ::Formtastic::Inputs]
 
-      def initialize(*args)
-        @use_form_buffer = true # force ActiveAdmin::FormBuilder to use the form buffer
-        super
-      end
+      # TODO: remove input class finders after formtastic 4 (where it will be default)
+      self.input_class_finder = ::Formtastic::InputClassFinder
 
       def filter(method, options = {})
         if method.present? && options[:as] ||= default_input_type(method)
-          input(method, options)
+          template.concat input(method, options)
         end
       end
 
@@ -22,8 +20,10 @@ module ActiveAdmin
       # Returns the default filter type for a given attribute. If you want
       # to use a custom search method, you have to specify the type yourself.
       def default_input_type(method, options = {})
-        if method =~ /_(contains|starts_with|ends_with)\z/
+        if method =~ /_(eq|equals|cont|contains|start|starts_with|end|ends_with)\z/
           :string
+        elsif klass._ransackers.key?(method.to_s)
+          klass._ransackers[method.to_s].type
         elsif reflection_for(method) || polymorphic_foreign_type?(method)
           :select
         elsif column = column_for(method)
@@ -39,15 +39,6 @@ module ActiveAdmin
           end
         end
       end
-
-      def custom_input_class_name(as)
-        "Filter#{as.to_s.camelize}Input"
-      end
-
-      def active_admin_input_class_name(as)
-        "ActiveAdmin::Inputs::Filter#{as.to_s.camelize}Input"
-      end
-
     end
 
 
@@ -56,29 +47,28 @@ module ActiveAdmin
 
       # Helper method to render a filter form
       def active_admin_filters_form_for(search, filters, options = {})
-        defaults = { :builder => ActiveAdmin::Filters::FormBuilder,
-                     :url     => collection_path,
-                     :html    => {:class  => 'filter_form'} }
-        required = { :html    => {:method => :get},
-                     :as      => :q }
+        defaults = { builder: ActiveAdmin::Filters::FormBuilder,
+                     url: collection_path,
+                     html: {class: 'filter_form'} }
+        required = { html: {method: :get},
+                     as: :q }
         options  = defaults.deep_merge(options).deep_merge(required)
 
         form_for search, options do |f|
-          filters.group_by{ |o| o[:attribute] }.each do |attribute, array|
-            opts     = array.last # grab last-defined `filter` call from DSL
+          filters.each do |attribute, opts|
             next if opts.key?(:if)     && !call_method_or_proc_on(self, opts[:if])
             next if opts.key?(:unless) &&  call_method_or_proc_on(self, opts[:unless])
 
             f.filter attribute, opts.except(:if, :unless)
           end
 
-          buttons = content_tag :div, :class => "buttons" do
+          buttons = content_tag :div, class: "buttons" do
             f.submit(I18n.t('active_admin.filters.buttons.filter')) +
-              link_to(I18n.t('active_admin.filters.buttons.clear'), '#', :class => 'clear_filters_btn') +
-              hidden_field_tags_for(params, :except => [:q, :page])
+              link_to(I18n.t('active_admin.filters.buttons.clear'), '#', class: 'clear_filters_btn') +
+              hidden_field_tags_for(params, except: [:q, :page])
           end
 
-          f.form_buffers.last + buttons
+          f.template.concat buttons
         end
       end
 

data/lib/active_admin/filters/formtastic_addons.rb

@@ -3,41 +3,75 @@ module ActiveAdmin
     module FormtasticAddons
 
       #
-      # The below are Formtastic overrides to use `base` instead of `class` for MetaSearch.
+      # The below are Formtastic method overrides that jump inside of the Ransack
+      # search object to get at the object being searched upon.
       #
 
-      # Returns the default label for a given attribute. Uses ActiveModel I18n if available.
       def humanized_method_name
-        if object.base.respond_to?(:human_attribute_name)
-          object.base.human_attribute_name(method)
+        if klass.respond_to?(:human_attribute_name)
+          klass.human_attribute_name(method)
         else
-          method.to_s.send(builder.label_str_method)
+          method.to_s.public_send(builder.label_str_method)
         end
       end
 
-      # Returns the association reflection for the method if it exists
       def reflection_for(method)
-        @object.base.reflect_on_association(method) if @object.base.respond_to?(:reflect_on_association)
+        klass.reflect_on_association(method) if klass.respond_to? :reflect_on_association
       end
 
-      # Returns the column for an attribute on the object being searched if it exists.
       def column_for(method)
-        @object.base.columns_hash[method.to_s] if @object.base.respond_to?(:columns_hash)
+        klass.columns_hash[method.to_s] if klass.respond_to? :columns_hash
+      end
+
+      def column
+        column_for method
       end
 
       #
       # The below are custom methods that Formtastic does not provide.
       #
 
-      def foreign_key?(method)
-        @object.base.reflections.select{ |_,r| r.macro == :belongs_to }.values
-          .map(&:foreign_key).include? method.to_s
+      # The resource class, unwrapped from Ransack
+      def klass
+        @object.object.klass
       end
 
       def polymorphic_foreign_type?(method)
-        type = Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0 ? proc{ |r| r.options[:foreign_type] } : :foreign_type
-        @object.base.reflections.values.select{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
-          .map(&type).include? method.to_s
+        klass.reflect_on_all_associations.select{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
+          .map(&:foreign_type).include? method.to_s
+      end
+
+      #
+      # These help figure out whether the given method or association will be recognized by Ransack.
+      #
+
+      def searchable_has_many_through?
+        if reflection && reflection.options[:through]
+          reflection.through_reflection.klass.ransackable_attributes.include? reflection.foreign_key
+        else
+          false
+        end
+      end
+
+      def seems_searchable?
+        has_predicate? || ransacker? || scope?
+      end
+
+      # If the given method has a predicate (like _eq or _lteq), it's pretty
+      # likely we're dealing with a valid search method.
+      def has_predicate?
+        !!Ransack::Predicate.detect_from_string(method.to_s)
+      end
+
+      # Ransack lets you define custom search methods, called ransackers.
+      def ransacker?
+        klass._ransackers.key? method.to_s
+      end
+
+      # Ransack supports exposing selected scopes on your model for advanced searches.
+      def scope?
+        context = Ransack::Context.for klass
+        context.respond_to?(:ransackable_scope?) && context.ransackable_scope?(method.to_s, klass)
       end
 
     end