activeadmin 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,26 +1,75 @@
+== 0.2.2 (2011-05-26)
+
+68 Commits by 13 Contributors
+
+=== 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)
+* 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)
+
+=== Test Suite
+
+* Update RSpec to latest & fix specs (Thanks Ben Marini & Jeremt Ruppel!) (#100)
+* Added tests for STI models (#52)
+
+=== Contributors
+
+* Ben Marini
+* Bookis Smuin
+* Caley Woods
+* Doug Puchalski
+* Federico Romero
+* Greg Bell
+* Ian MacLeod
+* Jeremy Ruppel
+* Jordan Sitkin
+* Juha Suuraho
+* Mathieu Martin
+* Paul Annesley
+* Philippe Creux
+
 == 0.2.1 (2011-05-12)
 
-* Bug Fixes
-  * Fixed issue with dashboard rendering a sidebar
+=== Bug Fixes
+* Fixed issue with dashboard rendering a sidebar
 
 == 0.2.0 (2011-05-12)
 
 0.2.0 is essentially an entire re-write of Active Admin. Here are some
 of the highlights. 250 commits. Enough said.
 
-* Features & Enhancements
-  * Full visual redesign
-  * Integrated Devise for authentication
-  * Brand new view and component layer called Arbre (Project coming soon)
-  * Added ActiveAdmin::Comments
+=== Features & Enhancements
 
-* Bug Fixes
-  * Too many to list! Been in production for close to a year
+* Full visual redesign
+* Integrated Devise for authentication
+* Brand new view and component layer called Arbre (Project coming soon)
+* Added ActiveAdmin::Comments
+
+=== Bug Fixes
+
+* Too many to list! Been in production for close to a year
 
 == 0.1.1 (2010-09-15)
 
-* Bug Fixes
-  * Fixed issues running on Ruby 1.9.2
+=== Bug Fixes
+
+* Fixed issues running on Ruby 1.9.2
 
 == 0.1.0
 

data/Gemfile

@@ -17,6 +17,8 @@ when "3.0.5"
   gem 'rails',          '= 3.0.5'
 when "3.0.6"
   gem 'rails',          '= 3.0.6'
+when "3.0.7"
+  gem 'rails',          '= 3.0.7'
 else
   # Default gems for in the gemspec
   gem 'rails',          '>= 3.0.0'
@@ -27,16 +29,18 @@ gem 'devise',         '>= 1.1.2'
 gem 'formtastic',     '>= 1.1.0'
 gem 'will_paginate',  '>= 3.0.pre2'
 gem 'inherited_views'
-gem 'haml',           '>= 3.0.18'
+gem 'sass',           '>= 3.1.0'
 
 group :development, :test do
   gem 'sqlite3-ruby',   :require => 'sqlite3'
   gem 'jeweler',        '1.5.2'
+  gem 'rake',           '0.8.7', :require => false
+  gem 'haml',           '~> 3.1.1', :require => false
 end
 
 group :test do
-  gem 'rspec',          '2.0.0.beta.22'
-  gem 'rspec-rails',    '2.0.0.beta.22'
+  gem 'rspec',          '~> 2.6.0'
+  gem 'rspec-rails',    '~> 2.6.0'
   gem 'capybara',       '0.3.9'
   gem 'cucumber',       '0.9.2'
   gem 'cucumber-rails', '0.3.2'

data/README.rdoc

@@ -96,6 +96,42 @@ 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
@@ -221,10 +257,39 @@ resource.
     end
   end
 
-
 === Index Filters
 
-=== Index Scopes
+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 dislay 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 }
 
 == Customizing the Form
 
@@ -253,18 +318,63 @@ http://github.com/justinfrench/formtastic
 
 == Customizing the Show Screen
 
-== Action Items
+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
 
-== The Dashboard
+To add a sidebar section to all the screen within a section, use the sidebar method:
 
-== Custom Actions
+  sidebar :help do
+    "Need help? Email us at help@example.com"
+  end
 
-=== Collection Actions
+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.
 
-=== Member Actions
+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"
 
 == Tools Being Used
 
@@ -301,7 +411,7 @@ Iconic Icons::
 We are using the awesome Github issues!
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix on a new topic branch
 * Add specs and cukes for it. This is important so I don't break it in a

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 desc "Install all supported versions of rails"
 task :install_all_rails do
-  (0..6).to_a.each do |v|
+  (0..7).to_a.each do |v|
     system "rm Gemfile.lock"
     puts "Installing for RAILS=3.0.#{v}"
     cmd "RAILS=3.0.#{v} bundle install"
@@ -71,6 +71,10 @@ namespace :cucumber do
   Cucumber::Rake::Task.new(:all) do |t|
     t.profile = 'default'
   end
+  
+  Cucumber::Rake::Task.new(:wip) do |t|
+    t.profile = 'wip'
+  end
 end
 
 task :cucumber => "cucumber:all"

data/activeadmin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activeadmin}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Bell"]
-  s.date = %q{2011-05-12}
+  s.date = %q{2011-05-27}
   s.description = %q{The administration framework for Ruby on Rails.}
   s.email = %q{gregdbell@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "cucumber.yml",
     "features/comments/commenting.feature",
     "features/comments/viewing_index.feature",
+    "features/dashboard.feature",
     "features/edit_page.feature",
     "features/first_boot.feature",
     "features/global_navigation.feature",
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
     "features/index/index_as_table.feature",
     "features/index/index_scopes.feature",
     "features/index/pagination.feature",
+    "features/menu.feature",
     "features/new_page.feature",
     "features/registering_assets.feature",
     "features/registering_resources.feature",
@@ -50,15 +52,18 @@ Gem::Specification.new do |s|
     "features/step_definitions/attribute_steps.rb",
     "features/step_definitions/comment_steps.rb",
     "features/step_definitions/configuration_steps.rb",
+    "features/step_definitions/dashboard_steps.rb",
     "features/step_definitions/factory_steps.rb",
     "features/step_definitions/flash_steps.rb",
     "features/step_definitions/format_steps.rb",
     "features/step_definitions/index_scope_steps.rb",
+    "features/step_definitions/menu_steps.rb",
     "features/step_definitions/pagination_steps.rb",
     "features/step_definitions/sidebar_steps.rb",
     "features/step_definitions/tab_steps.rb",
     "features/step_definitions/user_steps.rb",
     "features/step_definitions/web_steps.rb",
+    "features/sti_resource.feature",
     "features/support/env.rb",
     "features/support/paths.rb",
     "features/users/logging_in.feature",
@@ -206,11 +211,8 @@ Gem::Specification.new do |s|
     "lib/generators/active_admin/install/templates/migrations/2_move_admin_notes_to_comments.rb",
     "lib/generators/active_admin/resource/resource_generator.rb",
     "lib/generators/active_admin/resource/templates/admin.rb",
+    "spec/controllers/index_as_csv_spec.rb",
     "spec/integration/belongs_to_spec.rb",
-    "spec/integration/dashboard_spec.rb",
-    "spec/integration/index_as_csv_spec.rb",
-    "spec/integration/index_as_table_spec.rb",
-    "spec/integration/layout_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/integration_example_group.rb",
     "spec/support/rails_template.rb",
@@ -250,6 +252,7 @@ Gem::Specification.new do |s|
     "spec/unit/pretty_format_spec.rb",
     "spec/unit/registration_spec.rb",
     "spec/unit/renderer_spec.rb",
+    "spec/unit/resource_controller/collection_spec.rb",
     "spec/unit/resource_controller_spec.rb",
     "spec/unit/resource_spec.rb",
     "spec/unit/routing_spec.rb",
@@ -262,11 +265,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.7.2}
   s.summary = %q{The administration framework for Ruby on Rails.}
   s.test_files = [
+    "spec/controllers/index_as_csv_spec.rb",
     "spec/integration/belongs_to_spec.rb",
-    "spec/integration/dashboard_spec.rb",
-    "spec/integration/index_as_csv_spec.rb",
-    "spec/integration/index_as_table_spec.rb",
-    "spec/integration/layout_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/integration_example_group.rb",
     "spec/support/rails_template.rb",
@@ -306,6 +306,7 @@ Gem::Specification.new do |s|
     "spec/unit/pretty_format_spec.rb",
     "spec/unit/registration_spec.rb",
     "spec/unit/renderer_spec.rb",
+    "spec/unit/resource_controller/collection_spec.rb",
     "spec/unit/resource_controller_spec.rb",
     "spec/unit/resource_spec.rb",
     "spec/unit/routing_spec.rb",
@@ -324,9 +325,11 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<formtastic>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 3.0.pre2"])
       s.add_runtime_dependency(%q<inherited_views>, [">= 0"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.18"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.1.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["= 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_development_dependency(%q<haml>, ["~> 3.1.1"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<meta_search>, [">= 0.9.2"])
@@ -334,9 +337,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<formtastic>, [">= 1.1.0"])
       s.add_dependency(%q<will_paginate>, [">= 3.0.pre2"])
       s.add_dependency(%q<inherited_views>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 3.0.18"])
+      s.add_dependency(%q<sass>, [">= 3.1.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["= 1.5.2"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_dependency(%q<haml>, ["~> 3.1.1"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -345,9 +350,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<formtastic>, [">= 1.1.0"])
     s.add_dependency(%q<will_paginate>, [">= 3.0.pre2"])
     s.add_dependency(%q<inherited_views>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 3.0.18"])
+    s.add_dependency(%q<sass>, [">= 3.1.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["= 1.5.2"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
+    s.add_dependency(%q<haml>, ["~> 3.1.1"])
   end
 end
 

data/cucumber.yml

@@ -1 +1,2 @@
 default: --format 'progress' --require features/support/env.rb --require features/step_definitions features
+wip: --format 'progress' --require features/support/env.rb --require features/step_definitions features --tags @wip:3 --wip features

data/features/comments/commenting.feature

@@ -73,9 +73,13 @@ Feature: Commenting
     Then I should see a flash with "Comment was successfully created"
     And I should be in the resource section for articles
 
+  Scenario: Create an empty comment
+    When I add a comment ""
+    Then I should see a flash with "Comment wasn't saved, text was empty."
+    And I should see "Comments (0)"
+
   Scenario: Viewing all commments for a namespace
     When I add a comment "Hello from Comment"
     When I am on the index page for comments
     Then I should see a table header for "Body"
     And I should see "Hello from Comment"
-

data/features/dashboard.feature

@@ -0,0 +1,26 @@
+Feature: Dashboard
+
+  Background:
+    Given I am logged in
+
+
+  Scenario: With no configuration
+    Given a configuration of:
+      """
+      """
+    When I go to the dashboard
+    Then I should see the default welcome message
+
+  Scenario: Displaying a dashboard widget
+    Given a configuration of:
+      """
+      ActiveAdmin::Dashboards.build do
+        section 'Hello World' do
+          para "Hello world from the content"
+        end
+      end
+      """
+    When I go to the dashboard
+    Then I should not see the default welcome message
+    And I should see a dashboard widget "Hello World"
+    And I should see "Hello world from the content"