activeadmin 0.5.0 → 0.5.1

data/.travis.yml

@@ -1,4 +1,4 @@
-script: bundle exec rake
+script: bundle exec rake test
 rvm:
   - ree
   - 1.9.2

data/CHANGELOG.md

@@ -1,11 +1,73 @@
 ## Master (unreleased)
 
+## 0.5.1
+
+### Enhancements
+
+* Developer can pass options for CSV generation. [#1626][] by [@rheaton][]
+```ruby
+    ActiveAdmin.register Post do
+      csv options: {force_quotes: true} do
+        column :title
+      end
+    end
+```
+
+* Breadcrumb links can be customized by [@simonoff][]
+```ruby
+    ActiveAdmin.register Post do
+      breadcrumb do
+        [
+          link_to("My account", account_path(current_user))
+        ]
+      end
+    end
+```
+
+* Support proc for parent options on menus [#1664][] by [@shell][]
+```ruby
+    ActiveAdmin.register Post do
+      menu parent: proc { I18n.t("admin") }
+    end
+```
+
+* Support automatic use of Decorators. [#1117][] by [@amiel][] and [#1647][] by [@dapi][]
+```ruby
+    ActiveAdmin.register Post do
+      decorate_with PostDecorator
+    end
+```
+
+* Allow blacklisting of filters with 'remove_filter' [#1609][] by [@tracedwax][]
+```ruby
+    ActiveAdmin.register Post do
+      remove_filter :author
+    end
+```
+
+* ActiveAdmin i18n translations can be overwritten in your rails
+application locales. [#1775][] by [@caifara][]
+* Add "Powered by" to translations. [#1783][] by [@sunny][]
+* Forms accept two level deeps has_many. [#1699][] by [@kerberoS][] and tests in [#1782][] by [@ptn][]
+* Extract download_format_links into helper [#1752][] by [@randym][]
+* Add support for semantic errors [#905][] by [@robdiciuccio][]
+* Add support for boolean inputs [#1668][] by [@orendon][]
+* Support subURI on logout [#1681][] by [@yawn][]
+
+### Bug fix
+* Apply before_filter to BaseController [#1683][] by [@yorch][]
+* ... and much more.
+
+### Contributions
+
+156 commits (49 Pull Requests) by 51 contributors.
+
 ## 0.5.0
 
 ### Enhancements
 
 * Created new view components (Footer, TitleBar, Header, UtilityNav) to more
-  easily customize the views in Active Admin and per namespace. (@gregbell)
+  easily customize the views in Active Admin and per namespace. ([@gregbell][])
 * All CSS is now encapsulated under the `body.active_admin` class. This may
   change the precedence of styles that you created to override or use in
   other areas of your application.
@@ -566,6 +628,7 @@ of the highlights. 250 commits. Enough said.
 [#865]: https://github.com/gregbell/active_admin/issues/865
 [#869]: https://github.com/gregbell/active_admin/issues/869
 [#897]: https://github.com/gregbell/active_admin/issues/897
+[#905]: https://github.com/gregbell/active_admin/issues/905
 [#931]: https://github.com/gregbell/active_admin/issues/931
 [#960]: https://github.com/gregbell/active_admin/issues/960
 [#971]: https://github.com/gregbell/active_admin/issues/971
@@ -580,12 +643,28 @@ of the highlights. 250 commits. Enough said.
 [#1033]: https://github.com/gregbell/active_admin/issues/1033
 [#1041]: https://github.com/gregbell/active_admin/issues/1041
 [#1063]: https://github.com/gregbell/active_admin/issues/1063
+[#1117]: https://github.com/gregbell/active_admin/issues/1117
+[#1609]: https://github.com/gregbell/active_admin/issues/1609
+[#1626]: https://github.com/gregbell/active_admin/issues/1626
+[#1647]: https://github.com/gregbell/active_admin/issues/1647
+[#1664]: https://github.com/gregbell/active_admin/issues/1664
+[#1668]: https://github.com/gregbell/active_admin/issues/1668
+[#1681]: https://github.com/gregbell/active_admin/issues/1681
+[#1683]: https://github.com/gregbell/active_admin/issues/1683
+[#1699]: https://github.com/gregbell/active_admin/issues/1699
+[#1752]: https://github.com/gregbell/active_admin/issues/1752
+[#1775]: https://github.com/gregbell/active_admin/issues/1775
+[#1782]: https://github.com/gregbell/active_admin/issues/1782
+[#1783]: https://github.com/gregbell/active_admin/issues/1783
 [@BoboFraggins]: https://github.com/BoboFraggins
 [@DMajrekar]: https://github.com/DMajrekar
 [@MoritzMoritz]: https://github.com/MoritzMoritz
 [@ZequeZ]: https://github.com/ZequeZ
+[@amiel]: https://github.com/amiel
 [@bobbytables]: https://github.com/bobbytables
+[@caifara]: https://github.com/caifara
 [@comboy]: https://github.com/comboy
+[@dapi]: https://github.com/dapi
 [@dhiemstra]: https://github.com/dhiemstra
 [@doug316]: https://github.com/doug316
 [@ebeigarts]: https://github.com/ebeigarts
@@ -600,6 +679,7 @@ of the highlights. 250 commits. Enough said.
 [@jancel]: https://github.com/jancel
 [@jbarket]: https://github.com/jbarket
 [@jschwindt]: https://github.com/jschwindt
+[@kerberoS]: https://github.com/kerberoS
 [@knoopx]: https://github.com/knoopx
 [@krug]: https://github.com/krug
 [@latortuga]: https://github.com/latortuga
@@ -607,14 +687,25 @@ of the highlights. 250 commits. Enough said.
 [@mattvague]: https://github.com/mattvague
 [@mperham]: https://github.com/mperham
 [@mwindwer]: https://github.com/mwindwer
+[@orendon]: https://github.com/orendon
 [@page_title]: https://github.com/page_title
 [@pcreux]: https://github.com/pcreux
 [@per_page]: https://github.com/per_page
+[@ptn]: https://github.com/ptn
+[@randym]: https://github.com/randym
+[@rheaton]: https://github.com/rheaton
+[@robdiciuccio]: https://github.com/robdiciuccio
 [@rolfb]: https://github.com/rolfb
 [@samvincent]: https://github.com/samvincent
 [@sftsang]: https://github.com/sftsang
 [@shayfrendt]: https://github.com/shayfrendt
+[@shell]: https://github.com/shell
+[@simonoff]: https://github.com/simonoff
+[@sunny]: https://github.com/sunny
+[@tracedwax]: https://github.com/tracedwax
 [@tricknotes]: https://github.com/tricknotes
 [@utkarshkukreti]: https://github.com/utkarshkukreti
 [@vairix]: https://github.com/vairix
 [@watson]: https://github.com/watson
+[@yawn]: https://github.com/yawn
+[@yorch]: https://github.com/yorch

data/CONTRIBUTING.md

@@ -3,10 +3,10 @@
 This is a guide to contributing to Active Admin. It should walk you through the
 major steps to contributing code to the project.
 
-### 1. Create an Issue on Github
+### 1. Create an Issue on GitHub
 
 The first step to contributing to Active Admin is creating a ticket in our
-[ticketing system on Github](https://github.com/gregbell/active_admin/issues).
+[ticketing system on GitHub](https://github.com/gregbell/active_admin/issues).
 The community has been hard at work already, so please take a second to search
 for the issue or feature before creating a new one.
 
@@ -107,5 +107,5 @@ up to date with Active Admin's master branch. If there were any changes, you
 should rebase your feature branch and make sure that it will merge correctly. If
 there are any merge conflicts, your pull request will not be merged in.
 
-Now push your changes up to your feature branch on github and make a pull request!
+Now push your changes up to your feature branch on GitHub and make a pull request!
 We will pull your changes, run the test suite, review the code and merge it in.

data/Gemfile

@@ -24,22 +24,23 @@ end
 group :development, :test do
   gem 'sqlite3'
 
-  gem 'rake',           '~> 0.9.2.2', :require => false
-  gem 'haml',           '~> 3.1.1', :require => false
+  gem 'rake',           '~> 10.0.2', :require => false
+  gem 'haml',           '~> 3.1.7', :require => false
   gem 'yard'
   gem 'rdiscount' # For yard
   gem "sprockets"
   gem 'rails-i18n' # Gives us default i18n for many languages
+  gem 'parallel_tests'
 end
 
 group :test do
   gem 'rspec-rails',    '~> 2.9.0'
-  gem 'cucumber-rails', '1.2.1', :require => false
+  gem 'cucumber-rails', '1.3.0', :require => false
   gem 'capybara',       '1.1.2'
   gem 'database_cleaner'
-  gem 'shoulda-matchers', '1.0.0'
+  gem 'shoulda-matchers'
   gem 'launchy'
-  gem 'jslint_on_rails',    '~> 1.0.6'
+  gem 'jslint_on_rails',    '~> 1.1.1'
   gem 'guard-rspec'
   gem "guard-coffeescript"
   gem 'jasmine'

data/README.rdoc

@@ -4,7 +4,7 @@ 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.
 
-{<img src="https://secure.travis-ci.org/gregbell/active_admin.png?branch=master" />}[http://travis-ci.org/gregbell/active_admin] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/gregbell/active_admin]
+{<img src="https://secure.travis-ci.org/gregbell/active_admin.png?branch=master" />}[http://travis-ci.org/gregbell/active_admin] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/gregbell/active_admin] {<img src="https://gemnasium.com/gregbell/active_admin.png" />}[https://gemnasium.com/gregbell/active_admin]
 
 == Documentation & Support
 
@@ -78,6 +78,11 @@ Refresh your web browser to see the interface.
 When upgrading to a new version of ActiveAdmin you may need to run
   $> rails generate active_admin:assets
 
+If you get:
+  uninitialized constant Admin::DashboardController
+when trying to view the dashboard (at +/admin+), ensure +app/admin/dashboards.rb+ looks like the current {default}[https://raw.github.com/gregbell/active_admin/master/lib/generators/active_admin/install/templates/dashboard.rb].
+
+
 == Next Steps
 
 The best place to get documentation is at http://activeadmin.info/documentation.html.

data/Rakefile

@@ -14,8 +14,8 @@ require File.expand_path('../spec/support/detect_rails_version', __FILE__)
 # Import all our rake tasks
 FileList['tasks/**/*.rake'].each { |task| import task }
 
-# Run the specs & cukes
-task :default => :test
+# Run the specs & cukes using parallel_tests
+task :default => :parallel_tests
 
 begin
   require 'jasmine'

data/app/assets/stylesheets/active_admin/_forms.css.scss

@@ -107,7 +107,7 @@ form {
     }
 
     /* Date and Time Fields */
-    &.date, &.time, &.datetime {
+    &.date, &.time, &.datetime, &.date_select {
       fieldset ol li {
         float:left; width:auto; margin:0 0.5em 0 0; 
         label { display: none; }
@@ -145,7 +145,6 @@ form {
 
     /* Errors */
     p.inline-errors { 
-      text-transform:capitalize;
       color: $error-color;
       font-weight: bold;
       margin:0.3em 0 0 20%; 
@@ -164,6 +163,18 @@ form {
     }
   }
 
+  /* semantic_errors */
+  ul.errors { 
+    background: lighten($error-color, 60%);
+    @include rounded(4px);
+    color: $error-color;
+    font-weight: bold;
+    margin-bottom: 10px;
+    padding: 10px;
+    list-style:square; 
+    li { margin-left:15px; padding:0; border:none; display:list-item; }
+  }
+
   /* Buttons */
   
   input[type=submit] {

data/app/assets/stylesheets/active_admin/components/_comments.css.scss

@@ -10,6 +10,7 @@
     .active_admin_comment_meta {
       width: 130px;
       float: left;
+      overflow: hidden;
       font-size: 0.9em;
       color: lighten($primary-color, 10%);
       .active_admin_comment_author {

data/app/assets/stylesheets/active_admin/components/_table_tools.css.scss

@@ -1,7 +1,8 @@
 .table_tools {
   display: block;
-  margin-bottom: 14px;
+  margin-bottom: 16px;
   width: 100%;
+  height: 20px;
 }
 
 .table_tools {

data/app/views/active_admin/resource/index.csv.erb

@@ -7,7 +7,10 @@
               CSV
             end
 
-  csv_output = csv_lib.generate(:col_sep => active_admin_config.csv_builder.column_separator || active_admin_application.csv_column_separator) do |csv|
+  col_sep = active_admin_config.csv_builder.column_separator || active_admin_application.csv_column_separator
+  options = (active_admin_config.csv_builder.options || active_admin_application.csv_options).merge(:col_sep => col_sep)
+
+  csv_output = csv_lib.generate(options) do |csv|
     columns = active_admin_config.csv_builder.columns
     csv << columns.map(&:name)
     collection.each do |resource|

data/app/views/layouts/active_admin_logged_out.html.erb

@@ -6,7 +6,7 @@
   <title><%= [@page_title, render_or_call_method_or_proc_on(self, ActiveAdmin.application.site_title)].compact.join(" | ") %></title>
 
   <% ActiveAdmin.application.stylesheets.each do |style| %>
-    <%= stylesheet_link_tag style.path, style.options %>
+    <%= stylesheet_link_tag style.path, style.options.dup %>
   <% end %>
   <% ActiveAdmin.application.javascripts.each do |path| %>
     <%= javascript_include_tag path %>
@@ -18,8 +18,8 @@
 <div id="wrapper">
 
   <div id="content_wrapper">
-    <% if flash.keys.any? %>
-      <% flash.each do |type, message| %>
+    <% if active_admin_flash_messages.any? %>
+      <% active_admin_flash_messages.each do |type, message| %>
         <%= content_tag :div, message, :class => "flash flash_#{type}" %>
       <% end %>
     <% end %>

data/docs/0-installation.md

@@ -6,13 +6,6 @@ your Gemfile:
     # Gemfile
     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'
-
 ## Running the Generator
 
 Once you have added the gem to your Gemfile (and any other dependencies), you

data/docs/1-general-configuration.md

@@ -77,3 +77,40 @@ individually.
 
 Each setting available in the Active Admin setup block is configurable on a per
 namespace basis.
+
+## Load paths
+
+By default Active Admin files go under '/app/admin'. You can change this
+directory in the initializer file:
+
+    ActiveAdmin.setup do |config|
+      config.load_paths = [File.join(Rails.root, "app", "ui")]
+    end
+
+## Comments
+
+By default Active Admin includes comments on resources. Sometimes, this is
+undesired. To disable comments for the entire application:
+
+    ActiveAdmin.setup do |config|
+
+      config.allow_comments = false
+
+    end
+
+If you would like to enable / disable comments for just a namespace, do the
+following:
+
+    ActiveAdmin.setup do |config|
+
+      config.namespace :admin do |admin|
+        admin.allow_comments = false
+      end
+
+    end
+
+You can also disable comments for a specific resource:
+
+    ActiveAdmin.register Post do
+      config.comments = false
+    end

data/docs/11-decorators.md

@@ -0,0 +1,48 @@
+# Decorators
+
+Active Admin supports the use of decorators for resources. Resources will be
+be decorated for the index and show blocks. The [draper](http://github.com/jcasimir/draper)
+gem is recommended but not required (more on requirements below).
+
+## Configuration
+
+    ActiveAdmin.register Post do
+      decorate_with PostDecorator
+    end
+
+## Example Usage
+
+This example uses [draper](http://github.com/jcasimir/draper).
+
+    # Gemfile
+    gem 'draper'
+
+Assuming a post and a post decorator
+
+    class Post < ActiveRecord::Base; end
+
+    class PostDecorator < ApplicationDecorator
+      decorates :post
+
+      def image
+        h.image_tag model.image_url
+      end
+    end
+
+Then the following is possible
+
+    ActiveAdmin.register Post do
+      decorate_with PostDecorator
+
+      index do
+        column(:title)
+        column(:image)
+      end
+
+      show do
+        attributes_table do
+          row(:title)
+          row(:image)
+        end
+      end
+    end

data/docs/12-arbre-components.md

@@ -0,0 +1,145 @@
+# Arbre Components
+
+Arbre allows the creation of shareable and extendable HTML components and is
+used throughout Active Admin to create view components.
+
+## Text Node
+
+Sometimes it makes sense to insert something into a registered resource like a
+non-breaking space or some text. The text_node method can be used to insert
+these elements into the page inside of other Arbre components or resource
+controller functions.
+
+	ActiveAdmin.register Post do
+		show do
+			panel "Post Details" do
+				row("") { post.id }
+				row("Tags") do
+					text_node link_to "#{tag}", 
+						admin_post_path( q: { tagged_with_contains: tag } )
+					text_node "&nbsp".html_safe
+				end
+			end
+		end
+	end
+
+## Common Components
+
+### Panel Component
+
+A panel is a component that takes up all available horizontal space and takes a
+title and a hash of attributes as arguments. If a sidebar is present, a panel
+will take up the remaining space.
+
+The following code will create two stacked panels:
+
+    show do
+
+      panel "Post Details" do
+        render partial: "show_details", locals: {post: post}
+      end
+
+      panel "Post Tags" do
+        render partial: "show_enhancements", locals: {post: post}
+      end
+
+    end
+
+### Columns Component
+
+The Columns component allows you draw content into scalable columns. All you
+need to do is define the number of columns and the component will take care of
+the rest.
+
+#### Simple Columns
+	
+To create simple columnns, use the #columns method. Within the block, call the
+#column method to create a new column.
+
+	columns do
+	  
+	  column do
+		span "Column #1"
+	  end
+	  
+	  column do
+		span "Column #2"
+	  end
+
+	end
+
+#### Multiple Span Columns
+
+To create columns that have multiple spans, pass the :span option to the column
+method.
+
+	columns do
+      column :span => 2 do
+        span "Column # 1
+      end
+      column do
+        span "Column # 2
+      end
+    end
+
+By default, each column spans 1 column. The above layout would have 2 columns,
+the first being twice as large as the second.
+
+#### Max and Mix Column Sizes
+
+Active Admin uses a fluid width layout, causing column width to be defined
+using percentages. Due to using this style of layout, columns can shrink or
+expand past points that may not be desirable. To overcome this issue,
+columns provide :max_width and :min_width options.
+
+    columns do
+      column :max_width => "200px", :min_width => "100px" do
+        span "Column # 1
+      end
+      column do
+        span "Column # 2
+      end
+    end
+
+In the above example, the first column will not grow larger than 200px and will
+not shrink less than 100px.
+
+### Table For Component
+ 
+Table For provides the ability to create tables like those present in
+#index_as_table. table_for takes a collection and a hash of options and then
+uses #column to build the fields to show with the table.
+
+	table_for order.payments do
+	  column "Payment Type" { |payment| payment.payment_type.titleize }
+	  column "Received On", :created_at
+	  column "Payment Details & Notes", :payment_details
+	  column "Amount" { |payment| payment.amount_in_dollars }
+	end
+
+the #column method can take a title as its first argument and data
+(:your_method) as its second (or first if no title provided). Column also
+takes a block.
+
+### Status tag
+
+Status tags provide convenient syntactic sugar for styling items that have
+status. A common example of where the status tag could be useful is for orders
+that are complete or in progress. status_tag takes a status, like
+"In Progress", a type, which defaults to nil, and a hash of options. The
+status_tag will generate html markup that Active Admin css uses in styling.
+
+    status_tag('In Progress')
+    # => <span class='status_tag in_progress'>In Progress</span>
+  
+    status_tag('active', :ok)
+    # => <span class='status_tag active ok'>Active</span>
+  
+    status_tag (
+      'active', 
+      :ok, 
+      :class => 'important', 
+      :id => 'status_123', 
+      :label => 'on'
+    )
+    # => <span class='status_tag active ok important' id='status_123'>on</span>