activeadmin 1.0.0.pre5 → 1.0.0

data/lib/active_admin/resource_controller/data_access.rb

@@ -98,10 +98,6 @@ module ActiveAdmin
       # Does the actual work of finding a resource in the database. This
       # method uses the finder method as defined in InheritedResources.
       #
-      # Note that public_send can't be used here because Rails 3.2's
-      # ActiveRecord::Associations::CollectionProxy (belongs_to associations)
-      # mysteriously returns an Enumerator object.
-      #
       # @return [ActiveRecord::Base] An active record object.
       def find_resource
         scoped_collection.send method_for_find, params[:id]
@@ -120,7 +116,6 @@ module ActiveAdmin
         get_resource_ivar || begin
           resource = build_new_resource
           resource = apply_decorations(resource)
-          resource = assign_attributes(resource, resource_params)
           run_build_callbacks resource
           authorize_resource! resource
 
@@ -131,12 +126,9 @@ module ActiveAdmin
       # Builds a new resource. This method uses the method_for_build provided
       # by Inherited Resources.
       #
-      # Note that public_send can't be used here w/ Rails 3.2 & a belongs_to
-      # config, or you'll get undefined method `build' for []:Array.
-      #
       # @return [ActiveRecord::Base] An un-saved active record base object
       def build_new_resource
-        scoped_collection.send method_for_build
+        scoped_collection.send method_for_build, *resource_params
       end
 
       # Calls all the appropriate callbacks and then creates the new resource.
@@ -305,6 +297,23 @@ module ActiveAdmin
       def apply_decorations(resource)
         apply_decorator(resource)
       end
+
+      # @return [String]
+      def smart_resource_url
+        if create_another?
+          new_resource_url(create_another: params[:create_another])
+        else
+          super
+        end
+      end
+
+      private
+
+      # @return [Boolean] true if user requested to create one more
+      #   resource after creating this one.
+      def create_another?
+        params[:create_another].present?
+      end
     end
   end
 end

data/lib/active_admin/resource_dsl.rb

@@ -1,10 +1,6 @@
 module ActiveAdmin
   # This is the class where all the register blocks are evaluated.
   class ResourceDSL < DSL
-    def initialize(config, resource_class)
-      @resource = resource_class
-      super(config)
-    end
 
     private
 
@@ -47,7 +43,7 @@ module ActiveAdmin
     end
 
     #
-    # Rails 4 Strong Parameters Support
+    # Keys included in the `permitted_params` setting are automatically whitelisted.
     #
     # Either
     #
@@ -64,16 +60,19 @@ module ActiveAdmin
     #     end
     #   end
     #
-    # Keys included in the `permitted_params` setting are automatically whitelisted.
-    #
     def permit_params(*args, &block)
       param_key = config.param_key.to_sym
       belongs_to_param = config.belongs_to_param
+      create_another_param = :create_another if config.create_another
 
       controller do
         define_method :permitted_params do
-          params.permit *(active_admin_namespace.permitted_params + Array.wrap(belongs_to_param)),
-            param_key => block ? instance_exec(&block) : args
+          permitted_params =
+            active_admin_namespace.permitted_params +
+              Array.wrap(belongs_to_param) +
+              Array.wrap(create_another_param)
+
+          params.permit(*permitted_params, param_key => block ? instance_exec(&block) : args)
         end
       end
     end
@@ -107,7 +106,7 @@ module ActiveAdmin
     #   end
     #
     def csv(options={}, &block)
-      options[:resource] = @resource
+      options[:resource] = config
 
       config.csv_builder = CSVBuilder.new(options, &block)
     end
@@ -136,8 +135,7 @@ module ActiveAdmin
       title = options.delete(:title)
 
       controller do
-        callback = ActiveAdmin::Dependency.rails >= 4 ? :before_action : :before_filter
-        send(callback, only: [name]) { @page_title = title } if title
+        before_action(only: [name]) { @page_title = title } if title
         define_method(name, &block || Proc.new{})
       end
     end
@@ -187,17 +185,22 @@ module ActiveAdmin
     delegate :before_save,    :after_save,    to: :controller
     delegate :before_destroy, :after_destroy, to: :controller
 
-    # This code defines both *_filter and *_action for Rails 3.2 to Rails 5.
-    actions = [
+    # This code defines both *_filter and *_action for Rails 4.0 to Rails 5 and  *_action for Rails >= 5.1
+    phases = [
       :before, :skip_before,
       :after,  :skip_after,
       :around, :skip
     ]
-    destination = ActiveAdmin::Dependency.rails >= 4 ? :action : :filter
-    [:action, :filter].each do |name|
-      actions.each do |action|
+    keywords = if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 1
+                       [:action]
+                     else
+                       [:action, :filter]
+                     end
+
+    keywords.each do |name|
+       phases.each do |action|
         define_method "#{action}_#{name}" do |*args, &block|
-          controller.public_send "#{action}_#{destination}", *args, &block
+          controller.public_send "#{action}_action", *args, &block
         end
       end
     end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.0.pre5'
+  VERSION = '1.0.0'
 end

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -12,7 +12,7 @@ module ActiveAdmin
           # 1. try using `display_name` if we can locate a DB object
           # 2. try using the model name translation
           # 3. default to calling `titlecase` on the URL fragment
-          if part =~ /\A(\d+|[a-f0-9]{24})\z/ && parts[index-1]
+          if part =~ /\A(\d+|[a-f0-9]{24}|(?:[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}))\z/ && parts[index-1]
             parent = active_admin_config.belongs_to_config.try :target
             config = parent && parent.resource_name.route_key == parts[index-1] ? parent : active_admin_config
             name   = display_name config.find_resource part

data/lib/active_admin/view_helpers/display_helper.rb

@@ -45,7 +45,7 @@ module ActiveAdmin
 
         if value.is_a?(Arbre::Element)
           value
-        elsif boolean_attr?(resource, attr)
+        elsif boolean_attr?(resource, attr, value)
           Arbre::Context.new { status_tag value }
         else
           pretty_format value
@@ -55,8 +55,6 @@ module ActiveAdmin
       def find_value(resource, attr)
         if attr.is_a? Proc
           attr.call resource
-        elsif attr =~ /\A(.+)_id\z/ && reflection_for(resource, $1.to_sym)
-          resource.public_send $1
         elsif resource.respond_to? attr
           resource.public_send attr
         elsif resource.respond_to? :[]
@@ -70,7 +68,7 @@ module ActiveAdmin
         when String, Numeric, Symbol, Arbre::Element
           object.to_s
         when Date, Time
-          localize object, format: active_admin_application.localize_format
+          I18n.localize object, format: active_admin_application.localize_format
         else
           if defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Base) ||
              defined?(::Mongoid)      && object.class.include?(Mongoid::Document)
@@ -81,14 +79,14 @@ module ActiveAdmin
         end
       end
 
-      def reflection_for(resource, method)
-        klass = resource.class
-        klass.reflect_on_association method if klass.respond_to? :reflect_on_association
-      end
-
-      def boolean_attr?(resource, attr)
-        if resource.class.respond_to? :columns_hash
-          column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+      def boolean_attr?(resource, attr, value)
+        case value
+        when TrueClass, FalseClass
+           true
+        else
+          if resource.class.respond_to? :columns_hash
+            column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+          end
         end
       end
 

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -2,6 +2,18 @@ module ActiveAdmin
   module ViewHelpers
     module DownloadFormatLinksHelper
 
+      def build_download_formats(download_links)
+        download_links = instance_exec(&download_links) if download_links.is_a?(Proc)
+
+        if download_links.is_a?(Array) && !download_links.empty?
+          download_links
+        elsif download_links == false
+          []
+        else
+          self.class.formats
+        end
+      end
+
       def build_download_format_links(formats = self.class.formats)
         params = request.query_parameters.except :format, :commit
         div class: "download_links" do

data/lib/active_admin/view_helpers/fields_for.rb

@@ -16,7 +16,6 @@ module ActiveAdmin
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
         except    = Array.wrap(options[:except]).map &:to_s
-        params    = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
 
         params.flat_map do |k, v|
           next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
@@ -39,7 +38,7 @@ module ActiveAdmin
             end
           when nil
             { k => '' }
-          when TrueClass,FalseClass
+          when TrueClass, FalseClass
             { k => v }
           else
             raise "I don't know what to do with #{v.class} params: #{v.inspect}"

data/lib/active_admin/view_helpers/form_helper.rb

@@ -9,7 +9,7 @@ module ActiveAdmin
       end
 
       def hidden_field_tags_for(params, options={})
-        fields_for_params(params, options).map do |kv|
+        fields_for_params(params.to_unsafe_hash, options).map do |kv|
           k, v = kv.first
           hidden_field_tag k, v, id: sanitize_to_id("hidden_active_admin_#{k}")
         end.join("\n").html_safe

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

@@ -34,7 +34,7 @@ module ActiveAdmin
         @opening_tag, @closing_tag = split_string_on(form_string, "</form>")
         instance_eval(&block) if block_given?
 
-        # Rails 4 sets multipart automatically if a file field is present,
+        # Rails sets multipart automatically if a file field is present,
         # but the form tag has already been rendered before the block eval.
         if multipart? && @opening_tag !~ /multipart/
           @opening_tag.sub!(/<form/, '<form enctype="multipart/form-data"')
@@ -72,10 +72,17 @@ module ActiveAdmin
       end
 
       def commit_action_with_cancel_link
+        add_create_another_checkbox
         action(:submit)
         cancel_link
       end
 
+      def add_create_another_checkbox
+        if %w(new create).include?(helpers.action_name) &&  active_admin_config && active_admin_config.create_another
+          current_arbre_element.add_child(create_another_checkbox)
+        end
+      end
+
       def has_many(*args, &block)
         insert_tag(HasManyProxy, form_builder, *args, &block)
       end
@@ -91,6 +98,25 @@ module ActiveAdmin
       def form_buffers
         raise "'form_buffers' has been removed from ActiveAdmin::FormBuilder, please read https://github.com/activeadmin/activeadmin/blob/master/docs/5-forms.md for details."
       end
+
+      private
+
+      def create_another_checkbox
+        create_another = params[:create_another]
+        label = @resource.class.model_name.human
+        Arbre::Context.new do
+          li do
+            input(
+              checked: create_another,
+              id: 'create_another',
+              class: 'create_another',
+              name: 'create_another',
+              type: 'checkbox',
+            )
+            label(I18n.t('active_admin.create_another', model: label), for: 'create_another')
+          end
+        end
+      end
     end
 
     class SemanticInputsProxy < FormtasticProxy
@@ -100,7 +126,7 @@ module ActiveAdmin
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
         legend_tag = legend ? "<legend><span>#{legend}</span></legend>" : ""
-        fieldset_attrs = html_options.map {|k,v| %Q{#{k}="#{v}"} }.join(" ")
+        fieldset_attrs = html_options.map {|k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)

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

@@ -71,19 +71,14 @@ module ActiveAdmin
           build_pagination
           div(page_entries_info(options).html_safe, class: "pagination_information")
 
-          download_links = @download_links.is_a?(Proc) ? instance_exec(&@download_links) : @download_links
-
-          if download_links.is_a?(Array) && !download_links.empty?
-            build_download_format_links download_links
-          else
-            build_download_format_links unless download_links == false
-          end
+          formats = build_download_formats @download_links
+          build_download_format_links formats if formats.any?
         end
       end
 
       def build_per_page_select
         div class: "pagination_per_page" do
-          text_node "Per page:"
+          text_node I18n.t("active_admin.pagination.per_page")
           select do
             @per_page.each do |per_page|
               option(

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

@@ -139,7 +139,7 @@ module ActiveAdmin
 
         attr_accessor :title, :data , :html_class
 
-        def initialize(*args, &block) 
+        def initialize(*args, &block)
           @options = args.extract_options!
 
           @title = args[0]

data/lib/active_admin/views/index_as_table.rb

@@ -233,8 +233,8 @@ module ActiveAdmin
         proc do
           selectable_column
           id_column if resource_class.primary_key
-          resource_class.content_columns.each do |col|
-            column col.name.to_sym
+          active_admin_config.resource_columns.each do |attribute|
+            column attribute
           end
           actions
         end

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

@@ -2,7 +2,7 @@ module ActiveAdmin
   module Views
     module Pages
 
-      # Acts as a standard rails Layout for use when logged
+      # Acts as a standard Rails Layout for use when logged
       # out or when rendering custom actions.
       class Layout < Base
 

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

@@ -49,7 +49,7 @@ module ActiveAdmin
           end
 
           def default_attribute_table_rows
-            resource.class.columns.collect{|column| column.name.to_sym }
+            active_admin_config.resource_columns
           end
         end
 

data/lib/bug_report_templates/rails_5_master.rb

@@ -21,8 +21,6 @@ gemfile(true) do
   else
     gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin', require: false
   end
-
-  gem 'inherited_resources', '~> 1.7', require: false
 end
 
 # prepare active_record database
@@ -41,7 +39,7 @@ ActiveRecord::Schema.define do
   end
 end
 
-# prepare rails app
+# prepare Rails app
 require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'active_admin'

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

@@ -55,7 +55,7 @@ module ActiveAdmin
       end
 
       def add_default_user_to_seed
-        seeds_paths = Rails.application.paths["db/seeds.rb"] || Rails.application.paths["db/seeds"] # "db/seeds" => Rails 3.2 fallback
+        seeds_paths = Rails.application.paths["db/seeds.rb"]
         seeds_file = seeds_paths.existent.first
         return if seeds_file.nil? || !options[:default_user]
 

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

@@ -179,6 +179,13 @@ ActiveAdmin.setup do |config|
   #
   # config.breadcrumb = false
 
+  # == Create Another Checkbox
+  #
+  # Create another checkbox is disabled by default. You can customize it for individual
+  # resources or you can enable them globally from here.
+  #
+  # config.create_another = true
+
   # == Register Stylesheets & Javascripts
   #
   # We recommend using the built in Active Admin layout and loading

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

@@ -1,8 +1,6 @@
 ActiveAdmin.register <%= @user_class %> do
-<% unless Rails::VERSION::MAJOR < 4 -%>
   permit_params :email, :password, :password_confirmation
 
-<% end -%>
   index do
     selectable_column
     id_column

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

@@ -1,15 +1,13 @@
 <%
-parent_class = ActiveRecord::Migration
-parent_class = parent_class[5.0] if Rails::VERSION::MAJOR >= 5
-%>
-
+  parent_class = ActiveRecord::Migration
+  parent_class = parent_class[parent_class.current_version] if Rails::VERSION::MAJOR >= 5
+-%>
 class CreateActiveAdminComments < <%= parent_class.to_s %>
   def self.up
     create_table :active_admin_comments do |t|
       t.string :namespace
       t.text   :body
-      t.string :resource_id,   null: false
-      t.string :resource_type, null: false
+      t.references :resource, polymorphic: true
       t.references :author, polymorphic: true
       <%- if Rails::VERSION::MAJOR >= 5 -%>
       t.timestamps
@@ -21,9 +19,9 @@ class CreateActiveAdminComments < <%= parent_class.to_s %>
     <%- unless Rails::VERSION::MAJOR >= 5 -%>
 
     add_index :active_admin_comments, [:author_type, :author_id]
+    add_index :active_admin_comments, [:resource_type, :resource_id]
     <%- end -%>
 
-    add_index :active_admin_comments, [:resource_type, :resource_id]
   end
 
   def self.down