andrewroth_activeadmin 0.3.4 → 0.3.4.1

data/features/step_definitions/dashboard_steps.rb

@@ -7,5 +7,9 @@ Then /^I should not see the default welcome message$/ do
 end
 
 Then /^I should see a dashboard widget "([^"]*)"$/ do |name|
-  Then %{I should see "#{name}" within ".dashboard .panel h3"}
+  page.should have_css('.dashboard .panel h3', :text => name) 
+end
+
+Then /^I should not see a dashboard widget "([^"]*)"$/ do |name|
+  page.should_not have_css('.dashboard .panel h3', :text => name) 
 end

data/features/step_definitions/factory_steps.rb

@@ -12,9 +12,9 @@ Given /^a post with the title "([^"]*)" written by "([^"]*)" exists$/ do |title,
   Post.create! :title => title, :author => author
 end
 
-Given /^(\d+) posts? exists?/ do |count|
+Given /^(\d+)( published)? posts? exists?$/ do |count, published|
   (0...count.to_i).each do |i|
-    Post.create! :title => "Hello World #{i}"
+    Post.create! :title => "Hello World #{i}", :published_at => (published ? Time.now : nil)
   end
 end
 
@@ -27,3 +27,10 @@ Given /^a (user|publisher) named "([^"]*)" exists$/ do |type, name|
   type = type.camelize.constantize
   type.create! :first_name => first, :last_name => last, :username => name
 end
+
+Given /^I create a new post with the title "([^"]*)"$/ do |title|
+  click_link "Posts"
+  click_link "New Post"
+  fill_in :title, :with => title
+  click_button "Create Post"
+end

data/features/step_definitions/flash_steps.rb

@@ -1,3 +1,11 @@
 Then /^I should see a flash with "([^"]*)"$/ do |text|
-  Then %{I should see "#{text}"}
+  page.should have_content(text)
+end
+
+Then /^I should see a successful create flash$/ do
+  page.should have_css('div.flash_notice', :text => /was successfully created/)
+end
+
+Then /^I should not see a successful create flash$/ do
+  page.should_not have_css('div.flash_notice', :text => /was successfully created/)
 end

data/features/step_definitions/index_scope_steps.rb

@@ -2,19 +2,31 @@ Then /^I should see the scope "([^"]*)"$/ do |name|
   Then %{I should see "#{name}" within ".scopes"}
 end
 
+Then /^I should not see the scope "([^"]*)"$/ do |name|
+  Then %{I should not see "#{name}" within ".scopes"}
+end
+
 Then /^I should see the scope "([^"]*)" selected$/ do |name|
-  Then %{I should see "#{name}" within ".scopes span.selected"}
+  Then %{I should see "#{name}" within ".scopes .selected"}
 end
 
 Then /^I should see the scope "([^"]*)" not selected$/ do |name|
   Then %{I should see the scope "#{name}"}
-  page.should_not have_css('.scopes span.selected', :text => name)
+  page.should_not have_css('.scopes .selected', :text => name)
 end
 
 Then /^I should see the scope "([^"]*)" with the count (\d+)$/ do |name, count|
-  Then %{I should see "#{count}" within ".scopes .#{name.downcase} .count"}
+  Then %{I should see "#{count}" within ".scopes .#{name.gsub(" ", "").underscore.downcase} .count"}
 end
 
 Then /^I should see (\d+) ([\w]*) in the table$/ do |count, resource_type|
-  page.should have_css("table##{resource_type} tr > td:first", :count => count.to_i)
+  begin
+    page.should have_css("table##{resource_type} tr > td:first", :count => count.to_i)
+  rescue
+    current_count = 0
+    
+    all("table##{resource_type} tr > td:first").each { current_count += 1 }
+
+    raise "There were #{current_count} rows in the table not #{count}"
+  end
 end

data/features/step_definitions/member_link_steps.rb

@@ -0,0 +1,7 @@
+Then /^I should see an action item button "([^"]*)"$/ do |content|
+  page.should have_css(".action_items a", :text => content)
+end
+
+Then /^I should not see an action item button "([^"]*)"$/ do |content|
+  page.should_not have_css(".action_items", :text => content)
+end

data/features/step_definitions/site_title_steps.rb

@@ -0,0 +1,15 @@
+Then /^I should see the site title "([^"]*)"$/ do |title|
+  page.should have_css('h1#site_title', :text => title)
+end
+
+Then /^I should not see the site title "([^"]*)"$/ do |title|
+  page.should_not have_css('h1#site_title', :text => title)
+end
+
+Then /^I should see the site title image "([^"]*)"$/ do |image|
+  page.should have_css('h1#site_title img', :src => image)
+end
+
+Then /^I should see the site title image linked to "([^"]*)"$/ do |url|
+  page.should have_css('h1#site_title a', :href => url)
+end

data/features/support/paths.rb

@@ -28,6 +28,12 @@ module NavigationHelpers
     when /^the index page for (.*)$/
       send(:"admin_#{$1}_path")
 
+    when /^the last author's posts$/
+      admin_user_posts_path(User.last)
+
+    when /^the last author's last post page$/
+      admin_user_post_path(User.last, Post.where(:author_id => User.last.id).last)
+
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
     #

data/features/users/logging_out.feature

@@ -11,3 +11,14 @@ Feature: User Logging out
     When I go to the dashboard
     And I follow "Logout"
     Then I should see "Login"
+
+  Scenario: With logout_link_path set to :logout_path (the symbol)
+    Given a configuration of:
+      """
+      ActiveAdmin.setup do |config|
+        config.logout_link_path = :logout_path
+      end
+      """
+    And I am logged in
+    When I go to the dashboard
+    Then I should see the default welcome message

data/lib/active_admin.rb

@@ -1,7 +1,10 @@
 require 'meta_search'
+require 'bourbon'
 require 'devise'
 require 'kaminari'
+require 'formtastic'
 require 'sass'
+require 'jquery-rails'
 require 'active_admin/arbre'
 require 'active_admin/engine'
 
@@ -13,6 +16,7 @@ module ActiveAdmin
   autoload :Breadcrumbs,              'active_admin/breadcrumbs'
   autoload :Callbacks,                'active_admin/callbacks'
   autoload :Component,                'active_admin/component'
+  autoload :BaseController,           'active_admin/base_controller'
   autoload :ControllerAction,         'active_admin/controller_action'
   autoload :CSVBuilder,               'active_admin/csv_builder'
   autoload :Dashboards,               'active_admin/dashboards'
@@ -22,14 +26,20 @@ module ActiveAdmin
   autoload :DSL,                      'active_admin/dsl'
   autoload :Event,                    'active_admin/event'
   autoload :FormBuilder,              'active_admin/form_builder'
+  autoload :FilterFormBuilder,        'active_admin/filter_form_builder'
+  autoload :Inputs,                   'active_admin/inputs'
   autoload :Iconic,                   'active_admin/iconic'
   autoload :Menu,                     'active_admin/menu'
   autoload :MenuItem,                 'active_admin/menu_item'
   autoload :Namespace,                'active_admin/namespace'
-  autoload :PageConfig,               'active_admin/page_config'
+  autoload :Page,                     'active_admin/page'
+  autoload :PagePresenter,            'active_admin/page_presenter'
+  autoload :PageController,           'active_admin/page_controller'
+  autoload :PageDSL,                  'active_admin/page_dsl'
   autoload :Reloader,                 'active_admin/reloader'
   autoload :Resource,                 'active_admin/resource'
   autoload :ResourceController,       'active_admin/resource_controller'
+  autoload :ResourceDSL,              'active_admin/resource_dsl'
   autoload :Renderer,                 'active_admin/renderer'
   autoload :Scope,                    'active_admin/scope'
   autoload :ScopeChain,               'active_admin/helpers/scope_chain'
@@ -45,27 +55,31 @@ module ActiveAdmin
     I18n.load_path += Dir[File.expand_path('../active_admin/locales/*.yml', __FILE__)]
   end
 
-  # The instance of the configured application
-  @@application = ::ActiveAdmin::Application.new
-  mattr_accessor :application
-
   class << self
 
+    attr_accessor :application
+
+    def application
+      @application ||= ::ActiveAdmin::Application.new
+    end
+
     # Gets called within the initializer
     def setup
+      application.setup!
       yield(application)
       application.prepare!
     end
 
-    delegate :register, :to => :application
-    delegate :unload!,  :to => :application
-    delegate :load!,    :to => :application
-    delegate :routes,   :to => :application
+    delegate :register,      :to => :application
+    delegate :register_page, :to => :application
+    delegate :unload!,       :to => :application
+    delegate :load!,         :to => :application
+    delegate :routes,        :to => :application
 
     # Returns true if this rails application has the asset
     # pipeline enabled.
     def use_asset_pipeline?
-      DependencyChecker.rails_3_1? && Rails.application.config.assets.enabled
+      DependencyChecker.rails_3_1? && Rails.application.config.try(:assets).try(:enabled)
     end
 
     # Migration MoveAdminNotesToComments generated with version 0.2.2 might reference
@@ -75,6 +89,7 @@ module ActiveAdmin
       "ActiveAdmin.default_namespace is deprecated. Please use ActiveAdmin.application.default_namespace"
 
   end
+
 end
 
 ActiveAdmin::DependencyChecker.check!

data/lib/active_admin/application.rb

@@ -5,6 +5,13 @@ module ActiveAdmin
   class Application
     include Settings
 
+    # Adds settings to both the Application and the Namespace instance
+    # so that they can be configured independantly.
+    def self.inheritable_setting(name, default)
+      Namespace.setting name, nil
+      setting name, default
+    end
+
     # The default namespace to put controllers and routes inside. Set this
     # in config/initializers/active_admin.rb using:
     #
@@ -12,40 +19,43 @@ module ActiveAdmin
     #
     setting :default_namespace, :admin
 
-    # The default number of resources to display on index pages
-    setting :default_per_page, 30
-
     # A hash of all the registered namespaces
     setting :namespaces, {}
 
-    # The title which gets displayed in the main layout
-    setting :site_title, ""
-    
-    # Set the site title link href (defaults to AA dashboard)
-    setting :site_title_link, ""
-
     # Load paths for admin configurations. Add folders to this load path
     # to load up other resources for administration. External gems can
     # include their paths in this load path to provide active_admin UIs
     setting :load_paths, [File.expand_path('app/admin', Rails.root)]
 
+    # The default number of resources to display on index pages
+    inheritable_setting :default_per_page, 30
+
+    # The title which gets displayed in the main layout
+    inheritable_setting :site_title, ""
+
+    # Set the site title link href (defaults to AA dashboard)
+    inheritable_setting :site_title_link, ""
+
+    # Set the site title image displayed in the main layout (has precendence over :site_title)
+    inheritable_setting :site_title_image, ""
+
     # The view factory to use to generate all the view classes. Take
     # a look at ActiveAdmin::ViewFactory
-    setting :view_factory, ActiveAdmin::ViewFactory.new
+    inheritable_setting :view_factory, ActiveAdmin::ViewFactory.new
 
     # The method to call in controllers to get the current user
-    setting :current_user_method, false
+    inheritable_setting :current_user_method, false
 
     # The method to call in the controllers to ensure that there
     # is a currently authenticated admin user
-    setting :authentication_method, false
+    inheritable_setting :authentication_method, false
 
     # The path to log user's out with. If set to a symbol, we assume
     # that it's a method to call which returns the path
-    setting :logout_link_path, :destroy_admin_user_session_path
+    inheritable_setting :logout_link_path, :destroy_admin_user_session_path
 
     # The method to use when generating the link for user logout
-    setting :logout_link_method, :get
+    inheritable_setting :logout_link_method, :get
 
     # Active Admin makes educated guesses when displaying objects, this is
     # the list of methods it tries calling in order
@@ -67,10 +77,12 @@ module ActiveAdmin
     # the #allow_comments_in option instead
     attr_accessor :admin_notes
 
-
     include AssetRegistration
 
-    def initialize
+    # Event that gets triggered on load of Active Admin
+    LoadEvent = 'active_admin.application.load'.freeze
+
+    def setup!
       register_default_assets
     end
 
@@ -82,21 +94,39 @@ module ActiveAdmin
 
     # Registers a brand new configuration for the given resource.
     def register(resource, options = {}, &block)
-      namespace_name = options.has_key?(:namespace) ? options[:namespace] : default_namespace
+      namespace_name = extract_namespace_name(options)
       namespace = find_or_create_namespace(namespace_name)
       namespace.register(resource, options, &block)
     end
 
     # Creates a namespace for the given name
+    #
+    # Yields the namespace if a block is given
+    #
+    # @returns [Namespace] the new or existing namespace
     def find_or_create_namespace(name)
       name ||= :root
       return namespaces[name] if namespaces[name]
       namespace = Namespace.new(self, name)
-      ActiveAdmin::Event.dispatch ActiveAdmin::Namespace::RegisterEvent, namespace
       namespaces[name] = namespace
+      ActiveAdmin::Event.dispatch ActiveAdmin::Namespace::RegisterEvent, namespace
+      yield(namespace) if block_given?
       namespace
     end
 
+    alias_method :namespace, :find_or_create_namespace
+
+    # Register a page
+    #
+    # @param name [String] The page name
+    # @options [Hash] Accepts option :namespace.
+    # @&block The registration block.
+    #
+    def register_page(name, options = {}, &block)
+      namespace_name = extract_namespace_name(options)
+      namespace = find_or_create_namespace(namespace_name)
+      namespace.register_page(name, options, &block)
+    end
 
     # Stores if everything has been loaded or we need to reload
     @@loaded = false
@@ -113,7 +143,6 @@ module ActiveAdmin
     # to allow for changes without having to restart the server.
     def unload!
       namespaces.values.each{|namespace| namespace.unload! }
-      self.namespaces = {}
       @@loaded = false
     end
 
@@ -137,6 +166,9 @@ module ActiveAdmin
       # Load Menus
       namespaces.values.each{|namespace| namespace.load_menu! }
 
+      # Dispatch an ActiveAdmin::Application::LoadEvent with the Application
+      ActiveAdmin::Event.dispatch LoadEvent, self
+
       @@loaded = true
     end
 
@@ -192,10 +224,21 @@ module ActiveAdmin
     private
 
     def register_default_assets
-      register_stylesheet 'active_admin.css'
+      register_stylesheet 'active_admin.css', :media => 'all'
+
+      if !ActiveAdmin.use_asset_pipeline?
+        register_javascript 'jquery.min.js'
+        register_javascript 'jquery-ui.min.js'
+        register_javascript 'jquery_ujs.js'
+      end
+
       register_javascript 'active_admin.js'
     end
 
+    def extract_namespace_name(options)
+      options.has_key?(:namespace) ? options[:namespace] : default_namespace
+    end
+
     # Since we're dealing with all our own file loading, we need
     # to remove our paths from the ActiveSupport autoload paths.
     # If not, file naming becomes very important and can cause clashes.

data/lib/active_admin/arbre/html/element.rb

@@ -97,6 +97,16 @@ module Arbre
       end
       alias_method :find_by_tag, :get_elements_by_tag_name
 
+      def get_elements_by_class_name(class_name)
+        elements = Collection.new
+        children.each do |child|
+          elements << child if child.class_list =~ /#{class_name}/
+          elements.concat(child.get_elements_by_tag_name(tag_name))
+        end
+        elements
+      end
+      alias_method :find_by_class, :get_elements_by_class_name
+
       def content
         children.to_html
       end

data/lib/active_admin/asset_registration.rb

@@ -3,8 +3,8 @@ module ActiveAdmin
 
     # Stylesheets
 
-    def register_stylesheet(name)
-      stylesheets << name
+    def register_stylesheet(*args)
+      stylesheets << ActiveAdmin::Stylesheet.new(*args)
     end
 
     def stylesheets
@@ -31,4 +31,17 @@ module ActiveAdmin
     end
 
   end
+  
+  # Wrapper class for stylesheet registration
+  class Stylesheet
+    
+    attr_reader :options, :path
+    
+    def initialize(*args)
+      @options = args.extract_options!
+      @path = args.first if args.first
+    end
+    
+  end
+  
 end

data/lib/active_admin/base_controller.rb

@@ -0,0 +1,61 @@
+require 'inherited_resources'
+require 'active_admin/base_controller/menu'
+
+module ActiveAdmin
+  # BaseController for ActiveAdmin. 
+  # It implements ActiveAdmin controllers core features.
+  class BaseController < ::InheritedResources::Base
+    helper ::ActiveAdmin::ViewHelpers
+
+    layout 'active_admin'
+
+    before_filter :only_render_implemented_actions
+    before_filter :authenticate_active_admin_user
+
+    class << self
+      # Ensure that this method is available for the DSL
+      public :actions
+
+      # Reference to the Resource object which initialized
+      # this controller
+      attr_accessor :active_admin_config
+    end
+
+    # By default Rails will render un-implemented actions when the view exists. Becuase Active
+    # Admin allows you to not render any of the actions by using the #actions method, we need
+    # to check if they are implemented.
+    def only_render_implemented_actions
+      raise AbstractController::ActionNotFound unless action_methods.include?(params[:action])
+    end
+
+    include Menu
+
+    private
+
+    # Calls the authentication method as defined in ActiveAdmin.authentication_method
+    def authenticate_active_admin_user
+      send(active_admin_namespace.authentication_method) if active_admin_namespace.authentication_method
+    end
+
+    def current_active_admin_user
+      send(active_admin_namespace.current_user_method) if active_admin_namespace.current_user_method
+    end
+    helper_method :current_active_admin_user
+
+    def current_active_admin_user?
+      !current_active_admin_user.nil?
+    end
+    helper_method :current_active_admin_user?
+
+    def active_admin_config
+      self.class.active_admin_config
+    end
+    helper_method :active_admin_config
+
+    def active_admin_namespace
+      active_admin_config.namespace
+    end
+    helper_method :active_admin_namespace
+
+  end
+end