activeadmin 0.5.1 → 0.6.0

data/spec/unit/scope_spec.rb

@@ -43,6 +43,19 @@ describe ActiveAdmin::Scope do
       its(:scope_method) { should == nil }
       its(:scope_block)  { should be_a(Proc)}
     end
+
+    context "with a proc as the label" do
+      it "should raise an exception if a second argument isn't provided" do
+        expect{ ActiveAdmin::Scope.new proc{ Date.today.strftime '%A' }
+        }.to raise_error
+      end
+
+      it "should properly render the proc" do
+        scope = ActiveAdmin::Scope.new proc{ Date.today.strftime '%A' }, :foobar
+        scope.name.should eq Date.today.strftime '%A'
+      end
+    end
+
   end # describe "creating a scope"
 
   describe "#display_if_block" do

data/spec/unit/view_factory_spec.rb

@@ -9,7 +9,6 @@ end
 describe ActiveAdmin::ViewFactory do
 
   it_should_have_view :global_navigation,    ActiveAdmin::Views::TabbedNavigation
-  it_should_have_view :utility_navigation,   ActiveAdmin::Views::UtilityNav
   it_should_have_view :site_title,           ActiveAdmin::Views::SiteTitle
   it_should_have_view :action_items,         ActiveAdmin::Views::ActionItems
   it_should_have_view :header,               ActiveAdmin::Views::Header

data/spec/unit/view_helpers/fields_for_spec.rb

@@ -43,4 +43,8 @@ describe ActiveAdmin::ViewHelpers::FormHelper, ".fields_for" do
     fields_for_params(:filter => :id).
       should == [ { :filter => "id" } ]
   end
+
+  it "should work with booleans" do
+    fields_for_params(:booleantest => false).should == [ { :booleantest => false } ]
+  end
 end

data/spec/unit/view_helpers/form_helper_spec.rb

@@ -6,12 +6,16 @@ describe ActiveAdmin::ViewHelpers::FormHelper do
 
     it "should render hidden field tags for params" do
       view.hidden_field_tags_for(:scope => "All", :filter => "None").should == 
-        %{<input id="scope" name="scope" type="hidden" value="All" />\n<input id="filter" name="filter" type="hidden" value="None" />}
+        %{<input id="hidden_active_admin_scope" name="scope" type="hidden" value="All" />\n<input id="hidden_active_admin_filter" name="filter" type="hidden" value="None" />}
+    end
+
+    it "should generate not default id for hidden input" do
+      view.hidden_field_tags_for(:scope => "All")[/id="([^"]+)"/, 1].should_not == "scope"
     end
 
     it "should filter out the field passed via the option :except" do
       view.hidden_field_tags_for({:scope => "All", :filter => "None"}, :except => :filter).should == 
-        %{<input id="scope" name="scope" type="hidden" value="All" />}
+        %{<input id="hidden_active_admin_scope" name="scope" type="hidden" value="All" />}
     end
   end
 end

data/spec/unit/view_helpers/method_or_proc_helper_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe MethodOrProcHelper do
+  let(:receiver) { mock }
+
+  let(:context) do
+    obj = mock(:receiver_in_context => receiver)
+    obj.extend MethodOrProcHelper
+    obj
+  end
+
+  describe "#call_method_or_exec_proc" do
+
+    it "should call the method in the context when a symbol" do
+      context.call_method_or_exec_proc(:receiver_in_context).
+        should == receiver
+    end
+
+    it "should call the method in the context when a string" do
+      context.call_method_or_exec_proc("receiver_in_context").
+        should == receiver
+    end
+
+    it "should exec a proc in the context" do
+      test_proc = Proc.new{ raise "Success" if receiver_in_context }
+
+      expect {
+        context.call_method_or_exec_proc(test_proc)
+      }.to raise_error("Success")
+    end
+
+  end
+
+  describe "#call_method_or_proc_on" do
+
+    context "when a symbol" do
+
+      it 'should call the method on the receiver' do
+        receiver.should_receive(:hello).and_return("hello")
+
+        context.call_method_or_proc_on(receiver, "hello").
+          should == "hello"
+      end
+
+      it "should receive additional arguments" do
+        receiver.should_receive(:hello).with("world").and_return("hello world")
+
+        context.call_method_or_proc_on(receiver, :hello, "world").
+          should == "hello world"
+      end
+
+    end
+
+    context "when a proc" do
+
+      it "should exec the block in the context and pass in the receiver" do
+        test_proc = Proc.new do |arg|
+          raise "Success!" if arg == receiver_in_context
+        end
+
+        expect {
+          context.call_method_or_proc_on(receiver,test_proc)
+        }.to raise_error("Success!")
+      end
+
+      it "should receive additional arguments" do
+        test_proc = Proc.new do |arg1, arg2|
+          raise "Success!" if arg1 == receiver_in_context && arg2 == "Hello"
+        end
+
+        expect {
+          context.call_method_or_proc_on(receiver, test_proc, "Hello")
+        }.to raise_error("Success!")
+      end
+
+    end
+
+    context "when a proc and :exec => false" do
+
+      it "should call the proc and pass in the receiver" do
+        obj_not_in_context = mock
+
+        test_proc = Proc.new do |arg|
+          raise "Success!" if arg == receiver && obj_not_in_context
+        end
+
+        expect {
+          context.call_method_or_proc_on(receiver,test_proc, :exec => false)
+        }.to raise_error("Success!")
+      end
+
+    end
+
+
+  end
+
+end

data/spec/unit/views/components/attributes_table_spec.rb

@@ -90,6 +90,17 @@ describe ActiveAdmin::Views::AttributesTable do
       end
     end # describe dsl styles
 
+    it "should allow html options for the row itself" do
+      table = render_arbre_component(assigns) {
+        attributes_table_for(post) do
+          row("Wee", :class => "custom_row", :style => "custom_style") { }
+        end
+      }
+      table.find_by_tag("tr").first.to_s.
+        split("\n").first.lstrip.
+          should == '<tr class="custom_row" style="custom_style">'
+    end
+
     it "should allow html content inside the attributes table" do
       table = render_arbre_component(assigns) {
         attributes_table_for(post) do

data/spec/unit/views/components/index_list_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe ActiveAdmin::Views::IndexList do
+
+  describe "#index_list_renderer" do
+
+    
+    let(:index_classes) { [ActiveAdmin::Views::IndexAsTable, ActiveAdmin::Views::IndexAsBlock] }
+
+    let(:helpers) do 
+      helpers = mock_action_view
+      helpers.stub! :url_for => "/"
+      helpers.stub!(:params).and_return({:as => "table"})
+      helpers
+    end
+
+    subject do
+      render_arbre_component({:index_classes => index_classes}, helpers) do
+        index_list_renderer(index_classes)
+      end
+    end
+
+    its(:tag_name) { should == 'ul' }
+
+    it "should contain the names of available indexes in links" do
+      a_tags = subject.find_by_tag("a")
+      a_tags.size.should == 2
+      a_tags.first.to_s.should include("Table")
+      a_tags.last.to_s.should include("List")
+    end
+  end
+end

data/spec/unit/views/tabbed_navigation_spec.rb

@@ -23,30 +23,31 @@ describe ActiveAdmin::Views::TabbedNavigation do
   describe "rendering a menu" do
 
     before do
-      menu.add MenuItem.new(:label => "Blog Posts",		:url => :admin_posts_path)
-      menu.add MenuItem.new(:label => "Reports",		:url => "/admin/reports")
-      menu.add MenuItem.new(:label => "Administration", :url => "/admin/administration")
-      menu.add MenuItem.new(:label => "Management",		:url => "#")
-
-      reports = menu["Reports"]
-      reports.add MenuItem.new(:label => "A Sub Reports", :url => "/admin/a-sub-reports")
-      reports.add MenuItem.new(:label => "B Sub Reports", :url => "/admin/b-sub-reports")
-
-      administration = menu["Administration"]
-      administration.add MenuItem.new(:label => "User administration", 
-									  :url => '/admin/user-administration', 
-									  :priority => 10, 
-									  :if => proc { false })
-
-      management = menu["Management"]
-      management.add MenuItem.new(:label => "Order management", 
-								  :url => '/admin/order-management', 
-								  :priority => 10, 
-								  :if => proc { false })
-      management.add MenuItem.new(:label => "Bill management", 
-								  :url => '/admin/bill-management', 
-								  :priority => 10, 
-								  :if => :admin_logged_in?)
+      menu.add :label => "Blog Posts", :url => :admin_posts_path
+
+      menu.add :label => "Reports", :url => "/admin/reports" do |reports|
+        reports.add :label => "A Sub Reports", :url => "/admin/a-sub-reports"
+        reports.add :label => "B Sub Reports", :url => "/admin/b-sub-reports"
+        reports.add :label => proc{ "Label Proc Sub Reports" }, :url => "/admin/label-proc-sub-reports", :id => "Label Proc Sub Reports"
+      end
+
+      menu.add :label => "Administration", :url => "/admin/administration" do |administration|
+        administration.add :label => "User administration", 
+                           :url => '/admin/user-administration', 
+                           :priority => 10, 
+                           :if => proc { false }
+      end
+
+      menu.add :label => "Management", :url => "#" do |management|
+        management.add :label => "Order management", 
+                       :url => '/admin/order-management', 
+                       :priority => 10, 
+                       :if => proc { false }
+        management.add :label => "Bill management", 
+                       :url => '/admin/bill-management', 
+                       :priority => 10, 
+                       :if => :admin_logged_in?
+      end
     end
 
     it "should generate a ul" do
@@ -70,6 +71,10 @@ describe ActiveAdmin::Views::TabbedNavigation do
       html.should have_tag("li", :parent => { :tag => "ul" }, :attributes => {:id => "b_sub_reports"})
     end
 
+    it "should generate a valid id from a label proc" do
+      html.should have_tag("li", :parent => { :tag => "ul" }, :attributes => {:id => "label_proc_sub_reports"})
+    end
+
     it "should not generate a link for user administration" do
       html.should_not have_tag("a", "User administration", :attributes => { :href => '/admin/user-administration' })
     end
@@ -110,38 +115,35 @@ describe ActiveAdmin::Views::TabbedNavigation do
 
   describe "returning the menu items to display" do
 
-    it "should be reture one item with no if block" do
-      menu.add MenuItem.new(:label => "Hello World", :url => "/")
+    it "should return one item with no if block" do
+      menu.add :label => "Hello World", :url => "/"
       tabbed_navigation.menu_items.should == menu.items
     end
 
-    it "should not include a menu items with an if block that returns false" do
-      menu.add MenuItem.new(:label => "Don't Show", :url => "/", :priority => 10, :if => proc{ false })
-      tabbed_navigation.menu_items.should == []
+    it "should not include menu items with an if block that returns false" do
+      menu.add :label => "Don't Show", :url => "/", :priority => 10, :if => proc{ false }
+      tabbed_navigation.menu_items.should be_empty
     end
 
     it "should not include menu items with an if block that calls a method that returns false" do
-      menu.add MenuItem.new(:label => "Don't Show", :url => "/", :priority => 10, :if => :admin_logged_in?)
-      tabbed_navigation.menu_items.should == []
+      menu.add :label => "Don't Show", :url => "/", :priority => 10, :if => :admin_logged_in?
+      tabbed_navigation.menu_items.should be_empty
     end
 
     it "should not display any items that have no children to display" do
-      item = MenuItem.new(:label => "Parent", :url => "#") do |p|
-        p.add MenuItem.new(:label => "Child", :url => "/", :priority => 10, :if => proc{ false })
+      menu.add :label => "Parent", :url => "#" do |p|
+        p.add :label => "Child", :url => "/", :priority => 10, :if => proc{ false }
       end
-	  menu.add item
-      tabbed_navigation.menu_items.should == []
+      tabbed_navigation.menu_items.should be_empty
     end
 
     it "should display a parent that has a child to display" do
-      item = MenuItem.new(:label => "Parent", :url => "#") do |p|
-        p.add MenuItem.new(:label => "Hidden Child", :url => "/", :priority => 10, :if => proc{ false })
-        p.add MenuItem.new(:label => "Child", :url => "/")
+      menu.add :label => "Parent", :url => "#" do |p|
+        p.add :label => "Hidden Child", :url => "/", :priority => 10, :if => proc{ false }
+        p.add :label => "Child", :url => "/"
       end
-	  menu.add item
       tabbed_navigation.should have(1).menu_items
     end
 
   end
-
 end

data/tasks/test.rake

@@ -30,7 +30,7 @@ namespace :test do
 
   desc "Run the full suite against the important versions of rails"
   task :major_supported_rails do
-    run_tests_against "3.0.12", "3.1.4", "3.2.3"
+    run_tests_against *TRAVIS_RAILS_VERSIONS
   end
 
   desc "Alias for major_supported_rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70236163154140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236163154140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70236163151960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236163151960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bourbon
-  requirement: &70236163150540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236163150540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70236163149640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70236163149640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70236163148140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70236163148140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &70236163147260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236163147260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70236163146640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70236163146640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70236170623620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236170623620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70236170620080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236170620080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70236170616980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236170616980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: arbre
-  requirement: &70236171213280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +181,12 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70236171213280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: The administration framework for Ruby on Rails.
 email:
 - gregdbell@gmail.com
@@ -157,6 +212,10 @@ files:
 - app/assets/images/active_admin/datepicker/datepicker-next-link-icon.png
 - app/assets/images/active_admin/datepicker/datepicker-nipple.png
 - app/assets/images/active_admin/datepicker/datepicker-prev-link-icon.png
+- app/assets/images/active_admin/index_list_icons/block_icon.svg
+- app/assets/images/active_admin/index_list_icons/blog_icon.svg
+- app/assets/images/active_admin/index_list_icons/grid_icon.svg
+- app/assets/images/active_admin/index_list_icons/table_icon.svg
 - app/assets/images/active_admin/loading.gif
 - app/assets/images/active_admin/nested_menu_arrow.gif
 - app/assets/images/active_admin/nested_menu_arrow_dark.gif
@@ -185,6 +244,7 @@ files:
 - app/assets/stylesheets/active_admin/components/_dropdown_menu.scss
 - app/assets/stylesheets/active_admin/components/_flash_messages.css.scss
 - app/assets/stylesheets/active_admin/components/_grid.scss
+- app/assets/stylesheets/active_admin/components/_index_list.scss
 - app/assets/stylesheets/active_admin/components/_links.scss
 - app/assets/stylesheets/active_admin/components/_pagination.scss
 - app/assets/stylesheets/active_admin/components/_panels.scss
@@ -232,8 +292,10 @@ files:
 - docs/10-custom-pages.md
 - docs/11-decorators.md
 - docs/12-arbre-components.md
+- docs/13-authorization-adapter.md
 - docs/2-resource-customization.md
 - docs/3-index-pages.md
+- docs/3-index-pages/create-an-index.md
 - docs/3-index-pages/index-as-block.md
 - docs/3-index-pages/index-as-blog.md
 - docs/3-index-pages/index-as-grid.md
@@ -245,6 +307,8 @@ files:
 - docs/8-custom-actions.md
 - docs/9-batch-actions.md
 - features/action_item.feature
+- features/authorization.feature
+- features/authorization_cancan.feature
 - features/belongs_to.feature
 - features/breadcrumb.feature
 - features/comments/commenting.feature
@@ -270,6 +334,7 @@ files:
 - features/index/index_scopes.feature
 - features/index/page_title.feature
 - features/index/pagination.feature
+- features/index/switch_index_view.feature
 - features/menu.feature
 - features/new_page.feature
 - features/registering_assets.feature
@@ -297,6 +362,7 @@ files:
 - features/step_definitions/format_steps.rb
 - features/step_definitions/i18n_steps.rb
 - features/step_definitions/index_scope_steps.rb
+- features/step_definitions/index_views_steps.rb
 - features/step_definitions/layout_steps.rb
 - features/step_definitions/member_link_steps.rb
 - features/step_definitions/menu_steps.rb
@@ -318,7 +384,9 @@ files:
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
 - lib/active_admin/asset_registration.rb
+- lib/active_admin/authorization_adapter.rb
 - lib/active_admin/base_controller.rb
+- lib/active_admin/base_controller/authorization.rb
 - lib/active_admin/base_controller/menu.rb
 - lib/active_admin/batch_actions.rb
 - lib/active_admin/batch_actions/controller.rb
@@ -328,6 +396,7 @@ files:
 - lib/active_admin/batch_actions/views/batch_action_selector.rb
 - lib/active_admin/batch_actions/views/selection_cells.rb
 - lib/active_admin/callbacks.rb
+- lib/active_admin/cancan_adapter.rb
 - lib/active_admin/comments.rb
 - lib/active_admin/comments/comment.rb
 - lib/active_admin/comments/namespace_helper.rb
@@ -388,6 +457,7 @@ files:
 - lib/active_admin/locales/no-NB.yml
 - lib/active_admin/locales/pl.yml
 - lib/active_admin/locales/pt-BR.yml
+- lib/active_admin/locales/pt-PT.yml
 - lib/active_admin/locales/ro.yml
 - lib/active_admin/locales/ru.yml
 - lib/active_admin/locales/sv-SE.yml
@@ -396,7 +466,7 @@ files:
 - lib/active_admin/locales/zh-CN.yml
 - lib/active_admin/locales/zh-TW.yml
 - lib/active_admin/menu.rb
-- lib/active_admin/menu_builder.rb
+- lib/active_admin/menu_collection.rb
 - lib/active_admin/menu_item.rb
 - lib/active_admin/namespace.rb
 - lib/active_admin/page.rb
@@ -412,14 +482,14 @@ files:
 - lib/active_admin/resource/naming.rb
 - lib/active_admin/resource/page_presenters.rb
 - lib/active_admin/resource/pagination.rb
+- lib/active_admin/resource/routes.rb
 - lib/active_admin/resource/scopes.rb
 - lib/active_admin/resource/sidebars.rb
 - lib/active_admin/resource_collection.rb
 - lib/active_admin/resource_controller.rb
 - lib/active_admin/resource_controller/action_builder.rb
 - lib/active_admin/resource_controller/actions.rb
-- lib/active_admin/resource_controller/callbacks.rb
-- lib/active_admin/resource_controller/collection.rb
+- lib/active_admin/resource_controller/data_access.rb
 - lib/active_admin/resource_controller/decorators.rb
 - lib/active_admin/resource_controller/resource_class_methods.rb
 - lib/active_admin/resource_controller/scoping.rb
@@ -455,6 +525,7 @@ files:
 - lib/active_admin/views/components/blank_slate.rb
 - lib/active_admin/views/components/columns.rb
 - lib/active_admin/views/components/dropdown_menu.rb
+- lib/active_admin/views/components/index_list.rb
 - lib/active_admin/views/components/paginated_collection.rb
 - lib/active_admin/views/components/panel.rb
 - lib/active_admin/views/components/popover.rb
@@ -479,7 +550,6 @@ files:
 - lib/active_admin/views/pages/show.rb
 - lib/active_admin/views/tabbed_navigation.rb
 - lib/active_admin/views/title_bar.rb
-- lib/active_admin/views/utility_nav.rb
 - lib/activeadmin.rb
 - lib/generators/active_admin/assets/assets_generator.rb
 - lib/generators/active_admin/assets/templates/3.0/active_admin.js
@@ -496,7 +566,7 @@ files:
 - lib/generators/active_admin/resource/templates/admin.rb
 - script/local
 - script/use_rails
-- spec/integration/default_namespace.rb
+- spec/integration/default_namespace_spec.rb
 - spec/integration/javascript_spec.rb
 - spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
@@ -534,13 +604,15 @@ files:
 - spec/unit/active_admin_spec.rb
 - spec/unit/application_spec.rb
 - spec/unit/asset_registration_spec.rb
+- spec/unit/authorization/authorization_adapter_spec.rb
+- spec/unit/authorization/controller_authorization_spec.rb
 - spec/unit/auto_link_spec.rb
-- spec/unit/base_controller_shared_examples.rb
 - spec/unit/base_controller_spec.rb
 - spec/unit/batch_actions/resource_spec.rb
 - spec/unit/batch_actions/settings_spec.rb
 - spec/unit/belongs_to_spec.rb
 - spec/unit/breadcrumbs_spec.rb
+- spec/unit/cancan_adapter_spec.rb
 - spec/unit/comments_spec.rb
 - spec/unit/component_spec.rb
 - spec/unit/config_shared_examples.rb
@@ -551,7 +623,7 @@ files:
 - spec/unit/dashboards_spec.rb
 - spec/unit/devise_spec.rb
 - spec/unit/display_name_spec.rb
-- spec/unit/dsl_include_spec.rb
+- spec/unit/dsl_spec.rb
 - spec/unit/event_spec.rb
 - spec/unit/filters/filter_form_builder_spec.rb
 - spec/unit/filters/resource_spec.rb
@@ -560,8 +632,10 @@ files:
 - spec/unit/helpers/collection_spec.rb
 - spec/unit/helpers/scope_chain_spec.rb
 - spec/unit/helpers/settings_spec.rb
+- spec/unit/menu_collection_spec.rb
 - spec/unit/menu_item_spec.rb
 - spec/unit/menu_spec.rb
+- spec/unit/namespace/authorization_spec.rb
 - spec/unit/namespace/register_page_spec.rb
 - spec/unit/namespace/register_resource_spec.rb
 - spec/unit/namespace_spec.rb
@@ -578,7 +652,7 @@ files:
 - spec/unit/resource/scopes_spec.rb
 - spec/unit/resource/sidebars_spec.rb
 - spec/unit/resource_collection_spec.rb
-- spec/unit/resource_controller/collection_spec.rb
+- spec/unit/resource_controller/data_access_spec.rb
 - spec/unit/resource_controller/sidebars_spec.rb
 - spec/unit/resource_controller_spec.rb
 - spec/unit/resource_registration_spec.rb
@@ -590,11 +664,13 @@ files:
 - spec/unit/view_helpers/download_format_links_helper_spec.rb
 - spec/unit/view_helpers/fields_for_spec.rb
 - spec/unit/view_helpers/form_helper_spec.rb
+- spec/unit/view_helpers/method_or_proc_helper_spec.rb
 - spec/unit/views/components/action_list_popover_spec.rb
 - spec/unit/views/components/attributes_table_spec.rb
 - spec/unit/views/components/batch_action_popover_spec.rb
 - spec/unit/views/components/blank_slate_spec.rb
 - spec/unit/views/components/columns_spec.rb
+- spec/unit/views/components/index_list_spec.rb
 - spec/unit/views/components/paginated_collection_spec.rb
 - spec/unit/views/components/panel_spec.rb
 - spec/unit/views/components/popover_spec.rb
@@ -611,7 +687,8 @@ files:
 - tasks/test.rake
 - tasks/yard.rake
 homepage: http://activeadmin.info
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -624,7 +701,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -891628006576778499
+      hash: -3751499823018813299
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -633,15 +710,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -891628006576778499
+      hash: -3751499823018813299
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The administration framework for Ruby on Rails.
 test_files:
 - features/action_item.feature
+- features/authorization.feature
+- features/authorization_cancan.feature
 - features/belongs_to.feature
 - features/breadcrumb.feature
 - features/comments/commenting.feature
@@ -667,6 +746,7 @@ test_files:
 - features/index/index_scopes.feature
 - features/index/page_title.feature
 - features/index/pagination.feature
+- features/index/switch_index_view.feature
 - features/menu.feature
 - features/new_page.feature
 - features/registering_assets.feature
@@ -694,6 +774,7 @@ test_files:
 - features/step_definitions/format_steps.rb
 - features/step_definitions/i18n_steps.rb
 - features/step_definitions/index_scope_steps.rb
+- features/step_definitions/index_views_steps.rb
 - features/step_definitions/layout_steps.rb
 - features/step_definitions/member_link_steps.rb
 - features/step_definitions/menu_steps.rb
@@ -711,7 +792,7 @@ test_files:
 - features/users/logging_in.feature
 - features/users/logging_out.feature
 - features/users/resetting_password.feature
-- spec/integration/default_namespace.rb
+- spec/integration/default_namespace_spec.rb
 - spec/integration/javascript_spec.rb
 - spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
@@ -749,13 +830,15 @@ test_files:
 - spec/unit/active_admin_spec.rb
 - spec/unit/application_spec.rb
 - spec/unit/asset_registration_spec.rb
+- spec/unit/authorization/authorization_adapter_spec.rb
+- spec/unit/authorization/controller_authorization_spec.rb
 - spec/unit/auto_link_spec.rb
-- spec/unit/base_controller_shared_examples.rb
 - spec/unit/base_controller_spec.rb
 - spec/unit/batch_actions/resource_spec.rb
 - spec/unit/batch_actions/settings_spec.rb
 - spec/unit/belongs_to_spec.rb
 - spec/unit/breadcrumbs_spec.rb
+- spec/unit/cancan_adapter_spec.rb
 - spec/unit/comments_spec.rb
 - spec/unit/component_spec.rb
 - spec/unit/config_shared_examples.rb
@@ -766,7 +849,7 @@ test_files:
 - spec/unit/dashboards_spec.rb
 - spec/unit/devise_spec.rb
 - spec/unit/display_name_spec.rb
-- spec/unit/dsl_include_spec.rb
+- spec/unit/dsl_spec.rb
 - spec/unit/event_spec.rb
 - spec/unit/filters/filter_form_builder_spec.rb
 - spec/unit/filters/resource_spec.rb
@@ -775,8 +858,10 @@ test_files:
 - spec/unit/helpers/collection_spec.rb
 - spec/unit/helpers/scope_chain_spec.rb
 - spec/unit/helpers/settings_spec.rb
+- spec/unit/menu_collection_spec.rb
 - spec/unit/menu_item_spec.rb
 - spec/unit/menu_spec.rb
+- spec/unit/namespace/authorization_spec.rb
 - spec/unit/namespace/register_page_spec.rb
 - spec/unit/namespace/register_resource_spec.rb
 - spec/unit/namespace_spec.rb
@@ -793,7 +878,7 @@ test_files:
 - spec/unit/resource/scopes_spec.rb
 - spec/unit/resource/sidebars_spec.rb
 - spec/unit/resource_collection_spec.rb
-- spec/unit/resource_controller/collection_spec.rb
+- spec/unit/resource_controller/data_access_spec.rb
 - spec/unit/resource_controller/sidebars_spec.rb
 - spec/unit/resource_controller_spec.rb
 - spec/unit/resource_registration_spec.rb
@@ -805,11 +890,13 @@ test_files:
 - spec/unit/view_helpers/download_format_links_helper_spec.rb
 - spec/unit/view_helpers/fields_for_spec.rb
 - spec/unit/view_helpers/form_helper_spec.rb
+- spec/unit/view_helpers/method_or_proc_helper_spec.rb
 - spec/unit/views/components/action_list_popover_spec.rb
 - spec/unit/views/components/attributes_table_spec.rb
 - spec/unit/views/components/batch_action_popover_spec.rb
 - spec/unit/views/components/blank_slate_spec.rb
 - spec/unit/views/components/columns_spec.rb
+- spec/unit/views/components/index_list_spec.rb
 - spec/unit/views/components/paginated_collection_spec.rb
 - spec/unit/views/components/panel_spec.rb
 - spec/unit/views/components/popover_spec.rb