activeadmin 0.4.4 → 0.5.0.pre

data/spec/unit/menu_spec.rb

@@ -1,52 +1,66 @@
-require 'spec_helper' 
+require 'spec_helper_without_rails'
+require 'active_admin/menu'
+require 'active_admin/menu_item'
+
+include ActiveAdmin
 
 describe ActiveAdmin::Menu do
 
   context "with no items" do
-    it "should be empty" do
-      ActiveAdmin::Menu.new.items.should == []
+
+    it "should have an empty item collection" do
+      menu = Menu.new
+      menu.items.should be_empty
     end
-    
+
     it "should accept new items" do
-      menu = ActiveAdmin::Menu.new
-      menu.add "Dashboard", "/admin"
-      menu.items.first.should be_an_instance_of(ActiveAdmin::MenuItem)
-      menu.items.first.name.should == "Dashboard"
-    end
-    
-    it "should default new items to the priority of 10" do
-      menu = ActiveAdmin::Menu.new
-      menu.add "Dashboard", "/admin"
-      menu.items.first.priority.should == 10
+      menu = Menu.new
+      item = MenuItem.new
+      menu.add item
+      menu.items.first.should == item
     end
+
   end
-  
+
   context "with many item" do
     let(:menu) do
-      ActiveAdmin::Menu.new do |m|
-        m.add "Dashboard", "/admin"
-        m.add "Blog",      "/admin/blog"
-        m.add "Users",     "/admin/users"
-        m.add "Settings",  "/admin/settings" do |s|
-          s.add "Admin Settings", "/admin/settings/admin" do |as|
-            s.add "User Settings", "/admin/settings/users"
-          end
-        end
+      Menu.new do |m|
+        m.add MenuItem.new(:label => "Dashboard")
+        m.add MenuItem.new(:label => "Blog")
       end
     end
 
     it "should give access to the menu item as an array" do
-      menu['Dashboard'].name.should == 'Dashboard'
+      menu['Dashboard'].label.should == 'Dashboard'
     end
-    
-    it "should find the item by a url on the top level" do
-      menu.find_by_url("/admin").name.should == "Dashboard"
+  end
+
+  describe Menu::ItemCollection do
+
+    let(:collection) { Menu::ItemCollection.new }
+
+    it "should initialize" do
+      collection.should be_empty
     end
-    
-    it "should find the item deep in the tree" do
-      menu.find_by_url("/admin/settings/users").name.should == "User Settings"
+
+    describe "#find_by_id" do
+      let(:menu_item) { MenuItem.new(:id => "an_id") }
+
+      before do
+        collection.push menu_item
+      end
+
+      it "retrieve an item id" do
+        MenuItem.should_receive(:generate_item_id).with("an_id").and_return("an_id")
+        collection.find_by_id("an_id").should == menu_item
+      end
+
+      it "returns nil when no matching ids" do
+        collection.find_by_id("not matching").should == nil
+      end
+
     end
-    
+
   end
 
 end

data/spec/unit/namespace/register_page_spec.rb

@@ -20,7 +20,6 @@ describe ActiveAdmin::Namespace, "registering a page" do
     end
 
     it "should create a menu item" do
-      namespace.load_menu!
       namespace.menu["Status"].should be_an_instance_of(ActiveAdmin::MenuItem)
     end
   end # context "with no configuration"
@@ -39,7 +38,6 @@ describe ActiveAdmin::Namespace, "registering a page" do
     describe "adding as a top level item" do
       before do
         namespace.register_page "Status"
-        namespace.load_menu!
       end
 
       it "should add a new menu item" do
@@ -52,7 +50,6 @@ describe ActiveAdmin::Namespace, "registering a page" do
         namespace.register_page "Status" do
           menu :parent => 'Extra'
         end
-        namespace.load_menu!
       end
       it "should generate the parent menu item" do
         namespace.menu['Extra'].should_not be_nil
@@ -67,7 +64,6 @@ describe ActiveAdmin::Namespace, "registering a page" do
         namespace.register_page "Status" do
           menu false
         end
-        namespace.load_menu!
       end
       it "should not create a menu item" do
         namespace.menu["Status"].should be_nil
@@ -79,7 +75,6 @@ describe ActiveAdmin::Namespace, "registering a page" do
         namespace.register_page "Status" do
           menu :priority => 2
         end
-        namespace.load_menu!
       end
       it "should have a custom priority of 2" do
         namespace.menu["Status"].priority.should == 2
@@ -91,7 +86,6 @@ describe ActiveAdmin::Namespace, "registering a page" do
         namespace.register_page "Status" do
           menu :if => proc { false }
         end
-        namespace.load_menu!
       end
       it "should have a proc returning false" do
         namespace.menu["Status"].display_if_block.should be_instance_of(Proc)

data/spec/unit/namespace/register_resource_spec.rb

@@ -20,7 +20,6 @@ describe ActiveAdmin::Namespace, "registering a resource" do
       defined?(Admin::DashboardController).should be_true
     end
     it "should create a menu item" do
-      namespace.load_menu!
       namespace.menu["Categories"].should be_an_instance_of(ActiveAdmin::MenuItem)
       namespace.menu["Categories"].url.should == :admin_categories_path
     end
@@ -43,13 +42,12 @@ describe ActiveAdmin::Namespace, "registering a resource" do
     end
 
     it "should store the namespaced registered configuration" do
-      namespace.resources.keys.should include('MockResource')
+      namespace.resources.keys.should include('Mock::Resource')
     end
     it "should create a new controller in the default namespace" do
       defined?(Admin::MockResourcesController).should be_true
     end
     it "should create a menu item" do
-      namespace.load_menu!
       namespace.menu["Mock Resources"].should be_an_instance_of(ActiveAdmin::MenuItem)
     end
 
@@ -88,7 +86,6 @@ describe ActiveAdmin::Namespace, "registering a resource" do
     describe "adding as a top level item" do
       before do
         namespace.register Category
-        namespace.load_menu!
       end
       it "should add a new menu item" do
         namespace.menu['Categories'].should_not be_nil
@@ -100,7 +97,6 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         namespace.register Category do
           menu :parent => 'Blog'
         end
-        namespace.load_menu!
       end
       it "should generate the parent menu item" do
         namespace.menu['Blog'].should_not be_nil
@@ -115,7 +111,6 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         namespace.register Category do
           menu false
         end
-        namespace.load_menu!
       end
       it "should not create a menu item" do
         namespace.menu["Categories"].should be_nil
@@ -127,7 +122,6 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         namespace.register Category do
           menu :priority => 2
         end
-        namespace.load_menu!
       end
       it "should have a custom priority of 2" do
         namespace.menu["Categories"].priority.should == 2
@@ -139,7 +133,6 @@ describe ActiveAdmin::Namespace, "registering a resource" do
         namespace.register Category do
           menu :if => proc { false }
         end
-        namespace.load_menu!
       end
       it "should have a proc returning false" do
         namespace.menu["Categories"].display_if_block.should be_instance_of(Proc)

data/spec/unit/namespace_spec.rb

@@ -19,8 +19,14 @@ describe ActiveAdmin::Namespace do
       namespace.resources.resources.should be_empty
     end
 
-    it "should have an empty menu" do
-      namespace.menu.items.should be_empty
+    it "should not have any menu item" do
+      if ActiveAdmin::Dashboards.built?
+        # DEPRECATED behavior. If a dashboard was built while running this
+        # spec, then an item gets added to the menu
+        namespace.menu.should have(1).item
+      else
+        namespace.menu.items.should be_empty
+      end
     end
   end # context "when new"
 

data/spec/unit/page_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper' 
 require File.expand_path('config_shared_examples', File.dirname(__FILE__))
 
@@ -11,36 +13,46 @@ module ActiveAdmin
     let(:namespace){ Namespace.new(application, :admin) }
 
     def config(options = {})
-      @config ||= Page.new(namespace, "Status", options)
+      @config ||= namespace.register_page("Chocolate I lØve You!", options)
     end
 
     describe "controller name" do
       it "should return a namespaced controller name" do
-        config.controller_name.should == "Admin::StatusController"
+        config.controller_name.should == "Admin::ChocolateILoveYouController"
       end
       context "when non namespaced controller" do
         let(:namespace){ ActiveAdmin::Namespace.new(application, :root) }
         it "should return a non namespaced controller name" do
-          config.controller_name.should == "StatusController"
+          config.controller_name.should == "ChocolateILoveYouController"
         end
       end
     end
 
     describe "#resource_name" do
       it "returns the name" do
-        config.resource_name.should == "Status"
+        config.resource_name.should == "Chocolate I lØve You!"
+      end
+
+      it "returns the singular, lowercase name" do
+        config.resource_name.singular.should == "chocolate i lØve you!"
       end
     end
 
-    describe "#plural_resource_name" do
+    describe "#plural_resource_label" do
       it "returns the singular name" do
-        config.plural_resource_name.should == "Status"
+        config.plural_resource_label.should == "Chocolate I lØve You!"
       end
     end
 
     describe "#underscored_resource_name" do
-      it "returns the underscored name" do
-        config.underscored_resource_name.should == "status"
+      it "returns the resource name underscored" do
+        config.underscored_resource_name.should == "chocolate_i_love_you"
+      end
+    end
+
+    describe "#camelized_resource_name" do
+      it "returns the resource name camel case" do
+        config.camelized_resource_name.should == "ChocolateILoveYou"
       end
     end
 

data/spec/unit/resource/naming_spec.rb

@@ -12,64 +12,65 @@ module ActiveAdmin
       @config ||= Resource.new(namespace, Category, options)
     end
 
+    module ::Mock class Resource < ActiveRecord::Base; end; end
+    module NoActiveModel class Resource; end; end
 
-    describe "underscored resource name" do
+    describe "singular resource name" do
       context "when class" do
-        it "should be the underscored safe resource name" do
-          config.underscored_resource_name.should == "category"
+        it "should be the underscored singular resource name" do
+          config.resource_name.singular.should == "category"
         end
       end
       context "when a class in a module" do
         it "should underscore the module and the class" do
-          module ::Mock; class Resource; end; end
-          Resource.new(namespace, Mock::Resource).underscored_resource_name.should == "mock_resource"
+          Resource.new(namespace, Mock::Resource).resource_name.singular.should == "mock_resource"
         end
       end
       context "when you pass the 'as' option" do
         it "should underscore the passed through string" do
-          config(:as => "Blog Category").underscored_resource_name.should == "blog_category"
+          config(:as => "Blog Category").resource_name.singular.should == "blog_category"
         end
       end
     end
 
-    describe "camelized resource name" do
-      it "should return a camelized version of the underscored resource name" do
-        config(:as => "Blog category").camelized_resource_name.should == "BlogCategory"
-      end
-    end
-    
-    describe "resource name" do
+    describe "resource label" do
       it "should return a pretty name" do
-        config.resource_name.should == "Category"
+        config.resource_label.should == "Category"
       end
 
       it "should return the plural version" do
-        config.plural_resource_name.should == "Categories"
+        config.plural_resource_label.should == "Categories"
       end
 
       context "when the :as option is given" do
         it "should return the custom name" do
-          config(:as => "My Category").resource_name.should == "My Category"
+          config(:as => "My Category").resource_label.should == "My Category"
+        end
+      end
+
+      context "when a class in a module" do
+        it "should include the module and the class" do
+          Resource.new(namespace, Mock::Resource).resource_label.should == "Mock Resource"
+        end
+
+        it "should include the module and the pluralized class" do
+          Resource.new(namespace, Mock::Resource).plural_resource_label.should == "Mock Resources"
         end
       end
 
       describe "I18n integration" do
-        describe "singular name" do
+        describe "singular label" do
           it "should return the titleized model_name.human" do
-            Category.model_name.should_receive(:human).and_return "Da category"
+            config.resource_name.should_receive(:human).and_return "Da category"
 
-            config.resource_name.should == "Da Category"
+            config.resource_label.should == "Da category"
           end
         end
 
-        describe "plural name" do
+        describe "plural label" do
           it "should return the titleized plural version defined by i18n if available" do
-            Category.model_name.should_receive(:underscore).and_return "category"
-            Category.model_name.should_not_receive(:i18n_key) # Not implemented in Rails 3.0.0
-            I18n.should_receive(:translate!).
-              with("activerecord.models.category.other").
-              and_return("Da categories")
-            config.plural_resource_name.should == "Da Categories"
+            I18n.should_receive(:translate).at_least(:once).and_return("Da categories")
+            config.plural_resource_label.should == "Da categories"
           end
         end
 

data/spec/unit/resource/sidebars_spec.rb

@@ -40,11 +40,4 @@ describe ActiveAdmin::Resource::Sidebars do
 
   end
 
-  describe "default sidebar sections" do
-
-    it "should have a filters section by default" do
-      resource.sidebar_sections.first.name.should == :filters
-    end
-
-  end
 end

data/spec/unit/resource_collection_spec.rb

@@ -12,19 +12,19 @@ describe ActiveAdmin::ResourceCollection do
   end
 
   it "should be enumerable" do
-    resource = mock(:resource_key => "MyResource")
+    resource = mock(:resource_name => "MyResource")
     collection.add(resource)
     collection.each{|r| r.should == resource }
   end
 
   it "should return the available keys" do
-    resource = mock(:resource_key => "MyResource")
+    resource = mock(:resource_name => "MyResource")
     collection.add resource
-    collection.keys.should == [resource.resource_key]
+    collection.keys.should == [resource.resource_name]
   end
 
   describe "adding a new resource" do
-    let(:resource){ mock(:resource_key => "MyResource") }
+    let(:resource){ mock(:resource_name => "MyResource") }
 
     it "should return the resource" do
       collection.add(resource).should == resource
@@ -37,13 +37,13 @@ describe ActiveAdmin::ResourceCollection do
 
     it "should be available by name" do
       collection.add(resource)
-      collection.find_by_key(resource.resource_key).should == resource
+      collection.find_by_key(resource.resource_name).should == resource
     end
   end
 
   describe "adding a new resource when the key already exists" do
-    let(:stored_resource){ mock(:resource_key => "MyResource") }
-    let(:resource){ mock(:resource_key => "MyResource") }
+    let(:stored_resource){ mock(:resource_name => "MyResource") }
+    let(:resource){ mock(:resource_name => "MyResource") }
 
     before do
       collection.add(stored_resource)
@@ -60,8 +60,8 @@ describe ActiveAdmin::ResourceCollection do
   end
 
   describe "adding an existing resource key with a different resource class" do
-    let(:stored_resource){ mock(:resource_key => "MyResource", :resource_class => mock) }
-    let(:resource){ mock(:resource_key => "MyResource", :resource_class => mock) }
+    let(:stored_resource){ mock(:resource_name => "MyResource", :resource_class => mock) }
+    let(:resource){ mock(:resource_name => "MyResource", :resource_class => mock) }
 
     it "should raise a ActiveAdmin::ResourceMismatchError" do
       collection.add(stored_resource)
@@ -75,9 +75,9 @@ describe ActiveAdmin::ResourceCollection do
   describe "#find_by_resource_class" do
 
     let(:base_class){ mock(:to_s => "BaseClass")}
-    let(:resource_from_base_class){ mock(:resource_key => "MyBaseClassResource", :resource_class => base_class )}
+    let(:resource_from_base_class){ mock(:resource_name => "MyBaseClassResource", :resource_class => base_class )}
     let(:resource_class){ mock(:base_class => base_class, :to_s => "ResourceClass") }
-    let(:resource){ mock(:resource_key => "MyResource", :resource_class => resource_class) }
+    let(:resource){ mock(:resource_name => "MyResource", :resource_class => resource_class) }
 
     it "should find a resource when it's in the collection" do
       collection.add resource