activeadmin 0.3.4 → 0.4.0

data/spec/unit/scope_spec.rb

@@ -23,10 +23,10 @@ describe ActiveAdmin::Scope do
     end
 
     context "when a name and scope method" do
-      let(:scope)        { ActiveAdmin::Scope.new "My Scope", :scope_method }
-      its(:name)         { should == "My Scope"}
-      its(:id)           { should == "my_scope"}
-      its(:scope_method) { should == :scope_method }
+      let(:scope)        { ActiveAdmin::Scope.new "With API Access", :with_api_access }
+      its(:name)         { should == "With API Access"}
+      its(:id)           { should == "with_api_access"}
+      its(:scope_method) { should == :with_api_access }
     end
 
     context "when a name and scope block" do
@@ -38,4 +38,18 @@ describe ActiveAdmin::Scope do
     end
   end # describe "creating a scope"
 
+  describe "#display_if_block" do
+
+    it "should return true by default" do
+      scope = ActiveAdmin::Scope.new(:default)
+      scope.display_if_block.call.should == true
+    end
+
+    it "should return the :if block if set" do
+      scope = ActiveAdmin::Scope.new(:with_block, nil, :if => proc{ false })
+      scope.display_if_block.call.should == false
+    end
+
+  end
+
 end

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

@@ -0,0 +1,163 @@
+require 'spec_helper'
+
+describe ActiveAdmin::Views::PaginatedCollection do
+  describe "creating with the dsl" do
+    setup_arbre_context!
+
+    let(:collection) do
+      posts = [Post.new(:title => "First Post"), Post.new(:title => "Second Post"), Post.new(:title => "Third Post")]
+      Kaminari.paginate_array(posts).page(1).per(5)
+    end
+
+    before :all do
+      load_defaults!
+      reload_routes!
+    end
+
+    before do
+      request.stub!(:query_parameters).and_return({:controller => 'admin/posts', :action => 'index', :page => '1'})
+      controller.params = {:controller => 'admin/posts', :action => 'index'}
+    end
+
+    context "when specifying collection" do
+      let(:pagination) do
+        paginated_collection(collection)
+      end
+
+      it "should set :collection as the passed in collection" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> posts"
+      end
+
+      it "should raise error if collection has no pagination scope" do
+        lambda {
+          paginated_collection([Post.new, Post.new])
+        }.should raise_error(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
+      end
+    end
+
+    context "when specifying :param_name option" do
+      let(:collection) do
+        posts = 10.times.inject([]) {|m, _| m << Post.new }
+        Kaminari.paginate_array(posts).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection, :param_name => :post_page) }
+
+      it "should customize the page number parameter in pagination links" do
+        pagination.find_by_tag('div')[1].content.should match(/\/admin\/posts\?post_page=2/)
+      end
+    end
+
+    context "when specifying :download_links => false option" do
+      let(:collection) do
+        posts = 10.times.inject([]) {|m, _| m << Post.new }
+        Kaminari.paginate_array(posts).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection, :download_links => false) }
+
+      it "should not render download links" do
+        pagination.find_by_tag('div').last.content.should_not match(/Download:/)
+      end
+    end
+
+    context "when specifying :entry_name option with a single item" do
+      let(:collection) do
+        posts = [Post.new]
+        Kaminari.paginate_array(posts).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection, :entry_name => "message") }
+
+      it "should use :entry_name as the collection name" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> message"
+      end
+    end
+
+    context "when specifying :entry_name option with multiple items" do
+      let(:pagination) { paginated_collection(collection, :entry_name => "message") }
+
+      it "should use :entry_name as the collection name" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> messages"
+      end
+    end
+
+    context "when specifying :entry_name and :entries_name option with a single item" do
+      let(:collection) do
+        posts = [Post.new]
+        Kaminari.paginate_array(posts).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection, :entry_name => "singular", :entries_name => "plural") }
+
+      it "should use :entry_name as the collection name" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> singular"
+      end
+    end
+
+    context "when specifying :entry_name and :entries_name option with a multiple items" do
+      let(:pagination) { paginated_collection(collection, :entry_name => "singular", :entries_name => "plural") }
+
+      it "should use :entries_name as the collection name" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> plural"
+      end
+    end
+
+    context "when omitting :entry_name with a single item" do
+      let(:collection) do
+        posts = [Post.new]
+        Kaminari.paginate_array(posts).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection) }
+
+      it "should use 'post' as the collection name when there is no I18n translation" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> post"
+      end
+
+      it "should use 'Singular' as the collection name when there is an I18n translation" do
+        I18n.stub(:translate!) { "Singular" }
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>1</b> Singular"
+      end
+    end
+
+    context "when omitting :entry_name with multiple items" do
+      let(:pagination) { paginated_collection(collection) }
+
+      it "should use 'posts' as the collection name when there is no I18n translation" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> posts"
+      end
+
+      it "should use 'Plural' as the collection name when there is an I18n translation" do
+        I18n.stub(:translate!) { "Plural" }
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 3</b> Plural"
+      end
+    end
+
+    context "when specifying an empty collection" do
+      let(:collection) do
+        posts = []
+        Kaminari.paginate_array(posts).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection) }
+
+      it "should display 'No entries found'" do
+        pagination.find_by_class('pagination_information').first.content.should == "No entries found"
+      end
+    end
+
+    context "when collection comes from find with GROUP BY" do
+      let(:collection) do
+        %w{Foo Foo Bar}.each {|title| Post.create(:title => title) }
+        Post.group(:title).page(1).per(5)
+      end
+
+      let(:pagination) { paginated_collection(collection) }
+
+      it "should display proper message (including number and not hash)" do
+        pagination.find_by_class('pagination_information').first.content.should == "Displaying <b>all 2</b> posts"
+      end
+    end
+  end
+end

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

@@ -26,4 +26,13 @@ describe ActiveAdmin::Views::Panel do
     panel("Title", :icon => :arrow_down).find_by_tag("h3").first.content.should include("span class=\"icon")
   end
 
+  describe "#children?" do
+
+    it "returns false if no children have been added to the panel" do
+      the_panel = panel("A Panel")
+      the_panel.children?.should == false
+    end
+
+  end
+
 end

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

@@ -63,6 +63,15 @@ describe ActiveAdmin::Views::StatusTag do
       its(:class_list)  { should include('ok') }
     end
 
+    context "when status is 'Active' and label is 'on'" do
+      subject { status_tag('Active', :label => 'on') }
+
+      its(:content)     { should == 'on' }
+      its(:class_list)  { should include('status') }
+      its(:class_list)  { should include('active') }
+      its(:class_list)  { should_not include('on') }
+    end
+
     context "when status is 'So useless', type is :ok, class is 'woot awesome' and id is 'useless'" do
       subject { status_tag('So useless', :ok, :class => 'woot awesome', :id => 'useless') }
 

data/spec/unit/views/tabbed_navigation_spec.rb

@@ -80,7 +80,8 @@ describe ActiveAdmin::Views::TabbedNavigation do
 
       it "should add the 'current' and 'has_nested' classes to the li and 'current' to the sub li" do
         assigns[:current_tab] = "Reports/A Sub Reports"
-        html.should have_tag("li", :attributes => { :id => "reports", :class => "current has_nested" })
+        html.should have_tag("li", :attributes => { :id => "reports", :class => /current/ })
+        html.should have_tag("li", :attributes => { :id => "reports", :class => /has_nested/ })
         html.should have_tag("li", :attributes => { :id => "a_sub_reports", :class => "current" })
       end
 

data/tasks/test.rake

@@ -5,53 +5,71 @@ task :setup do
   system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb"
 end
 
+# Run specs and cukes
+desc "Run the full suite"
+task :test => ['spec:unit', 'spec:integration', 'cucumber', 'cucumber:class_reloading']
+
 namespace :test do
-  desc "Run against the important versions of rails"
-  task :major_rails_versions do
+
+  def run_tests_against(*versions)
     current_version = detect_rails_version if File.exists?("Gemfile.lock")
-    ["3.0.10", "3.1.0"].each do |version|
-      puts
+
+    versions.each do |version|
       puts
       puts "== Using Rails #{version}"
+
       cmd "./script/use_rails #{version}"
-      cmd "bundle exec rspec spec/unit"
-      cmd "bundle exec rspec spec/integration"
+      cmd "bundle exec rspec spec"
       cmd "bundle exec cucumber features"
+      cmd "bundle exec cucumber -p class-reloading features"
     end
+
     cmd "./script/use_rails #{current_version}" if current_version
   end
 
-end
+  desc "Run the full suite against the important versions of rails"
+  task :major_supported_rails do
+    run_tests_against "3.0.11", "3.1.3", "3.2.0"
+  end
+
+  desc "Alias for major_supported_rails"
+  task :all => :major_supported_rails
 
-# Run specs and cukes
-task :test do
-  cmd "bundle exec rspec spec/unit"
-  cmd "bundle exec rspec spec/integration"
-  cmd "bundle exec cucumber features"
 end
 
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
 namespace :spec do
-  desc "Run specs for all versions of rails"
-  task :all do
-    (0..6).to_a.each do |v|
-      puts "Running for Rails 3.0.#{v}"
-      cmd "rm Gemfile.lock" if File.exists?("Gemfile.lock")
-      cmd "/usr/bin/env RAILS=3.0.#{v} bundle install"
-      cmd "/usr/bin/env RAILS=3.0.#{v} rake spec"
-    end
+
+  desc "Run the unit specs"
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = "spec/unit/**/*_spec.rb"
+  end
+
+  desc "Run the integration specs"
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    t.pattern = "spec/integration/**/*_spec.rb"
   end
+
 end
 
+
 require 'cucumber/rake/task'
 
+Cucumber::Rake::Task.new(:cucumber) do |t|
+  t.profile = 'default'
+end
+
 namespace :cucumber do
-  Cucumber::Rake::Task.new(:all) do |t|
-    t.profile = 'default'
-  end
 
-  Cucumber::Rake::Task.new(:wip) do |t|
+  Cucumber::Rake::Task.new(:wip, "Run the cucumber scenarios with the @wip tag") do |t|
     t.profile = 'wip'
   end
-end
 
-task :cucumber => "cucumber:all"
+  Cucumber::Rake::Task.new(:class_reloading, "Run the cucumber scenarios that test reloading") do |t|
+    t.profile = 'class-reloading'
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activeadmin
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
   - 4
-  segments_generated: true
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Greg Bell
@@ -15,135 +15,166 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 -08:00
-default_executable: 
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        segments_generated: true
         version: 3.0.0
+  requirement: *id001
+  prerelease: false
+  name: rails
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id002
   prerelease: false
-  version_requirements: *id001
+  name: jquery-rails
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: meta_search
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id003
+  prerelease: false
+  name: bourbon
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 9
         - 2
-        segments_generated: true
         version: 0.9.2
-  type: :runtime
+  requirement: *id004
   prerelease: false
-  version_requirements: *id002
+  name: meta_search
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: devise
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
         - 2
-        segments_generated: true
         version: 1.1.2
-  type: :runtime
+  requirement: *id005
   prerelease: false
-  version_requirements: *id003
+  name: devise
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: formtastic
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        segments_generated: true
         version: 2.0.0
-  type: :runtime
+  requirement: *id006
   prerelease: false
-  version_requirements: *id004
+  name: formtastic
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: inherited_resources
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
         - 0
-        segments_generated: true
         version: 1.3.0
-  type: :runtime
+  requirement: *id007
   prerelease: false
-  version_requirements: *id005
+  name: inherited_resources
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: kaminari
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
-        - 12
-        - 4
-        segments_generated: true
-        version: 0.12.4
-  type: :runtime
+        - 13
+        - 0
+        version: 0.13.0
+  requirement: *id008
   prerelease: false
-  version_requirements: *id006
+  name: kaminari
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: sass
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 3
         - 1
         - 0
-        segments_generated: true
         version: 3.1.0
-  type: :runtime
+  requirement: *id009
   prerelease: false
-  version_requirements: *id007
+  name: sass
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
+  requirement: *id010
   prerelease: false
-  version_requirements: *id008
+  name: fastercsv
+  type: :runtime
 description: The administration framework for Ruby on Rails.
 email: 
 - gregdbell@gmail.com
@@ -159,6 +190,7 @@ files:
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -175,16 +207,26 @@ files:
 - app/assets/images/active_admin/nested_menu_arrow.gif
 - app/assets/images/active_admin/nested_menu_arrow_dark.gif
 - app/assets/images/active_admin/orderable.png
+- app/assets/javascripts/active_admin/application.js
 - app/assets/javascripts/active_admin/base.js
-- app/assets/javascripts/active_admin/vendor.js
 - app/assets/stylesheets/active_admin/_base.css.scss
 - app/assets/stylesheets/active_admin/_forms.css.scss
 - app/assets/stylesheets/active_admin/_header.css.scss
 - app/assets/stylesheets/active_admin/_mixins.css.scss
 - app/assets/stylesheets/active_admin/_typography.css.scss
+- app/assets/stylesheets/active_admin/components/_blank_slates.scss
+- app/assets/stylesheets/active_admin/components/_breadcrumbs.scss
+- app/assets/stylesheets/active_admin/components/_buttons.scss
 - app/assets/stylesheets/active_admin/components/_comments.css.scss
 - app/assets/stylesheets/active_admin/components/_date_picker.css.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/_links.scss
+- app/assets/stylesheets/active_admin/components/_pagination.scss
+- app/assets/stylesheets/active_admin/components/_panels.scss
+- app/assets/stylesheets/active_admin/components/_scopes.scss
+- app/assets/stylesheets/active_admin/components/_status_tags.scss
+- app/assets/stylesheets/active_admin/components/_table_tools.css.scss
 - app/assets/stylesheets/active_admin/components/_tables.css.scss
 - app/assets/stylesheets/active_admin/mixins/_all.css.scss
 - app/assets/stylesheets/active_admin/mixins/_buttons.css.scss
@@ -194,8 +236,14 @@ files:
 - app/assets/stylesheets/active_admin/mixins/_rounded.css.scss
 - app/assets/stylesheets/active_admin/mixins/_sections.css.scss
 - app/assets/stylesheets/active_admin/mixins/_shadows.css.scss
+- app/assets/stylesheets/active_admin/mixins/_typography.scss
 - app/assets/stylesheets/active_admin/mixins/_utilities.scss
 - app/assets/stylesheets/active_admin/mixins/_variables.css.scss
+- app/assets/stylesheets/active_admin/pages/_dashboard.scss
+- app/assets/stylesheets/active_admin/pages/_logged_out.scss
+- app/assets/stylesheets/active_admin/structure/_footer.scss
+- app/assets/stylesheets/active_admin/structure/_main_structure.scss
+- app/assets/stylesheets/active_admin/structure/_title_bar.scss
 - app/views/active_admin/dashboard/index.html.arb
 - app/views/active_admin/devise/mailer/reset_password_instructions.html.erb
 - app/views/active_admin/devise/mailer/unlock_instructions.html.erb
@@ -204,6 +252,7 @@ files:
 - app/views/active_admin/devise/sessions/new.html.erb
 - app/views/active_admin/devise/shared/_links.erb
 - app/views/active_admin/devise/unlocks/new.html.erb
+- app/views/active_admin/page/index.html.arb
 - app/views/active_admin/resource/edit.html.arb
 - app/views/active_admin/resource/index.csv.erb
 - app/views/active_admin/resource/index.html.arb
@@ -225,12 +274,16 @@ files:
 - docs/6-show-screens.md
 - docs/7-sidebars.md
 - docs/8-custom-actions.md
+- docs/9-custom-pages.md
+- features/belongs_to.feature
 - features/comments/commenting.feature
 - features/comments/viewing_index.feature
 - features/dashboard.feature
+- features/development_reloading.feature
 - features/edit_page.feature
 - features/first_boot.feature
 - features/global_navigation.feature
+- features/index/filter_with_check_boxes.feature
 - features/index/filters.feature
 - features/index/format_as_csv.feature
 - features/index/formats.feature
@@ -244,15 +297,18 @@ files:
 - features/menu.feature
 - features/new_page.feature
 - features/registering_assets.feature
+- features/registering_pages.feature
 - features/registering_resources.feature
 - features/show/default_content.feature
 - features/show/page_title.feature
 - features/sidebar_sections.feature
 - features/specifying_actions.feature
 - features/step_definitions/action_item_steps.rb
+- features/step_definitions/action_link_steps.rb
 - features/step_definitions/additional_web_steps.rb
 - features/step_definitions/asset_steps.rb
 - features/step_definitions/attribute_steps.rb
+- features/step_definitions/breadcrumb_steps.rb
 - features/step_definitions/comment_steps.rb
 - features/step_definitions/configuration_steps.rb
 - features/step_definitions/dashboard_steps.rb
@@ -261,9 +317,11 @@ files:
 - features/step_definitions/format_steps.rb
 - features/step_definitions/index_scope_steps.rb
 - features/step_definitions/layout_steps.rb
+- features/step_definitions/member_link_steps.rb
 - features/step_definitions/menu_steps.rb
 - features/step_definitions/pagination_steps.rb
 - features/step_definitions/sidebar_steps.rb
+- features/step_definitions/site_title_steps.rb
 - features/step_definitions/tab_steps.rb
 - features/step_definitions/user_steps.rb
 - features/step_definitions/web_steps.rb
@@ -279,7 +337,6 @@ files:
 - lib/active_admin/arbre.rb
 - lib/active_admin/arbre/builder.rb
 - lib/active_admin/arbre/context.rb
-- lib/active_admin/arbre/core_extensions.rb
 - lib/active_admin/arbre/html/attributes.rb
 - lib/active_admin/arbre/html/class_list.rb
 - lib/active_admin/arbre/html/collection.rb
@@ -289,10 +346,11 @@ files:
 - lib/active_admin/arbre/html/tag.rb
 - lib/active_admin/arbre/html/text_node.rb
 - lib/active_admin/asset_registration.rb
+- lib/active_admin/base_controller.rb
+- lib/active_admin/base_controller/menu.rb
 - lib/active_admin/callbacks.rb
 - lib/active_admin/comments.rb
 - lib/active_admin/comments/comment.rb
-- lib/active_admin/comments/configuration.rb
 - lib/active_admin/comments/namespace_helper.rb
 - lib/active_admin/comments/resource_helper.rb
 - lib/active_admin/comments/show_page_helper.rb
@@ -311,20 +369,37 @@ files:
 - lib/active_admin/dsl.rb
 - lib/active_admin/engine.rb
 - lib/active_admin/event.rb
+- lib/active_admin/filter_form_builder.rb
 - lib/active_admin/form_builder.rb
 - lib/active_admin/helpers/optional_display.rb
 - lib/active_admin/helpers/scope_chain.rb
 - lib/active_admin/helpers/settings.rb
 - lib/active_admin/iconic.rb
 - lib/active_admin/iconic/icons.rb
+- lib/active_admin/inputs.rb
+- lib/active_admin/inputs/datepicker_input.rb
+- lib/active_admin/inputs/filter_base.rb
+- lib/active_admin/inputs/filter_check_boxes_input.rb
+- lib/active_admin/inputs/filter_date_range_input.rb
+- lib/active_admin/inputs/filter_numeric_input.rb
+- lib/active_admin/inputs/filter_select_input.rb
+- lib/active_admin/inputs/filter_string_input.rb
 - lib/active_admin/locales/bg.yml
+- lib/active_admin/locales/ca.yml
 - lib/active_admin/locales/cs.yml
 - lib/active_admin/locales/da.yml
+- lib/active_admin/locales/de.yml
 - lib/active_admin/locales/en.yml
 - lib/active_admin/locales/es.yml
 - lib/active_admin/locales/fr.yml
+- lib/active_admin/locales/hr.yml
+- lib/active_admin/locales/hu.yml
 - lib/active_admin/locales/it.yml
 - lib/active_admin/locales/ja.yml
+- lib/active_admin/locales/ko.yml
+- lib/active_admin/locales/lv.yml
+- lib/active_admin/locales/nl.yml
+- lib/active_admin/locales/no-NB.yml
 - lib/active_admin/locales/pl.yml
 - lib/active_admin/locales/pt-BR.yml
 - lib/active_admin/locales/ru.yml
@@ -333,27 +408,32 @@ files:
 - lib/active_admin/menu.rb
 - lib/active_admin/menu_item.rb
 - lib/active_admin/namespace.rb
-- lib/active_admin/page_config.rb
+- lib/active_admin/page.rb
+- lib/active_admin/page_controller.rb
+- lib/active_admin/page_dsl.rb
+- lib/active_admin/page_presenter.rb
 - lib/active_admin/reloader.rb
 - lib/active_admin/renderer.rb
 - lib/active_admin/resource.rb
 - lib/active_admin/resource/action_items.rb
 - lib/active_admin/resource/belongs_to.rb
+- lib/active_admin/resource/controllers.rb
 - lib/active_admin/resource/menu.rb
 - lib/active_admin/resource/naming.rb
+- lib/active_admin/resource/page_presenters.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/filters.rb
-- lib/active_admin/resource_controller/form.rb
-- lib/active_admin/resource_controller/menu.rb
-- lib/active_admin/resource_controller/page_configurations.rb
+- lib/active_admin/resource_controller/resource_class_methods.rb
 - lib/active_admin/resource_controller/scoping.rb
 - lib/active_admin/resource_controller/sidebars.rb
+- lib/active_admin/resource_dsl.rb
 - lib/active_admin/router.rb
 - lib/active_admin/sass/active_admin.scss
 - lib/active_admin/sass/css_loader.rb
@@ -396,15 +476,14 @@ files:
 - lib/active_admin/views/index_as_table.rb
 - lib/active_admin/views/pages/base.rb
 - lib/active_admin/views/pages/dashboard.rb
-- lib/active_admin/views/pages/edit.rb
+- lib/active_admin/views/pages/form.rb
 - lib/active_admin/views/pages/index.rb
 - lib/active_admin/views/pages/layout.rb
-- lib/active_admin/views/pages/new.rb
+- lib/active_admin/views/pages/page.rb
 - lib/active_admin/views/pages/show.rb
 - lib/active_admin/views/tabbed_navigation.rb
 - lib/activeadmin.rb
 - lib/generators/active_admin/assets/assets_generator.rb
-- lib/generators/active_admin/assets/templates/3.0/active_admin.js
 - lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss
 - lib/generators/active_admin/assets/templates/3.1/active_admin.js
 - lib/generators/active_admin/assets/templates/dashboards.rb
@@ -418,18 +497,19 @@ files:
 - lib/generators/active_admin/resource/templates/admin.rb
 - script/local
 - script/use_rails
-- spec/integration/belongs_to_spec.rb
 - spec/integration/default_namespace.rb
 - spec/integration/javascript_spec.rb
 - spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_without_rails.rb
 - spec/support/detect_rails_version.rb
 - spec/support/integration_example_group.rb
 - spec/support/jslint.yml
 - spec/support/rails_template.rb
 - spec/support/rails_template_with_data.rb
 - spec/support/templates/cucumber.rb
+- spec/support/templates/cucumber_with_reloading.rb
 - spec/unit/abstract_view_factory_spec.rb
 - spec/unit/action_builder_spec.rb
 - spec/unit/active_admin_spec.rb
@@ -442,10 +522,13 @@ files:
 - spec/unit/arbre/html_spec.rb
 - spec/unit/asset_registration_spec.rb
 - spec/unit/auto_link_spec.rb
+- spec/unit/base_controller_shared_examples.rb
+- spec/unit/base_controller_spec.rb
 - spec/unit/belongs_to_spec.rb
 - spec/unit/breadcrumbs_spec.rb
 - spec/unit/comments_spec.rb
 - spec/unit/component_spec.rb
+- spec/unit/config_shared_examples.rb
 - spec/unit/controller_filters_spec.rb
 - spec/unit/csv_builder_spec.rb
 - spec/unit/dashboard_controller_spec.rb
@@ -461,19 +544,25 @@ files:
 - spec/unit/helpers/settings_spec.rb
 - spec/unit/menu_item_spec.rb
 - spec/unit/menu_spec.rb
+- spec/unit/namespace/register_page_spec.rb
+- spec/unit/namespace/register_resource_spec.rb
 - spec/unit/namespace_spec.rb
+- spec/unit/page_controller_spec.rb
+- spec/unit/page_spec.rb
 - spec/unit/pretty_format_spec.rb
 - spec/unit/rails_spec.rb
-- spec/unit/registration_spec.rb
 - spec/unit/reloader_spec.rb
 - spec/unit/renderer_spec.rb
 - spec/unit/resource/action_items_spec.rb
 - spec/unit/resource/menu_spec.rb
 - spec/unit/resource/naming_spec.rb
+- spec/unit/resource/page_presenters_spec.rb
 - 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_spec.rb
+- spec/unit/resource_registration_spec.rb
 - spec/unit/resource_spec.rb
 - spec/unit/routing_spec.rb
 - spec/unit/sass/helpers_spec.rb
@@ -482,6 +571,7 @@ files:
 - spec/unit/views/components/attributes_table_spec.rb
 - spec/unit/views/components/blank_slate_spec.rb
 - spec/unit/views/components/columns_spec.rb
+- spec/unit/views/components/paginated_collection_spec.rb
 - spec/unit/views/components/panel_spec.rb
 - spec/unit/views/components/sidebar_section_spec.rb
 - spec/unit/views/components/status_tag_spec.rb
@@ -491,7 +581,6 @@ files:
 - tasks/docs.rake
 - tasks/test.rake
 - tasks/yard.rake
-has_rdoc: true
 homepage: http://activeadmin.info
 licenses: []
 
@@ -505,35 +594,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2097501069627714187
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2097501069627714187
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The administration framework for Ruby on Rails.
 test_files: 
+- features/belongs_to.feature
 - features/comments/commenting.feature
 - features/comments/viewing_index.feature
 - features/dashboard.feature
+- features/development_reloading.feature
 - features/edit_page.feature
 - features/first_boot.feature
 - features/global_navigation.feature
+- features/index/filter_with_check_boxes.feature
 - features/index/filters.feature
 - features/index/format_as_csv.feature
 - features/index/formats.feature
@@ -547,15 +637,18 @@ test_files:
 - features/menu.feature
 - features/new_page.feature
 - features/registering_assets.feature
+- features/registering_pages.feature
 - features/registering_resources.feature
 - features/show/default_content.feature
 - features/show/page_title.feature
 - features/sidebar_sections.feature
 - features/specifying_actions.feature
 - features/step_definitions/action_item_steps.rb
+- features/step_definitions/action_link_steps.rb
 - features/step_definitions/additional_web_steps.rb
 - features/step_definitions/asset_steps.rb
 - features/step_definitions/attribute_steps.rb
+- features/step_definitions/breadcrumb_steps.rb
 - features/step_definitions/comment_steps.rb
 - features/step_definitions/configuration_steps.rb
 - features/step_definitions/dashboard_steps.rb
@@ -564,9 +657,11 @@ test_files:
 - features/step_definitions/format_steps.rb
 - features/step_definitions/index_scope_steps.rb
 - features/step_definitions/layout_steps.rb
+- features/step_definitions/member_link_steps.rb
 - features/step_definitions/menu_steps.rb
 - features/step_definitions/pagination_steps.rb
 - features/step_definitions/sidebar_steps.rb
+- features/step_definitions/site_title_steps.rb
 - features/step_definitions/tab_steps.rb
 - features/step_definitions/user_steps.rb
 - features/step_definitions/web_steps.rb
@@ -576,18 +671,19 @@ test_files:
 - features/support/selectors.rb
 - features/users/logging_in.feature
 - features/users/logging_out.feature
-- spec/integration/belongs_to_spec.rb
 - spec/integration/default_namespace.rb
 - spec/integration/javascript_spec.rb
 - spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_without_rails.rb
 - spec/support/detect_rails_version.rb
 - spec/support/integration_example_group.rb
 - spec/support/jslint.yml
 - spec/support/rails_template.rb
 - spec/support/rails_template_with_data.rb
 - spec/support/templates/cucumber.rb
+- spec/support/templates/cucumber_with_reloading.rb
 - spec/unit/abstract_view_factory_spec.rb
 - spec/unit/action_builder_spec.rb
 - spec/unit/active_admin_spec.rb
@@ -600,10 +696,13 @@ test_files:
 - spec/unit/arbre/html_spec.rb
 - spec/unit/asset_registration_spec.rb
 - spec/unit/auto_link_spec.rb
+- spec/unit/base_controller_shared_examples.rb
+- spec/unit/base_controller_spec.rb
 - spec/unit/belongs_to_spec.rb
 - spec/unit/breadcrumbs_spec.rb
 - spec/unit/comments_spec.rb
 - spec/unit/component_spec.rb
+- spec/unit/config_shared_examples.rb
 - spec/unit/controller_filters_spec.rb
 - spec/unit/csv_builder_spec.rb
 - spec/unit/dashboard_controller_spec.rb
@@ -619,19 +718,25 @@ test_files:
 - spec/unit/helpers/settings_spec.rb
 - spec/unit/menu_item_spec.rb
 - spec/unit/menu_spec.rb
+- spec/unit/namespace/register_page_spec.rb
+- spec/unit/namespace/register_resource_spec.rb
 - spec/unit/namespace_spec.rb
+- spec/unit/page_controller_spec.rb
+- spec/unit/page_spec.rb
 - spec/unit/pretty_format_spec.rb
 - spec/unit/rails_spec.rb
-- spec/unit/registration_spec.rb
 - spec/unit/reloader_spec.rb
 - spec/unit/renderer_spec.rb
 - spec/unit/resource/action_items_spec.rb
 - spec/unit/resource/menu_spec.rb
 - spec/unit/resource/naming_spec.rb
+- spec/unit/resource/page_presenters_spec.rb
 - 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_spec.rb
+- spec/unit/resource_registration_spec.rb
 - spec/unit/resource_spec.rb
 - spec/unit/routing_spec.rb
 - spec/unit/sass/helpers_spec.rb
@@ -640,9 +745,11 @@ test_files:
 - spec/unit/views/components/attributes_table_spec.rb
 - spec/unit/views/components/blank_slate_spec.rb
 - spec/unit/views/components/columns_spec.rb
+- spec/unit/views/components/paginated_collection_spec.rb
 - spec/unit/views/components/panel_spec.rb
 - spec/unit/views/components/sidebar_section_spec.rb
 - spec/unit/views/components/status_tag_spec.rb
 - spec/unit/views/components/table_for_spec.rb
 - spec/unit/views/pages/layout_spec.rb
 - spec/unit/views/tabbed_navigation_spec.rb
+has_rdoc: