activeadmin 1.0.0.pre4 → 1.0.0.pre5

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

@@ -7,7 +7,7 @@ module ActiveAdmin
     #
     #     dropdown_menu "Administration" do
     #       item "Edit Details", edit_details_path
-    #       item "Edit My Account", edit_my_acccount_path
+    #       item "Edit My Account", edit_my_account_path
     #     end
     #
     # This will create a button with the label "Administration" and
@@ -58,7 +58,7 @@ module ActiveAdmin
 
         menu_list = nil
 
-        div :class => 'dropdown_menu_list_wrapper' do
+        div class: 'dropdown_menu_list_wrapper' do
           menu_list = ul(options)
         end
 

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

@@ -36,7 +36,10 @@ module ActiveAdmin
       # @param [Class] index_class The class on which to build the link and html classes
       def build_index_list(index_class)
         li class: classes_for_index(index_class) do
-          a href: url_for(as: index_class.index_name.to_sym), class: "table_tools_button" do
+          params = request.query_parameters.except :page, :commit, :format
+          url_with_params = url_for(params.merge(as: index_class.index_name.to_sym))
+
+          a href: url_with_params, class: "table_tools_button" do
             name = index_class.index_name
             I18n.t("active_admin.index_list.#{name}", default: name.to_s.titleize)
           end

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

@@ -1,4 +1,5 @@
 require 'active_admin/helpers/collection'
+require 'active_admin/view_helpers/download_format_links_helper'
 
 module ActiveAdmin
   module Views

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

@@ -31,7 +31,7 @@ module ActiveAdmin
 
       def build_scope(scope, options)
         li class: classes_for_scope(scope) do
-          scope_name = I18n.t "active_admin.scopes.#{scope.id}", default: scope.name
+          scope_name = I18n.t "active_admin.scopes.#{scope.id}", default: name_for_scope(scope)
           params     = request.query_parameters.except :page, :scope, :commit, :format
 
           a href: url_for(scope: scope.id, params: params), class: 'table_tools_button' do
@@ -61,6 +61,13 @@ module ActiveAdmin
       def get_scope_count(scope)
         collection_size(scope_chain(scope, collection_before_scope))
       end
+
+      def name_for_scope(scope)
+        case scope.name
+          when Proc then self.instance_exec(&scope.name).to_s
+          else      scope.name.to_s
+        end
+      end
     end
   end
 end

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

@@ -41,11 +41,11 @@ module ActiveAdmin
       end
 
       def title_text
-        helpers.render_or_call_method_or_proc_on(self, @namespace.site_title)
+        helpers.render_or_call_method_or_proc_on(helpers, @namespace.site_title)
       end
 
       def title_image
-        path = helpers.render_or_call_method_or_proc_on(self, @namespace.site_title_image)
+        path = helpers.render_or_call_method_or_proc_on(helpers, @namespace.site_title_image)
         helpers.image_tag(path, id: "site_title_image", alt: title_text)
       end
 

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

@@ -85,7 +85,7 @@ module ActiveAdmin
         @tbody = tbody do
           # Build enough rows for our collection
           @collection.each do |elem|
-            classes = [cycle('odd', 'even')]
+            classes = [helpers.cycle('odd', 'even')]
 
             if @row_class
               classes << @row_class.call(elem)
@@ -98,7 +98,7 @@ module ActiveAdmin
 
       def build_table_cell(col, resource)
         td class: col.html_class do
-          html = format_attribute(resource, col.data)
+          html = helpers.format_attribute(resource, col.data)
           # Don't add the same Arbre twice, while still allowing format_attribute to call status_tag
           current_arbre_element << html unless current_arbre_element.children.include? html
         end
@@ -109,7 +109,7 @@ module ActiveAdmin
       #   current_sort[1] #=> asc | desc
       def current_sort
         @current_sort ||= begin
-          order_clause = OrderClause.new params[:order]
+          order_clause = active_admin_config.order_clause.new(active_admin_config, params[:order])
 
           if order_clause.valid?
             [order_clause.field, order_clause.order]

data/lib/active_admin/views/footer.rb

@@ -2,15 +2,29 @@ module ActiveAdmin
   module Views
     class Footer < Component
 
-      def build
+      def build(namespace)
         super id: "footer"
-        powered_by_message
+        @namespace = namespace
+
+        if footer?
+          para footer_text
+        else
+          para powered_by_message
+        end
+      end
+
+      def footer?
+        @namespace.footer.present?
       end
 
       private
 
+      def footer_text
+        helpers.render_or_call_method_or_proc_on(self, @namespace.footer)
+      end
+
       def powered_by_message
-        para I18n.t('active_admin.powered_by',
+        I18n.t('active_admin.powered_by',
           active_admin: link_to("Active Admin", "http://www.activeadmin.info"),
           version: ActiveAdmin::VERSION).html_safe
       end

data/lib/active_admin/views/index_as_table.rb

@@ -348,13 +348,13 @@ module ActiveAdmin
 
         def defaults(resource, options = {})
           if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
-            item I18n.t('active_admin.view'), resource_path(resource), class: "view_link #{options[:css_class]}"
+            item I18n.t('active_admin.view'), resource_path(resource), class: "view_link #{options[:css_class]}", title: I18n.t('active_admin.view')
           end
           if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
-            item I18n.t('active_admin.edit'), edit_resource_path(resource), class: "edit_link #{options[:css_class]}"
+            item I18n.t('active_admin.edit'), edit_resource_path(resource), class: "edit_link #{options[:css_class]}", title: I18n.t('active_admin.edit')
           end
           if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
-            item I18n.t('active_admin.delete'), resource_path(resource), class: "delete_link #{options[:css_class]}",
+            item I18n.t('active_admin.delete'), resource_path(resource), class: "delete_link #{options[:css_class]}", title: I18n.t('active_admin.delete'),
               method: :delete, data: {confirm: I18n.t('active_admin.delete_confirmation')}
           end
         end

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

@@ -12,6 +12,8 @@ module ActiveAdmin
 
         private
 
+        delegate :active_admin_config, :controller, :params, to: :helpers
+
         def add_classes_to_body
           @body.add_class(params[:action])
           @body.add_class(params[:controller].tr('/', '_'))
@@ -56,7 +58,7 @@ module ActiveAdmin
         end
 
         def build_unsupported_browser
-          if active_admin_namespace.unsupported_browser_matcher =~ request.user_agent
+          if active_admin_namespace.unsupported_browser_matcher =~ controller.request.user_agent
             insert_tag view_factory.unsupported_browser
           end
         end
@@ -138,7 +140,7 @@ module ActiveAdmin
 
         # Renders the content for the footer
         def build_footer
-          insert_tag view_factory.footer
+          insert_tag view_factory.footer, active_admin_namespace
         end
 
       end

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

@@ -6,10 +6,9 @@ module ActiveAdmin
 
         def title
           if form_presenter[:title]
-            render_or_call_method_or_proc_on(resource, form_presenter[:title])
+            helpers.render_or_call_method_or_proc_on(resource, form_presenter[:title])
           else
-            assigns[:page_title] || I18n.t("active_admin.#{normalized_action}_model",
-                                      model: active_admin_config.resource_label)
+            assigns[:page_title] || ActiveAdmin::Localizers.resource(active_admin_config).t("#{normalized_action}_model")
           end
         end
 

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

@@ -25,7 +25,8 @@ module ActiveAdmin
         end
 
         def attributes_table(*args, &block)
-          panel(I18n.t('active_admin.details', model: active_admin_config.resource_label)) do
+          table_title = ActiveAdmin::Localizers.resource(active_admin_config).t(:details)
+          panel(table_title) do
             attributes_table_for resource, *args, &block
           end
         end

data/lib/bug_report_templates/rails_5_master.rb

@@ -0,0 +1,120 @@
+begin
+  require 'bundler/inline'
+rescue LoadError => e
+  STDERR.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
+  raise e
+end
+
+gemfile(true) do
+  source 'https://rubygems.org'
+
+  gem 'rails', require: false
+  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
+
+  gem 'inherited_resources', '~> 1.7', require: false
+end
+
+# prepare active_record database
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+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
+  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)
+
+  secrets.secret_token = 'secret_token'
+  secrets.secret_key_base = 'secret_key_base'
+
+  config.eager_load = false
+end
+
+# create models
+class YourModel < ActiveRecord::Base
+end
+
+# configure active_admin
+ActiveAdmin.setup do |config|
+  # 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
+end
+
+# draw active_admin routes
+Rails.application.routes.draw do
+  ActiveAdmin.routes(self)
+end
+
+# prepare tests
+require 'minitest/autorun'
+require 'rack/test'
+
+# Replace this with the code necessary to make your test fail.
+class BugTest < Minitest::Test
+  include Rack::Test::Methods
+
+  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
+  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
+  end
+
+  private
+
+  def app
+    Rails.application
+  end
+end

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

@@ -12,8 +12,8 @@ module ActiveAdmin
 
       RESERVED_NAMES = [:active_admin_user]
 
-      class_option  :default_user, :type => :boolean, :default => true,
-                    :desc => "Should a default user be created inside the migration?"
+      class_option  :default_user, type: :boolean, default: true,
+                    desc: "Should a default user be created inside the migration?"
 
       def install_devise
         begin
@@ -24,7 +24,10 @@ module ActiveAdmin
 
         require 'devise'
 
-        if File.exists?(File.join(destination_root, "config", "initializers", "devise.rb"))
+        initializer_file =
+          File.join(destination_root, "config", "initializers", "devise.rb")
+
+        if File.exist?(initializer_file)
           log :generate, "No need to install devise, already done."
         else
           log :generate, "devise:install"

data/lib/generators/active_admin/install/install_generator.rb

@@ -38,7 +38,7 @@ module ActiveAdmin
       end
 
       def create_migrations
-        migration_template 'migrations/create_active_admin_comments.rb', 'db/migrate/create_active_admin_comments.rb'
+        migration_template 'migrations/create_active_admin_comments.rb.erb', 'db/migrate/create_active_admin_comments.rb'
       end
     end
   end

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

@@ -145,7 +145,7 @@ ActiveAdmin.setup do |config|
   # You can add before, after and around filters to all of your
   # Active Admin resources and pages from here.
   #
-  # config.before_filter :do_something_awesome
+  # config.before_action :do_something_awesome
 
   # == Localize Date/Time Format
   #
@@ -269,4 +269,18 @@ ActiveAdmin.setup do |config|
   # of those filters by default here.
   #
   # config.include_default_association_filters = true
+
+  # == Footer
+  #
+  # By default, the footer shows the current Active Admin version. You can
+  # override the content of the footer here.
+  #
+  # config.footer = 'my custom footer text'
+
+  # == Sorting
+  #
+  # By default ActiveAdmin::OrderClause is used for sorting logic
+  # You can inherit it with own class and inject it for all resources
+  #
+  # config.order_clause = MyOrderClause
 end

data/lib/generators/active_admin/install/templates/migrations/{create_active_admin_comments.rb → create_active_admin_comments.rb.erb}

@@ -1,4 +1,9 @@
-class CreateActiveAdminComments < ActiveRecord::Migration
+<%
+parent_class = ActiveRecord::Migration
+parent_class = parent_class[5.0] if Rails::VERSION::MAJOR >= 5
+%>
+
+class CreateActiveAdminComments < <%= parent_class.to_s %>
   def self.up
     create_table :active_admin_comments do |t|
       t.string :namespace
@@ -6,10 +11,18 @@ class CreateActiveAdminComments < ActiveRecord::Migration
       t.string :resource_id,   null: false
       t.string :resource_type, null: false
       t.references :author, polymorphic: true
+      <%- if Rails::VERSION::MAJOR >= 5 -%>
       t.timestamps
+      <%- else -%>
+      t.timestamps null: false
+      <%- end -%>
     end
     add_index :active_admin_comments, [:namespace]
+    <%- unless Rails::VERSION::MAJOR >= 5 -%>
+
     add_index :active_admin_comments, [:author_type, :author_id]
+    <%- end -%>
+
     add_index :active_admin_comments, [:resource_type, :resource_id]
   end
 

data/lib/ransack_ext.rb

@@ -10,11 +10,11 @@ Ransack.configure do |config|
     config.add_predicate old, arel_predicate: current
   end
 
-  config.add_predicate 'gteq_date',
+  config.add_predicate 'gteq_datetime',
     arel_predicate: 'gteq',
     formatter: ->(v) { v.beginning_of_day }
 
-  config.add_predicate 'lteq_date',
+  config.add_predicate 'lteq_datetime',
   	arel_predicate: 'lt',
   	formatter: ->(v) { v + 1.day }
 end

data/spec/bug_report_templates_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+RSpec.describe 'bug_report_templates' do
+  subject do
+    Bundler.with_clean_env do
+      Dir.chdir(chdir_path) do
+        system({'ACTIVE_ADMIN_PATH' => active_admin_root},
+               Gem.ruby,
+               template_path,
+               out: File::NULL)
+      end
+    end
+  end
+
+  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' }
+
+    it 'passes' do
+      expect(subject).to be_truthy
+    end
+  end
+
+
+end