yousty-activeadmin 1.0.4.pre → 1.0.5.pre

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

@@ -0,0 +1,50 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      class CheckBoxesInput < ::Formtastic::Inputs::CheckBoxesInput
+        include Base
+
+        def input_name
+          "#{object_name}[#{searchable_method_name}_in][]"
+        end
+
+        def selected_values
+          @object.public_send("#{searchable_method_name}_in") || []
+        end
+
+        def searchable_method_name
+          if searchable_has_many_through?
+            "#{reflection.through_reflection.name}_#{reflection.foreign_key}"
+          else
+            association_primary_key || method
+          end
+        end
+
+        # Add whitespace before label
+        def choice_label(choice)
+          ' ' + super
+        end
+
+        # Don't wrap in UL tag
+        def choices_group_wrapping(&block)
+          template.capture(&block)
+        end
+
+        # Don't wrap in LI tag
+        def choice_wrapping(html_options, &block)
+          template.capture(&block)
+        end
+
+        # Don't render hidden fields
+        def hidden_field_for_all
+          ""
+        end
+
+        # Don't render hidden fields
+        def hidden_fields?
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      class DateRangeInput < ::Formtastic::Inputs::StringInput
+        include Base
+
+        def to_html
+          input_wrapping do
+            [ label_html,
+              builder.text_field(gt_input_name, input_html_options(gt_input_name)),
+              template.content_tag(:span, "-", class: "seperator"),
+              builder.text_field(lt_input_name, input_html_options(lt_input_name)),
+            ].join("\n").html_safe
+          end
+        end
+
+        def gt_input_name
+          "#{method}_gteq"
+        end
+        alias :input_name :gt_input_name
+
+        def lt_input_name
+          "#{method}_lteq"
+        end
+
+        def input_html_options(input_name = gt_input_name)
+          current_value = @object.public_send input_name
+          { size: 12,
+            class: "datepicker",
+            max: 10,
+            value: current_value.respond_to?(:strftime) ? current_value.strftime("%Y-%m-%d") : "" }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      class NumericInput < ::Formtastic::Inputs::NumberInput
+        include Base
+        include Base::SearchMethodSelect
+
+        filter :equals, :greater_than, :less_than
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      class SelectInput < ::Formtastic::Inputs::SelectInput
+        include Base
+
+        def input_name
+          return method if seems_searchable?
+
+          searchable_method_name.concat multiple? ? '_in' : '_eq'
+        end
+
+        def searchable_method_name
+          if searchable_has_many_through?
+            "#{reflection.through_reflection.name}_#{reflection.foreign_key}"
+          else
+            name = method.to_s
+            name.concat '_id' if reflection
+            name
+          end
+        end
+
+        # Provide the AA translation to the blank input field.
+        def include_blank
+          I18n.t 'active_admin.any' if super
+        end
+
+        def input_html_options_name
+          "#{object_name}[#{input_name}]" # was "#{object_name}[#{association_primary_key}]"
+        end
+
+        # Would normally return true for has_many and HABTM, which would subsequently
+        # cause the select field to be multi-select instead of a dropdown.
+        def multiple_by_association?
+          false
+        end
+
+        # Provides an efficient default lookup query if the attribute is a DB column.
+        def collection
+          if !options[:collection] && column
+            pluck_column
+          else
+            super
+          end
+        end
+
+        def pluck_column
+          klass.reorder("#{method} asc").uniq.pluck method
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module ActiveAdmin
+  module Inputs
+    module Filters
+      class StringInput < ::Formtastic::Inputs::StringInput
+        include Base
+        include Base::SearchMethodSelect
+
+        filter :contains, :equals, :starts_with, :ends_with
+
+        # If the filter method includes a search condition, build a normal string search field.
+        # Else, build a search field with a companion dropdown to choose a search condition from.
+        def to_html
+          if seems_searchable?
+            input_wrapping do
+              label_html <<
+              builder.text_field(method, input_html_options)
+            end
+          else
+            super # SearchMethodSelect#to_html
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/active_admin/menu.rb

@@ -47,9 +47,9 @@ module ActiveAdmin
       #
       def add(options)
         item = if parent = options.delete(:parent)
-          (self[parent] || add(:label => parent)).add options
+          (self[parent] || add(label: parent)).add options
         else
-          _add options.merge :parent => self
+          _add options.merge parent: self
         end
 
         yield(item) if block_given?
@@ -92,7 +92,7 @@ module ActiveAdmin
       def normalize_id(id)
         case id
         when String, Symbol, ActiveModel::Name
-          id.to_s.downcase.gsub ' ', '_'
+          id.to_s.downcase.tr ' ', '_'
         when ActiveAdmin::Resource::Name
           id.param_key
         else

data/lib/active_admin/menu_collection.rb

@@ -5,9 +5,6 @@ module ActiveAdmin
   # A MenuCollection stores multiple menus for any given namespace. Namespaces delegate
   # the addition of menu items to this class.
   class MenuCollection
-
-    NoMenuError = Class.new(KeyError)
-
     def initialize
       @menus = {}
       @build_callbacks = []
@@ -34,7 +31,7 @@ module ActiveAdmin
       build_menus!
 
       @menus[menu_name] or
-        raise NoMenuError, "No menu by the name of #{menu_name.inspect} in availble menus: #{@menus.keys.join(", ")}"
+        raise NoMenuError, "No menu by the name of #{menu_name.inspect} in available menus: #{@menus.keys.join(", ")}"
     end
 
     # Add callbacks that will be run when the menu is going to be built. This

data/lib/active_admin/namespace.rb

@@ -11,7 +11,7 @@ module ActiveAdmin
   #
   # For example:
   #
-  #   ActiveAdmin.register Post, :namespace => :admin
+  #   ActiveAdmin.register Post, namespace: :admin
   #
   # Will register the Post model into the "admin" namespace. This will namespace the
   # urls for the resource to "/admin/posts" and will set the controller to
@@ -19,7 +19,7 @@ module ActiveAdmin
   #
   # You can also register to the "root" namespace, which is to say no namespace at all.
   #
-  #   ActiveAdmin.register Post, :namespace => false
+  #   ActiveAdmin.register Post, namespace: false
   #
   # This will register the resource to an instantiated namespace called :root. The
   # resource will be accessible from "/posts" and the controller will be PostsController.
@@ -45,7 +45,7 @@ module ActiveAdmin
 
       # Register the resource
       register_resource_controller(config)
-      parse_registration_block(config, &block) if block_given?
+      parse_registration_block(config, resource_class, &block) if block_given?
       reset_menu!
 
       # Dispatch a registration event
@@ -96,7 +96,7 @@ module ActiveAdmin
     # Override from ActiveAdmin::Settings to inherit default attributes
     # from the application
     def read_default_setting(name)
-      application.send(name)
+      application.public_send name
     end
 
     def fetch_menu(name)
@@ -112,7 +112,7 @@ module ActiveAdmin
     # @param [Symbol] name The name of the menu. Default: :default
     # @param [Proc] block The block to be ran when the menu is built
     #
-    # @returns [void]
+    # @return [void]
     def build_menu(name = DEFAULT_MENU, &block)
       @menus.before_build do |menus|
         menus.menu name do |menu|
@@ -121,30 +121,35 @@ module ActiveAdmin
       end
     end
 
-    # Add the default logout button to the menu, using the ActiveAdmin configuration settings
+    # The default logout menu item
     #
     # @param [ActiveAdmin::MenuItem] menu The menu to add the logout link to
-    # @param [Fixnum] priority Override the default priority of 100 to position the logout button where you want
+    # @param [Fixnum] priority The numeric priority for the order in which it appears
     # @param [Hash] html_options An options hash to pass along to link_to
     #
-    # @returns [void]
-    def add_logout_button_to_menu(menu, priority=100, html_options={})
+    def add_logout_button_to_menu(menu, priority = 20, html_options = {})
       if logout_link_path
-        logout_method = logout_link_method || :get
-        menu.add :id           => 'logout',
-                 :priority     => priority,
-                 :label        => proc{ I18n.t('active_admin.logout') },
-                 :html_options => html_options.reverse_merge(:method => logout_method),
-                 :url          => proc{ render_or_call_method_or_proc_on self, active_admin_namespace.logout_link_path },
-                 :if           => proc{ current_active_admin_user? }
+        html_options = html_options.reverse_merge(method: logout_link_method || :get)
+        menu.add id: 'logout', priority: priority, html_options: html_options,
+          label: ->{ I18n.t 'active_admin.logout' },
+          url:   ->{ render_or_call_method_or_proc_on self, active_admin_namespace.logout_link_path },
+          if:    :current_active_admin_user?
       end
     end
 
-    def add_current_user_to_menu(menu)
-      menu.add label: proc{ display_name current_active_admin_user },
-               url:   proc{ url_for [active_admin_namespace.name, current_active_admin_user] rescue '#' },
-               id:    'current_user',
-               if:    proc{ current_active_admin_user? }
+    # The default user session menu item
+    #
+    # @param [ActiveAdmin::MenuItem] menu The menu to add the logout link to
+    # @param [Fixnum] priority The numeric priority for the order in which it appears
+    # @param [Hash] html_options An options hash to pass along to link_to
+    #
+    def add_current_user_to_menu(menu, priority = 10, html_options = {})
+      if current_user_method
+        menu.add id: 'current_user', priority: priority, html_options: html_options,
+          label: -> { display_name current_active_admin_user },
+          url:   -> { auto_url_for(current_active_admin_user) },
+          if:    :current_active_admin_user?
+      end
     end
 
     protected
@@ -170,8 +175,7 @@ module ActiveAdmin
       end
     end
 
-    # Either returns an existing Resource instance or builds a new
-    # one for the resource and options
+    # Either returns an existing Resource instance or builds a new one.
     def find_or_build_resource(resource_class, options)
       resources.add Resource.new(self, resource_class, options)
     end
@@ -180,6 +184,7 @@ module ActiveAdmin
       resources.add Page.new(self, name, options)
     end
 
+    # TODO: replace `eval` with `Class.new`
     def register_page_controller(config)
       eval "class ::#{config.controller_name} < ActiveAdmin::PageController; end"
       config.controller.active_admin_config = config
@@ -188,9 +193,8 @@ module ActiveAdmin
     def unload_resources!
       resources.each do |resource|
         parent = (module_name || 'Object').constantize
-        const_name = resource.controller_name.split('::').last
-        # Remove the const if its been defined
-        parent.send(:remove_const, const_name) if parent.const_defined?(const_name)
+        name   = resource.controller_name.split('::').last
+        parent.send(:remove_const, name) if parent.const_defined? name
 
         # Remove circular references
         resource.controller.active_admin_config = nil
@@ -203,16 +207,19 @@ module ActiveAdmin
 
     # Creates a ruby module to namespace all the classes in if required
     def register_module
-      eval "module ::#{module_name}; end"
+      unless Object.const_defined? module_name
+        Object.const_set module_name, Module.new
+      end
     end
 
+    # TODO replace `eval` with `Class.new`
     def register_resource_controller(config)
       eval "class ::#{config.controller_name} < ActiveAdmin::ResourceController; end"
       config.controller.active_admin_config = config
     end
 
-    def parse_registration_block(config, &block)
-      config.dsl = ResourceDSL.new(config)
+    def parse_registration_block(config, resource_class, &block)
+      config.dsl = ResourceDSL.new(config, resource_class)
       config.dsl.run_registration_block(&block)
     end
 
@@ -220,5 +227,21 @@ module ActiveAdmin
       PageDSL.new(config).run_registration_block(&block)
     end
 
+    class Store
+      include Enumerable
+      delegate :[], :[]=, :empty?, to: :@namespaces
+
+      def initialize
+        @namespaces = {}
+      end
+
+      def each(&block)
+        @namespaces.values.each(&block)
+      end
+
+      def names
+        @namespaces.keys
+      end
+    end
   end
 end

data/lib/active_admin/order_clause.rb

@@ -0,0 +1,26 @@
+module ActiveAdmin
+  class OrderClause
+    attr_reader :field, :order
+
+    def initialize(clause)
+      clause =~ /^([\w\_\.]+)(->'\w+')?_(desc|asc)$/
+      @column = $1
+      @op = $2
+      @order = $3
+
+      @field = [@column, @op].compact.join
+    end
+
+    def valid?
+      @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(".")
+
+      [table_column, @op, ' ', @order].compact.join
+    end
+  end
+end

data/lib/active_admin/orm/active_record.rb

@@ -1,3 +1,5 @@
 # ActiveRecord-specific plugins should be required here
 
+ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid
+
 require 'active_admin/orm/active_record/comments'

data/lib/active_admin/orm/active_record/comments.rb

@@ -4,80 +4,77 @@ require 'active_admin/orm/active_record/comments/namespace_helper'
 require 'active_admin/orm/active_record/comments/resource_helper'
 
 # Add the comments configuration
-ActiveAdmin::Application.inheritable_setting :allow_comments,             true
+ActiveAdmin::Application.inheritable_setting :comments,                   true
 ActiveAdmin::Application.inheritable_setting :show_comments_in_menu,      true
 ActiveAdmin::Application.inheritable_setting :comments_registration_name, 'Comment'
 
 # Insert helper modules
 ActiveAdmin::Namespace.send :include, ActiveAdmin::Comments::NamespaceHelper
 ActiveAdmin::Resource.send  :include, ActiveAdmin::Comments::ResourceHelper
-
-# Add the module to the show page
 ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
 
 # Load the model as soon as it's referenced. By that point, Rails & Kaminari will be ready
-module ActiveAdmin
-  autoload :Comment, 'active_admin/orm/active_record/comments/comment'
-end
+ActiveAdmin.autoload :Comment, 'active_admin/orm/active_record/comments/comment'
 
 # Walk through all the loaded namespaces after they're loaded
 ActiveAdmin.after_load do |app|
-  app.namespaces.values.each do |namespace|
-    if namespace.comments?
-      namespace.register ActiveAdmin::Comment, :as => namespace.comments_registration_name do
-        actions :index, :show, :create
+  app.namespaces.each do |namespace|
+    namespace.register ActiveAdmin::Comment, as: namespace.comments_registration_name do
+      actions :index, :show, :create
 
-        menu false unless namespace.show_comments_in_menu
+      menu false unless namespace.comments && namespace.show_comments_in_menu
 
-        config.comments      = false # Don't allow comments on comments
-        config.batch_actions = false # The default destroy batch action isn't showing up anyway...
+      config.comments      = false # Don't allow comments on comments
+      config.batch_actions = false # The default destroy batch action isn't showing up anyway...
 
-        scope :all, :show_count => false
-        # Register a scope for every namespace that exists.
-        # The current namespace will be the default scope.
-        app.namespaces.values.map(&:name).each do |name|
-          scope name, :default => namespace.name == name do |scope|
-            scope.where :namespace => name.to_s
-          end
+      scope :all, show_count: false
+      # Register a scope for every namespace that exists.
+      # The current namespace will be the default scope.
+      app.namespaces.map(&:name).each do |name|
+        scope name, default: namespace.name == name do |scope|
+          scope.where namespace: name.to_s
         end
+      end
 
-        # Store the author and namespace
-        before_save do |comment|
-          comment.namespace = active_admin_config.namespace.name
-          comment.author    = current_active_admin_user
-        end
+      # Store the author and namespace
+      before_save do |comment|
+        comment.namespace = active_admin_config.namespace.name
+        comment.author    = current_active_admin_user
+      end
 
-        controller do
-          # Prevent N+1 queries
-          def scoped_collection
-            resource_class.includes :author, :resource
-          end
+      controller do
+        # Prevent N+1 queries
+        def scoped_collection
+          super.includes *( # rails/rails#14734
+            ActiveAdmin::Dependency.rails?('>= 4.1.0', '<= 4.1.1') ?
+              [:author] : [:author, :resource]
+          )
+        end
 
-          # Redirect to the resource show page after comment creation
-          def create
-            create! do |success, failure|
-              success.html{ redirect_to :back }
-              failure.html do
-                flash[:error] = I18n.t 'active_admin.comments.errors.empty_text'
-                redirect_to :back
-              end
+        # Redirect to the resource show page after comment creation
+        def create
+          create! do |success, failure|
+            success.html{ redirect_to :back }
+            failure.html do
+              flash[:error] = I18n.t 'active_admin.comments.errors.empty_text'
+              redirect_to :back
             end
           end
-
-          # Define the permitted params in case the app is using Strong Parameters
-          def permitted_params
-            params.permit active_admin_comment: [:body, :namespace, :resource_id, :resource_type]
-          end unless Rails::VERSION::MAJOR == 3 && !defined? StrongParameters
         end
+      end
 
-        index do
-          column I18n.t('active_admin.comments.resource_type'), :resource_type
-          column I18n.t('active_admin.comments.author_type'),   :author_type
-          column I18n.t('active_admin.comments.resource'),      :resource
-          column I18n.t('active_admin.comments.author'),        :author
-          column I18n.t('active_admin.comments.body'),          :body
-          actions
-        end
+      # Set up permitted params in case the app is using Strong Parameters
+      unless Rails::VERSION::MAJOR == 3 && !defined? StrongParameters
+        permit_params :body, :namespace, :resource_id, :resource_type
+      end
+
+      index do
+        column I18n.t('active_admin.comments.resource_type'), :resource_type
+        column I18n.t('active_admin.comments.author_type'),   :author_type
+        column I18n.t('active_admin.comments.resource'),      :resource
+        column I18n.t('active_admin.comments.author'),        :author
+        column I18n.t('active_admin.comments.body'),          :body
+        actions
       end
     end
   end