activeadmin 0.3.4 → 0.4.0

data/lib/active_admin/resource_controller/action_builder.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedResources::Base
+  class ResourceController < BaseController
 
     module ActionBuilder
       extend ActiveSupport::Concern

data/lib/active_admin/resource_controller/actions.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedResources::Base
+  class ResourceController < BaseController
 
     # Override the InheritedResources actions to use the
     # Active Admin templates.
@@ -10,11 +10,11 @@ module ActiveAdmin
     def index(options={}, &block)
       super(options) do |format|
         block.call(format) if block
-        format.html { render active_admin_template('index.html.arb') }
+        format.html { render active_admin_template('index') }
         format.csv do
           headers['Content-Type'] = 'text/csv; charset=utf-8'
           headers['Content-Disposition'] = %{attachment; filename="#{csv_filename}"}
-          render active_admin_template('index.csv.erb')
+          render active_admin_template('index')
         end
       end
     end
@@ -23,7 +23,7 @@ module ActiveAdmin
     def show(options={}, &block)
       super do |format|
         block.call(format) if block
-        format.html { render active_admin_template('show.html.arb') }
+        format.html { render active_admin_template('show') }
       end
     end
     alias :show! :show
@@ -31,7 +31,7 @@ module ActiveAdmin
     def new(options={}, &block)
       super do |format|
         block.call(format) if block
-        format.html { render active_admin_template('new.html.arb') }
+        format.html { render active_admin_template('new') }
       end
     end
     alias :new! :new
@@ -39,7 +39,7 @@ module ActiveAdmin
     def edit(options={}, &block)
       super do |format|
         block.call(format) if block
-        format.html { render active_admin_template('edit.html.arb') }
+        format.html { render active_admin_template('edit') }
       end
     end
     alias :edit! :edit
@@ -47,7 +47,7 @@ module ActiveAdmin
     def create(options={}, &block)
       super(options) do |success, failure|
         block.call(success, failure) if block
-        failure.html { render active_admin_template('new.html.arb') }
+        failure.html { render active_admin_template('new') }
       end
     end
     alias :create! :create
@@ -55,7 +55,7 @@ module ActiveAdmin
     def update(options={}, &block)
       super do |success, failure|
         block.call(success, failure) if block
-        failure.html { render active_admin_template('edit.html.arb') }
+        failure.html { render active_admin_template('edit') }
       end
     end
     alias :update! :update

data/lib/active_admin/resource_controller/callbacks.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedResources::Base
+  class ResourceController < BaseController
 
     module Callbacks
       extend ActiveSupport::Concern

data/lib/active_admin/resource_controller/collection.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedResources::Base
+  class ResourceController < BaseController
 
     # This module deals with the retrieval of collections for resources
     # within the resource controller.
@@ -46,9 +46,13 @@ module ActiveAdmin
 
         def sort_order(chain)
           params[:order] ||= active_admin_config.sort_order
-          table_name = active_admin_config.resource_table_name
           if params[:order] && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
-            chain.order("#{table_name}.#{$1} #{$2}")
+            column = $1
+            order  = $2
+            table  = active_admin_config.resource_table_name
+            table_column = (column =~ /\./) ? column : "#{table}.#{column}"
+
+            chain.order("#{table_column} #{order}")
           else
             chain # just return the chain
           end
@@ -120,7 +124,7 @@ module ActiveAdmin
         end
 
         def paginate(chain)
-          chain.page(params[:page]).per(@per_page || active_admin_application.default_per_page)
+          chain.send(Kaminari.config.page_method_name, params[:page]).per(@per_page || active_admin_namespace.default_per_page)
         end
       end
 

data/lib/active_admin/resource_controller/filters.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedResources::Base
+  class ResourceController < BaseController
 
     module Filters
       extend ActiveSupport::Concern

data/lib/active_admin/resource_controller/resource_class_methods.rb

@@ -0,0 +1,24 @@
+module ActiveAdmin
+  class ResourceController < BaseController
+    module ResourceClassMethods
+
+      # Override the default resource_class class and instance
+      # methods to only return the class defined in the instance
+      # of ActiveAdmin::Resource
+      def override_resource_class_methods!
+        self.class_eval do
+          def self.resource_class=(klass); end
+
+          def self.resource_class
+            @active_admin_config ? @active_admin_config.resource_class : nil
+          end
+
+          def resource_class
+            self.class.resource_class
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/active_admin/resource_controller/scoping.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedResources::Base
+  class ResourceController < BaseController
 
     # This module deals with scoping entire controllers to a relation
     module Scoping

data/lib/active_admin/resource_controller/sidebars.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class ResourceController < ::InheritedResources::Base
+  class ResourceController < BaseController
 
     module Sidebars
 

data/lib/active_admin/resource_dsl.rb

@@ -0,0 +1,157 @@
+module ActiveAdmin
+  # This is the class where all the register blocks are instance eval'd
+  class ResourceDSL < DSL
+    private
+
+    def belongs_to(target, options = {})
+      config.belongs_to(target, options)
+    end
+
+    # Scope this controller to some object which has a relation
+    # to the resource. Can either accept a block or a symbol 
+    # of a method to call.
+    #
+    # Eg:
+    #
+    #   ActiveAdmin.register Post do
+    #     scope_to :current_user
+    #   end
+    #
+    # Then every time we instantiate and object, it would call
+    #   
+    #   current_user.posts.build
+    #
+    # By default Active Admin will use the resource name to build a
+    # method to call as the association. If its different, you can 
+    # pass in the association_method as an option.
+    #
+    #   scope_to :current_user, :association_method => :blog_posts
+    #
+    # will result in the following
+    # 
+    #   current_user.blog_posts.build
+    #
+    def scope_to(*args, &block)
+      options = args.extract_options!
+      method = args.first
+
+      config.scope_to = block_given? ? block : method
+      config.scope_to_association_method = options[:association_method]
+    end
+
+    # Create a scope
+    def scope(*args, &block)
+      config.scope(*args, &block)
+    end
+
+    # Configure the index page for the resource
+    def index(options = {}, &block)
+      options[:as] ||= :table
+      config.set_page_presenter :index, ActiveAdmin::PagePresenter.new(options, &block)
+    end
+
+    # Configure the show page for the resource
+    def show(options = {}, &block)
+      config.set_page_presenter :show, ActiveAdmin::PagePresenter.new(options, &block)
+    end
+
+    def form(options = {}, &block)
+      config.set_page_presenter :form, ActiveAdmin::PagePresenter.new(options, &block)
+    end
+
+    # Configure the CSV format
+    #
+    # For example:
+    #
+    #   csv do
+    #     column :name
+    #     column("Author") { |post| post.author.full_name }
+    #   end
+    #
+    def csv(&block)
+      config.csv_builder = CSVBuilder.new(&block)
+    end
+
+    # Member Actions give you the functionality of defining both the
+    # action and the route directly from your ActiveAdmin registration
+    # block.
+    #
+    # For example:
+    #
+    #   ActiveAdmin.register Post do
+    #     member_action :comments do
+    #       @post = Post.find(params[:id]
+    #       @comments = @post.comments
+    #     end
+    #   end
+    #
+    # Will create a new controller action comments and will hook it up to
+    # the named route (comments_admin_post_path) /admin/posts/:id/comments
+    #
+    # You can treat everything within the block as a standard Rails controller
+    # action.
+    # 
+    def member_action(name, options = {}, &block)
+      config.member_actions << ControllerAction.new(name, options)
+      controller do
+        define_method(name, &block || Proc.new{})
+      end
+    end
+
+    def collection_action(name, options = {}, &block)
+      config.collection_actions << ControllerAction.new(name, options)
+      controller do
+        define_method(name, &block || Proc.new{})
+      end
+    end
+
+    # Defined Callbacks
+    #
+    # == After Build
+    # Called after the resource is built in the new and create actions.
+    #
+    # ActiveAdmin.register Post do
+    #   after_build do |post|
+    #     post.author = current_user
+    #   end
+    # end
+    #
+    # == Before / After Create
+    # Called before and after a resource is saved to the db on the create action.
+    #
+    # == Before / After Update
+    # Called before and after a resource is saved to the db on the update action.
+    #
+    # == Before / After Save
+    # Called before and after the object is saved in the create and update action.
+    # Note: Gets called after the create and update callbacks
+    #
+    # == 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
+
+    # Filters
+    delegate :filter, :to => :controller
+
+
+    # Standard rails filters
+    delegate :before_filter, :skip_before_filter, :after_filter, :around_filter, :to => :controller
+
+    # Specify which actions to create in the controller
+    #
+    # Eg:
+    #   
+    #   ActiveAdmin.register Post do
+    #     actions :index, :show
+    #   end
+    #
+    # Will only create the index and show actions (no create, update or delete)
+    delegate :actions, :to => :controller
+
+  end
+end

data/lib/active_admin/router.rb

@@ -28,27 +28,33 @@ module ActiveAdmin
 
       # Now define the routes for each resource
       router.instance_exec(@application.namespaces) do |namespaces|
-        resources = namespaces.values.collect{|n| n.resources.values }.flatten
+        resources = namespaces.values.collect{|n| n.resources.resources }.flatten
         resources.each do |config|
 
           # Define the block the will get eval'd within the namespace
           route_definition_block = Proc.new do
-            resources config.underscored_resource_name.pluralize do
-
-              # Define any member actions
-              member do
-                config.member_actions.each do |action|
-                  # eg: get :comment
-                  send(action.http_verb, action.name)
+            case config
+            when Resource
+              resources config.underscored_resource_name.pluralize do
+                # Define any member actions
+                member do
+                  config.member_actions.each do |action|
+                    # eg: get :comment
+                    send(action.http_verb, action.name)
+                  end
                 end
-              end
 
-              # Define any collection actions
-              collection do
-                config.collection_actions.each do |action|
-                  send(action.http_verb, action.name)
+                # Define any collection actions
+                collection do
+                  config.collection_actions.each do |action|
+                    send(action.http_verb, action.name)
+                  end
                 end
               end
+            when Page
+              match "/#{config.underscored_resource_name}" => "#{config.underscored_resource_name}#index"
+            else
+              raise "Unsupported config class: #{config.class}"
             end
           end
 
@@ -60,7 +66,8 @@ module ActiveAdmin
               instance_eval &routes_for_belongs_to if config.belongs_to_config.optional?
 
               # Make the nested belongs_to routes
-              resources config.belongs_to_config.target.underscored_resource_name.pluralize do
+              # :only is set to nothing so that we don't clobber any existing routes on the resource
+              resources config.belongs_to_config.target.underscored_resource_name.pluralize, :only => [] do
                 instance_eval &routes_for_belongs_to
               end
             end

data/lib/active_admin/scope.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   class Scope
 
-    attr_reader :name, :scope_method, :id, :scope_block
+    attr_reader :name, :scope_method, :id, :scope_block, :display_if_block
 
     # Create a Scope
     #
@@ -13,11 +13,14 @@ 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, active_admin_config.resource_class ) } ) { |articles| articles.where(:published => true) }
+    #   # => Scope with name 'Published' and scope method :public, optionally displaying the scope per the :if block, using a block
+    #
     #   Scope.new('Published') { |articles| articles.where(:published => true) }
     #   # => Scope with name 'Published' using a block to scope
     #
-    def initialize(name, method = nil, &block)
-      @name = name.to_s.titleize
+    def initialize(name, method = nil, options = {}, &block)
+      @name = name.is_a?( String ) ? name : name.to_s.titleize
       @scope_method = method
       # Scope ':all' means no scoping
       @scope_method ||= name.to_sym unless name.to_sym == :all
@@ -26,6 +29,15 @@ module ActiveAdmin
         @scope_method = nil
         @scope_block = block
       end
+
+      @display_if_block = options[:if]
     end
+
+    # Returns the display if block. If the block was not explicitly defined
+    # a default block always returning true will be returned.
+    def display_if_block
+      @display_if_block || proc{ true }
+    end
+
   end
 end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/lib/active_admin/view_factory.rb

@@ -15,9 +15,10 @@ module ActiveAdmin
     register  :dashboard_page     => ActiveAdmin::Views::Pages::Dashboard,
               :index_page         => ActiveAdmin::Views::Pages::Index,
               :show_page          => ActiveAdmin::Views::Pages::Show,
-              :new_page           => ActiveAdmin::Views::Pages::New,
-              :edit_page          => ActiveAdmin::Views::Pages::Edit,
-              :layout             => ActiveAdmin::Views::Pages::Layout
+              :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/auto_link_helper.rb

@@ -24,19 +24,10 @@ module ActiveAdmin
 
       # 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)
       end
 
-      # Returns the current Active Admin namespace
-      def active_admin_namespace
-        if respond_to?(:active_admin_config) && active_admin_config
-          active_admin_config.namespace
-        else
-          # Return a default namespace if none exists
-          active_admin_application.find_or_create_namespace(active_admin_application.default_namespace)
-        end
-      end
-
     end
   end
 end