andrewroth_activeadmin 0.3.4 → 0.3.4.1

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

@@ -0,0 +1,24 @@
+module ActiveAdmin
+  module Views
+    module Pages
+      class Page < Base
+
+        def main_content
+          page_presenter = active_admin_config.get_page_presenter(:index)
+
+          if page_presenter && page_presenter.block
+            instance_exec &page_presenter.block
+          else
+            nil
+          end
+        end
+
+        protected
+
+        def title
+          active_admin_config.name
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module ActiveAdmin
       class Show < Base
 
         def config
-          active_admin_config.page_configs[:show] || ::ActiveAdmin::PageConfig.new
+          active_admin_config.get_page_presenter(:show) || ::ActiveAdmin::PagePresenter.new
         end
 
         def title

data/lib/generators/active_admin/assets/assets_generator.rb

@@ -2,20 +2,38 @@ module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base
 
+      class_option :bourbon, :type => :boolean, :default => true,
+                   :desc => "Generate Bourbon scss files if using Rails 3.0.x"
+
+      class_option :jquery, :type => :boolean, :default => true,
+                   :desc => "Generate jQuery js files if using Rails 3.0.x"
+
       def self.source_root
         @_active_admin_source_root ||= File.expand_path("../templates", __FILE__)
       end
 
       def install_assets
+        require 'rails'
+        require 'active_admin'
+
         if ActiveAdmin.use_asset_pipeline?
           template '3.1/active_admin.js', 'app/assets/javascripts/active_admin.js'
           template '3.1/active_admin.css.scss', 'app/assets/stylesheets/active_admin.css.scss'
         else
-          template '3.0/active_admin.js', 'public/javascripts/active_admin.js'
+          template '../../../../../app/assets/javascripts/active_admin/application.js', 'public/javascripts/active_admin.js'
           directory '../../../../../app/assets/images/active_admin', 'public/images/active_admin'
+          generate "jquery:install --ui" if options.jquery?
+          install_bourbon if options.bourbon?
         end
       end
 
+      private
+
+      def install_bourbon
+        rake "bourbon:install"
+        create_file "public/stylesheets/sass/_bourbon.scss", '@import "bourbon/bourbon"'
+      end
+
     end
   end
 end

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

@@ -7,17 +7,24 @@ ActiveAdmin.setup do |config|
   #
   config.site_title = "<%= Rails.application.class.name.split("::").first.titlecase %>"
 
-  # Set the link url for the title. For example, to take 
+  # Set the link url for the title. For example, to take
   # users to your main site. Defaults to no link.
   #
   # config.site_title_link = "/"
 
+  # Set an optional image to be displayed for the header
+  # instead of a string (overrides :site_title)
+  #
+  # Note: Recommended image height is 21px to properly fit in the header
+  #
+  # config.site_title_image = "/images/logo.png"
+
   # == Default Namespace
   #
   # Set the default namespace each administration resource
-  # will be added to. 
+  # will be added to.
   #
-  # eg: 
+  # eg:
   #   config.default_namespace = :hello_world
   #
   # This will create resources in the HelloWorld module and
@@ -28,11 +35,22 @@ ActiveAdmin.setup do |config|
   #
   # Default:
   # config.default_namespace = :admin
+  #
+  # You can customize the settings for each namespace by using
+  # a namespace block. For example, to change the site title
+  # within a namespace:
+  #
+  #   config.namespace :admin do |admin|
+  #     admin.site_title = "Custom Admin Title"
+  #   end
+  #
+  # This will ONLY change the title for the admin section. Other
+  # namespaces will continue to use the main "site_title" configuration.
 
   # == User Authentication
   #
-  # Active Admin will automatically call an authentication 
-  # method in a before filter of all controller actions to 
+  # Active Admin will automatically call an authentication
+  # method in a before filter of all controller actions to
   # ensure that there is a currently logged in admin user.
   #
   # This setting changes the method which Active Admin calls
@@ -71,20 +89,25 @@ ActiveAdmin.setup do |config|
 
   # == Admin Comments
   #
-  # Admin comments allow you to add comments to any model for admin use
-  #
-  # Admin comments are enabled by default in the default
-  # namespace only. You can turn them on in a namesapce
-  # by adding them to the comments array.
+  # Admin comments allow you to add comments to any model for admin use.
+  # Admin comments are enabled by default.
   #
   # Default:
-  # config.allow_comments_in = [:admin]
+  # config.allow_comments = true
+  #
+  # You can turn them on and off for any given namespace by using a
+  # namespace config block.
+  #
+  # Eg:
+  #   config.namespace :without_comments do |without_comments|
+  #     without_comments.allow_comments = false
+  #   end
 
 
   # == Controller Filters
   #
   # You can add before, after and around filters to all of your
-  # Active Admin resources from here. 
+  # Active Admin resources from here.
   #
   # config.before_filter :do_something_awesome
 
@@ -98,6 +121,9 @@ ActiveAdmin.setup do |config|
   # To load a stylesheet:
   #   config.register_stylesheet 'my_stylesheet.css'
   #
+  # You can provide an options hash for more control, which is passed along to stylesheet_link_tag():
+  #   config.register_stylesheet 'my_print_stylesheet.css', :media => :print
+  #
   # To load a javascript file:
   #   config.register_javascript 'my_javascript.js'
 end

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

@@ -34,5 +34,11 @@ ActiveAdmin::Dashboards.build do
   #   section "Recent User", :priority => 1
   #
   # Will render the "Recent Users" then the "Recent Posts" sections on the dashboard.
+  
+  # == Conditionally Display
+  # Provide a method name or Proc object to conditionally render a section at run time.
+  #
+  # section "Membership Summary", :if => :memberships_enabled?
+  # section "Membership Summary", :if => Proc.new { current_admin_user.account.memberships.any? }
 
 end

data/spec/spec_helper.rb

@@ -90,6 +90,10 @@ module ActiveAdminIntegrationSpecHelper
   end  
   alias_method :action_view, :mock_action_view
 
+  # A mock resource to register
+  class MockResource
+  end
+
 end
 
 ENV['RAILS_ENV'] = 'test'

data/spec/support/rails_template.rb

@@ -2,8 +2,11 @@
 
 # Create a cucumber database and environment
 copy_file File.expand_path('../templates/cucumber.rb', __FILE__), "config/environments/cucumber.rb"
+copy_file File.expand_path('../templates/cucumber_with_reloading.rb', __FILE__), "config/environments/cucumber_with_reloading.rb"
+
 gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
 gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n  database: db/cucumber.sqlite3"
+gsub_file 'config/database.yml', /\z/, "\ncucumber_with_reloading:\n  <<: *test\n  database: db/cucumber.sqlite3"
 
 # Generate some test models
 generate :model, "post title:string body:text published_at:datetime author_id:integer category_id:integer"
@@ -22,6 +25,14 @@ run "rm -r test"
 run "rm -r spec"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+# we need this routing path, named "logout_path", for testing
+route <<-EOS
+  devise_scope :user do
+    match '/admin/logout' => 'active_admin/devise/sessions#destroy', :as => :logout
+  end
+EOS
+
 generate :'active_admin:install'
 
 # Setup a root path for devise

data/spec/support/templates/cucumber_with_reloading.rb

@@ -0,0 +1,5 @@
+require File.expand_path('config/environments/cucumber', Rails.root)
+
+Rails.application.class.configure do
+  config.cache_classes = false
+end

data/spec/unit/active_admin_spec.rb

@@ -14,4 +14,12 @@ describe ActiveAdmin do
       ActiveAdmin.default_namespace
     end
   end
+
+  %w(register register_page unload! load! routes).each do |method|
+    it "delegates ##{method} to application" do
+      ActiveAdmin.application.should_receive(method)
+
+      ActiveAdmin.send(method)
+    end
+  end
 end

data/spec/unit/application_spec.rb

@@ -39,6 +39,15 @@ describe ActiveAdmin::Application do
     application.site_title_link = "http://www.mygreatsite.com"
     application.site_title_link.should == "http://www.mygreatsite.com"
   end
+  
+  it "should store the site's title image" do
+    application.site_title_image.should == ""
+  end
+  
+  it "should set the site's title image" do
+    application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
+    application.site_title_image.should == "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
+  end
 
   it "should have a view factory" do
     application.view_factory.should be_an_instance_of(ActiveAdmin::ViewFactory)
@@ -48,8 +57,8 @@ describe ActiveAdmin::Application do
     application.admin_notes.should be_nil
   end
 
-  it "should have admin notes in admin namespace by default" do
-    application.allow_comments_in.should == [:admin]
+  it "should allow comments by default" do
+    application.allow_comments.should == true
   end
 
   describe "authentication settings" do
@@ -84,4 +93,41 @@ describe ActiveAdmin::Application do
     end
   end
 
+  describe "adding an inheritable setting" do
+
+    it "should add a setting to Application and Namespace" do
+      ActiveAdmin::Application.inheritable_setting :inheritable_setting, "inheritable_setting"
+      app = ActiveAdmin::Application.new
+      app.inheritable_setting.should == "inheritable_setting"
+      ns = ActiveAdmin::Namespace.new(app, :admin)
+      ns.inheritable_setting.should == "inheritable_setting"
+    end
+
+  end
+
+  describe "#namespace" do
+    it "should yield a new namespace" do
+      application.namespace :new_namespace do |ns|
+        ns.name.should == :new_namespace
+      end
+    end
+
+    it "should return an instantiated namespace" do
+      admin = application.find_or_create_namespace :admin
+      application.namespace :admin do |ns|
+        ns.should == admin
+      end
+    end
+  end
+
+  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
+      namespace.should_receive(:register_page).with("My Page", {:namespace => "public"})
+
+      application.register_page("My Page", :namespace => "public")
+    end
+  end
+
 end

data/spec/unit/arbre/html/element_finder_methods_spec.rb

@@ -49,6 +49,62 @@ describe Arbre::HTML::Element, "Finder Methods" do
     end
   end
 
-  describe "finding an element by id"
-  describe "finding an element by a class name"
+  #TODO: describe "finding an element by id"
+  
+  describe "finding an element by a class name" do
+    it "should return 0 when no elements exist" do
+      div.get_elements_by_class_name("my_class").size.should == 0
+    end
+    it "should return a child element" do
+      html = div do
+        div :class => "some_class"
+        div :class => "my_class"
+      end
+      elements = html.get_elements_by_class_name("my_class")
+      elements.size.should == 1
+      elements[0].should be_instance_of(Arbre::HTML::Div)
+    end
+
+    it "should return multple child elements" do
+      html = div do
+        div :class => "some_class"
+        div :class => "my_class"
+        div :class => "my_class"
+      end
+      elements = html.get_elements_by_class_name("my_class")
+      elements.size.should == 2
+      elements[0].should be_instance_of(Arbre::HTML::Div)
+      elements[1].should be_instance_of(Arbre::HTML::Div)
+    end
+    
+    it "should return elements that match one of several classes" do
+      html = div do
+        div :class => "some_class this_class"
+        div :class => "some_class"
+        div :class => "other_class"
+        
+      end
+      elements = html.get_elements_by_class_name("this_class")
+      elements.size.should == 1
+      elements[0].should be_instance_of(Arbre::HTML::Div)
+    end
+    
+    #TODO: find children's children by class name
+    
+    #it "should return elements that are nested" do
+    #  html = div do
+    #    div :class => "my_class"
+    #    div :class => "some_class" do
+    #      ul :class => "other_class" do
+    #        li :class => "special_awesome_class"
+    #      end
+    #    end
+    #  end
+    #  
+    #  elements = html.get_elements_by_class_name("special_awesome_class")
+    #
+    #  elements.size.should == 1
+    #  elements[0].should be_instance_of(Arbre::HTML::Li)
+    #end
+  end
 end

data/spec/unit/asset_registration_spec.rb

@@ -13,14 +13,20 @@ describe ActiveAdmin::AssetRegistration do
 
   it "should register a stylesheet file" do
     MockRegistration.register_stylesheet "active_admin.css"
-    MockRegistration.stylesheets.should == ["active_admin.css"]
+    MockRegistration.stylesheets.length.should == 1
+    MockRegistration.stylesheets.first.path.should == "active_admin.css"
   end
 
   it "should clear all existing stylesheets" do
     MockRegistration.register_stylesheet "active_admin.css"
-    MockRegistration.stylesheets.should == ["active_admin.css"]    
+    MockRegistration.stylesheets.length.should == 1
     MockRegistration.clear_stylesheets!
-    MockRegistration.stylesheets.should == []
+    MockRegistration.stylesheets.length.should == 0
+  end
+  
+  it "should allow media option when registering stylesheet" do
+    MockRegistration.register_stylesheet "active_admin.css", :media => :print
+    MockRegistration.stylesheets.first.options[:media].should == :print
   end
 
   it "should register a javascript file" do

data/spec/unit/auto_link_spec.rb

@@ -13,7 +13,7 @@ describe "auto linking resources" do
   include ActiveAdmin::ViewHelpers::DisplayHelper
 
   let(:active_admin_config) { AutoLinkMockResource.new(namespace) }
-  let(:namespace){ ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin) }
+  let(:active_admin_namespace){ ActiveAdmin::Namespace.new(ActiveAdmin::Application.new, :admin) }
   let(:post){ Post.create! :title => "Hello World" }
 
   def admin_post_path(post)
@@ -28,7 +28,7 @@ describe "auto linking resources" do
 
   context "when the resource is registered" do
     before do
-      namespace.register Post
+      active_admin_namespace.register Post
     end
     it "should return a link with the display name of the object" do
       self.should_receive(:link_to).with("Hello World", admin_post_path(post))

data/spec/unit/base_controller_shared_examples.rb

@@ -0,0 +1,28 @@
+# Required methods:
+#   * controller_class
+#   * controller
+#
+shared_examples_for "BaseController" do
+  let(:controller_class) { described_class }
+
+  describe "Menu" do
+    describe "setting the current tab" do
+      before do 
+        controller.stub!(:active_admin_config => resource, :parent? => true)
+        controller.send :set_current_tab # Run the before filter
+      end
+      subject{ controller.instance_variable_get(:@current_tab) }
+
+      context "when menu item name is 'Resources' without a parent menu item" do
+        let(:resource){ mock(:menu_item_name => "Resources", :parent_menu_item_name => nil, :belongs_to? => false) }
+        it { should == "Resources" }
+      end
+
+      context "when there is a parent menu item of 'Admin'" do
+        let(:resource){ mock(:parent_menu_item_name => "Admin", :menu_item_name => "Resources", :belongs_to? => false) }
+        it { should == "Admin/Resources" }
+      end
+    end
+  end
+
+end