activeadmin 1.0.0 → 1.1.0

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

@@ -29,6 +29,10 @@ module ActiveAdmin
               text_node stylesheet_link_tag(style, options).html_safe
             end
 
+            active_admin_namespace.meta_tags.each do |name, content|
+              text_node(tag(:meta, name: name, content: content))
+            end
+
             active_admin_application.javascripts.each do |path|
               text_node(javascript_include_tag(path))
             end
@@ -37,10 +41,6 @@ module ActiveAdmin
               text_node(favicon_link_tag(active_admin_namespace.favicon))
             end
 
-            active_admin_namespace.meta_tags.each do |name, content|
-              text_node(tag(:meta, name: name, content: content))
-            end
-
             text_node csrf_meta_tag
           end
         end

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

@@ -25,7 +25,12 @@ module ActiveAdmin
         end
 
         def attributes_table(*args, &block)
-          table_title = ActiveAdmin::Localizers.resource(active_admin_config).t(:details)
+          opts = args.extract_options!
+          table_title = if opts.has_key?(:title)
+                          render_or_call_method_or_proc_on(resource, opts[:title])
+                        else
+                          ActiveAdmin::Localizers.resource(active_admin_config).t(:details)
+                        end
           panel(table_title) do
             attributes_table_for resource, *args, &block
           end

data/lib/active_admin/views/title_bar.rb

@@ -29,10 +29,10 @@ module ActiveAdmin
         breadcrumb_config = active_admin_config && active_admin_config.breadcrumb
 
         links = if breadcrumb_config.is_a?(Proc)
-          instance_exec(controller, &active_admin_config.breadcrumb)
-        elsif breadcrumb_config.present?
-          breadcrumb_links
-        end
+                  instance_exec(controller, &active_admin_config.breadcrumb)
+                elsif breadcrumb_config.present?
+                  breadcrumb_links
+                end
         return unless links.present? && links.is_a?(::Array)
         span class: "breadcrumb" do
           links.each do |link|

data/lib/bug_report_templates/{rails_5_master.rb → active_admin_master.rb}

@@ -8,22 +8,24 @@ end
 gemfile(true) do
   source 'https://rubygems.org'
 
-  gem 'rails', require: false
-  gem 'sqlite3', platform: :mri
+  # Use local changes or ActiveAdmin master.
+  if ENV['ACTIVE_ADMIN_PATH']
+    gem 'activeadmin', path: ENV['ACTIVE_ADMIN_PATH'], require: false
+  else
+    gem 'activeadmin', github: 'activeadmin/activeadmin', require: false
+  end
 
+  # Change Rails version if necessary.
+  gem 'rails', '~> 5.1.0'
+
+  gem 'sass-rails'
+  gem 'sqlite3', platform: :mri
   gem 'activerecord-jdbcsqlite3-adapter',
       git: 'https://github.com/jruby/activerecord-jdbc-adapter',
       branch: 'rails-5',
       platform: :jruby
-
-  if ENV['ACTIVE_ADMIN_PATH']
-    gem 'activeadmin', path: ENV['ACTIVE_ADMIN_PATH'], require: false
-  else
-    gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin', require: false
-  end
 end
 
-# prepare active_record database
 require 'active_record'
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
@@ -33,81 +35,74 @@ ActiveRecord::Schema.define do
   create_table :active_admin_comments, force: true do |_t|
   end
 
-  # Add your schema here
-  create_table :your_models, force: true do |t|
-    t.string :name
+  create_table :users, force: true do |t|
+    t.string :full_name
   end
 end
 
-# prepare Rails app
 require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'active_admin'
 
-class ApplicationController < ActionController::Base
-end
-
 class TestApp < Rails::Application
-  config.root = File.dirname(__FILE__)
-  config.logger = Logger.new(STDOUT)
-
+  config.root = __dir__
+  config.session_store :cookie_store, key: "cookie_store_key"
   secrets.secret_token = 'secret_token'
   secrets.secret_key_base = 'secret_key_base'
 
   config.eager_load = false
+  config.logger = Logger.new($stdout)
+  Rails.logger  = config.logger
 end
 
-# create models
-class YourModel < ActiveRecord::Base
+class ApplicationController < ActionController::Base
+  include Rails.application.routes.url_helpers
+end
+
+class User < ActiveRecord::Base
 end
 
-# configure active_admin
 ActiveAdmin.setup do |config|
-  # Authentication disabled by default. Override if necessary
+  # Authentication disabled by default. Override if necessary.
   config.authentication_method = false
   config.current_user_method = false
 end
 
-# initialize app
 Rails.application.initialize!
 
-# register pages and resources
 ActiveAdmin.register_page 'Dashboard' do
   menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
-
   content do
     'Test Me'
   end
 end
 
-ActiveAdmin.register YourModel do
+ActiveAdmin.register User do
 end
 
-# draw active_admin routes
 Rails.application.routes.draw do
   ActiveAdmin.routes(self)
 end
 
-# prepare tests
 require 'minitest/autorun'
 require 'rack/test'
+require 'rails/test_help'
 
 # Replace this with the code necessary to make your test fail.
-class BugTest < Minitest::Test
-  include Rack::Test::Methods
+class BugTest < ActionDispatch::IntegrationTest
 
   def test_admin_root_success?
-    get '/admin'
-    assert last_response.ok?
-    assert_match 'Test Me', last_response.body # has content
-    assert_match 'Your Models', last_response.body # has 'Your Models' in menu
+    get admin_root_url
+    assert_response :success
+    assert_match 'Test Me', response.body # has content
+    assert_match 'Users', response.body # has 'Your Models' in menu
   end
 
-  def test_admin_your_models
-    YourModel.create! name: 'John Doe'
-    get '/admin/your_models'
-    assert last_response.ok?
-    assert_match 'John Doe', last_response.body # has created row
+  def test_admin_users
+    User.create! full_name: 'John Doe'
+    get admin_users_url
+    assert_response :success
+    assert_match 'John Doe', response.body # has created row
   end
 
   private

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

@@ -59,7 +59,7 @@ module ActiveAdmin
         seeds_file = seeds_paths.existent.first
         return if seeds_file.nil? || !options[:default_user]
 
-        create_user_code = "#{class_name}.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password')"
+        create_user_code = "#{class_name}.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password') if Rails.env.development?"
 
         append_to_file seeds_file, create_user_code
       end

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

@@ -17,7 +17,7 @@ ActiveAdmin.register <%= @user_class %> do
   filter :created_at
 
   form do |f|
-    f.inputs "Admin Details" do
+    f.inputs do
       f.input :email
       f.input :password
       f.input :password_confirmation

data/spec/bug_report_templates_spec.rb

@@ -15,13 +15,12 @@ RSpec.describe 'bug_report_templates' do
   let(:active_admin_root) { File.expand_path('../..', __FILE__) }
   let(:chdir_path) { File.join(active_admin_root, 'lib', 'bug_report_templates') }
 
-  context 'when runs rails_5_master.rb' do
-    let(:template_path) { 'rails_5_master.rb' }
+  context 'when runs active_admin_master.rb' do
+    let(:template_path) { 'active_admin_master.rb' }
 
     it 'passes' do
       expect(subject).to be_truthy
     end
   end
 
-
 end

data/spec/rails_helper.rb

@@ -57,6 +57,3 @@ ActiveSupport::Deprecation.behavior = :raise
 # improve the performance of the specs suite by not logging anything
 # see http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
 Rails.logger.level = Logger::FATAL
-
-# Make input type=hidden visible
-Capybara.ignore_hidden_elements = false

data/spec/spec_helper.rb

@@ -1,12 +1 @@
-require 'simplecov'
-
-SimpleCov.start do
-  add_filter 'spec/'
-  add_filter 'features/'
-  add_filter 'bundle/' # for Travis
-end
-
-if ENV['CI'] == 'true'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end
+require 'simplecov' if ENV["COVERAGE"] == "true"

data/spec/support/active_admin_integration_spec_helper.rb

@@ -62,7 +62,7 @@ module ActiveAdminIntegrationSpecHelper
     # If no translations have been loaded, any later calls to `I18n.t` will
     # cause the full translation hash to be loaded, possibly overwritting what
     # we've loaded via `store_translations`. We use this hack to prevent that.
-    # @todo Might not be necessary anymore once
+    # TODO: Might not be necessary anymore once
     # https://github.com/svenfuchs/i18n/pull/353 lands.
     I18n.backend.send(:init_translations)
     I18n.backend.store_translations I18n.locale, translation

data/spec/support/rails_template.rb

@@ -14,7 +14,7 @@ create_file 'app/models/post.rb', <<-RUBY.strip_heredoc, force: true
     belongs_to :author, class_name: 'User'
     has_many :taggings
     accepts_nested_attributes_for :author
-    accepts_nested_attributes_for :taggings
+    accepts_nested_attributes_for :taggings, allow_destroy: true
 
     ransacker :custom_title_searcher do |parent|
       parent.table[:title]
@@ -28,9 +28,6 @@ create_file 'app/models/post.rb', <<-RUBY.strip_heredoc, force: true
       # nothing to see here
     end
 
-    if defined? ProtectedAttributes
-      attr_accessible :id, :title, :body, :starred, :author, :position, :published_date, :author_id, :custom_category_id, :category
-    end
   end
 RUBY
 copy_file File.expand_path('../templates/post_decorator.rb', __FILE__), 'app/models/post_decorator.rb'
@@ -43,11 +40,8 @@ create_file 'app/models/blog/post.rb', <<-RUBY.strip_heredoc, force: true
     belongs_to :author, class_name: 'User'
     has_many :taggings
     accepts_nested_attributes_for :author
-    accepts_nested_attributes_for :taggings
+    accepts_nested_attributes_for :taggings, allow_destroy: true
 
-    if defined? ProtectedAttributes
-      attr_accessible :title, :body, :starred, :author, :position, :published_date, :author_id, :custom_category_id, :category
-    end
   end
 RUBY
 
@@ -64,10 +58,6 @@ create_file 'app/models/user.rb', <<-RUBY.strip_heredoc, force: true
       parent.table[:age]
     end
 
-    if defined? ProtectedAttributes
-      attr_accessible :first_name, :last_name, :username,  :age
-    end
-
     def display_name
       "\#{first_name} \#{last_name}"
     end
@@ -77,10 +67,6 @@ RUBY
 create_file 'app/models/profile.rb', <<-RUBY.strip_heredoc, force: true
   class Profile < ActiveRecord::Base
     belongs_to :user
-
-    if defined? ProtectedAttributes
-      attr_accessible :bio
-    end
   end
 RUBY
 
@@ -92,42 +78,24 @@ create_file 'app/models/category.rb', <<-RUBY.strip_heredoc, force: true
     has_many :posts, foreign_key: :custom_category_id
     has_many :authors, through: :posts
     accepts_nested_attributes_for :posts
-
-    if defined? ProtectedAttributes
-      attr_accessible :name, :description
-    end
   end
 RUBY
 
 generate :model, 'store name:string'
 
-# Generate a model with string ids
 generate :model, 'tag name:string'
-gsub_file Dir['db/migrate/*_create_tags.rb'].first, /\:tags do .*/, <<-RUBY.strip_heredoc
-  :tags, id: false, primary_key: :id do |t|
-    t.string :id
-RUBY
 create_file 'app/models/tag.rb', <<-RUBY.strip_heredoc, force: true
   class Tag < ActiveRecord::Base
-    self.primary_key = :id
-    before_create :set_id
-
-    private
-    def set_id
-      self.id = SecureRandom.uuid
-    end
-
-    if defined? ProtectedAttributes
-      attr_accessible :name
-    end
   end
 RUBY
 
-generate :model, 'tagging post_id:integer tag_id:integer'
+generate :model, 'tagging post_id:integer tag_id:integer position:integer'
 create_file 'app/models/tagging.rb', <<-RUBY.strip_heredoc, force: true
   class Tagging < ActiveRecord::Base
     belongs_to :post
     belongs_to :tag
+
+    delegate :name, to: :tag, prefix: true
   end
 RUBY
 

data/spec/support/rails_template_with_data.rb

@@ -1,22 +1,145 @@
 apply File.expand_path("../rails_template.rb", __FILE__)
 
-%w{Post User Category}.each do |type|
+inject_into_file 'config/initializers/active_admin.rb', <<-RUBY, after: "ActiveAdmin.setup do |config|\n"
+
+  config.comments_menu = { parent: 'Administrative' }
+RUBY
+
+inject_into_file 'app/admin/admin_user.rb', <<-RUBY, after: "ActiveAdmin.register AdminUser do\n"
+
+  menu parent: "Administrative", priority: 1
+RUBY
+
+generate :'active_admin:page', 'KitchenSink'
+
+gsub_file 'app/admin/kitchen_sink.rb', /^ *content.*?end/m, <<-RUBY
+
+  sidebar "Sample Sidebar" do
+    para "Sidebars can also be used on custom pages."
+    para do
+      a "Active Admin", href: "https://github.com/activeadmin/activeadmin"
+      text_node "is a Ruby on Rails framework for"
+      em "creating elegant backends"
+      text_node "for"
+      strong "website administration."
+    end
+    para do
+      abbr "HTML", title: "HyperText Markup Language"
+      text_node "is the most basic building block of the Web."
+    end
+  end
+
+  content do
+    columns do
+      column do
+        panel "Panel title" do
+          h1 "This is an h1"
+          h2 "This is an h2"
+          h3 "This is an h3"
+        end
+      end
+      column do
+        table_for User.all do
+          column :id
+          column :display_name
+          column :username
+          column :age
+          column :updated_at
+        end
+      end
+    end
+
+    tabs do
+      tab :first do
+        ul do
+          li "List item"
+          li "Another list item"
+          li "Last item"
+        end
+        ol do
+          li "First list item"
+          li "Second list item"
+          li "Third list item"
+        end
+      end
+      tab :second do
+        para "A popular quote."
+        blockquote do
+          text_node "&ldqou;Be yourself; everyone else is already taken.&rdqou;".html_safe
+          cite "― Oscar Wilde"
+        end
+      end
+      tab :third do
+        para "Third tab content."
+      end
+    end
+  end
+RUBY
+
+%w{Post User Category Tag}.each do |type|
   generate :'active_admin:resource', type
 end
 
 inject_into_file 'app/admin/category.rb', <<-RUBY, after: "ActiveAdmin.register Category do\n"
 
+  config.create_another = true
+
   permit_params [:name, :description]
 RUBY
 
 inject_into_file 'app/admin/user.rb', <<-RUBY, after: "ActiveAdmin.register User do\n"
 
+  config.create_another = true
+
   permit_params [:first_name, :last_name, :username, :age]
+
+  index as: :grid do |user|
+    div for: user do
+      resource_selection_cell user
+      h2 link_to(user.display_name, admin_user_path(user)), style: 'margin-bottom: 0'
+      para do
+        strong user.username, style: 'text-transform: uppercase; font-size: 10px;'
+        br
+        em user.age
+        text_node 'years old'
+      end
+    end
+  end
+
+  show do
+    attributes_table do
+      row :id
+      row :first_name
+      row :last_name
+      row :username
+      row :age
+      row :created_at
+      row :updated_at
+    end
+
+    panel 'Posts' do
+      table_for(user.posts.includes(:category).order(:updated_at).limit(10)) do
+        column :id do |post|
+          link_to post.id, admin_post_path(post)
+        end
+        column :title
+        column :published_date
+        column :category
+        column :created_at
+        column :updated_at
+      end
+      para do
+        link_to "View all posts", admin_posts_path('q[author_id_eq]' => user.id)
+      end
+    end
+  end
 RUBY
 
-inject_into_file 'app/admin/post.rb', <<-RUBY, after: "ActiveAdmin.register Post do\n"
+inject_into_file 'app/admin/post.rb', <<-'RUBY', after: "ActiveAdmin.register Post do\n"
 
-  permit_params [:custom_category_id, :author_id, :title, :body, :published_date, :position, :starred]
+  permit_params :custom_category_id, :author_id, :title, :body, :published_date, :position, :starred, taggings_attributes: [ :id, :tag_id, :name, :position, :_destroy ]
+
+  includes :author, :category, :taggings
 
   scope :all, default: true
 
@@ -35,6 +158,133 @@ inject_into_file 'app/admin/post.rb', <<-RUBY, after: "ActiveAdmin.register Post
   scope :my_posts do |posts|
     posts.where(author_id: current_admin_user.id)
   end
+
+  batch_action :set_starred, form: { starred: :checkbox } do |ids, inputs|
+    Post.where(id: ids).update_all(starred: inputs['starred'].present?)
+    redirect_to collection_path, notice: "The posts have been updated."
+  end
+
+  index do
+    selectable_column
+    id_column
+    column :title
+    column :published_date
+    column :author
+    column :category
+    column :starred
+    column :position
+    column :created_at
+    column :updated_at
+  end
+
+  sidebar :author, only: :show do
+    attributes_table_for post.author do
+      row :id do |author|
+        link_to author.id, admin_user_path(author)
+      end
+      row :first_name
+      row :last_name
+      row :username
+      row :age
+    end
+  end
+
+  member_action :toggle_starred, method: :put do
+    resource.update(starred: !resource.starred)
+    redirect_to resource_path, notice: "Post updated."
+  end
+
+  action_item :toggle_starred, only: :show do
+    link_to 'Toggle Starred', toggle_starred_admin_post_path(post), method: :put
+  end
+
+  show do |post|
+    attributes_table do
+      row :id
+      row :title
+      row :published_date
+      row :author
+      row :body
+      row :category
+      row :starred
+      row :position
+      row :created_at
+      row :updated_at
+    end
+
+    columns do
+      column do
+        panel 'Tags' do
+          table_for(post.taggings.order(:position)) do
+            column :id do |tagging|
+              link_to tagging.tag_id, admin_tag_path(tagging.tag)
+            end
+            column :tag, &:tag_name
+            column :position
+            column :updated_at
+          end
+        end
+      end
+      column do
+        panel 'Category' do
+          attributes_table_for post.category do
+            row :id do |category|
+              link_to category.id, admin_category_path(category)
+            end
+            row :description
+          end
+        end
+      end
+    end
+  end
+
+  form do |f|
+    columns do
+      column do
+        f.inputs 'Details' do
+          f.input :title
+          f.input :author
+          f.input :published_date,
+            hint: f.object.persisted? && "Created at #{f.object.created_at}"
+          f.input :custom_category_id
+          f.input :category
+          f.input :position
+          f.input :starred
+        end
+      end
+      column do
+        f.inputs 'Content' do
+          f.input :body
+        end
+      end
+    end
+    f.inputs "Tags" do
+      f.has_many :taggings, sortable: :position do |t|
+        t.input :tag
+        t.input :_destroy, as: :boolean
+      end
+    end
+    para "Press cancel to return to the list without saving."
+    f.actions
+  end
+RUBY
+
+inject_into_file 'app/admin/tag.rb', <<-RUBY, after: "ActiveAdmin.register Tag do\n"
+
+  config.create_another = true
+
+  permit_params [:name]
+
+  index do
+    selectable_column
+    id_column
+    column :name
+    column :created_at
+    actions dropdown: true do |tag|
+      item "Preview", admin_tag_path(tag)
+    end
+  end
+
 RUBY
 
 append_file "db/seeds.rb", "\n\n" + <<-RUBY.strip_heredoc
@@ -63,6 +313,15 @@ append_file "db/seeds.rb", "\n\n" + <<-RUBY.strip_heredoc
                 author: user,
                 starred: true
   end
+
+  800.times do |i|
+    ActiveAdmin::Comment.create!(
+      namespace: :admin,
+      author: AdminUser.first,
+      body: "Test comment #{i}",
+      resource: categories.sample,
+    )
+  end
 RUBY
 
 rake 'db:seed'