activeadmin 0.3.0 → 0.3.1

data/.yardopts

@@ -4,5 +4,5 @@ lib/**/*.rb
 --asset docs/images:images
 -
 README.rdoc 
-CHANGELOG.rdoc
+CHANGELOG.md
 docs/**/*.md

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Nothing yet
 
+## 0.3.1
+
+* Only support InheritedResources up to 1.2.2
+
 ## 0.3.0
 
 326 commits by 35 contributors
@@ -9,56 +13,56 @@ Nothing yet
 ### New Features
 
 * I18n! Now supported in 10 languages!
-* Customizeable CSV (@pcreux, @gregbell)
+* Customizeable CSV ([@pcreux][], [@gregbell][])
 * Menus now support `if` and `priority` (Moritz Lawitschka)
 * Rails 3.1 support
-* Asset pipeline support (@gregbell)
-* `skip_before_filter` now supported in DSL (@shayfrendt)
-* Added a blank slate design (@mattvague)
-* Collection and Member actions use the Active Admin layout (@gregbell)
+* Asset pipeline support ([@gregbell][])
+* `skip_before_filter` now supported in DSL ([@shayfrendt][])
+* Added a blank slate design ([@mattvague][])
+* Collection and Member actions use the Active Admin layout ([@gregbell][])
 
 ### Enhancements
 
-* Better I18n config file loading (@fabiokr)
-* `TableFor` now supports I18n headers (@fabiokr)
-* `AttributesTable` now supports I18n attributes (@fabiokr)
-* Member actions all use CSS class `member_link` (@doug316)
-* Made `status_tag` an Arbre component (@pcreux)
-* CSV downloads have sexy names such as "articles-2011-06-21.csv" (@pcreux)
-* Created `ActiveAdmin::Setting` to easily create settings (@gregbell)
-* New datepicker styles (@mattvague)
-* Set `@page_title` in member action to render a custom title (@gregbell)
-* #248: Settable logout link options in initializer (@gregbell)
-* Added a DependencyChecker that warns if dependencies aren't met (@pcreux)
+* Better I18n config file loading ([@fabiokr][])
+* `TableFor` now supports I18n headers ([@fabiokr][])
+* `AttributesTable` now supports I18n attributes ([@fabiokr][])
+* Member actions all use CSS class `member_link` ([@doug316][])
+* Made `status_tag` an Arbre component ([@pcreux][])
+* CSV downloads have sexy names such as "articles-2011-06-21.csv" ([@pcreux][])
+* Created `ActiveAdmin::Setting` to easily create settings ([@gregbell][])
+* New datepicker styles ([@mattvague][])
+* Set `[@page_title][]` in member action to render a custom title ([@gregbell][])
+* [#248][]: Settable logout link options in initializer ([@gregbell][])
+* Added a DependencyChecker that warns if dependencies aren't met ([@pcreux][])
 
 ### Bug Fixes
 
-* #52: Fix update action with STI models (@gregbell)
-* #122: Fix sortable columns on nested resources (@knoopx)
-* Fix so that Dashboard Sections can appear in root namespace (@knoopx)
-* #131: Fixed `status_tag` with nil content (@pcreux)
-* #110: Fixed dropdown menu floats in Firefox (@mattvague)
-* Use quoted table names (@krug)
-* Fixed CSS float of `.paginated_collection_contents` bug in Firefox (@mattvague)
-* Removed unwanted gradient in IE in attribute table headers (@emzeq)
-* #222: Added `Arbre::Context#length` for Rack servers (@gregbell)
-* #255: Fixed problem with dropdown menus in IE8 and IE9 (@mattvague)
-* #235: Default sort order should use primary_key (@gregbell)
-* #197: Fixed issues with #form params disappearing (@rolfb)
-* #186: Fixes for when `default_namespace = false` (@gregbell)
-* #135: Comments on STI classes redirect correctly (@gregbell)
-* #77: Fixed performance issue where ActiveRecord::Base.all was being called (@pcreux)
-* #332: Fixed Devise redirection when in false namespace (@gregbell)
-* #171: Fixed issue where class names would clash with HTML object names (@gregbell)
-* #381: Fixed issues with Devise < 1.2 (@pcreux)
-* #369: Added support for pluralized model names such as News (@gregbell)
-* #42: Default forms work with polymorphic associations (@mattvague)
+* [#52][]: Fix update action with STI models ([@gregbell][])
+* [#122][]: Fix sortable columns on nested resources ([@knoopx][])
+* Fix so that Dashboard Sections can appear in root namespace ([@knoopx][])
+* [#131][]: Fixed `status_tag` with nil content ([@pcreux][])
+* [#110][]: Fixed dropdown menu floats in Firefox ([@mattvague][])
+* Use quoted table names ([@krug][])
+* Fixed CSS float of `.paginated_collection_contents` bug in Firefox ([@mattvague][])
+* Removed unwanted gradient in IE in attribute table headers ([@emzeq][])
+* [#222][]: Added `Arbre::Context#length` for Rack servers ([@gregbell][])
+* [#255][]: Fixed problem with dropdown menus in IE8 and IE9 ([@mattvague][])
+* [#235][]: Default sort order should use primary_key ([@gregbell][])
+* [#197][]: Fixed issues with #form params disappearing ([@rolfb][])
+* [#186][]: Fixes for when `default_namespace = false` ([@gregbell][])
+* [#135][]: Comments on STI classes redirect correctly ([@gregbell][])
+* [#77][]: Fixed performance issue where ActiveRecord::Base.all was being called ([@pcreux][])
+* [#332][]: Fixed Devise redirection when in false namespace ([@gregbell][])
+* [#171][]: Fixed issue where class names would clash with HTML object names ([@gregbell][])
+* [#381][]: Fixed issues with Devise < 1.2 ([@pcreux][])
+* [#369][]: Added support for pluralized model names such as News ([@gregbell][])
+* [#42][]: Default forms work with polymorphic associations ([@mattvague][])
 
 ### Dependencies
 
-* Switched from will_paginate to  Kaminari for pagination (@mwindwer)
-* Removed dependency on InheritedViews (@gregbell)
-* Removed Jeweler. Using Bundler and a gemspec (@gregbell)
+* Switched from will_paginate to  Kaminari for pagination ([@mwindwer][])
+* Removed dependency on InheritedViews ([@gregbell][])
+* Removed Jeweler. Using Bundler and a gemspec ([@gregbell][])
 
 ### Contributors
 
@@ -105,29 +109,29 @@ Nothing yet
 
 ### Features & Enhancements
 
-* Arbre includes self closing tags (#100)
-* Controller class & action added to body as CSS classes (#99)
-* HAML is not required by default (#92)
-* Devise login now respects Devise.authentication_keys (#69)
-* Active Admin no longer uses <tt>ActiveRecord::Base#search</tt> (#28)
-* Resource's can now override the label in the menu (#48)
+* Arbre includes self closing tags ([#100][])
+* Controller class & action added to body as CSS classes ([#99][])
+* HAML is not required by default ([#92][])
+* Devise login now respects Devise.authentication_keys ([#69][])
+* Active Admin no longer uses <tt>ActiveRecord::Base#search</tt> ([#28][])
+* Resource's can now override the label in the menu ([#48][])
 * Subdirectories are now loaded in the Active Admin load path
 
 ### Bug Fixes
 
-* Sort order now includes table name (#38)
-* Fixed table_for 'odd', 'even' row classes (#96)
-* Fixed Devise installation if AdminUser already exists (#95)
-* Fixed issues when ActiveAdmin.default_namespaces is false (#32)
-* Added styles for missing HTML 5 inputs (#31)
-* Fixed issue if adding empty Active Admin Comment (#21)
-* Fixed layout issues in FF 4 (#22)
-* Use Sass::Plugin.options[:css_location] instead of Rails.root (#55)
+* Sort order now includes table name ([#38][])
+* Fixed table_for 'odd', 'even' row classes ([#96][])
+* Fixed Devise installation if AdminUser already exists ([#95][])
+* Fixed issues when ActiveAdmin.default_namespaces is false ([#32][])
+* Added styles for missing HTML 5 inputs ([#31][])
+* Fixed issue if adding empty Active Admin Comment ([#21][])
+* Fixed layout issues in FF 4 ([#22][])
+* Use Sass::Plugin.options[:css_location] instead of Rails.root ([#55][])
 
 ### Test Suite
 
-* Update RSpec to latest & fix specs (Thanks Ben Marini & Jeremt Ruppel!) (#100)
-* Added tests for STI models (#52)
+* Update RSpec to latest & fix specs (Thanks Ben Marini & Jeremt Ruppel!) ([#100][])
+* Added tests for STI models ([#52][])
 
 ### Contributors
 
@@ -174,4 +178,49 @@ of the highlights. 250 commits. Enough said.
 
 ## 0.1.0
 
-e Initial release
+* Initial release
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#21]: https://github.com/gregbell/active_admin/issues/21
+[#22]: https://github.com/gregbell/active_admin/issues/22
+[#28]: https://github.com/gregbell/active_admin/issues/28
+[#31]: https://github.com/gregbell/active_admin/issues/31
+[#32]: https://github.com/gregbell/active_admin/issues/32
+[#38]: https://github.com/gregbell/active_admin/issues/38
+[#42]: https://github.com/gregbell/active_admin/issues/42
+[#48]: https://github.com/gregbell/active_admin/issues/48
+[#52]: https://github.com/gregbell/active_admin/issues/52
+[#55]: https://github.com/gregbell/active_admin/issues/55
+[#69]: https://github.com/gregbell/active_admin/issues/69
+[#77]: https://github.com/gregbell/active_admin/issues/77
+[#92]: https://github.com/gregbell/active_admin/issues/92
+[#95]: https://github.com/gregbell/active_admin/issues/95
+[#96]: https://github.com/gregbell/active_admin/issues/96
+[#99]: https://github.com/gregbell/active_admin/issues/99
+[#100]: https://github.com/gregbell/active_admin/issues/100
+[#110]: https://github.com/gregbell/active_admin/issues/110
+[#122]: https://github.com/gregbell/active_admin/issues/122
+[#131]: https://github.com/gregbell/active_admin/issues/131
+[#135]: https://github.com/gregbell/active_admin/issues/135
+[#171]: https://github.com/gregbell/active_admin/issues/171
+[#186]: https://github.com/gregbell/active_admin/issues/186
+[#197]: https://github.com/gregbell/active_admin/issues/197
+[#222]: https://github.com/gregbell/active_admin/issues/222
+[#235]: https://github.com/gregbell/active_admin/issues/235
+[#248]: https://github.com/gregbell/active_admin/issues/248
+[#255]: https://github.com/gregbell/active_admin/issues/255
+[#332]: https://github.com/gregbell/active_admin/issues/332
+[#369]: https://github.com/gregbell/active_admin/issues/369
+[#381]: https://github.com/gregbell/active_admin/issues/381
+[@doug316]: https://github.com/doug316
+[@emzeq]: https://github.com/emzeq
+[@fabiokr]: https://github.com/fabiokr
+[@gregbell]: https://github.com/gregbell
+[@knoopx]: https://github.com/knoopx
+[@krug]: https://github.com/krug
+[@mattvague]: https://github.com/mattvague
+[@mwindwer]: https://github.com/mwindwer
+[@page_title]: https://github.com/page_title
+[@pcreux]: https://github.com/pcreux
+[@rolfb]: https://github.com/rolfb
+[@shayfrendt]: https://github.com/shayfrendt

data/Gemfile

@@ -9,10 +9,11 @@ gem 'rails',          rails_version
 
 case rails_version
 when /^3\.0/
-  gem "meta_search",    '~> 1.0.0'
+  # Do nothing, bundler should figure it out
 when /^3\.1/
-  gem "meta_search",    '>= 1.1.0.pre'
-  gem 'sass-rails',     "~> 3.1.0.rc"
+  # These are the gems you have to have for Rails 3.1 to be happy
+  gem 'sass-rails'
+  gem 'uglifier'
 else
   raise "Rails #{rails_version} is not supported yet"
 end

data/README.rdoc

@@ -4,11 +4,13 @@ Active Admin is a framework for creating administration style interfaces. It
 abstracts common business application patterns to make it simple for developers
 to implement beautiful and elegant interfaces with very little effort.
 
+
 == Help / Support / Demo
+
+* Documentation & Guides: http://activeadmin.info/documentation.html
 * Mailing list: http://groups.google.com/group/activeadmin
 * Bug reports: https://github.com/gregbell/active_admin/issues
 * RDoc: http://rubydoc.info/github/gregbell/active_admin/master/frames
-* Guides: http://activeadmin.info/documentation.html
 * Live demo: http://demo.activeadmin.info/admin
 * Website: http://www.activeadmin.info
 
@@ -27,8 +29,14 @@ to implement beautiful and elegant interfaces with very little effort.
 Active Admin is released as a Ruby Gem. The gem is to be installed within a Ruby
 on Rails 3 application. To install, simply add the following to your Gemfile:
 
-  # Gemfile
+  # Gemfile in Rails <= 3.1
+  gem 'activeadmin'
+
+If you are using Rails >= 3.1, you must also include a beta version of MetaSearch and sass-rails:
+
+  # Gemfile in Rails >= 3.1
   gem 'activeadmin'
+  gem 'sass-rails'
 
 After updating your bundle, run the installer
 
@@ -56,387 +64,15 @@ To register your first model, run:
 This creates a file at <tt>app/admin/my_model_names.rb</tt> for configuring the resource.
 Refresh your web browser to see the interface.
 
-To learn how to further configure your admin section, keep on reading!
-
-== General Configuration
-
-=== Admin Users
-
-By default Active Admin will include Devise and create a new model called
-AdminUser. If you would like to use another name, you can pass it in to the
-installer through the user option:
-
-  $> rails generate active_admin:install UserClassName
-
-If you don't want the generator to create any user classes:
-
-  $> rails generate active_admin:install --skip-users
-
-=== Authentication
-
-Active Admin requires two settings to authenticate and use the current user
-within your application. Both are set in
-<tt>config/initializers/active_admin.rb</tt>. By default they are setup for use
-with Devise and a model named AdminUser. If you chose a different model name,
-you will need to update these settings.
-
-Set the method that controllers should call to authenticate the current user
-with:
-
-  # config/initializers/active_admin.rb
-  config.authentication_method = :authenticate_admin_user!
-
-Set the method to call within the view to access the current admin user
-
-  # config/initializers/active_admin.rb
-  config.current_user_method = :current_admin_user
-
-Both of these settings can be set to false to turn off authentication.
-
-  # Turn off authentication all together
-  config.authentication_method = false
-  config.current_user_method   = false
-
-=== Site Title
-
-You can update the title used for the site in the initializer also. By default
-it is set to the name of your Rails.application class name.
-
-  # config/initializers/active_admin.rb
-  config.site_title = "My Admin Site"
-
-== Customize The Resource
-
-=== Rename the Resource
-
-By default, any references to the resource (menu, routes, buttons, etc) in the
-interface will use the name of the class. You can rename the resource by using
-the <tt>:as</tt> option.
-
-  ActiveAdmin.register Post, :as => "Article"
-
-The resource will then be available as /admin/articles
-
-=== Customize the Navigation
-
-The resource will be displayed in the global navigation by default.
-
-To disable the resource from being displayed in the global navigation:
-
-  ActiveAdmin.register Post do
-    menu false
-  end
-
-To change the name of the label in the menu:
-
-  ActiveAdmin.register Post do
-    menu :label => "My Posts"
-  end
-
-To add the menu as a child of another menu:
-
-  ActiveAdmin.register Post do
-    menu :parent => "Blog"
-  end
-
-This will create the menu item if it doesn't exist yet.
-
-== Customizing the Index Page
-
-Filtering and listing resources is one of the most important tasks for
-administering a web application. Active Admin provides many different tools for
-you to build a compelling interface into your data for the admin staff.
-
-Built in, Active Admin has the following index renderers:
-
-* *Table*: A table drawn with each row being a resource
-* *Grid*: A set of rows and columns each cell being a resource
-* *Blocks*: A set of rows (not tabular) each row being a resource
-* *Blog*: A title and body content, similar to a blog index
-
-All index pages also support scopes, filters, pagination, action items, and
-sidebar sections.
-
-=== Index as a Table
-
-By default, the index page is a table with each of the models content columns and links to
-show, edit and delete the object. There are many ways to customize what gets
-displayed.
-
-==== Defining Columns
-
-To display an attribute or a method on a resource, simply pass a symbol into the
-column method:
-
-    index do
-      column :title
-    end
-
-If the default title does not work for you, pass it as the first argument:
-
-    index do
-      column "My Custom Title", :title
-    end
-
-Sometimes calling methods just isn't enough and you need to write some view
-specific code. For example, say we wanted a colum called Title which holds a
-link to the posts admin screen.
-
-The column method accepts a block as an argument which will then be rendered
-within the context of the view for each of the objects in the collection.
-
-    index do
-      column "Title" do |post|
-        link_to post.title, admin_post_path(post)
-      end
-    end
-
-The block gets called once for each resource in the collection. The resource gets passed into
-the block as an argument.
-
-
-==== Sorting
-
-When a column is generated from an Active Record attribute, the table is
-sortable by default. If you are creating a custom column, you may need to give
-Active Admin a hint for how to sort the table.
-
-If a column is defined using a block, you must pass the key to turn on sorting. The key
-is the attribute which gets used to sort objects using Active Record.
-
-  index do
-    column "Title", :sortable => :title do |post|
-      link_to post.title, admin_post_path(post)
-    end
-  end
-
-You can turn off sorting on any column by passing false:
-
-  index do
-    column :title, :sortable => false
-  end
-
-==== Showing and Hiding Columns
-
-The entire index block is rendered within the context of the view, so you can
-easily do things that show or hide columns based on the current context.
-
-For example, if you were using CanCan:
-
-  index do
-    column :title, :sortable => false
-    if can? :manage, Post
-      column :some_secret_data
-    end
-  end
 
-=== Index as a Grid
+== Next Steps
 
-Sometimes you want to display the index screen for a set of resources as a grid
-(possibly a grid of thumbnail images). To do so, use the :grid option for the
-index block.
+The best place to get documentation is at http://activeadmin.info/documentation.html.
 
-  index :as => :grid do |product|
-    link_to(image_tag(product.image_path), admin_product_path(product))
-  end
+To view a sample Active Admin application, checkout http://demo.activeadmin.info
 
-The block is rendered within a cell in the grid once for each resource in the
-collection. The resource is passed into the block for you to use in the view.
+If you have any questions, please email the mailing list at http://groups.google.com/group/activeadmin
 
-You can customize the number of colums that are rendered using the columns
-option:
-
-  index :as => :grid, :columns => 5 do |product|
-    link_to(image_tag(product.image_path), admin_product_path(product))
-  end
-
-
-=== Index as a Block
-
-If you want to fully customize the display of your resources on the index
-screen, Index as a Block allows you to render a block of content for each
-resource.
-
-  index :as => :block do |product|
-    div :for => product do
-      h2 auto_link(product.title)
-      div do
-        simple_format product.description
-      end
-    end
-  end
-
-=== Index Filters
-
-By default the index screen includes a "Filters" sidebar on the right hand side
-with a filter for each attribute of the registered model. You can customize the
-filters that are displayed as well as the type of widgets they use.
-
-To display a filter for an attribute, use the filter method
-
-  ActiveAdmin.register Post do
-    filter :title
-  end
-
-Out of the box, Active Admin supports the following filter types:
-
-* *:string* - A search field
-* *:date_range* - A start and end date field with calendar inputs
-* *:numeric* - A drop down for selecting "Equal To", "Greater Than" or "Less
-  Than" and an input for a value.
-* *:select* - A drop down which filters based on a selected item in a collection
-  or all.
-* *:check_boxes* - A list of check boxes users can turn on and off to filter
-
-By default, Active Admin will pick the most relevant filter based on the
-attribute type. You can force the type by passing the :as option.
-
-  filter :author, :as => :check_boxes
-
-The :check_boxes and :select types accept options for the collection. By default
-it attempts to create a collection based on an association. But you can pass in
-the collection as a proc to be called at render time.
-
-  # Will call available
-  filter :author, :as => :check_boxes, :collection => proc { Author.all }
-
-You can change the filter label by passing a label option:
-
-  filter :author, :label => 'Author'
-
-By default, Active Admin will try to use ActiveModel I18n to determine the label.
-
-== Customizing the CSV format
-
-Customizing the CSV format is as simple as customizing the index page.
-
-  csv do
-    column :name
-    column("Author") { |post| post.author.full_name }
-  end
-
-== Customizing the Form
-
-Active Admin gives complete control over the output of the form by creating a thin DSL on top of
-the fabulous DSL created by Formtastic (http://github.com/justinfrench/formtastic).
-
-  ActiveAdmin.register Post do
-
-    form do |f|
-      f.inputs "Details" do
-        f.input :title
-        f.input :published_at, :label => "Publish Post At"
-        f.input :category
-      end
-      f.inputs "Content" do
-        f.input :body
-      end
-      f.buttons
-    end
-
-  end
-
-Please view the documentation for Formtastic to see all the wonderful things you can do:
-http://github.com/justinfrench/formtastic
-
-If you require a more custom form than can be provided through the DSL, you can pass
-a partial in to render the form yourself.
-
-For example:
-
-  ActiveAdmin.register Post do
-    form :partial => "form"
-  end
-
-Then implement app/views/admin/posts/_form.html.erb:
-
-  <%= semantic_form_for [:admin, @post] do |f| %>
-    <%= f.inputs :title, :body %>
-    <%= f.buttons :commit %>
-  <% end %>
-
-
-== Customizing the Show Screen
-
-Customizing the show screen is as simple as implementing the show block:
-
-  ActiveAdmin.register Post do
-    show do
-      h3 post.title
-      div do
-        simple_format post.body
-      end
-    end
-  end
-
-The show block is rendered within the context of the view and uses the Arbre HTML DSL. You
-can also render a partial at any point.
-
-  ActiveAdmin.register Post do
-    show do
-      # renders app/views/admin/posts/_some_partial.html.erb
-      render "some_partial"
-    end
-  end
-
-
-== Sidebar Sections
-
-To add a sidebar section to all the screen within a section, use the sidebar method:
-
-  sidebar :help do
-    "Need help? Email us at help@example.com"
-  end
-
-This will generate a sidebar section on each screen of the resource. With the block as
-the contents of the section. The first argument is the section title.
-
-You can also use Arbre syntax to define the content.
-
-  sidebar :help do
-    ul do
-      li "Second List First Item"
-      li "Second List Second Item"
-    end
-  end
-
-Sidebar sections can be rendered on a specific action by using the :only or :except
-options.
-
-  sidebar :help, :only => :index do
-    "Need help? Email us at help@example.com"
-  end
-
-If you only pass a symbol, Active Admin will attempt to locate a partial to render.
-
-  # Will render app/views/admin/posts/_help_sidebar.html.erb
-  sidebar :help
-
-Or you can pass your own custom partial to render.
-
-  sidebar :help, :partial => "custom_help_partial"
-
-== Add collection and member actions
-
-To add a collection action, use the collection_action method:
-
-  collection_action :import_csv do
-    # do csv import
-    redirect_to :action => :index, :notice => "CSV imported successfully!"
-  end
-
-To add a member action, use the member_action method:
-
-  member_action :lock, :method => :post do
-    resource.lock!
-    redirect_to :action => :show, :notice => "Locked!"
-  end
-
-== Internationalization (I18n)
-
-To internationalize Active Admin or to change default strings, you can copy
-lib/active_admin/locales/en.yml to your application config/locales directory and
-change its content. You can contribute to the project with your translations to!
 
 == Tools Being Used
 
@@ -446,8 +82,6 @@ other open source projects:
 InheritedResources::
   Inherited Resources speeds up development by making your controllers inherit all restful
   actions so you just have to focus on what is important.
-InheritedViews::
-  Inherited Views is a thin addition to Inherited Resources which adds in html views to the mix
 Formtastic::
   A DSL for semantically building amazing forms.
 Devise::
@@ -458,29 +92,20 @@ Iconic Icons::
   Excellent SVG icon set designed by P.J. Onori: http://somerandomdude.com/projects/iconic
 
 
-== Contributors
-
-* Greg Bell       http://github.com/gregbell
-* Philippe Creux  http://github.com/pcreux
-* Sam Vincent     http://github.com/samvincent
-* Matt Vague      http://github.com/mattvague
-* Dan Kubb        http://github.com/dkubb
-* Sam Reh         http://github.com/samuelreh
-
-
 == Roadmap & Issue Tracking
 
-We are using the awesome Github issues!
+We are using the awesome Github issues! Please submit bugs or features to
+https://github.com/gregbell/active_admin/issues
+
 
 == Note on Patches/Pull Requests
 
 * Fork the project.
-* Make your feature addition or bug fix on a new topic branch
+* Make a NEW TOPIC BRANCH, then make your feature addition or bug fix
 * Add specs and cukes for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request.
+* Send a pull request.
 
 == Copyright
 

data/activeadmin.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency("meta_search", ">= 0.9.2")
   s.add_dependency("devise", ">= 1.1.2")
   s.add_dependency("formtastic", ">= 1.1.0")
-  s.add_dependency("inherited_resources", ">= 0")
+  s.add_dependency("inherited_resources", "< 1.3.0")
   s.add_dependency("kaminari", ">= 0.12.4")
   s.add_dependency("sass", ">= 3.1.0")
   s.add_dependency("fastercsv", ">= 0")

data/docs/1-general-configuration.md

@@ -40,4 +40,4 @@ it is set to the name of your Rails.application class name.
 
 To internationalize Active Admin or to change default strings, you can copy
 lib/active_admin/locales/en.yml to your application config/locales directory and
-change its content. You can contribute to the project with your translations to!
+change its content. You can contribute to the project with your translations too!

data/docs/2-resource-customization.md

@@ -10,26 +10,70 @@ the <tt>:as</tt> option.
 
 The resource will then be available as /admin/articles
 
-## Customize the Navigation
+## Customize the Menu
 
-The resource will be displayed in the global navigation by default.
-
-To disable the resource from being displayed in the global navigation:
+The resource will be displayed in the global navigation by default. To disable
+the resource from being displayed in the global navigation, pass `false` to the
+`menu` method:
 
     ActiveAdmin.register Post do
       menu false
     end
 
+The menu method accepts a hash with the following options:
+
+* `:label` - The string label to display in the menu
+* `:parent` - The string label of the parent to set for this menu
+* `:if` - A block or a symbol of a method to call to decide if the menu item
+  should be displayed
+* `:priority` - The integer value of the priority. Defaults to 10
+
+### Labels
+
 To change the name of the label in the menu:
 
     ActiveAdmin.register Post do
       menu :label => "My Posts"
     end
 
+By default the menu uses a pluralized version of your resource name.
+
+### Drop Down Menus
+
+In many cases, a single level navigation will not be enough for the
+administration of a production application. In that case, you can categorize
+your resources and creating drop down menus to access them.
+
 To add the menu as a child of another menu:
 
     ActiveAdmin.register Post do
       menu :parent => "Blog"
     end
 
-This will create the menu item if it doesn't exist yet.
+Note, the "Blog" menu does not even have to exist yet. It will be generated on
+the fly as a drop down list for you.
+
+### Menu Priority
+
+By default Active Admin sorts menus alphabetically. Some times you want specific
+resources to show up at the beginning or the end of your menu.
+
+Each menu item is given an integer priority value (default 10). You can set it
+to edit the location of the menu item.
+
+    ActiveAdmin.register Post do
+      menu :priority => 1
+    end
+
+This would ensure that the Post menu item, is at the beginning of the menu.
+
+### Conditionally Showing / Hiding Menu Items
+
+Menu items can be shown or hidden at runtime using the `:if` option. 
+
+    ActiveAdmin.register Post do
+      menu :if => proc{ current_admin_user.can_edit_posts? }
+    end
+
+The `proc` will be called in the context of the view, so you have access to all
+your helpers and current user session information.

data/docs/3-index-pages.md

@@ -8,7 +8,7 @@ Built in, Active Admin has the following index renderers:
 
 * *Table*: A table drawn with each row being a resource ([View Table Docs](3-index-pages/index-as-table.md))
 * *Grid*: A set of rows and columns each cell being a resource ([View Grid Docs](3-index-pages/index-as-grid.md))
-* *Blocks*: A set of rows (not tabular) each row being a resource ([View Blocks Docs](3-index-pages/index-as-blocks.md))
+* *Blocks*: A set of rows (not tabular) each row being a resource ([View Blocks Docs](3-index-pages/index-as-block.md))
 * *Blog*: A title and body content, similar to a blog index ([View Blog Docs](3-index-pages/index-as-blog.md))
 
 All index pages also support scopes, filters, pagination, action items, and

data/docs/3-index-pages/index-as-blog.md

@@ -5,10 +5,10 @@
 Render your index page as a set of posts. The post has two main options:
 title and body.
 
-  index :as => :blog do
-    title :my_title # Calls #my_title on each resource
-    body  :my_body  # Calls #my_body on each resource
-  end
+    index :as => :blog do
+      title :my_title # Calls #my_title on each resource
+      body  :my_body  # Calls #my_body on each resource
+    end
 
 ## Post Title
 

data/lib/active_admin/locales/it.yml

@@ -1,5 +1,6 @@
 it:
   active_admin:
+    dashboard: Dashboard
     dashboard_welcome:
       welcome: "Benvenuti in Active Admin. Questa è la pagina dashboard di default."
       call_to_action: "Per aggiungere sezioni alla dashboard controlla il file 'app/admin/dashboards.rb'"

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/active_admin/view_helpers/filter_form_helper.rb

@@ -82,7 +82,7 @@ module ActiveAdmin
                                   :onchange => "document.getElementById('#{method}_numeric').name = 'q[' + this.value + ']';"
       filter_input = text_field current_filter, :size => 10, :id => "#{method}_numeric"
 
-      [ label(method),
+      [ label(method, options[:label]),
         filter_select,
         " ",
         filter_input

data/lib/active_admin/views/index_as_blog.rb

@@ -6,10 +6,10 @@ module ActiveAdmin
     # Render your index page as a set of posts. The post has two main options:
     # title and body.
     #
-    #   index :as => :blog do
-    #     title :my_title # Calls #my_title on each resource
-    #     body  :my_body  # Calls #my_body on each resource
-    #   end
+    #     index :as => :blog do
+    #       title :my_title # Calls #my_title on each resource
+    #       body  :my_body  # Calls #my_body on each resource
+    #     end
     #
     # == Post Title
     #

data/tasks/test.rake

@@ -9,7 +9,7 @@ namespace :test do
   desc "Run against the important versions of rails"
   task :major_rails_versions do
     current_version = detect_rails_version if File.exists?("Gemfile.lock")
-    ["3.0.10", "3.1.0.rc6"].each do |version|
+    ["3.0.10", "3.1.0"].each do |version|
       puts
       puts
       puts "== Using Rails #{version}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70119273208180 !ruby/object:Gem::Requirement
+  requirement: &70245214115280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70119273208180
+  version_requirements: *70245214115280
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70119273207680 !ruby/object:Gem::Requirement
+  requirement: &70245214709900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70119273207680
+  version_requirements: *70245214709900
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70119273207220 !ruby/object:Gem::Requirement
+  requirement: &70245215132620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70119273207220
+  version_requirements: *70245215132620
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &70119273206760 !ruby/object:Gem::Requirement
+  requirement: &70245215318320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,21 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70119273206760
+  version_requirements: *70245215318320
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70119273206300 !ruby/object:Gem::Requirement
+  requirement: &70245215317700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70119273206300
+  version_requirements: *70245215317700
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70119273205840 !ruby/object:Gem::Requirement
+  requirement: &70245215297560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70119273205840
+  version_requirements: *70245215297560
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70119273205360 !ruby/object:Gem::Requirement
+  requirement: &70245215296960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70119273205360
+  version_requirements: *70245215296960
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70119273204900 !ruby/object:Gem::Requirement
+  requirement: &70245215296300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119273204900
+  version_requirements: *70245215296300
 description: The administration framework for Ruby on Rails.
 email:
 - gregdbell@gmail.com
@@ -451,7 +451,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2396832735345360600
+      hash: -256188017324891804
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -460,7 +460,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2396832735345360600
+      hash: -256188017324891804
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6