yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/lib/active_admin/resource_controller/decorators.rb

@@ -1,20 +1,102 @@
 module ActiveAdmin
   class ResourceController < BaseController
     module Decorators
-      protected
 
-      def resource
-        decorator = active_admin_config.decorator_class
-        resource = super
-        decorator ? decorator.new(resource) : resource
+    protected
+
+      def apply_decorator(resource)
+        decorate? ? decorator_class.new(resource) : resource
+      end
+
+      def apply_collection_decorator(collection)
+        if decorate?
+          collection_decorator.decorate collection, with: decorator_class
+        else
+          collection
+        end
+      end
+
+      def self.undecorate(resource)
+        if resource.respond_to?(:decorated?) && resource.decorated?
+          resource.model
+        else
+          resource
+        end
+      end
+
+    private
+
+      def decorate?
+        case action_name
+        when 'new', 'edit'
+          form = active_admin_config.get_page_presenter :form
+          form && form.options[:decorate] && decorator_class.present?
+        else
+          decorator_class.present?
+        end
+      end
+
+      def decorator_class
+        active_admin_config.decorator_class
       end
 
-      def active_admin_collection
-        decorator = active_admin_config.decorator_class
-        collection = super
-        decorator ? decorator.decorate_collection(collection) : collection
+      # When using Draper, we wrap the collection draper in a new class that
+      # correctly delegates methods that Active Admin depends on.
+      def collection_decorator
+        if decorator_class
+          Wrapper.wrap decorator_class
+        end
       end
 
+      class Wrapper
+        @cache = {}
+
+        def self.wrap(decorator)
+          collection_decorator = find_collection_decorator(decorator)
+
+          if draper_collection_decorator? collection_decorator
+            name = "#{collection_decorator.name} of #{decorator} + ActiveAdmin"
+            @cache[name] ||= wrap! collection_decorator, name
+          else
+            collection_decorator
+          end
+        end
+
+      private
+
+        def self.wrap!(parent, name)
+          ::Class.new parent do
+            delegate :reorder, :page, :current_page, :total_pages, :limit_value,
+                     :total_count, :num_pages, :to_key, :group_values, :except,
+                     :find_each
+
+            define_singleton_method(:name) { name }
+          end
+        end
+
+        # Draper::CollectionDecorator was introduced in 1.0.0
+        # Draper::Decorator#collection_decorator_class was introduced in 1.3.0
+        def self.find_collection_decorator(decorator)
+          if Dependency.draper?    '>= 1.3.0'
+            decorator.collection_decorator_class
+          elsif Dependency.draper? '>= 1.0.0'
+            draper_collection_decorator
+          else
+            decorator
+          end
+        end
+
+        def self.draper_collection_decorator?(decorator)
+          decorator && decorator <= draper_collection_decorator
+        rescue NameError
+          false
+        end
+
+        def self.draper_collection_decorator
+          ::Draper::CollectionDecorator
+        end
+
+      end
     end
   end
 end

data/lib/active_admin/resource_controller/streaming.rb

@@ -0,0 +1,37 @@
+require 'csv'
+
+module ActiveAdmin
+  class ResourceController < BaseController
+
+    # This module overrides CSV responses to allow large data downloads.
+    # Could be expanded to JSON and XML in the future.
+    #
+    module Streaming
+
+      def index
+        super do |format|
+          format.csv { stream_csv }
+          yield(format) if block_given?
+        end
+      end
+
+      protected
+
+      def stream_resource(&block)
+        headers['X-Accel-Buffering'] = 'no'
+        headers['Cache-Control'] = 'no-cache'
+        self.response_body = Enumerator.new &block
+      end
+
+      def csv_filename
+        "#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_s(:default)}.csv"
+      end
+
+      def stream_csv
+        headers['Content-Disposition'] = %{attachment; filename="#{csv_filename}"}
+        stream_resource &active_admin_config.csv_builder.method(:build).to_proc.curry[self]
+      end
+
+    end
+  end
+end

data/lib/active_admin/resource_dsl.rb

@@ -1,6 +1,11 @@
 module ActiveAdmin
-  # This is the class where all the register blocks are instance eval'd
+  # This is the class where all the register blocks are evaluated.
   class ResourceDSL < DSL
+    def initialize(config, resource_class)
+      @resource = resource_class
+      super(config)
+    end
+
     private
 
     def belongs_to(target, options = {})
@@ -17,6 +22,42 @@ module ActiveAdmin
       config.scope(*args, &block)
     end
 
+    # Store relations that should be included
+    def includes(*args)
+      config.includes.push *args
+    end
+
+    #
+    # Rails 4 Strong Parameters Support
+    #
+    # Either
+    #
+    #   permit_params :title, :author, :body, tags: []
+    #
+    # Or
+    #
+    #   permit_params do
+    #     defaults = [:title, :body]
+    #     if current_user.admin?
+    #       defaults + [:author]
+    #     else
+    #       defaults
+    #     end
+    #   end
+    #
+    # Keys included in the `permitted_params` setting are automatically whitelisted.
+    #
+    def permit_params(*args, &block)
+      param_key = config.param_key.to_sym
+
+      controller do
+        define_method :permitted_params do
+          params.permit *active_admin_namespace.permitted_params,
+            param_key => block ? instance_exec(&block) : args
+        end
+      end
+    end
+
     # Configure the index page for the resource
     def index(options = {}, &block)
       options[:as] ||= :table
@@ -41,11 +82,13 @@ module ActiveAdmin
     #     column("Author") { |post| post.author.full_name }
     #   end
     #
-    #   csv :col_sep => ";", :force_quotes => true do
+    #   csv col_sep: ";", force_quotes: true do
     #     column :name
     #   end
     #
     def csv(options={}, &block)
+      options[:resource] = @resource
+
       config.csv_builder = CSVBuilder.new(options, &block)
     end
 
@@ -73,7 +116,7 @@ module ActiveAdmin
       title = options.delete(:title)
 
       controller do
-        before_filter(:only => [name]) { @page_title = title } if title
+        before_filter(only: [name]) { @page_title = title } if title
         define_method(name, &block || Proc.new{})
       end
     end
@@ -110,14 +153,15 @@ module ActiveAdmin
     # == Before / After Destroy
     # Called before and after the object is destroyed from the database.
     #
-    delegate :before_build,   :after_build,   :to => :controller
-    delegate :before_create,  :after_create,  :to => :controller
-    delegate :before_update,  :after_update,  :to => :controller
-    delegate :before_save,    :after_save,    :to => :controller
-    delegate :before_destroy, :after_destroy, :to => :controller
+    delegate :before_build,   :after_build,   to: :controller
+    delegate :before_create,  :after_create,  to: :controller
+    delegate :before_update,  :after_update,  to: :controller
+    delegate :before_save,    :after_save,    to: :controller
+    delegate :before_destroy, :after_destroy, to: :controller
 
     # Standard rails filters
-    delegate :before_filter, :skip_before_filter, :after_filter, :around_filter, :skip_filter, :to => :controller
+    delegate :before_filter, :skip_before_filter, :after_filter, :skip_after_filter, :around_filter, :skip_filter,
+             to: :controller
 
     # Specify which actions to create in the controller
     #
@@ -128,7 +172,7 @@ module ActiveAdmin
     #   end
     #
     # Will only create the index and show actions (no create, update or delete)
-    delegate :actions, :to => :controller
+    delegate :actions, to: :controller
 
   end
 end

data/lib/active_admin/router.rb

@@ -18,13 +18,13 @@ module ActiveAdmin
     end
 
     def define_root_routes(router)
-      router.instance_exec @application.namespaces.values do |namespaces|
+      router.instance_exec @application.namespaces do |namespaces|
         namespaces.each do |namespace|
           if namespace.root?
-            root :to => namespace.root_to
+            root namespace.root_to_options.merge(to: namespace.root_to)
           else
             namespace namespace.name do
-              root :to => namespace.root_to
+              root namespace.root_to_options.merge(to: namespace.root_to)
             end
           end
         end
@@ -34,7 +34,7 @@ module ActiveAdmin
     # Defines the routes for each resource
     def define_resource_routes(router)
       router.instance_exec @application.namespaces, self do |namespaces, aa_router|
-        resources = namespaces.values.map{ |n| n.resources.values }.flatten
+        resources = namespaces.flat_map{ |n| n.resources.values }
         resources.each do |config|
           routes = aa_router.resource_routes(config)
 
@@ -47,7 +47,7 @@ module ActiveAdmin
 
               # Make the nested belongs_to routes
               # :only is set to nothing so that we don't clobber any existing routes on the resource
-              resources config.belongs_to_config.target.resource_name.plural, :only => [] do
+              resources config.belongs_to_config.target.resource_name.plural, only: [] do
                 instance_exec &belongs_to
               end
             end
@@ -80,14 +80,14 @@ module ActiveAdmin
         }
         case config
         when ::ActiveAdmin::Resource
-          resources config.resource_name.route_key, :only => config.defined_actions do
+          resources config.resource_name.route_key, only: config.defined_actions do
             member do
               config.member_actions.each &build_action
             end
 
             collection do
               config.collection_actions.each &build_action
-              post :batch_action
+              post :batch_action if config.batch_actions_enabled?
             end
           end
         when ::ActiveAdmin::Page

data/lib/active_admin/scope.rb

@@ -13,12 +13,12 @@ module ActiveAdmin
     #   Scope.new('Published', :public)
     #   # => Scope with name 'Published' and scope method :public
     #
-    #   Scope.new 'Published', :public, :if => proc { current_admin_user.can? :manage, resource_class } do |articles|
-    #     articles.where :published => true
+    #   Scope.new 'Published', :public, if: proc { current_admin_user.can? :manage, resource_class } do |articles|
+    #     articles.where published: true
     #   end
     #   # => Scope with name 'Published' and scope method :public, optionally displaying the scope per the :if block
     #
-    #   Scope.new('Published') { |articles| articles.where(:published => true) }
+    #   Scope.new('Published') { |articles| articles.where(published: true) }
     #   # => Scope with name 'Published' using a block to scope
     #
     #   Scope.new ->{Date.today.strftime '%A'}, :published_today
@@ -29,16 +29,16 @@ module ActiveAdmin
 
       if name.is_a? Proc
         raise "A string/symbol is required as the second argument if your label is a proc." unless method
-        @id = method.to_s.gsub(' ', '').underscore
+        @id = method.to_s.parameterize("_")
       else
         @scope_method ||= name.to_sym
-        @id = name.to_s.gsub(' ', '').underscore
+        @id = name.to_s.parameterize("_")
       end
 
       @scope_method               = nil        if @scope_method == :all
       @scope_method, @scope_block = nil, block if block_given?
 
-      @show_count       = options[:show_count].nil? ? true : options[:show_count]
+      @show_count       = options.fetch(:show_count, true)
       @display_if_block = options[:if]      || proc{ true }
       @default_block    = options[:default] || proc{ false }
 

data/lib/active_admin/sidebar_section.rb

@@ -25,12 +25,20 @@ module ActiveAdmin
 
     # The title gets displayed within the section in the view
     def title
-      I18n.t("active_admin.sidebars.#{name.to_s}", :default => name.to_s.titlecase)
+      I18n.t("active_admin.sidebars.#{name.to_s}", default: name.to_s.titlecase)
     end
 
     # If a block is not passed in, the name of the partial to render
     def partial_name
-      options[:partial] || "#{name.to_s.downcase.gsub(' ', '_')}_sidebar"
+      options[:partial] || "#{name.to_s.downcase.tr(' ', '_')}_sidebar"
+    end
+
+    def custom_class
+      options[:class]
+    end
+
+    def priority
+      options[:priority] || 10
     end
   end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.4.pre'
+  VERSION = '1.0.5.pre'
 end

data/lib/active_admin/view_factory.rb

@@ -4,24 +4,25 @@ module ActiveAdmin
   class ViewFactory < AbstractViewFactory
 
     # Register Helper Renderers
-    register  :global_navigation    => ActiveAdmin::Views::TabbedNavigation,
-              :utility_navigation   => ActiveAdmin::Views::TabbedNavigation,
-              :site_title           => ActiveAdmin::Views::SiteTitle,
-              :action_items         => ActiveAdmin::Views::ActionItems,
-              :title_bar            => ActiveAdmin::Views::TitleBar,
-              :header               => ActiveAdmin::Views::Header,
-              :footer               => ActiveAdmin::Views::Footer,
-              :index_scopes         => ActiveAdmin::Views::Scopes,
-              :blank_slate          => ActiveAdmin::Views::BlankSlate,
-              :action_list_popover  => ActiveAdmin::Views::ActionListPopover
+    register  global_navigation:   ActiveAdmin::Views::TabbedNavigation,
+              utility_navigation:  ActiveAdmin::Views::TabbedNavigation,
+              site_title:          ActiveAdmin::Views::SiteTitle,
+              unsupported_browser: ActiveAdmin::Views::UnsupportedBrowser,
+              action_items:        ActiveAdmin::Views::ActionItems,
+              title_bar:           ActiveAdmin::Views::TitleBar,
+              header:              ActiveAdmin::Views::Header,
+              footer:              ActiveAdmin::Views::Footer,
+              index_scopes:        ActiveAdmin::Views::Scopes,
+              blank_slate:         ActiveAdmin::Views::BlankSlate,
+              action_list_popover: ActiveAdmin::Views::ActionListPopover
 
     # Register All The Pages
-    register  :index_page         	=> ActiveAdmin::Views::Pages::Index,
-              :show_page          	=> ActiveAdmin::Views::Pages::Show,
-              :new_page           	=> ActiveAdmin::Views::Pages::Form,
-              :edit_page          	=> ActiveAdmin::Views::Pages::Form,
-              :layout             	=> ActiveAdmin::Views::Pages::Layout,
-              :page               	=> ActiveAdmin::Views::Pages::Page
+    register  index_page: ActiveAdmin::Views::Pages::Index,
+              show_page:  ActiveAdmin::Views::Pages::Show,
+              new_page:   ActiveAdmin::Views::Pages::Form,
+              edit_page:  ActiveAdmin::Views::Pages::Form,
+              layout:     ActiveAdmin::Views::Pages::Layout,
+              page:       ActiveAdmin::Views::Pages::Page
 
   end
 end

data/lib/active_admin/view_helpers.rb

@@ -4,7 +4,6 @@ module ActiveAdmin
     # Require all ruby files in the view helpers dir
     Dir[File.expand_path('../view_helpers', __FILE__) + "/*.rb"].each{|f| require f }
 
-    include AssignsWithIndifferentAccessHelper
     include ActiveAdminApplicationHelper
     include AutoLinkHelper
     include BreadcrumbHelper

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -9,24 +9,35 @@ module ActiveAdmin
       # The default content in the link is returned from ActiveAdmin::ViewHelpers::DisplayHelper#display_name
       #
       # You can pass in the content to display
-      #   eg: auto_link(@post, "My Link Content")
+      #   eg: auto_link(@post, "My Link")
       #
-      def auto_link(resource, link_content = nil)
-        content = link_content || display_name(resource)
-        if (registration = active_admin_resource_for(resource.class))
-          begin
-            content = link_to(content, registration.route_instance_path(resource))
-          rescue
-            # ignored
-          end
+      def auto_link(resource, content = display_name(resource))
+        if url = auto_url_for(resource)
+          link_to content, url
+        else
+          content
+        end
+      end
+
+      # Like `auto_link`, except that it only returns a URL instead of a full <a> tag
+      def auto_url_for(resource)
+        config = active_admin_resource_for(resource.class)
+        return unless config
+
+        if config.controller.action_methods.include?("show") &&
+          authorized?(ActiveAdmin::Auth::READ, resource)
+          url_for config.route_instance_path resource
+        elsif config.controller.action_methods.include?("edit") &&
+          authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          url_for config.route_edit_instance_path resource
         end
-        content
       end
 
       # Returns the ActiveAdmin::Resource instance for a class
       def active_admin_resource_for(klass)
-        return nil unless respond_to?(:active_admin_namespace)
-        active_admin_namespace.resource_for(klass)
+        if respond_to? :active_admin_namespace
+          active_admin_namespace.resource_for klass
+        end
       end
 
     end