activeadmin 0.2.1 → 0.2.2

data/features/menu.feature

@@ -0,0 +1,26 @@
+Feature: Menu
+
+  Background:
+    Given I am logged in
+
+  Scenario: Hide the menu item
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        menu false
+      end
+    """
+    When I am on the dashboard
+    Then I should not see a menu item for "Posts"
+
+  @wip
+  Scenario: Set the menu item label
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        menu :label => "Articles"
+      end
+    """
+    When I am on the dashboard
+    Then I should see a menu item for "Articles"
+    And I should not see a menu item for "Posts"

data/features/step_definitions/dashboard_steps.rb

@@ -0,0 +1,11 @@
+Then /^I should see the default welcome message$/ do
+  Then %{I should see "Welcome to Active Admin" within "#dashboard_default_message"}
+end
+
+Then /^I should not see the default welcome message$/ do
+  Then %{I should not see "Welcome to Active Admin"}
+end
+
+Then /^I should see a dashboard widget "([^"]*)"$/ do |name|
+  Then %{I should see "#{name}" within ".dashboard .panel h3"}
+end

data/features/step_definitions/menu_steps.rb

@@ -0,0 +1,7 @@
+Then /^I should see a menu item for "([^"]*)"$/ do |name|
+  Then %{I should see "#{name}" within "#tabs li a"}
+end
+
+Then /^I should not see a menu item for "([^"]*)"$/ do |name|
+  Then %{I should not see "#{name}" within "#tabs li a"}
+end

data/features/sti_resource.feature

@@ -0,0 +1,49 @@
+Feature: STI Resource
+
+  Ensure that standard CRUD works with STI models
+
+  Background:
+    Given I am logged in
+    And a configuration of:
+    """
+      ActiveAdmin.register Publisher
+      ActiveAdmin.register User
+    """
+
+  Scenario: Create, update and delete a child STI resource
+    Given I am on the index page for publishers
+    When I follow "New Publisher"
+    And I fill in "First name" with "Terry"
+    And I fill in "Last name" with "Fox"
+    And I fill in "Username" with "terry_fox"
+    And I press "Create Publisher"
+    Then I should see "Publisher was successfully created"
+    And I should see "Terry"
+
+    When I follow "Edit Publisher"
+    And I fill in "First name" with "Joe"
+    And I press "Update Publisher"
+    Then I should see "Publisher was successfully updated"
+    And I should see "Joe"
+
+    When I follow "Delete Publisher"
+    Then I should see "Publisher was successfully destroyed"
+
+  Scenario: Create, update and delete a parent STI resource
+    Given I am on the index page for users
+    When I follow "New User"
+    And I fill in "First name" with "Terry"
+    And I fill in "Last name" with "Fox"
+    And I fill in "Username" with "terry_fox"
+    And I press "Create User"
+    Then I should see "User was successfully created"
+    And I should see "Terry"
+
+    When I follow "Edit User"
+    And I fill in "First name" with "Joe"
+    And I press "Update User"
+    Then I should see "User was successfully updated"
+    And I should see "Joe"
+
+    When I follow "Delete User"
+    Then I should see "User was successfully destroyed"

data/lib/active_admin.rb

@@ -55,13 +55,13 @@ module ActiveAdmin
     @@namespaces = {}
     mattr_accessor :namespaces
 
-    # The title which get's displayed in the main layout
+    # The title which gets displayed in the main layout
     @@site_title = ""
     mattr_accessor :site_title
 
     # Load paths for admin configurations. Add folders to this load path
     # to load up other resources for administration. External gems can
-    # include thier paths in this load path to provide active_admin UIs
+    # include their paths in this load path to provide active_admin UIs
     @@load_paths = [File.expand_path('app/admin', Rails.root)]
     mattr_accessor :load_paths
 
@@ -70,10 +70,10 @@ module ActiveAdmin
     @@view_factory = ActiveAdmin::ViewFactory.new
     mattr_accessor :view_factory
 
-    # Whether or not to use admin comments
-    @@admin_notes = true
+    # DEPRECATED: This option is deprecated and will be removed. Use
+    # the #allow_comments_in option instead
     mattr_accessor :admin_notes
-    
+
     # The method to call in controllers to get the current user
     @@current_user_method = :current_admin_user
     mattr_accessor :current_user_method
@@ -84,7 +84,7 @@ module ActiveAdmin
     mattr_accessor :authentication_method
 
     # Active Admin makes educated guesses when displaying objects, this is
-    # the list of methods its tries calling in order
+    # the list of methods it tries calling in order
     @@display_name_methods = [:display_name, :full_name, :name, :username, :login, :title, :email, :to_s]
     mattr_accessor :display_name_methods
 
@@ -96,7 +96,7 @@ module ActiveAdmin
   class << self
 
 
-    # Get's called within the initializer
+    # Gets called within the initializer
     def setup
       # Register the default assets
       register_stylesheet 'admin/active_admin.css'
@@ -105,7 +105,7 @@ module ActiveAdmin
 
       # Since we're dealing with all our own file loading, we need
       # to remove our paths from the ActiveSupport autoload paths.
-      # If not, file nameing becomes very important and can cause clashes.
+      # If not, file naming becomes very important and can cause clashes.
       ActiveSupport::Dependencies.autoload_paths.reject!{|path| load_paths.include?(path) }
 
       # Add the Active Admin view path to the rails view path
@@ -125,14 +125,18 @@ module ActiveAdmin
 
       yield self
 
+      generate_stylesheets
+    end
+
+    def generate_stylesheets
       # Setup SASS
       require 'sass/plugin' # This must be required after initialization
-      Sass::Plugin.add_template_location(File.expand_path("../active_admin/stylesheets/", __FILE__), File.join(Rails.root, "public/stylesheets/admin"))
+      Sass::Plugin.add_template_location(File.expand_path("../active_admin/stylesheets/", __FILE__), File.join(Sass::Plugin.options[:css_location], 'admin'))
     end
 
     # Registers a brand new configuration for the given resource.
     def register(resource, options = {}, &block)
-      namespace_name = options[:namespace] == false ? :root : (options[:namespace] || default_namespace)
+      namespace_name = options[:namespace] == false ? :root : (options[:namespace] || default_namespace || :root)
       namespace = find_or_create_namespace(namespace_name)
       namespace.register(resource, options, &block)
     end
@@ -178,9 +182,7 @@ module ActiveAdmin
       return false if loaded?
 
       # Load files
-      load_paths.flatten.compact.uniq.each do |path|
-        Dir["#{path}/*.rb"].each{|f| load f }
-      end
+      files_in_load_path.each{|file| load file }
 
       # If no configurations, let's make sure you can still login
       load_default_namespace if namespaces.values.empty?
@@ -191,6 +193,11 @@ module ActiveAdmin
       @@loaded = true
     end
 
+    # Returns ALL the files to load from all the load paths
+    def files_in_load_path
+      load_paths.flatten.compact.uniq.collect{|path| Dir["#{path}/**/*.rb"] }.flatten
+    end
+
     # Creates all the necessary routes for the ActiveAdmin configurations
     #
     # Use this within the routes.rb file:

data/lib/active_admin/arbre/tag.rb

@@ -86,8 +86,12 @@ module Arbre
         html = ""
 
         if no_child? || child_is_text?
-          # one line
-          html << spaces << open_tag << child_content << close_tag
+          if self_closing_tag?
+            html << spaces << open_tag.sub( />$/, '/>' )
+          else
+            # one line
+            html << spaces << open_tag << child_content << close_tag
+          end
         else
           # multiple lines
           html << spaces << open_tag << "\n"
@@ -100,6 +104,10 @@ module Arbre
         html
       end
       
+      def self_closing_tag?
+        %w|meta link|.include?(tag_name)
+      end
+      
       def no_child?
         children.empty?
       end

data/lib/active_admin/comments.rb

@@ -53,6 +53,21 @@ ActiveAdmin::Event.subscribe ActiveAdmin::Namespace::RegisterEvent do |namespace
         comment.author = current_active_admin_user
       end
 
+      # Redirect to the resource show page when failing to add a comment
+      # TODO: Provide helpers to make such kind of customization much simpler
+      controller do
+        def create
+          create! do |success, failure|
+            failure.html do 
+              resource_config = active_admin_config.namespace.resource_for(@comment.resource.class)
+              flash[:error] = "Comment wasn't saved, text was empty."
+              redirect_to send(resource_config.route_instance_path, @comment.resource)
+            end
+          end
+        end
+      end
+
+
       # Display as a table
       index do
         column("Resource"){|comment| auto_link(comment.resource) }

data/lib/active_admin/form_builder.rb

@@ -42,7 +42,7 @@ module ActiveAdmin
     def cancel_link(url = nil, html_options = {}, li_attributes = {})
       li_attributes[:class] ||= "cancel"
       url ||= {:action => "index"}
-      template.content_tag(:li, (template.link_to ActiveAdmin::Iconic.icon(:x) + " Cancel", url, html_options), li_attributes)
+      template.content_tag(:li, (template.link_to "Cancel", url, html_options), li_attributes)
     end
     
     def commit_button_with_cancel_link

data/lib/active_admin/resource.rb

@@ -82,6 +82,10 @@ module ActiveAdmin
       @plural_resource_name ||= resource_name.pluralize
     end
 
+    def resource_table_name
+      resource.table_name
+    end
+
     # Returns a properly formatted controller name for this
     # resource within its namespace
     def controller_name
@@ -121,16 +125,17 @@ module ActiveAdmin
       @menu_options[:parent]
     end
 
+    # Returns the name to be displayed in the menu for this resource
+    def menu_item_name
+      @menu_options[:label] || plural_resource_name
+    end
+
     # Should this resource be added to the menu system?
     def include_in_menu?
       return false if @menu_options[:display] == false
       !(belongs_to? && !belongs_to_config.optional?)
     end
 
-    # Returns the name to be displayed in the menu for this resource
-    def menu_item_name
-      @menu_item_name ||= plural_resource_name
-    end
 
     # Clears all the member actions this resource knows about
     def clear_member_actions!

data/lib/active_admin/resource_controller.rb

@@ -53,20 +53,20 @@ module ActiveAdmin
     end
 
     # Default Sidebar Sections
-    sidebar :filters, :only => :index, :icon => :magnifying_glass do
+    sidebar :filters, :only => :index do
       active_admin_filters_form_for assigns["search"], filters_config
     end
 
     # Default Action Item Links
     action_item :only => :show do
       if controller.action_methods.include?('edit')
-        link_to(icon(:pen) + "Edit #{active_admin_config.resource_name}", edit_resource_path(resource))
+        link_to("Edit #{active_admin_config.resource_name}", edit_resource_path(resource))
       end
     end
 
     action_item :only => :show do
       if controller.action_methods.include?("destroy")
-        link_to(icon(:trash_stroke) + "Delete #{active_admin_config.resource_name}",
+        link_to("Delete #{active_admin_config.resource_name}",
           resource_path(resource), 
           :method => :delete, :confirm => "Are you sure you want to delete this?")
       end
@@ -74,7 +74,7 @@ module ActiveAdmin
 
     action_item :except => [:new, :show] do
       if controller.action_methods.include?('new')
-        link_to(icon(:plus_alt) + "New #{active_admin_config.resource_name}", new_resource_path)
+        link_to("New #{active_admin_config.resource_name}", new_resource_path)
       end
     end
 

data/lib/active_admin/resource_controller/collection.rb

@@ -46,8 +46,9 @@ 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("#{$1} #{$2}")
+            chain.order("#{table_name}.#{$1} #{$2}")
           else
             chain # just return the chain
           end
@@ -63,7 +64,7 @@ module ActiveAdmin
         end
 
         def search(chain)
-          @search = chain.search(clean_search_params(params[:q]))
+          @search = chain.metasearch(clean_search_params(params[:q]))
           @search.relation
         end
 

data/lib/active_admin/stylesheets/active_admin.scss

@@ -56,7 +56,7 @@ body {
 }
 
 // ----------------------------------- Main Structure 
-#content { 
+#active_admin_content { 
   margin: 0; 
   padding: 25px $horizontal-page-margin; 
   
@@ -222,6 +222,9 @@ table {
   .previous_page, .next_page { display:none; }
 }
 
+
+.index_content { clear: both; }
+
 // -------------------------------------- Index as Grid 
 table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; margin: 0;}
 
@@ -268,7 +271,7 @@ body.logged_out {
   #content_wrapper{
     width: 500px;
     margin: 70px auto;
-    #content {
+    #active_admin_content {
       @include shadow;
       background: #fff;
       padding: 13px 30px;
@@ -342,7 +345,10 @@ table.dashboard {
   .dashboard_section { @include section; }
 }
 
+
 // -------------------------------------- Resource Attributes Table 
+.attributes_table { overflow: hidden; }
+
 .attributes_table table {
   th, td {
     padding: 8px $cell-horizontal-padding 6px $cell-horizontal-padding;
@@ -371,6 +377,7 @@ table.dashboard {
 
 .sidebar_section .attributes_table th { width: 50px; }
 
+
 // -------------------------------------- Status Tags
 .status {
   background: darken($secondary-color, 15%);

data/lib/active_admin/stylesheets/active_admin/_forms.scss

@@ -74,7 +74,7 @@ form {
   }
 
   /* Text Fields */
-  input[type=text], input[type=password], input[type=email], input[type=tel], textarea {
+  input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea {
     width: 76%;
     border: 1px solid #c9d0d6;
     font-size: 0.95em;
@@ -150,7 +150,7 @@ form {
     }
 
     &.error {
-      input[type=text], input[type=password], input[type=email], input[type=tel], textarea {
+      input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea {
         border: 1px solid #cc0000;
       }
     }

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/active_admin/view_helpers/filter_form_helper.rb

@@ -155,7 +155,7 @@ module ActiveAdmin
       end
 
       if reflection = reflection_for(method)
-        return :select if reflection.macro == :belongs_to && reflection.collection?
+        return :select if reflection.macro == :belongs_to && !reflection.options[:polymorphic]
       end
     end
 

data/lib/active_admin/views/components/table_for.rb

@@ -76,7 +76,7 @@ module ActiveAdmin
       def build_table_body
         @tbody = tbody do
           # Build enough rows for our collection
-          @collection.each{|_| tr(:class => cycle('odd', 'event')) }
+          @collection.each{|_| tr(:class => cycle('odd', 'even')) }
         end
       end
 

data/lib/active_admin/views/index_as_table.rb

@@ -35,9 +35,9 @@ module ActiveAdmin
             :name => ""
           }.merge(options)
           column options[:name] do |resource|
-            links = link_to icon(:arrow_right_alt1) + "View", resource_path(resource), :class => "view_link"
-            links += link_to icon(:pen) + "Edit", edit_resource_path(resource), :class => "edit_link"
-            links += link_to icon(:trash_stroke) + "Delete", resource_path(resource), :method => :delete, :confirm => "Are you sure you want to delete this?", :class => "delete_link"
+            links = link_to "View", resource_path(resource), :class => "view_link"
+            links += link_to "Edit", edit_resource_path(resource), :class => "edit_link"
+            links += link_to "Delete", resource_path(resource), :method => :delete, :confirm => "Are you sure you want to delete this?", :class => "delete_link"
             links
           end
         end

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

@@ -5,12 +5,19 @@ module ActiveAdmin
 
         def build(*args)
           super
+          add_classes_to_body
           build_active_admin_head
           build_page
         end
 
         private
 
+
+        def add_classes_to_body
+          @body.add_class(params[:action])
+          @body.add_class(params[:controller].gsub('/', '_'))
+        end
+
         def build_active_admin_head
           within @head do
             meta :"http-equiv" => "Content-type", :content => "text/html; charset=utf-8"
@@ -71,7 +78,7 @@ module ActiveAdmin
         end
 
         def build_page_content
-          div :id => "content", :class => (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
+          div :id => "active_admin_content", :class => (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
             build_flash_messages
             build_main_content_wrapper
             build_sidebar