activeadmin 0.6.6 → 1.0.0.pre1

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

@@ -0,0 +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

@@ -0,0 +1,81 @@
+require 'active_admin/orm/active_record/comments/views'
+require 'active_admin/orm/active_record/comments/show_page_helper'
+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 :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
+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
+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.each do |namespace|
+    namespace.register ActiveAdmin::Comment, as: namespace.comments_registration_name do
+      actions :index, :show, :create
+
+      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...
+
+      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
+
+      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
+          end
+        end
+      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
+end

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

@@ -0,0 +1,45 @@
+module ActiveAdmin
+  class Comment < ActiveRecord::Base
+
+    self.table_name = 'active_admin_comments'
+
+    belongs_to :resource, polymorphic: true
+    belongs_to :author,   polymorphic: true
+
+    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+      attr_accessible :resource, :resource_id, :resource_type, :body, :namespace
+    end
+
+    validates_presence_of :body, :namespace, :resource
+
+    before_create :set_resource_type
+
+    # @return [String] The name of the record to use for the polymorphic relationship
+    def self.resource_type(resource)
+      ResourceController::Decorators.undecorate(resource).class.base_class.name.to_s
+    end
+
+    # Postgres adapters won't compare strings to numbers (issue 34)
+    def self.resource_id_cast(record)
+      resource_id_type == :string ? record.id.to_s : record.id
+    end
+
+    def self.find_for_resource_in_namespace(resource, namespace)
+      where(
+        resource_type: resource_type(resource),
+        resource_id:   resource_id_cast(resource),
+        namespace:     namespace.to_s
+      ).order('created_at ASC')
+    end
+
+    def self.resource_id_type
+      columns.detect{ |i| i.name == "resource_id" }.type
+    end
+
+    def set_resource_type
+      self.resource_type = self.class.resource_type(resource)
+    end
+
+  end
+end
+

data/lib/active_admin/{comments → orm/active_record/comments}/namespace_helper.rb

@@ -3,9 +3,9 @@ module ActiveAdmin
 
     module NamespaceHelper
 
-      # Returns true of the namespace allows comments
+      # Returns true if the namespace allows comments
       def comments?
-        allow_comments == true
+        comments == true
       end
 
     end

data/lib/active_admin/{comments → orm/active_record/comments}/resource_helper.rb

@@ -9,7 +9,7 @@ module ActiveAdmin
       end
 
       def comments?
-        namespace.comments? && comments != false
+        (namespace.comments? && comments != false) || comments == true
       end
     end
 

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

@@ -0,0 +1,2 @@
+require 'active_admin/views'
+require 'active_admin/orm/active_record/comments/views/active_admin_comments'

data/lib/active_admin/{comments → orm/active_record/comments}/views/active_admin_comments.rb

@@ -8,17 +8,19 @@ module ActiveAdmin
       class Comments < ActiveAdmin::Views::Panel
         builder_method :active_admin_comments_for
 
+        attr_accessor :resource
+
         def build(resource)
           @resource = resource
-          @comments = ActiveAdmin::Comment.find_for_resource_in_namespace @resource, active_admin_namespace.name
-          super(title, :for => resource)
+          @comments = ActiveAdmin::Comment.find_for_resource_in_namespace resource, active_admin_namespace.name
+          super(title, for: resource)
           build_comments
         end
 
         protected
 
         def title
-          I18n.t 'active_admin.comments.title_content', :count => @comments.count
+          I18n.t 'active_admin.comments.title_content', count: @comments.count
         end
 
         def build_comments
@@ -27,21 +29,21 @@ module ActiveAdmin
         end
 
         def build_comment(comment)
-          div :for => comment do
-            div :class => 'active_admin_comment_meta' do
-              h4 :class => 'active_admin_comment_author' do
-                comment.author ? auto_link(comment.author) : 'Anonymous'
+          div for: comment do
+            div class: 'active_admin_comment_meta' do
+              h4 class: 'active_admin_comment_author' do
+                comment.author ? auto_link(comment.author) : I18n.t('active_admin.comments.author_missing')
               end
               span pretty_format comment.created_at
             end
-            div :class => 'active_admin_comment_body' do
+            div class: 'active_admin_comment_body' do
               simple_format comment.body
             end
           end
         end
 
         def build_empty_message
-          span I18n.t('active_admin.comments.no_comments_yet'), :class => 'empty'
+          span I18n.t('active_admin.comments.no_comments_yet'), class: 'empty'
         end
 
         def comment_form_url
@@ -53,14 +55,14 @@ module ActiveAdmin
         end
 
         def build_comment_form
-          self << active_admin_form_for(ActiveAdmin::Comment.new, :url => comment_form_url) do |f|
+          active_admin_form_for(ActiveAdmin::Comment.new, url: comment_form_url) do |f|
             f.inputs do
-              f.input :resource_type, :as => :hidden,  :input_html => { :value => ActiveAdmin::Comment.resource_type(@resource) }
-              f.input :resource_id,   :as => :hidden,  :input_html => { :value => @resource.id }
-              f.input :body,          :label => false, :input_html => { :size => '80x8' }
+              f.input :resource_type, as: :hidden,  input_html: { value: ActiveAdmin::Comment.resource_type(parent.resource) }
+              f.input :resource_id,   as: :hidden,  input_html: { value: parent.resource.id }
+              f.input :body,          label: false, input_html: { size: '80x8' }
             end
             f.actions do
-              f.action :submit, :label => I18n.t('active_admin.comments.add')
+              f.action :submit, label: I18n.t('active_admin.comments.add')
             end
           end
         end

data/lib/active_admin/orm/mongoid.rb

@@ -0,0 +1 @@
+# Mongoid-specific plugins should be required here

data/lib/active_admin/page.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   # Page is the primary data storage for page configuration in Active Admin
   #
-  # When you register a page (ActiveAdmin.page "Status") you are actually creating
+  # When you register a page (ActiveAdmin.register_page "Status") you are actually creating
   # a new Page instance within the given Namespace.
   #
   # The instance of the current page is available in PageController and views
@@ -49,15 +49,19 @@ module ActiveAdmin
     end
 
     def underscored_resource_name
-      resource_name.parameterize.underscore
+      resource_name.to_s.parameterize.underscore
     end
 
     def camelized_resource_name
       underscored_resource_name.camelize
     end
 
+    def namespace_name
+      namespace.name.to_s
+    end
+
     def default_menu_options
-      super.merge(:id => resource_name)
+      super.merge(id: resource_name)
     end
 
     def controller_name

data/lib/active_admin/page_dsl.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  # This is the class where all the register_page blocks are instance eval'd
+  # This is the class where all the register_page blocks are evaluated.
   class PageDSL < DSL
 
     # Page content.

data/lib/active_admin/page_presenter.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
   #
   # Usage:
   #
-  #     presenter = PagePresenter.new :as => :table do
+  #     presenter = PagePresenter.new as: :table do
   #       # some awesome stuff
   #     end
   #
@@ -18,7 +18,7 @@ module ActiveAdmin
 
     attr_reader :block, :options
 
-    delegate :has_key?, :to => :options
+    delegate :has_key?, :fetch, to: :options
 
     def initialize(options = {}, &block)
       @options, @block = options, block

data/lib/active_admin/pundit_adapter.rb

@@ -0,0 +1,68 @@
+ActiveAdmin::Dependency.pundit!
+
+require 'pundit'
+
+# Add a setting to the application to configure the pundit default policy
+ActiveAdmin::Application.inheritable_setting :pundit_default_policy, nil
+
+module ActiveAdmin
+
+  class PunditAdapter < AuthorizationAdapter
+
+    def authorized?(action, subject = nil)
+      policy = retrieve_policy(subject)
+      action = format_action(action, subject)
+
+      policy.respond_to?(action) && policy.public_send(action)
+    end
+
+    def scope_collection(collection, action = Auth::READ)
+      # scoping is appliable only to read/index action
+      # which means there is no way how to scope other actions
+      Pundit.policy_scope!(user, collection)
+    rescue Pundit::NotDefinedError => e
+      if default_policy_class && default_policy_class.const_defined?(:Scope)
+        default_policy_class::Scope.new(user, collection).resolve
+      else
+        raise e
+      end
+    end
+
+    def retrieve_policy(subject)
+      case subject
+      when nil   then Pundit.policy!(user, resource)
+      when Class then Pundit.policy!(user, subject.new)
+      else Pundit.policy!(user, subject)
+      end
+    rescue Pundit::NotDefinedError => e
+      if default_policy_class
+        default_policy(user, subject)
+      else
+        raise e
+      end
+    end
+
+    def format_action(action, subject)
+      # https://github.com/elabs/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
+      case action
+      when Auth::CREATE  then :create?
+      when Auth::UPDATE  then :update?
+      when Auth::READ    then subject.is_a?(Class) ? :index? : :show?
+      when Auth::DESTROY then subject.is_a?(Class) ? :destroy_all? : :destroy?
+      else "#{action}?"
+      end
+    end
+
+    private
+
+    def default_policy_class
+      ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
+    end
+
+    def default_policy(user, subject)
+      default_policy_class.new(user, subject)
+    end
+
+  end
+
+end

data/lib/active_admin/resource.rb

@@ -6,6 +6,7 @@ require 'active_admin/resource/pagination'
 require 'active_admin/resource/routes'
 require 'active_admin/resource/naming'
 require 'active_admin/resource/scopes'
+require 'active_admin/resource/includes'
 require 'active_admin/resource/scope_to'
 require 'active_admin/resource/sidebars'
 require 'active_admin/resource/belongs_to'
@@ -38,13 +39,16 @@ module ActiveAdmin
     attr_reader :collection_actions
 
     # The default sort order to use in the controller
-    attr_accessor :sort_order
+    attr_writer :sort_order
+    def sort_order
+      @sort_order ||= (resource_class.respond_to?(:primary_key) ? resource_class.primary_key.to_s : 'id') + '_desc'
+    end
 
     # Set the configuration for the CSV
     attr_writer :csv_builder
 
     # Set breadcrumb builder
-    attr_accessor :breadcrumb
+    attr_writer :breadcrumb
 
     # Store a reference to the DSL so that we can dereference it during garbage collection.
     attr_accessor :dsl
@@ -57,8 +61,8 @@ module ActiveAdmin
       def initialize(namespace, resource_class, options = {})
         @namespace = namespace
         @resource_class_name = "::#{resource_class.name}"
-        @options = default_options.merge(options)
-        @sort_order = @options[:sort_order]
+        @options    = options
+        @sort_order = options[:sort_order]
         @member_actions, @collection_actions = [], []
       end
     end
@@ -74,9 +78,9 @@ module ActiveAdmin
     include PagePresenters
     include Pagination
     include Scopes
+    include Includes
     include ScopeTo
     include Sidebars
-    include Menu
     include Routes
 
     # The class this resource wraps. If you register the Post model, Resource#resource_class
@@ -135,24 +139,19 @@ module ActiveAdmin
       @csv_builder || default_csv_builder
     end
 
-    def find_resource(id)
-      resource = resource_class.where(resource_class.primary_key => id).first
-      decorator_class ? decorator_class.new(resource) : resource
+    def breadcrumb
+      instance_variable_defined?(:@breadcrumb) ? @breadcrumb : namespace.breadcrumb
     end
 
-    # @deprecated
-    def resource
-      resource_class
+    def find_resource(id)
+      resource = resource_class.public_send(method_for_find, id)
+      decorator_class ? decorator_class.new(resource) : resource
     end
-    ActiveAdmin::Deprecation.deprecate self, :resource,
-      "ActiveAdmin::Resource#resource is deprecated. Please use #resource_class instead."
 
     private
 
-    def default_options
-      {
-        :sort_order => (resource_class.respond_to?(:primary_key) ? resource_class.primary_key.to_s : 'id') + '_desc'
-      }
+    def method_for_find
+      resources_configuration[:self][:finder] || :"find_by_#{resource_class.primary_key}"
     end
 
     def default_csv_builder