activeadmin 0.5.1 → 0.6.0

data/lib/active_admin/views/index_as_blog.rb

@@ -93,6 +93,10 @@ module ActiveAdmin
         @body
       end
 
+      def self.index_name
+        "blog"
+      end
+
       private
 
       def build_posts

data/lib/active_admin/views/index_as_grid.rb

@@ -34,6 +34,10 @@ module ActiveAdmin
         @page_presenter[:columns] || default_number_of_columns
       end
 
+      def self.index_name
+        "grid"
+      end
+
       protected
 
       def build_table

data/lib/active_admin/views/index_as_table.rb

@@ -69,12 +69,22 @@ module ActiveAdmin
     # If a column is defined using a block, you must pass the key to turn on sorting. The key
     # is the attribute which gets used to sort objects using Active Record.
     #
+    # By default, this is the column on the resource's table that the attribute corresponds to. 
+    # Otherwise, any attribute that the resource collection responds to can be used.
+    #
     #     index do
     #       column "Title", :sortable => :title do |post|
     #         link_to post.title, admin_post_path(post)
     #       end
     #     end
     #
+    # You can also sort using an attribute on another table by passing the table name
+    # and the attribute separated by a dot:
+    #
+    #     index do
+    #       column :title, :sortable => 'categories.name'
+    #     end
+    #
     # You can turn off sorting on any column by passing false:
     #
     #     index do
@@ -99,7 +109,7 @@ module ActiveAdmin
 
       def build(page_presenter, collection)
         table_options = {
-          :id => active_admin_config.resource_name.plural,
+          :id => "index_table_#{active_admin_config.resource_name.plural}",
           :sortable => true,
           :class => "index_table index",
           :i18n => active_admin_config.resource_class,
@@ -126,6 +136,10 @@ module ActiveAdmin
         end
       end
 
+      def self.index_name
+        "table"
+      end
+
       #
       # Extend the default ActiveAdmin::Views::TableFor with some
       # methods for quickly displaying items on the index page
@@ -145,24 +159,52 @@ module ActiveAdmin
           end
         end
 
-        # Adds links to View, Edit and Delete
-        def default_actions(options = {})
+        # Add links to perform actions.
+        #
+        #   # Add default links.
+        #   actions
+        #
+        #   # Append some actions onto the end of the default actions.
+        #   actions do |admin_user|
+        #     link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        #   end
+        #
+        #   # Custom actions without the defaults.
+        #   actions :defaults => false do |admin_user|
+        #     link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        #   end
+        def actions(options = {}, &block)
           options = {
-            :name => ""
+            :name => "",
+            :defaults => true
           }.merge(options)
           column options[:name] do |resource|
+            text_node default_actions(resource) if options[:defaults]
+            text_node instance_exec(resource, &block) if block_given?
+          end
+        end
+
+        def default_actions(*args)
+          links = proc do |resource|
             links = ''.html_safe
-            if controller.action_methods.include?('show')
+            if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
               links << link_to(I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link")
             end
-            if controller.action_methods.include?('edit')
+            if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
               links << link_to(I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link")
             end
-            if controller.action_methods.include?('destroy')
+            if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
               links << link_to(I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation')}, :class => "member_link delete_link")
             end
             links
           end
+
+          options = args.extract_options!
+          if options.present? || args.empty?
+            actions options
+          else
+            links.call(args.first)
+          end
         end
 
         # Display A Status Tag Column

data/lib/active_admin/views/pages/index.rb

@@ -7,15 +7,16 @@ module ActiveAdmin
       class Index < Base
 
         def title
-          if config[:title].is_a? String
-            config[:title]
+          case config[:title]
+          when Proc then controller.instance_eval(&config[:title])
+          when String then config[:title]
           else
             active_admin_config.plural_resource_label
           end
         end
 
         def config
-          active_admin_config.get_page_presenter(:index) || default_index_config
+          active_admin_config.get_page_presenter(:index, params[:as]) || default_index_config
         end
 
         # Render's the index configuration that was set in the
@@ -61,6 +62,7 @@ module ActiveAdmin
           div :class => "table_tools" do
             build_batch_actions_selector
             build_scopes
+            build_index_list
           end
         end
 
@@ -80,6 +82,19 @@ module ActiveAdmin
           end
         end
 
+        def build_index_list
+          indexes = active_admin_config.page_presenters[:index]
+
+          if indexes.kind_of?(Hash) && indexes.length > 1
+            index_classes = []
+            active_admin_config.page_presenters[:index].each do |type, page_presenter|
+              index_classes << find_index_renderer_class(page_presenter[:as])
+            end
+            
+            index_list_renderer index_classes
+          end
+        end
+
         # Creates a default configuration for the resource class. This is a table
         # with each column displayed as well as all the default actions
         def default_index_config
@@ -122,7 +137,7 @@ module ActiveAdmin
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
           paginator      = config[:paginator].nil?      ? true : config[:paginator]
-          download_links = config[:download_links].nil? ? true : config[:download_links]
+          download_links = config[:download_links].nil? ? active_admin_config.namespace.download_links : config[:download_links]
           
           paginated_collection(collection, :entry_name     => active_admin_config.resource_label,
                                            :entries_name   => active_admin_config.plural_resource_label,

data/lib/active_admin/views/tabbed_navigation.rb

@@ -22,9 +22,9 @@ module ActiveAdmin
         build_menu
       end
 
-      # Returns the first level menu items to display
+      # The top-level menu items that should be displayed.
       def menu_items
-        displayable_items(menu.items)
+        menu.items(self)
       end
 
       def tag_name
@@ -40,35 +40,16 @@ module ActiveAdmin
       end
 
       def build_menu_item(item)
-        li :id => item.dom_id do |li_element|
-          li_element.add_class "current" if current?(item)
-          link_path = url_for_menu_item(item)
+        li :id => item.id do |li|
+          li.add_class "current" if item.current? assigns[:current_tab]
 
-          if item.children.any?
-            li_element.add_class "has_nested"
-            text_node link_to(item.label, link_path)
-            render_nested_menu(item)
-          else
-            link_to item.label, link_path
-          end
-        end
-      end
-
-      def url_for_menu_item(menu_item)
-        case menu_item.url
-        when Symbol
-          send(menu_item.url)
-        when nil
-          "#"
-        else
-          menu_item.url
-        end
-      end
+          text_node link_to item.label(self), item.url(self), item.html_options
 
-      def render_nested_menu(item)
-        ul do
-          displayable_items(item.children).each do |child|
-            build_menu_item child
+          if children = item.items(self).presence
+            li.add_class "has_nested"
+            ul do
+              children.each{ |child| build_menu_item child }
+            end
           end
         end
       end
@@ -76,31 +57,6 @@ module ActiveAdmin
       def default_options
         { :id => "tabs" }
       end
-
-      # Returns true if the menu item name is @current_tab (set in controller)
-      def current?(menu_item)
-        assigns[:current_tab] == menu_item || menu_item.children.include?(assigns[:current_tab])
-      end
-
-      # Returns an Array of items to display
-      def displayable_items(items)
-        items.select do |item|
-          display_item? item
-        end
-      end
-
-      # Returns true if the item should be displayed
-      def display_item?(item)
-        return false unless call_method_or_proc_on(self, item.display_if_block)
-        return false if (!item.url || item.url == "#") && !displayable_children?(item)
-        true
-      end
-
-      # Returns true if the item has any children that should be displayed
-      def displayable_children?(item)
-        !item.children.find{|child| display_item?(child) }.nil?
-      end
     end
-
   end
 end

data/lib/generators/active_admin/install/install_generator.rb

@@ -27,7 +27,11 @@ module ActiveAdmin
       end
 
       def setup_routes
-        route "ActiveAdmin.routes(self)"
+        if ARGV.include? "--skip-users"
+          route "ActiveAdmin.routes(self)"
+        else # Ensure Active Admin routes occur after Devise routes so that Devise has higher priority
+          inject_into_file "config/routes.rb", "\n  ActiveAdmin.routes(self)", :after => /devise_for.*/
+        end
       end
 
       def create_assets

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -149,4 +149,62 @@ ActiveAdmin.setup do |config|
   #
   # Set the CSV builder options (default is {})
   # config.csv_options = {}
+
+
+  # == Menu System
+  #
+  # You can add a navigation menu to be used in your application, or configure a provided menu
+  # 
+  # To change the default utility navigation to show a link to your website & a logout btn
+  # 
+  #   config.namespace :admin do |admin|
+  #     admin.build_menu :utility_navigation do |menu|
+  #       menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank }
+  #       admin.add_logout_button_to_menu menu
+  #     end
+  #   end
+  #
+  # If you wanted to add a static menu item to the default menu provided:
+  #
+  #   config.namespace :admin do |admin|
+  #     admin.build_menu :default do |menu|
+  #       menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank }
+  #     end
+  #   end
+
+  # == Download Links
+  #
+  # You can disable download links on resource listing pages,
+  # or customize the formats shown per namespace/globally
+  #
+  # To disable/customize for the :admin namespace:
+  #
+  #   config.namespace :admin do |admin|
+  #
+  #     # Disable the links entirely
+  #     admin.download_links = false
+  #
+  #     # Only show XML & PDF options
+  #     admin.download_links = [:xml, :pdf]
+  #
+  #   end
+
+
+  # == Pagination
+  #
+  # Pagination is enabled by default for all resources.
+  # You can control the default per page count for all resources here.
+  #
+  # config.default_per_page = 30
+
+
+  # == Filters
+  #
+  # By default the index screen includes a “Filters” sidebar on the right 
+  # hand side with a filter for each attribute of the registered model.
+  # You can enable or disable them for all resources here.
+  #
+  # config.filters = true
+
+
 end

data/spec/integration/{default_namespace.rb → default_namespace_spec.rb}

@@ -21,14 +21,6 @@ describe ActiveAdmin::Application do
         ActiveAdmin.application = @__original_application
       end
 
-      it "should generate a dashboard controller" do
-        defined?(::DashboardController).should be_true
-      end
-
-      it "should generate a dashboard route" do
-        dashboard_path.should == "/"
-      end
-
       it "should generate a log out path" do
         destroy_admin_user_session_path.should == "/admin_users/logout"
       end
@@ -56,14 +48,6 @@ describe ActiveAdmin::Application do
         ActiveAdmin.application = @__original_application
       end
 
-      it "should generate a dashboard controller" do
-        defined?(::Test::DashboardController).should be_true
-      end
-
-      it "should generate a dashboard route" do
-        test_dashboard_path.should == "/test"
-      end
-
       it "should generate a log out path" do
         destroy_admin_user_session_path.should == "/test/logout"
       end

data/spec/spec_helper.rb

@@ -116,6 +116,8 @@ ENV["RAILS_ASSET_ID"] = ''
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures = false
+  config.include Devise::TestHelpers, :type => :controller
+  config.render_views = false
 end
 
 # All RSpec configuration needs to happen before any examples
@@ -123,6 +125,7 @@ end
 require 'integration_example_group'
 RSpec.configure do |c|
   c.include RSpec::Rails::IntegrationExampleGroup, :example_group => { :file_path => /\bspec\/integration\// }
+  c.include Devise::TestHelpers, :type => :controller
 end
 
 # Ensure this is defined for Ruby 1.8

data/spec/support/detect_rails_version.rb

@@ -1,12 +1,19 @@
 # Detects the current version of Rails that is being used
 #
 #
-unless defined?(RAILS_VERSION_FILE)
+unless defined? RAILS_VERSION_FILE
   RAILS_VERSION_FILE = File.expand_path("../../../.rails-version", __FILE__)
 end
 
-unless defined?(DEFAULT_RAILS_VERSION)
-  DEFAULT_RAILS_VERSION = "3.2.0"
+unless defined? TRAVIS_CONFIG
+  require 'yaml'
+  filename = File.expand_path("../../../.travis.yml", __FILE__)
+  TRAVIS_CONFIG = YAML.load_file filename
+  TRAVIS_RAILS_VERSIONS = TRAVIS_CONFIG['env'].grep(/RAILS=(.*)/){ $1 }.sort
+end
+
+unless defined? DEFAULT_RAILS_VERSION
+  DEFAULT_RAILS_VERSION = TRAVIS_RAILS_VERSIONS.last
 end
 
 def detect_rails_version

data/spec/support/rails_template.rb

@@ -16,7 +16,7 @@ inject_into_file 'app/models/post.rb', "  belongs_to :author, :class_name => 'Us
 copy_file File.expand_path('../templates/post_decorator.rb', __FILE__), "app/models/post_decorator.rb"
 
 # Rails 3.2.3 model generator declare attr_accessible
-inject_into_file 'app/models/post.rb', "  attr_accessible :author\n", :before => "end" if Rails::VERSION::STRING >= '3.2.3'
+inject_into_file 'app/models/post.rb', "  attr_accessible :author\n", :before => "end" if Rails::VERSION::STRING >= '3.2'
 generate :model, "user type:string first_name:string last_name:string username:string age:integer"
 inject_into_file 'app/models/user.rb', "  has_many :posts, :foreign_key => 'author_id'\n", :after => "class User < ActiveRecord::Base\n"
 generate :model, "publisher --migration=false --parent=User"

data/spec/support/templates/post_decorator.rb

@@ -8,12 +8,12 @@ require_dependency 'post'
 class PostDecorator < SimpleDelegator
   delegate :id, :to => :__getobj__
 
-  def self.decorate(collection_or_object)
-    if collection_or_object.respond_to?(:to_ary)
-      DecoratedEnumerableProxy.new(collection_or_object)
-    else
-      new(collection_or_object)
-    end
+  def self.decorate(object)
+    new(object)
+  end
+
+  def self.decorate_collection(collection)
+    DecoratedEnumerableProxy.new(collection)
   end
 
   def self.model_name

data/spec/unit/application_spec.rb

@@ -95,18 +95,18 @@ describe ActiveAdmin::Application do
 
   describe "files in load path" do
     it "should load files in the first level directory" do
-      application.files_in_load_path.should include(File.expand_path("app/admin/dashboard.rb", Rails.root))
+      application.files.should include(File.expand_path("app/admin/dashboard.rb", Rails.root))
     end
 
     it "should load files from subdirectories" do
       FileUtils.mkdir_p(File.expand_path("app/admin/public", Rails.root))
       test_file = File.expand_path("app/admin/public/posts.rb", Rails.root)
       FileUtils.touch(test_file)
-      application.files_in_load_path.should include(test_file)
+      application.files.should include(test_file)
     end
   end
 
-  describe "#namespace (or #find_or_create_namespace)" do
+  describe "#namespace" do
 
     it "should yield a new namespace" do
       application.namespace :new_namespace do |ns|
@@ -115,7 +115,7 @@ describe ActiveAdmin::Application do
     end
 
     it "should return an instantiated namespace" do
-      admin = application.find_or_create_namespace :admin
+      admin = application.namespace :admin
       admin.should == application.namespaces[:admin]
     end
 
@@ -132,7 +132,7 @@ describe ActiveAdmin::Application do
   describe "#register_page" do
     it "finds or create the namespace and register the page to it" do
       namespace = mock
-      application.should_receive(:find_or_create_namespace).with("public").and_return namespace
+      application.should_receive(:namespace).with("public").and_return namespace
       namespace.should_receive(:register_page).with("My Page", {:namespace => "public"})
 
       application.register_page("My Page", :namespace => "public")