activeadmin 0.3.4 → 0.4.0

data/features/step_definitions/asset_steps.rb

@@ -1,5 +1,9 @@
 Then /^I should see the css file "([^"]*)"$/ do |path|
-  page.should have_xpath("//link[contains(@href, /stylesheets/#{path})]")
+  step %{I should see the css file "#{path}" of media "screen"}  
+end
+
+Then /^I should see the css file "([^"]*)" of media "([^"]*)"$/ do |path, media|
+  page.should have_xpath("//link[contains(@href, /stylesheets/#{path}) and contains(@media, #{media})]")
 end
 
 Then /^I should see the js file "([^"]*)"$/ do |path|

data/features/step_definitions/breadcrumb_steps.rb

@@ -0,0 +1,5 @@
+Then /^I should see a link to "([^"]*)" in the breadcrumb$/ do |text|
+  within ".breadcrumb" do
+    page.should have_css("a", :text => text)
+  end
+end

data/features/step_definitions/comment_steps.rb

@@ -1,8 +1,8 @@
 Then /^I should see a comment by "([^"]*)"$/ do |name|
-  Then %{I should see "#{name}" within ".active_admin_comment_author"}
+  step %{I should see "#{name}" within ".active_admin_comment_author"}
 end
 
 When /^I add a comment "([^"]*)"$/ do |comment|
-  When %{I fill in "active_admin_comment_body" with "#{comment}"}
-  And  %{I press "Add Comment"}
+  step %{I fill in "active_admin_comment_body" with "#{comment}"}
+  step  %{I press "Add Comment"}
 end

data/features/step_definitions/configuration_steps.rb

@@ -1,31 +1,87 @@
+module ActiveAdminReloading
+
+  def load_active_admin_configuration(configuration_content)
+    eval(configuration_content)
+    ActiveAdmin::Event.dispatch ActiveAdmin::Application::LoadEvent, ActiveAdmin.application
+    Rails.application.reload_routes!
+    ActiveAdmin.application.namespaces.values.each{|n| n.load_menu! }
+  end
+
+end
+
+module ActiveAdminContentsRollback
+
+  def self.recorded_files
+    @files ||= {}
+  end
+
+  # Records the contents of a file the first time we are
+  # about to change it
+  def self.record(filename)
+    contents = File.read(filename) rescue nil
+    recorded_files[filename] = contents unless recorded_files.has_key?(filename)
+  end
+
+  # Rolls the recorded files back to their original states
+  def self.rollback!
+    recorded_files.each do |filename, contents|
+      # contents will be nil if the file didin't exist
+      if contents
+        File.open(filename, "w+") {|f| f << contents }
+      else
+        File.delete(filename)
+      end
+    end
+
+    @files = {}
+  end
+
+end
+
+World(ActiveAdminReloading)
+
+After do
+  ActiveAdminContentsRollback.rollback!
+end
+
 Given /^a configuration of:$/ do |configuration_content|
-  eval configuration_content
-  Rails.application.reload_routes!
+  load_active_admin_configuration(configuration_content)
   ActiveAdmin.application.namespaces.values.each{|n| n.load_menu! }
 end
 
 Given /^an index configuration of:$/ do |configuration_content|
-  eval configuration_content
-  Rails.application.reload_routes!
-  ActiveAdmin.application.namespaces.values.each{|n| n.load_menu! }
+  load_active_admin_configuration(configuration_content)
 
-  And 'I am logged in'
-  When "I am on the index page for posts"
+  step 'I am logged in'
+  step "I am on the index page for posts"
 end
 
 Given /^a show configuration of:$/ do |configuration_content|
-  eval configuration_content
-  Rails.application.reload_routes!
-  ActiveAdmin.application.namespaces.values.each{|n| n.load_menu! }
+  load_active_admin_configuration(configuration_content)
 
-  And 'I am logged in'
-  When "I am on the index page for posts"
-  And 'I follow "View"'
+  step 'I am logged in'
+  step "I am on the index page for posts"
+  step 'I follow "View"'
 end
 
 Given /^"([^"]*)" contains:$/ do |filename, contents|
   require 'fileutils'
   filepath = Rails.root + filename
   FileUtils.mkdir_p File.dirname(filepath)
+  ActiveAdminContentsRollback.record(filepath)
+
   File.open(filepath, 'w+'){|f| f << contents }
 end
+
+Given /^I add "([^"]*)" to the "([^"]*)" model$/ do |code, model_name|
+  filename = File.join(Rails.root, "app", "models", "#{model_name}.rb")
+  ActiveAdminContentsRollback.record(filename)
+
+  # Update the file
+  contents = File.read(filename)
+  File.open(filename, "w+") do |f|
+    f << contents.gsub(/^(class .+)$/, "\\1\n  #{code}\n")
+  end
+
+  ActiveSupport::Dependencies.clear
+end

data/features/step_definitions/dashboard_steps.rb

@@ -1,11 +1,15 @@
 Then /^I should see the default welcome message$/ do
-  Then %{I should see "Welcome to Active Admin" within "#dashboard_default_message"}
+  step %{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"}
+  step %{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"}
+  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/format_steps.rb

@@ -1,3 +1,11 @@
+CSVLib = if RUBY_VERSION =~ /^1.8/
+            require 'fastercsv'
+            FasterCSV
+          else
+            require 'csv'
+            CSV
+          end
+
 Then "I should see nicely formatted datetimes" do
   page.body.should =~ /\w+ \d{1,2}, \d{4} \d{2}:\d{2}/
 end
@@ -14,7 +22,7 @@ Then /^I should download a CSV file for "([^"]*)" containing:$/ do |resource_nam
   body = page.driver.response.body
 
   begin
-    csv = CSV.parse(body)
+    csv = CSVLib.parse(body)
     table.raw.each_with_index do |expected_row, row_index|
       expected_row.each_with_index do |expected_cell, col_index|
         cell = csv.try(:[], row_index).try(:[], col_index)

data/features/step_definitions/index_scope_steps.rb

@@ -1,20 +1,32 @@
 Then /^I should see the scope "([^"]*)"$/ do |name|
-  Then %{I should see "#{name}" within ".scopes"}
+  step %{I should see "#{name}" within ".scopes"}
+end
+
+Then /^I should not see the scope "([^"]*)"$/ do |name|
+  step %{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"}
+  step %{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)
+  step %{I should see the scope "#{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"}
+  step %{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/pagination_steps.rb

@@ -3,6 +3,6 @@ Then /^I should not see pagination$/ do
 end
 
 Then /^I should see pagination with (\d+) pages$/ do |count|
-  Then %{I should see "#{count}" within ".pagination a"}
-  Then %{I should not see "#{count.to_i + 1}" within ".pagination a"}
+  step %{I should see "#{count}" within ".pagination a"}
+  step %{I should not see "#{count.to_i + 1}" within ".pagination a"}
 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/step_definitions/tab_steps.rb

@@ -1,3 +1,3 @@
 Then /^the "([^"]*)" tab should be selected$/ do |name|
-  Then %{I should see "#{name}" within "ul#tabs li.current"}
+  step %{I should see "#{name}" within "ul#tabs li.current"}
 end

data/features/step_definitions/user_steps.rb

@@ -5,7 +5,7 @@ Given /^I am logged out$/ do
 end
 
 Given /^I am logged in$/ do
-  Given 'an admin user "admin@example.com" exists'
+  step 'an admin user "admin@example.com" exists'
 
   if page.all(:css, "a", :text => "Logout").size > 0
     click_link "Logout"

data/features/step_definitions/web_steps.rb

@@ -32,13 +32,13 @@ end
 World(WithinHelpers)
 
 # Single-line step scoper
-When /^(.*) within (.*[^:])$/ do |step, parent|
-  with_scope(parent) { When step }
+When /^(.*) within (.*[^:])$/ do |step_name, parent|
+  with_scope(parent) { step step_name }
 end
 
 # Multi-line step scoper
-When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
-  with_scope(parent) { When "#{step}:", table_or_string }
+When /^(.*) within (.*[^:]):$/ do |step_name, parent, table_or_string|
+  with_scope(parent) { step "#{step_name}:", table_or_string }
 end
 
 Given /^(?:|I )am on (.+)$/ do |page_name|

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,11 @@
 require 'meta_search'
+require 'bourbon'
 require 'devise'
 require 'kaminari'
+require 'formtastic'
 require 'sass'
+require 'inherited_resources'
+require 'jquery-rails'
 require 'active_admin/arbre'
 require 'active_admin/engine'
 
@@ -13,6 +17,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 +27,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 +56,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 +90,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.
@@ -208,10 +251,9 @@ module ActiveAdmin
     end
 
     def attach_reloader
-      ActiveAdmin::Reloader.new(Rails.application, self, Rails.version).attach!
+      ActiveAdmin::Reloader.build(Rails.application, self, Rails.version).attach!
     end
 
-
     def generate_stylesheets
       # This must be required after initialization
       require 'sass/plugin'