activeadmin 0.5.0 → 0.5.1

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -0,0 +1,50 @@
+module ActiveAdmin
+  module ViewHelpers
+    module DownloadFormatLinksHelper
+
+      module ClassMethods
+
+        # A ready only of formats to make available in index/paginated
+        # collection view.
+        # @return [Array]
+        # @see add_format for information on adding custom download link
+        # formats
+        def formats
+          @formats ||= [:csv, :xml, :json]
+          @formats.clone
+        end
+        
+        # Adds a mime type extension to the list of available formats.
+        # You must register the extension prior to adding it to the list
+        # of avilable formats. This should be used by plugins that want 
+        # to add additional formats to the download format links.
+        # @param [Symbol] extension the mime extension to add
+        # @return [Array] A copy of the updated formats array.
+        def add_format extension
+          unless formats.include?(extension)
+            if Mime::Type.lookup_by_extension(extension).nil?
+              raise ArgumentError, "The mime extension you defined: #{extension} is not registered. Please register it via Mime::Type.register before adding it to the available formats."
+            end
+          @formats << extension
+          end
+          formats
+        end
+      end
+
+      # TODO: Refactor to new HTML DSL
+      def build_download_format_links(formats = self.class.formats)
+        links = formats.collect do |format|
+          link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
+        end
+        div :class => "download_links" do
+          text_node [I18n.t('active_admin.download'), links].flatten.join("&nbsp;").html_safe
+        end
+      end
+
+      def self.included base
+        base.extend ClassMethods
+      end
+    end
+  end
+end
+

data/lib/active_admin/view_helpers/fields_for.rb

@@ -28,12 +28,16 @@ module ActiveAdmin
           case v
           when String
             { k => v }
+          when Symbol
+            { k => v.to_s }
           when Hash
             fields_for_params(v, :namespace => k)
           when Array
             v.map do |v|
               { "#{k}[]" => v }
             end
+          when nil
+          	{ k => '' }
           else
             raise "I don't know what to do with #{v.class} params: #{v.inspect}"
           end

data/lib/active_admin/view_helpers/flash_helper.rb

@@ -0,0 +1,13 @@
+module ActiveAdmin
+  module ViewHelpers
+    module FlashHelper
+
+      # Returns all the flash keys to display in any Active Admin view.
+      # This method removes the :timedout key that Devise uses by default
+      def active_admin_flash_messages
+        @active_admin_flash_messages ||= flash.to_hash.except(:timedout)
+      end
+
+    end
+  end
+end

data/lib/active_admin/views/components/paginated_collection.rb

@@ -77,18 +77,9 @@ module ActiveAdmin
         text_node paginate(collection, options.symbolize_keys)
       end
 
-      # TODO: Refactor to new HTML DSL
-      def build_download_format_links(formats = [:csv, :xml, :json])
-        links = formats.collect do |format|
-          link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
-        end
-        div :class => "download_links" do
-          text_node [I18n.t('active_admin.download'), links].flatten.join(" ").html_safe
-        end
-      end
-
       include ::ActiveAdmin::Helpers::Collection
-
+      include ::ActiveAdmin::ViewHelpers::DownloadFormatLinksHelper
+        
       # modified from will_paginate
       def page_entries_info(options = {})
         if options[:entry_name]

data/lib/active_admin/views/components/table_for.rb

@@ -60,25 +60,19 @@ module ActiveAdmin
       end
 
       def build_table_header(col)
-        if sortable? && col.sortable?
-          build_sortable_header_for(col.title, col.sort_key)
-        else
-          th(col.title, :class => (col.data.to_s.downcase.underscore if col.data.is_a?(Symbol)))
-        end
-      end
-
-      def build_sortable_header_for(title, sort_key)
-        classes = Arbre::HTML::ClassList.new(["sortable"])
-        if current_sort[0] == sort_key
-          classes << "sorted-#{current_sort[1]}"
-        end
+        classes = Arbre::HTML::ClassList.new
+        sort_key = sortable? && col.sortable? && col.sort_key
 
-        header_class = title.downcase.underscore
+        classes << 'sortable'                         if sort_key
+        classes << "sorted-#{current_sort[1]}"        if sort_key && current_sort[0] == sort_key
+        classes << col.html_class
 
-        classes << header_class
-
-        th :class => classes do
-          link_to(title, params.merge(:order => "#{sort_key}_#{order_for_sort_key(sort_key)}").except(:page))
+        if sort_key
+          th :class => classes do
+            link_to(col.pretty_title, params.merge(:order => "#{sort_key}_#{order_for_sort_key(sort_key)}").except(:page))
+          end
+        else
+          th(col.pretty_title, :class => classes)
         end
       end
 
@@ -90,7 +84,7 @@ module ActiveAdmin
       end
 
       def build_table_cell(col, item)
-        td(:class => (col.data.to_s.downcase if col.data.is_a?(Symbol))) do
+        td(:class =>  col.html_class) do
           rvalue = call_method_or_proc_on(item, col.data, :exec => false)
           if col.data.is_a?(Symbol)
             rvalue = pretty_format(rvalue)
@@ -128,12 +122,13 @@ module ActiveAdmin
 
       class Column
 
-        attr_accessor :title, :data
+        attr_accessor :title, :data , :html_class
 
         def initialize(*args, &block)
           @options = args.extract_options!
 
-          @title = pretty_title args[0]
+          @title = args[0]
+          @html_class = @options.delete(:class) || @title.to_s.downcase.underscore.gsub(/ +/,'_')
           @data  = args[1] || args[0]
           @data = block if block
           @resource_class = args[2]
@@ -178,17 +173,16 @@ module ActiveAdmin
           end
         end
 
-        private
-
-        def pretty_title(raw)
-          if raw.is_a?(Symbol)
+        def pretty_title
+          if @title.is_a?(Symbol)
+            default_title =  @title.to_s.titleize
             if @options[:i18n] && @options[:i18n].respond_to?(:human_attribute_name)
-              raw = @options[:i18n].human_attribute_name(raw, :default => raw.to_s.titleize)
+              @title = @options[:i18n].human_attribute_name(@title, :default => default_title)
             else
-              raw.to_s.titleize
+              default_title
             end
           else
-            raw
+            @title
           end
         end
       end

data/lib/active_admin/views/footer.rb

@@ -10,7 +10,9 @@ module ActiveAdmin
       private
 
       def powered_by_message
-        para "Powered by #{link_to("Active Admin", "http://www.activeadmin.info")} #{ActiveAdmin::VERSION}".html_safe
+        para t('active_admin.powered_by',
+          :active_admin => link_to("Active Admin", "http://www.activeadmin.info"),
+          :version => ActiveAdmin::VERSION).html_safe
       end
 
     end

data/lib/active_admin/views/index_as_block.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
 
       def build(page_presenter, collection)
         add_class "index"
-        resource_selection_toggle_panel
+        resource_selection_toggle_panel if active_admin_config.batch_actions.any?
         collection.each do |obj|
           instance_exec(obj, &page_presenter.block)
         end

data/lib/active_admin/views/index_as_grid.rb

@@ -37,7 +37,7 @@ module ActiveAdmin
       protected
 
       def build_table
-        resource_selection_toggle_panel
+        resource_selection_toggle_panel if active_admin_config.batch_actions.any?
         table :class => "index_grid" do
           collection.in_groups_of(number_of_columns).each do |group|
             build_row(group)

data/lib/active_admin/views/pages/base.rb

@@ -24,7 +24,7 @@ module ActiveAdmin
           within @head do
             insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_application.site_title)].join(" | ")
             active_admin_application.stylesheets.each do |style|
-              text_node(stylesheet_link_tag(style.path, style.options).html_safe)
+              text_node(stylesheet_link_tag(style.path, style.options.dup).html_safe)
             end
 
             active_admin_application.javascripts.each do |path|
@@ -63,9 +63,9 @@ module ActiveAdmin
         end
 
         def build_flash_messages
-          if flash.keys.any?
+          if active_admin_flash_messages.any?
             div :class => 'flashes' do
-              flash.each do |type, message|
+              active_admin_flash_messages.each do |type, message|
                 div message, :class => "flash flash_#{type}"
               end
             end

data/lib/active_admin/views/pages/index.rb

@@ -55,13 +55,7 @@ module ActiveAdmin
           end
         end
 
-        # TODO: Refactor to new HTML DSL
-        def build_download_format_links(formats = [:csv, :xml, :json])
-          links = formats.collect do |format|
-            link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
-          end
-          text_node [I18n.t('active_admin.download'), links].flatten.join(" ").html_safe
-        end
+        include ::ActiveAdmin::ViewHelpers::DownloadFormatLinksHelper
 
         def build_table_tools
           div :class => "table_tools" do

data/lib/active_admin/views/title_bar.rb

@@ -6,7 +6,6 @@ module ActiveAdmin
         super(:id => "title_bar")
         @title = title
         @action_items = action_items
-
         build_titlebar_left
         build_titlebar_right
       end
@@ -27,8 +26,12 @@ module ActiveAdmin
       end
 
       def build_breadcrumb(separator = "/")
-        links = breadcrumb_links
-        return if links.empty?
+        links = if active_admin_config && active_admin_config.breadcrumb.present?
+          instance_exec(controller, &active_admin_config.breadcrumb)
+        else
+          breadcrumb_links
+        end
+        return unless links.present? && links.is_a?(::Array)
         span :class => "breadcrumb" do
           links.each do |link|
             text_node link

data/lib/generators/active_admin/devise/devise_generator.rb

@@ -42,7 +42,7 @@ module ActiveAdmin
 
         if devise_migration_content["def change"]
           inject_into_file  devise_migration_file,
-                            "def migrate(direction)\n    super\n    # Create a default user\n    AdminUser.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up\n  end\n\n  ", 
+                            "def migrate(direction)\n    super\n    # Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up\n  end\n\n  ", 
                             :before => "def change"
         elsif devise_migration_content[/def (self.)?up/]
           inject_into_file  devise_migration_file,

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -116,12 +116,12 @@ ActiveAdmin.setup do |config|
   # Enable and disable Batch Actions
   #
   config.batch_actions = true
-  
+
 
   # == Controller Filters
   #
   # You can add before, after and around filters to all of your
-  # Active Admin resources from here.
+  # Active Admin resources and pages from here.
   #
   # config.before_filter :do_something_awesome
 
@@ -134,7 +134,7 @@ ActiveAdmin.setup do |config|
   #
   # To load a stylesheet:
   #   config.register_stylesheet 'my_stylesheet.css'
-  
+
   # You can provide an options hash for more control, which is passed along to stylesheet_link_tag():
   #   config.register_stylesheet 'my_print_stylesheet.css', :media => :print
   #
@@ -146,4 +146,7 @@ ActiveAdmin.setup do |config|
   #
   # Set the CSV builder separator (default is ",")
   # config.csv_column_separator = ','
+  #
+  # Set the CSV builder options (default is {})
+  # config.csv_options = {}
 end

data/lib/generators/active_admin/install/templates/admin_user.rb.erb

@@ -15,6 +15,6 @@ ActiveAdmin.register <%= @user_class %> do
       f.input :password               
       f.input :password_confirmation  
     end                               
-    f.buttons                         
+    f.actions                         
   end                                 
 end                                   

data/lib/generators/active_admin/install/templates/dashboard.rb

@@ -5,8 +5,8 @@ ActiveAdmin.register_page "Dashboard" do
   content :title => proc{ I18n.t("active_admin.dashboard") } do
     div :class => "blank_slate_container", :id => "dashboard_default_message" do
       span :class => "blank_slate" do
-        span "Welcome to Active Admin. This is the default dashboard page."
-        small "To add dashboard sections, checkout 'app/admin/dashboards.rb'"
+        span I18n.t("active_admin.dashboard_welcome.welcome")
+        small I18n.t("active_admin.dashboard_welcome.call_to_action")
       end
     end
 

data/lib/generators/active_admin/install/templates/migrations/2_move_admin_notes_to_comments.rb

@@ -10,7 +10,8 @@ class MoveAdminNotesToComments < ActiveRecord::Migration
 
     # Update all the existing comments to the default namespace
     say "Updating any existing comments to the #{ActiveAdmin.application.default_namespace} namespace."
-    execute "UPDATE active_admin_comments SET namespace='#{ActiveAdmin.application.default_namespace}'"
+    comments_table_name = ActiveRecord::Migrator.proper_table_name("active_admin_comments")
+    execute "UPDATE #{comments_table_name} SET namespace='#{ActiveAdmin.application.default_namespace}'"
   end
 
   def self.down

data/spec/integration/memory_spec.rb

@@ -18,7 +18,7 @@ describe "Memory Leak" do
       load_defaults!
       GC.start
 
-      count_instances_of(klass).should == count
+      count_instances_of(klass).should <= count
     end
   end
 

data/spec/support/rails_template.rb

@@ -9,8 +9,12 @@ gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n  database: db
 gsub_file 'config/database.yml', /\z/, "\ncucumber_with_reloading:\n  <<: *test\n  database: db/cucumber.sqlite3"
 
 # Generate some test models
-generate :model, "post title:string body:text published_at:datetime author_id:integer category_id:integer"
+generate :model, "post title:string body:text published_at:datetime author_id:integer category_id:integer starred:boolean"
 inject_into_file 'app/models/post.rb', "  belongs_to :author, :class_name => 'User'\n  belongs_to :category\n  accepts_nested_attributes_for :author\n", :after => "class Post < ActiveRecord::Base\n"
+
+# We'll put this basic delegator in app/models in order to simplify auto-loading.
+copy_file File.expand_path('../templates/post_decorator.rb', __FILE__), "app/models/post_decorator.rb"
+
 # Rails 3.2.3 model generator declare attr_accessible
 inject_into_file 'app/models/post.rb', "  attr_accessible :author\n", :before => "end" if Rails::VERSION::STRING >= '3.2.3'
 generate :model, "user type:string first_name:string last_name:string username:string age:integer"
@@ -22,7 +26,7 @@ generate :model, 'store name:string'
 
 # Generate a model with string ids
 generate :model, "tag name:string"
-gsub_file(Dir['db/migrate/*_create_tags.rb'][0], /\:tags\sdo\s.*/, ":tags, :id => false, :primary_key => :id do |t|\n\t\t\tt.string :id\n" )
+gsub_file(Dir['db/migrate/*_create_tags.rb'][0], /\:tags\sdo\s.*/, ":tags, :id => false, :primary_key => :id do |t|\n\t\t\tt.string :id\n")
 id_model_setup = <<-EOF
   self.primary_key = :id
   before_create :set_id
@@ -71,3 +75,38 @@ route "root :to => 'admin/dashboard#index'"
 rake "db:migrate"
 rake "db:test:prepare"
 run "/usr/bin/env RAILS_ENV=cucumber rake db:migrate"
+
+# Setup parallel_tests
+def setup_parallel_tests_database(after, force_insert_same_content = false)
+  inject_into_file 'config/database.yml', "<%= ENV['TEST_ENV_NUMBER'] %>", :after => after, :force => force_insert_same_content
+end
+
+setup_parallel_tests_database "test.sqlite3"
+setup_parallel_tests_database "cucumber.sqlite3", true
+
+# Note: this is hack!
+# Somehow, calling parallel_tests tasks from Rails generator using Thor does not work ...
+# RAILS_ENV variable never makes it to parallel_tests tasks.
+# We need to call these tasks in the after set up hook in order to creates cucumber DBs + run migrations on test & cucumber DBs
+create_file 'lib/tasks/parallel.rake' do
+  <<'RAKE'
+namespace :parallel do
+  def run_in_parallel(cmd, options)
+    count = "-n #{options[:count]}" if options[:count]
+    executable = 'parallel_test'
+    command = "#{executable} --exec '#{cmd}' #{count} #{'--non-parallel' if options[:non_parallel]}"
+    abort unless system(command)
+  end
+
+  desc "create cucumber databases via db:create --> parallel:create_cucumber_db[num_cpus]"
+  task :create_cucumber_db, :count do |t, args|
+    run_in_parallel("rake db:create RAILS_ENV=cucumber", args)
+  end
+
+  desc "load dumped schema for cucumber databases"
+  task :load_schema_cucumber_db, :count do |t,args|
+    run_in_parallel("rake db:schema:load RAILS_ENV=cucumber", args)
+  end
+end
+RAKE
+end

data/spec/support/rails_template_with_data.rb

@@ -51,7 +51,8 @@ append_file "db/seeds.rb", <<-EOF
                 :body => "Blog post \#{i} is written by \#{user.username} about \#{cat.name}",
                 :category => cat,
                 :published_at => published_at,
-                :author => user
+                :author => user,
+                :starred => true
   end
 EOF
 

data/spec/support/templates/en.yml

@@ -4,3 +4,5 @@
       store:
         one: Bookstore
         other: Bookstores
+  active_admin:
+    download: "Download this:"

data/spec/support/templates/post_decorator.rb

@@ -0,0 +1,53 @@
+# Minimal example of a decorator
+require_dependency 'post'
+
+# DelegateClass(Post) does not delegate attribute methods
+# in some environments:
+# http://travis-ci.org/#!/gregbell/active_admin/jobs/2021466
+#
+class PostDecorator < SimpleDelegator
+  delegate :id, :to => :__getobj__
+
+  def self.decorate(collection_or_object)
+    if collection_or_object.respond_to?(:to_ary)
+      DecoratedEnumerableProxy.new(collection_or_object)
+    else
+      new(collection_or_object)
+    end
+  end
+
+  def self.model_name
+    ActiveModel::Name.new Post
+  end
+
+  def decorator_method
+    'A method only available on the decorator'
+  end
+
+  # Minimal example of decorating a collection.
+  # A full example can be found in the draper project:
+  # https://github.com/jcasimir/draper/blob/master/lib/draper/decorated_enumerable_proxy.rb
+  class DecoratedEnumerableProxy < DelegateClass(ActiveRecord::Relation)
+    include Enumerable
+
+    delegate :as_json, :collect, :map, :each, :[], :all?, :include?, :first, :last, :shift, :to => :decorated_collection
+
+    def klass
+      PostDecorator
+    end
+
+    def wrapped_collection
+      __getobj__
+    end
+
+    def decorated_collection
+      @decorated_collection ||= wrapped_collection.collect { |member| klass.decorate(member) }
+    end
+    alias_method :to_ary, :decorated_collection
+
+    def each(&blk)
+      to_ary.each(&blk)
+    end
+  end
+end
+