yousty-activeadmin 1.0.4.pre → 1.0.5.pre

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

@@ -1,8 +1,10 @@
 module ActiveAdmin
   class Comment < ActiveRecord::Base
 
-    belongs_to :resource, :polymorphic => true
-    belongs_to :author,   :polymorphic => true
+    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
@@ -10,9 +12,11 @@ module ActiveAdmin
 
     validates_presence_of :body, :namespace, :resource
 
-    # @returns [String] The name of the record to use for the polymorphic relationship
-    def self.resource_type(record)
-      record.class.base_class.name.to_s
+    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)
@@ -21,17 +25,19 @@ module ActiveAdmin
     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
+      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 self.table_name
-      @table_name ||= ActiveRecord::Migrator.proper_table_name("active_admin_comments")
+    def set_resource_type
+      self.resource_type = self.class.resource_type(resource)
     end
 
   end

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

@@ -5,7 +5,7 @@ module ActiveAdmin
 
       # Returns true if the namespace allows comments
       def comments?
-        allow_comments == true
+        comments == true
       end
 
     end

data/lib/active_admin/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/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
+          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/page.rb

@@ -56,8 +56,12 @@ module ActiveAdmin
       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'
@@ -47,7 +48,7 @@ module ActiveAdmin
     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
@@ -77,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
@@ -138,13 +139,21 @@ module ActiveAdmin
       @csv_builder || default_csv_builder
     end
 
+    def breadcrumb
+      instance_variable_defined?(:@breadcrumb) ? @breadcrumb : namespace.breadcrumb
+    end
+
     def find_resource(id)
-      resource = resource_class.where(resource_class.primary_key => id).first
+      resource = resource_class.public_send(method_for_find, id)
       decorator_class ? decorator_class.new(resource) : resource
     end
 
     private
 
+    def method_for_find
+      resources_configuration[:self][:finder] || :"find_by_#{resource_class.primary_key}"
+    end
+
     def default_csv_builder
       @default_csv_builder ||= CSVBuilder.default_for_resource(resource_class)
     end

data/lib/active_admin/resource/action_items.rb

@@ -18,13 +18,18 @@ module ActiveAdmin
 
       # Add a new action item to a 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 add_action_item(options = {}, &block)
-        self.action_items << ActiveAdmin::ActionItem.new(options, &block)
+      def add_action_item(name, options = {}, &block)
+        self.action_items << ActiveAdmin::ActionItem.new(name, options, &block)
+      end
+
+      def remove_action_item(name)
+        self.action_items.delete_if { |item| item.name == name }
       end
 
       # Returns a set of action items to display for a specific controller action
@@ -51,21 +56,21 @@ module ActiveAdmin
       # Adds the default action items to each resource
       def add_default_action_items
         # New link on index
-        add_action_item only: :index do
+        add_action_item :new, only: :index do
           if controller.action_methods.include?('new') && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
             link_to I18n.t('active_admin.new_model', model: active_admin_config.resource_label), new_resource_path
           end
         end
 
         # Edit link on show
-        add_action_item only: :show do
+        add_action_item :show, only: :show do
           if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
             link_to I18n.t('active_admin.edit_model', model: active_admin_config.resource_label), edit_resource_path(resource)
           end
         end
 
         # Destroy link on show
-        add_action_item only: :show do
+        add_action_item :destroy, only: :show do
           if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             link_to I18n.t('active_admin.delete_model', model: active_admin_config.resource_label), resource_path(resource),
               method: :delete, data: {confirm: I18n.t('active_admin.delete_confirmation')}
@@ -80,10 +85,12 @@ module ActiveAdmin
   class ActionItem
     include ActiveAdmin::OptionalDisplay
 
-    attr_accessor :block
+    attr_accessor :block, :name
 
-    def initialize(options = {}, &block)
-      @options, @block = options, block
+    def initialize(name, options = {}, &block)
+      @name = name
+      @options = options
+      @block = block
       normalize_display_options!
     end
   end

data/lib/active_admin/resource/belongs_to.rb

@@ -4,7 +4,12 @@ module ActiveAdmin
   class Resource
     class BelongsTo
 
-      class TargetNotFound < StandardError; end
+      class TargetNotFound < StandardError
+        def initialize(key, namespace)
+          super "Could not find #{key} in #{namespace.name} " +
+                "with #{namespace.resources.map(&:resource_name)}"
+        end
+      end
 
       # The resource which initiated this relationship
       attr_reader :owner
@@ -16,8 +21,7 @@ module ActiveAdmin
       # Returns the target resource class or raises an exception if it doesn't exist
       def target
         key = @target_name.to_s.camelize
-        namespace.resources[key] or raise TargetNotFound, "Could not find #{key} in" +
-          " #{namespace.name} with #{namespace.resources.map(&:resource_name)}"
+        namespace.resources[key] or raise TargetNotFound.new key, namespace
       end
 
       def namespace

data/lib/active_admin/resource/controllers.rb

@@ -1,6 +1,7 @@
 module ActiveAdmin
   class Resource
     module Controllers
+      delegate :resources_configuration, to: :controller
 
       # Returns a properly formatted controller name for this
       # config within its namespace

data/lib/active_admin/resource/includes.rb

@@ -0,0 +1,12 @@
+module ActiveAdmin
+  class Resource
+    module Includes
+
+      # Return an array of includes for this resource
+      def includes
+        @includes ||= []
+      end
+
+    end
+  end
+end

data/lib/active_admin/resource/menu.rb

@@ -24,10 +24,10 @@ module ActiveAdmin
         menu_resource_class = respond_to?(:resource_class) ? resource_class : self
         resource = self
         {
-          :id    => resource_name.plural,
-          :label => proc{ resource.plural_resource_label },
-          :url   => proc{ resource.route_collection_path(params) },
-          :if    => proc{ authorized?(:read, menu_resource_class) }
+          id: resource_name.plural,
+          label: proc{ resource.plural_resource_label },
+          url:   proc{ resource.route_collection_path(params) },
+          if:    proc{ authorized?(:read, menu_resource_class) }
         }
       end
 
@@ -36,7 +36,7 @@ module ActiveAdmin
       def navigation_menu_name
         case @navigation_menu_name ||= DEFAULT_MENU
         when Proc
-          controller.instance_eval(&@navigation_menu_name).to_sym
+          controller.instance_exec(&@navigation_menu_name).to_sym
         else
           @navigation_menu_name
         end

data/lib/active_admin/resource/naming.rb

@@ -2,53 +2,51 @@ module ActiveAdmin
   class Resource
 
     module Naming
-
-      # Returns a name used to uniquely identify this resource
-      # this should be an instance of ActiveAdmin:Resource::Name, which responds to
-      # #singular, #plural, #route_key, #human etc.
       def resource_name
-        custom_name = @options[:as] && @options[:as].gsub(/\s/,'')
-        @resource_name ||= if custom_name || !resource_class.respond_to?(:model_name)
-            Resource::Name.new(resource_class, custom_name)
+        @resource_name ||= begin
+          as = @options[:as].gsub /\s/, '' if @options[:as]
+
+          if as || !resource_class.respond_to?(:model_name)
+            Name.new resource_class, as
           else
-            Resource::Name.new(resource_class)
+            Name.new resource_class
           end
+        end
       end
 
       # Returns the name to call this resource such as "Bank Account"
       def resource_label
-        resource_name.translate :count => 1, :default => resource_name.to_s.gsub('::', ' ').titleize
+        resource_name.translate count: 1,
+          default: resource_name.to_s.gsub('::', ' ').titleize
       end
 
       # Returns the plural version of this resource such as "Bank Accounts"
       def plural_resource_label(options = {})
-        resource_name.translate ({:count => 1.1, :default => resource_label.pluralize.titleize}).merge(options)
+        defaults = {count:   Helpers::I18n::PLURAL_MANY_COUNT,
+                    default: resource_label.pluralize.titleize}
+        resource_name.translate defaults.merge options
+      end
+
+      # Forms use the model's original `param_key`, so we can't use our
+      # custom `resource_name` when the model's been renamed in ActiveAdmin.
+      def param_key
+        if resource_class.respond_to? :model_name
+          resource_class.model_name.param_key
+        else
+          resource_name.param_key
+        end
       end
     end
 
-    # A subclass of ActiveModel::Name which supports the different APIs presented
-    # in Rails < 3.1 and > 3.1.
     class Name < ActiveModel::Name
-
-      delegate :hash, :to => :to_str
+      delegate :hash, to: :to_str
 
       def initialize(klass, name = nil)
-        if ActiveModel::Name.instance_method(:initialize).arity == 1
-          super(proxy_for_initializer(klass, name))
-        else
-          super(klass, nil, name)
-        end
+        super(klass, nil, name)
       end
 
       def translate(options = {})
-        I18n.t i18n_key, {:scope => [:activerecord, :models]}.merge(options)
-      end
-
-      def proxy_for_initializer(klass, name)
-        return klass unless name
-        return StringClassProxy.new(klass, name) if klass
-
-        StringProxy.new(name)
+        I18n.t i18n_key, {scope: [:activerecord, :models]}.merge(options)
       end
 
       def route_key
@@ -58,26 +56,6 @@ module ActiveAdmin
       def eql?(other)
         to_str.eql?(other.to_str)
       end
-
-      class StringProxy
-        def initialize(name)
-          @name = name
-        end
-
-        def name
-          @name
-        end
-      end
-
-      class StringClassProxy < StringProxy
-        delegate :lookup_ancestors, :i18n_scope, :to => :"@klass"
-
-        def initialize(klass, name)
-          @klass = klass || name
-          super(name)
-        end
-      end
-
     end
 
   end