activeadmin 0.6.0 → 0.6.1

data/spec/unit/page_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'spec_helper' 
+require 'spec_helper'
 require File.expand_path('config_shared_examples', File.dirname(__FILE__))
 
 module ActiveAdmin

data/spec/unit/resource/menu_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 module ActiveAdmin
   describe Resource, "Menu" do

data/spec/unit/resource/naming_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'spec_helper'
 
 module ActiveAdmin
@@ -74,6 +76,13 @@ module ActiveAdmin
           end
         end
 
+        describe "plural label with not default locale" do
+          it "should return the titleized plural version defined by i18n with custom :count if available" do
+            config.resource_name.should_receive(:translate).at_least(:once).and_return "Категории"
+            config.plural_resource_label(:count => 3).should == "Категории"
+          end
+        end
+
         context "when the :as option is given" do
           describe "singular label" do
             it "should translate the custom name" do

data/spec/unit/resource/pagination_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 module ActiveAdmin
   describe Resource, "Pagination" do
@@ -28,7 +28,7 @@ module ActiveAdmin
         namespace.should_receive(:default_per_page).and_return(5)
         config.per_page.should == 5
       end
-      
+
       it "should be settable" do
         config.per_page = 5
         config.per_page.should == 5

data/spec/unit/resource/routes_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper' 
+
+module ActiveAdmin
+  describe Resource::Routes do
+    before { load_defaults! }
+
+    describe "route names" do
+      context "when in the admin namespace" do
+        let!(:config)  { ActiveAdmin.register Category }
+        let(:category) { Category.new { |c| c.id = 123 } }
+
+        it "should return the route prefix" do
+          config.route_prefix.should eq 'admin'
+        end
+
+        it "should return the route collection path" do
+          config.route_collection_path.should eq '/admin/categories'
+        end
+
+        it "should return the route instance path" do
+          config.route_instance_path(category).should eq '/admin/categories/123'
+        end
+      end
+
+      context "when in the root namespace" do
+        let!(:config) { ActiveAdmin.register Category, :namespace => false }
+        it "should have a nil route_prefix" do
+          config.route_prefix.should be_nil
+        end
+
+        it "should generate a correct route" do
+          reload_routes!
+          config.route_collection_path.should == "/categories"
+        end
+      end
+
+      context "when registering a plural resource" do
+        class ::News; def self.has_many(*); end end
+        let!(:config) { ActiveAdmin.register News }
+        before{ reload_routes! }
+
+        it "should return the plural route with _index" do
+          config.route_collection_path.should == "/admin/news"
+        end
+      end
+
+      context "when the resource belongs to another resource" do
+        let! :config do
+          ActiveAdmin.register Post do
+            belongs_to :category
+          end
+        end
+
+        let :post do
+          Post.new do |p|
+            p.id = 3
+            p.category = Category.new{ |c| c.id = 1 }
+          end
+        end
+
+        before{ reload_routes! }
+
+        it "should nest the collection path" do
+          config.route_collection_path(category_id: 1).should == "/admin/categories/1/posts"
+        end
+
+        it "should nest the instance path" do
+          config.route_instance_path(post).should == "/admin/categories/1/posts/3"
+        end
+      end
+    end
+  end
+end

data/spec/unit/resource/scopes_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 module ActiveAdmin
   describe Resource, "Scopes" do

data/spec/unit/resource_collection_spec.rb

@@ -4,27 +4,29 @@ require 'active_admin/resource_collection'
 include ActiveAdmin
 
 describe ActiveAdmin::ResourceCollection do
+  let(:application) { ActiveAdmin::Application.new }
+  let(:namespace)   { ActiveAdmin::Namespace.new(application, :admin) }
 
   let(:collection){ ResourceCollection.new }
 
   it "should have no resources when new" do
-    collection.resources.should == []
+    collection.should be_empty
   end
 
   it "should be enumerable" do
-    resource = mock(:resource_name => "MyResource")
+    resource = mock :resource_name => "MyResource"
     collection.add(resource)
-    collection.each{|r| r.should == resource }
+    collection.each{ |r| r.should == resource }
   end
 
   it "should return the available keys" do
-    resource = mock(:resource_name => "MyResource")
+    resource = mock :resource_name => "MyResource"
     collection.add resource
     collection.keys.should == [resource.resource_name]
   end
 
   describe "adding a new resource" do
-    let(:resource){ mock(:resource_name => "MyResource") }
+    let(:resource){ mock :resource_name => "MyResource" }
 
     it "should return the resource" do
       collection.add(resource).should == resource
@@ -32,69 +34,119 @@ describe ActiveAdmin::ResourceCollection do
 
     it "should add a new resource" do
       collection.add(resource)
-      collection.resources.should == [resource]
+      collection.values.should == [resource]
     end
 
     it "should be available by name" do
       collection.add(resource)
-      collection.find_by_key(resource.resource_name).should == resource
+      collection[resource.resource_name].should == resource
     end
   end
 
   describe "adding a new resource when the key already exists" do
-    let(:stored_resource){ mock(:resource_name => "MyResource") }
-    let(:resource){ mock(:resource_name => "MyResource") }
+    let(:resource){ mock :resource_name => "MyResource" }
 
-    before do
-      collection.add(stored_resource)
+    it "should not add a new resource" do
+      collection.add(resource); collection.add(resource)
+      collection.values.should == [resource]
     end
+  end
 
-    it "should return the original resource" do
-      collection.add(resource).should == stored_resource
-    end
+  describe "#[]" do
+    let(:resource)              { Resource.new(namespace, resource_class) }
+    let(:inherited_resource)    { Resource.new(namespace, inherited_resource_class) }
 
-    it "should not add a new resource" do
-      collection.add(resource)
-      collection.resources.should == [stored_resource]
+    let(:resource_class)           { User }
+    let(:inherited_resource_class) { Publisher }
+    let(:unregistered_class)       { Category }
+
+    context "with resources" do
+      before do
+        collection.add resource
+        collection.add inherited_resource
+      end
+
+      it "should find resource by class" do
+        collection[resource_class].should == resource
+      end
+
+      it "should find resource by class string" do
+        collection[resource_class.to_s].should == resource
+      end
+
+      it "should find inherited resource by class" do
+        collection[inherited_resource_class].should == inherited_resource
+      end
+
+      it "should find inherited resource by class string" do
+        collection[inherited_resource_class.to_s].should == inherited_resource
+      end
+
+      it "should return nil when the resource_class does not respond to base_class and it is not in the collection" do
+        collection[mock].should == nil
+      end
+
+      it "should return nil when a resource class is NOT in the collection" do
+        collection[unregistered_class].should == nil
+      end
     end
-  end
 
-  describe "adding an existing resource key with a different resource class" do
-    let(:stored_resource){ mock(:resource_name => "MyResource", :resource_class => mock) }
-    let(:resource){ mock(:resource_name => "MyResource", :resource_class => mock) }
+    context "without inherited resources" do
+      before do
+        collection.add resource
+      end
 
-    it "should raise a ActiveAdmin::ResourceMismatchError" do
-      collection.add(stored_resource)
-      lambda {
-        collection.add(resource)
-      }.should raise_error(ActiveAdmin::ResourceMismatchError)
+      it "should find resource by inherited class" do
+        collection[inherited_resource_class].should == resource
+      end
     end
 
-  end
+    context "with a renamed resource" do
+      let(:renamed_resource) { Resource.new(namespace, resource_class, :as => name) }
+      let(:name)             { "Administrators" }
 
-  describe "#find_by_resource_class" do
+      before do
+        collection.add renamed_resource
+      end
 
-    let(:base_class){ mock(:to_s => "BaseClass")}
-    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_name => "MyResource", :resource_class => resource_class) }
+      it "should find resource by class" do
+        collection[resource_class].should == renamed_resource
+      end
 
-    it "should find a resource when it's in the collection" do
-      collection.add resource
-      collection.find_by_resource_class(resource_class).should == resource
-    end
+      it "should find resource by class string" do
+        collection[resource_class.to_s].should == renamed_resource
+      end
 
-    it "should return nil when the resource class is not in the collection" do
-      collection.find_by_resource_class(resource_class).should == nil
+      it "should find resource by name" do
+        collection[name].should == renamed_resource
+      end
     end
+  end
 
-    it "should return the resource when it and it's base class is in the collection" do
-      collection.add resource_from_base_class
-      collection.find_by_resource_class(resource_class).should == resource_from_base_class
+  describe ".add" do
+    let(:resource)         { Resource.new(namespace, Category) }
+    let(:resource_renamed) { Resource.new(namespace, Category, as: "Subcategory") }
+
+    context "when renamed resource is added first" do
+      before do
+        collection.add(resource_renamed)
+        collection.add(resource)
+      end
+
+      it "contains both resources" do
+        collection.values.should include(resource, resource_renamed)
+      end
     end
 
-    it "should return nil the resource_class does not repond to base_class and it's not in the collection" do
-      collection.find_by_resource_class(mock).should == nil
+    context "when resource is added first" do
+      before do
+        collection.add(resource)
+        collection.add(resource_renamed)
+      end
+
+      it "contains both resources" do
+        collection.values.should include(resource, resource_renamed)
+      end
     end
   end
 

data/spec/unit/resource_registration_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper' 
+require 'spec_helper'
 
 describe "Registering an object to administer" do
-  let(:application){ ActiveAdmin::Application.new }
+  application = ActiveAdmin::Application.new
 
   context "with no configuration" do
-    let(:namespace) { ActiveAdmin::Namespace.new(application, :admin) }
+    namespace = ActiveAdmin::Namespace.new(application, :admin)
     it "should call register on the namespace" do
       application.namespaces[namespace.name] = namespace
       namespace.should_receive(:register)
@@ -51,15 +51,6 @@ describe "Registering an object to administer" do
       config_1.should == config_2
       config_1.filters.size.should == 2
     end
-
-    context "with different resource classes" do
-      it "should raise an ActiveAdmin::ResourceMismatch" do
-        lambda {
-          ActiveAdmin.register Category
-          ActiveAdmin.register Post, :as => "Category"
-        }.should raise_error(ActiveAdmin::ResourceMismatchError)
-      end
-    end
   end
 
 end

data/spec/unit/resource_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 require File.expand_path('config_shared_examples', File.dirname(__FILE__))
 
 module ActiveAdmin
@@ -87,45 +87,13 @@ module ActiveAdmin
       end
 
       it "should set the target menu to the belongs to target" do
-        config.menu_item_menu_name.should == ActiveAdmin::DEFAULT_MENU
+        config.navigation_menu_name.should == ActiveAdmin::DEFAULT_MENU
         config.belongs_to :posts
-        config.menu_item_menu_name.should == :posts
+        config.navigation_menu_name.should == :posts
       end
 
     end
 
-    describe "route names" do
-      it "should return the route prefix" do
-        config.route_prefix.should == "admin"
-      end
-      it "should return the route collection path" do
-        config.route_collection_path.should == "/admin/categories"
-      end
-
-      context "when in the root namespace" do
-        let(:config){ application.register Category, :namespace => false}
-        it "should have a nil route_prefix" do
-          config.route_prefix.should == nil
-        end
-
-        it "should generate a correct route" do
-          config
-          reload_routes!
-          config.route_collection_path.should == "/categories"
-        end
-      end
-
-      context "when registering a plural resource" do
-        class ::News; def self.has_many(*); end end
-
-        it "should return the plurali route with _index" do
-          config = application.register News
-          reload_routes!
-          config.route_collection_path.should == "/admin/news"
-        end
-      end
-    end
-
     describe "scoping" do
       context "when using a block" do
         before do
@@ -155,19 +123,6 @@ module ActiveAdmin
         end
       end
 
-      context "when not using a block or symbol" do
-        before do
-          @resource = application.register Category do
-            scope_to "Some string"
-          end
-        end
-        it "should raise and exception" do
-          lambda {
-            @resource.controller.new.send(:begin_of_association_chain)
-          }.should raise_error(ArgumentError)
-        end
-      end
-
       describe "getting the method for the association chain" do
         context "when a simple registration" do
           before do
@@ -229,6 +184,13 @@ module ActiveAdmin
         config.scope :published
         config.get_scope_by_id(:published).name.should == "Published"
       end
+
+      it "should retrieve the default scope by proc" do
+        config.scope :published, :default => proc{ true }
+        config.scope :all
+        config.default_scope.name.should == "Published"
+      end
+
     end
 
     describe "#csv_builder" do
@@ -246,5 +208,36 @@ module ActiveAdmin
         end
       end
     end
+
+    describe '#find_resource' do
+      let(:resource) { namespace.register(Post) }
+      let(:post) { stub }
+      before do
+        Post.stub(:where).with('id' => '12345').and_return { [post] }
+      end
+
+      it 'can find the resource' do
+        resource.find_resource('12345').should == post
+      end
+
+      context 'with a decorator' do
+        let(:resource) { namespace.register(Post) { decorate_with PostDecorator } }
+        it 'decorates the resource' do
+          resource.find_resource('12345').should == PostDecorator.new(post)
+        end
+      end
+
+      context 'when using a nonstandard primary key' do
+        let(:different_post) { stub }
+        before do
+          Post.stub(:primary_key).and_return 'something_else'
+          Post.stub(:where).with('something_else' => '55555').and_return { [different_post] }
+        end
+
+        it 'can find the post by the custom primary key' do
+          resource.find_resource('55555').should == different_post
+        end
+      end
+    end
   end
 end