activeadmin 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e70a90d683c4af1876248495c8c055e9eb21669bac351b42dcdeb175f9003c62
-  data.tar.gz: 9f8029a8686ff5dd00932a248f620b1481c1d493f4d10594dc4549de07d269a8
+  metadata.gz: 7c8782460aa60e1293d44be5e3b998002e34794150cebf3c4effc6ba409149d8
+  data.tar.gz: b5834e4dc64f9043142376093ace0ddf0af7119f1a4dbba257ed344a4ac7079a
 SHA512:
-  metadata.gz: cdd5161de2dd77f1a01d4eae59f09c16c2f1aa356142a1add9fa7cfe8516bdff1676ebf98d0162c6ec736d0bdfaaba6a4f86b73664c734ac54b54a82d2808cd0
-  data.tar.gz: 4da12f46a43f27af9d4301520dfd337f31efe340890c8b255a0f11e92015996395d9a1f135a7f8a0f34534de493570ff065bff339b5e621837a06dcaf8985064
+  metadata.gz: c55ad8c616ffee8776434ac4626351a4e789a9cb4d0771da2c548517d9854c5c3fa66f3e9b856831c625bc8f0f8c6afe85d3cf9f28101ec54467fce8d97b43cc
+  data.tar.gz: 336e001de67c48174e8611f20007dc2a762eac47f09a4d6b3ad4ee6deb090410d072c58d1e3f61e8fc4a4cf1615e4a633f8210abd93979dd07a2d55f2510d4ef

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## Unreleased
 
+## 2.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.2.0..v2.3.0)
+
+### Enhancements
+
+#### Minor
+
+* Bump minimum ransack requirement to make sure everyone gets a version that works ok with all supported versions of Rails. [#5831] by [@deivid-rodriguez]
+
+### Bug Fixes
+
+* Fix CSVBuilder not respecting `ActiveAdmin.application.csv_options = { humanize_name: false }` setting. [#5800] by [@HappyKadaver]
+* Fix crash when displaying current filters after filtering by a nested resource. [#5816] by [@deivid-rodriguez]
+* Fix pagination when `pagination_total` is false to not show a "Last" link, since it's incorrect because we don't have the total pages information. [#5822] by [@deivid-rodriguez]
+* Fix optional nested resources causing incorrect routes to be generated, when renamed resources (through `:as` option) are involved. [#5826] by [@ndbroadbent], [@Kris-LIBIS] and [@deivid-rodriguez]
+* Fix double modal issue in applications using turbolinks 5. [#5842] by [@sgara]
+
 ## 2.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.1.0..v2.2.0)
 
 ### Enhancements
@@ -474,8 +490,14 @@ Please check [0-6-stable] for previous changes.
 [#5758]: https://github.com/activeadmin/activeadmin/pull/5758
 [#5777]: https://github.com/activeadmin/activeadmin/pull/5777
 [#5794]: https://github.com/activeadmin/activeadmin/pull/5794
+[#5800]: https://github.com/activeadmin/activeadmin/pull/5800
 [#5801]: https://github.com/activeadmin/activeadmin/pull/5801
 [#5802]: https://github.com/activeadmin/activeadmin/pull/5802
+[#5816]: https://github.com/activeadmin/activeadmin/pull/5816
+[#5822]: https://github.com/activeadmin/activeadmin/pull/5822
+[#5826]: https://github.com/activeadmin/activeadmin/pull/5826
+[#5831]: https://github.com/activeadmin/activeadmin/pull/5831
+[#5842]: https://github.com/activeadmin/activeadmin/pull/5842
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -503,6 +525,7 @@ Please check [0-6-stable] for previous changes.
 [@Fivell]: https://github.com/Fivell
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
+[@HappyKadaver]: https://github.com/HappyKadaver
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
 [@jasl]: https://github.com/jasl
@@ -544,3 +567,6 @@ Please check [0-6-stable] for previous changes.
 [@panasyuk]: https://github.com/panasyuk
 [@jscheid]: https://github.com/jscheid
 [@violeta-p]: https://github.com/violeta-p
+[@ndbroadbent]: https://github.com/ndbroadbent
+[@Kris-LIBIS]: https://github.com/Kris-LIBIS
+[@sgara]: https://github.com/sgara

data/CONTRIBUTING.md

@@ -26,8 +26,7 @@ git checkout -b 325-add-japanese-translations
 Make sure you're using a recent ruby and have the `bundler` gem installed, at
 least version `1.14.3`.
 
-You'll also need chrome and [chromedriver] installed in order to run cucumber
-scenarios.
+You'll also need chrome installed in order to run cucumber scenarios.
 
 Now install the development dependencies:
 
@@ -41,7 +40,7 @@ Now you should be able to run the entire suite using:
 bin/rake
 ```
 
-The test run will generate a sample Rails application in `tmp/rails` to run the
+The test run will generate a sample Rails application in `tmp/test_apps` to run the
 tests against.
 
 If your tests are passing locally but they're failing on CircleCI, it's probably
@@ -95,7 +94,7 @@ bin/rake local server
 ```
 
 This will automatically create a Rails app if none already exists, and store it
-in the `.test-rails-apps` folder.
+in the `tmp/development_apps` folder.
 
 You should now be able to open <http://localhost:3000/admin> in your browser.
 You can log in using:
@@ -204,7 +203,6 @@ Maintainers need to do the following to push out a release:
 * `bin/rake release`
 
 [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
-[chromedriver]: https://sites.google.com/a/chromium.org/chromedriver/getting-started
 [mailing list]: http://groups.google.com/group/activeadmin
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
 [search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something

data/README.md

@@ -21,6 +21,11 @@ creating elegant backends for website administration.
 * Try the [live demo][demo].
 * The [wiki] includes links to tutorials, articles and sample projects.
 
+## For enterprise
+
+Active Admin for enterprise is available via the Tidelift subscription. [Learn
+More][tidelift_enterprise].
+
 ## Need help?
 
 Please use [StackOverflow][stackoverflow] for help requests and how-to questions.
@@ -39,7 +44,7 @@ to ask.
 ## Want to support us?
 
 If you want to support us financially, you can [help fund the project
-through a Tidelift subscription][tidelift]. By buying a Tidelift subscription
+through a Tidelift subscription][tidelift_support]. By buying a Tidelift subscription
 you make sure your whole dependency stack is properly maintained, while also
 getting a comprehensive view of outdated dependencies, new releases, security
 alerts, and licensing compatibility issues.
@@ -96,6 +101,8 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 [inch]: http://inch-ci.org/github/activeadmin/activeadmin
 [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin
 [tidelift]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme
+[tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=enterprise
+[tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
 
 [docs]: http://activeadmin.info/0-installation.html
 [demo]: http://demo.activeadmin.info/admin

data/app/assets/javascripts/active_admin/lib/batch_actions.es6

@@ -1,9 +1,13 @@
 const onDOMReady = function() {
+  // Detach any previously attached handlers before re-attaching them.
+  // This avoids double-registered handlers when Turbolinks is enabled
+  $('.batch_actions_selector li a').off('click confirm:complete');
+
   //
   // Use ActiveAdmin.modal_dialog to prompt user if
   // confirmation is required for current Batch Action
   //
-  $('.batch_actions_selector li a').click(function(event){
+  $('.batch_actions_selector li a').on('click', function(event){
     let message;
     event.stopPropagation(); // prevent Rails UJS click event
     event.preventDefault();

data/app/views/kaminari/active_admin_countless/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="first">
+  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote %>
+</span>

data/app/views/kaminari/active_admin_countless/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page gap"><%= t('views.pagination.truncate').html_safe %></span>

data/app/views/kaminari/active_admin_countless/_next_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="next">
+  <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote %>
+</span>

data/app/views/kaminari/active_admin_countless/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page<%= ' current' if page.current? %>">
+  <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %>
+</span>

data/app/views/kaminari/active_admin_countless/_paginator.html.erb

@@ -0,0 +1,24 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <nav class="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.display_tag? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <% unless current_page.out_of_range? %>
+      <%= next_page_tag unless current_page.last? %>
+    <% end %>
+  </nav>
+<% end -%>

data/app/views/kaminari/active_admin_countless/_prev_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="prev">
+  <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, rel: 'prev', remote: remote %>
+</span>

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
-#encoding: utf-8
 ca:
   active_admin:
     dashboard: Tauler

data/docs/2-resource-customization.md

@@ -355,7 +355,7 @@ end
 ```
 
 If you need to completely replace the record retrieving code (e.g., you have a
-custom `to_param` implementation in your models), override the `resource` method
+custom `to_param` implementation in your models), override the `find_resource` method
 on the controller:
 
 ```ruby

data/docs/3-index-pages/index-as-table.md

@@ -193,6 +193,13 @@ controller do
 end
 ```
 
+You can also define associated objects to include outside of the
+`scoped_collection` method:
+
+```ruby
+includes :publisher
+```
+
 Then it's simple to sort by any Publisher attribute from within the index table:
 
 ```ruby

data/docs/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
 gem 'github-pages'
-gem 'jekyll-redirect-from'

data/docs/Gemfile.lock

@@ -198,15 +198,15 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.0.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
     octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
@@ -243,7 +243,6 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-redirect-from
 
 BUNDLED WITH
    1.16.5

data/docs/_config.yml

@@ -1,2 +1,4 @@
 plugins:
+  - jekyll-default-layout
   - jekyll-redirect-from
+  - jekyll-relative-links

data/docs/_includes/top-menu.html

@@ -8,9 +8,9 @@
     </div>
 
     <div id="tidelift">
-        <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme" target="_blank">
+        <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=homepage" target="_blank">
             <span class="cta">
-                Get license assurances and timely security notifications
+                Active Admin for enterprise available via Tidelift
             </span>
         </a>
     </div>

data/docs/index.html

@@ -10,81 +10,101 @@
         <p class="intro">
           The <strong>administration framework</strong> for business critical <strong>Ruby on Rails</strong> applications.
         </p>
+
         <p>
           Active Admin is a Ruby on Rails plugin for generating 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.
         </p>
+
         <h2>
           A beautiful interface designed for real people.
         </h2>
+
         <div id="features">
           <div id="features-left">
             <h3 class="first">
               Global Navigation
             </h3>
+
             <p>
               Customizable global navigation allows you to create usable admin interfaces for your business.
             </p>
+
             <h3>
               Scopes
             </h3>
+
             <p>
               Use scopes to create sections of mutually exclusive resources for quick navigation and reporting.
             </p>
+
             <h3>
               Index Styles
             </h3>
+
             <p>
               Index screens are available in many styles. The default, shown here, is a table view, but Active Admin also supports Grids, Blocks and a Blog view.
             </p>
+
             <h3>
               <span class="caps">API</span> &amp; Downloads
             </h3>
+
             <p>
               Each resource that is registered wtih Active Admin becomes available as <span class="caps">JSON</span>, <span class="caps">XML</span> and <span class="caps">CSV</span> download. Customize the output to meet your requirements.
             </p>
           </div>
+
           <div id="features-right">
             <h3 class="first">
               User Authentication
             </h3>
+
             <p>
               Use the bundled Devise configuration or implement your own authorization using the provided hooks.
             </p>
+
             <h3>
               Action Items
             </h3>
+
             <p>
               Add buttons, links or other content in the “Action Items” section on each screen.
             </p>
+
             <h3>
               Filters
             </h3>
+
             <p>
               Allow users to filter resources by searching strings, text fields, dates, and numeric values.
             </p>
+
             <h3>
               Sidebar Sections
             </h3>
+
             <p>
               Customize the sidebar sections with a simple <span class="caps">DSL</span> built in to Active Admin.
             </p>
           </div>
         </div>
+
         <p>
           Active Admin’s interface was designed from the ground up for non-technical users. It makes it easy for developers to build highly usable interfaces that customers will actually enjoy using.
         </p>
+
         <h2>
           An elegant <span class="caps">DSL</span> built for developer productivity.
         </h2>
+
         <p>
           Get started with one line of code or customize the entire interface with the provided <span class="caps">DSL</span>.
         </p>
+
         <div id="dsl">
           <div class="highlight">
-            <pre>
-<code class="ruby"><span class="c1"># app/admin/products.rb</span>
+            <pre><code class="ruby"><span class="c1"># app/admin/products.rb</span>
 <span class="no">ActiveAdmin</span><span class="o">.</span><span class="n">register</span> <span class="no">Product</span> <span class="k">do</span>
-
   <span class="c1"># Create sections on the index screen</span>
   <span class="n">scope</span> <span class="ss">:all</span><span class="p">,</span> <span class="ss">default:</span> <span class="kp">true</span>
   <span class="n">scope</span> <span class="ss">:available</span>
@@ -104,12 +124,93 @@
     <span class="k">end</span>
     <span class="n">actions</span>
   <span class="k">end</span>
-
-<span class="k">end</span>
-</code>
-            </pre>
+<span class="k">end</span></code></pre>
           </div>
         </div>
+
+        <h2>
+          Active Admin for enterprise
+        </h2>
+
+        <p>
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=homepage">
+            Available as part of the Tidelift Subscription
+          </a>
+        </p>
+
+        <p>
+          Active Admin and the maintainers of thousands of other packages are
+          working with Tidelift to deliver one enterprise subscription that
+          covers all of the open source you use.
+        </p>
+
+        <p>
+          If you want the flexibility of open source and the confidence of
+          commercial-grade software, this is for you.
+        </p>
+
+        <div class="tidelift-buttons">
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>LEARN MORE</span>
+          </a>
+
+          <a href="https://tidelift.com/subscription/request-a-demo?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>REQUEST A DEMO</span>
+          </a>
+        </div>
+
+        <h3>
+          The Tidelift Subscription manages your dependencies for you.
+        </h3>
+
+        <ul>
+          <li>
+            Get the tools you need to continuously catalog and understand the open source software that your application depends on.
+          </li>
+
+          <li>
+            Your subscription helps pay the open source maintainers of the exact
+            packages you use to ensure they meet the standards you require.
+          </li>
+
+          <li>
+            Address issues proactively, with tools that scan for new security,
+            licensing, and maintenance issues, and alert our participating open
+            source maintainers so they can resolve them on your behalf.
+          </li>
+
+          <li>
+            Measure and improve your open source dependencies' health—which
+            improves your app’s health—and get a short list of high-impact steps
+            your team can take to improve them even more.
+          </li>
+
+          <li>
+            Get commercial assurances that don't come for free with open source
+            packages, like intellectual property indemnification and support
+            under a service level agreement. You expect these guarantees from
+            proprietary software, and you can have them when using open source
+            as well.
+          </li>
+        </ul>
+
+        <p>
+          The end result? All of the capabilities you expect from
+          commercial-grade software, for the full breadth of open source you
+          use. That means less time grappling with esoteric open source trivia,
+          and more time building your own applications—and your business.
+        </p>
+
+        <div class="tidelift-buttons">
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>LEARN MORE</span>
+          </a>
+
+          <a href="https://tidelift.com/subscription/request-a-demo?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>REQUEST A DEMO</span>
+          </a>
+        </div>
+
         <h2 class="getting-started-heading">
           3 Ways to Get Started:
         </h2>

data/docs/stylesheets/main.css

@@ -615,6 +615,35 @@ body #tidelift a .cta {
   padding-left: 30px;
 }
 
+body .tidelift-buttons a {
+  display: table;
+  width: 200px;
+  border: 2px solid #407985;
+  border-radius: 4px;
+  text-decoration: none;
+  font-family: 'Yanone Kaffeesatz', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+  font-size: 18px;
+  letter-spacing: 1px;
+  margin: 0 10px;
+}
+
+body .tidelift-buttons a:first-child {
+  float: left;
+  color: #407985;
+  background: #FFF;
+}
+
+body .tidelift-buttons a:last-child {
+  color: #FFF;
+  background: #407985;
+}
+
+body .tidelift-buttons a span {
+  display: table-cell;
+  vertical-align: middle;
+  text-align: center;
+}
+
 body .clear {
   clear: both;
 }

data/lib/active_admin/csv_builder.rb

@@ -33,7 +33,7 @@ module ActiveAdmin
     def initialize(options = {}, &block)
       @resource = options.delete(:resource)
       @columns = []
-      @options = options
+      @options = ActiveAdmin.application.csv_options.merge options
       @block = block
     end
 
@@ -44,7 +44,6 @@ module ActiveAdmin
     def build(controller, csv)
       @collection  = controller.send :find_collection, except: :pagination
       columns      = exec_columns controller.view_context
-      options      = ActiveAdmin.application.csv_options.merge self.options
       bom          = options.delete :byte_order_mark
       column_names = options.delete(:column_names) { true }
       csv_options  = options.except :encoding_options, :humanize_name

data/lib/active_admin/generators/boilerplate.rb

@@ -9,8 +9,16 @@ module ActiveAdmin
         @class_name.constantize.new.attributes.keys
       end
 
+      def assignable_attributes
+        attributes - %w(id created_at updated_at)
+      end
+
+      def permit_params
+        assignable_attributes.map { |a| a.to_sym.inspect }.join(', ')
+      end
+
       def rows
-        attributes.map { |a| row(a) }.join("\n")
+        attributes.map { |a| row(a) }.join("\n  ")
       end
 
       def row(name)
@@ -18,7 +26,7 @@ module ActiveAdmin
       end
 
       def columns
-        attributes.map { |a| column(a) }.join("\n")
+        attributes.map { |a| column(a) }.join("\n  ")
       end
 
       def column(name)
@@ -26,7 +34,7 @@ module ActiveAdmin
       end
 
       def filters
-        attributes.map { |a| filter(a) }.join("\n")
+        attributes.map { |a| filter(a) }.join("\n  ")
       end
 
       def filter(name)
@@ -34,7 +42,7 @@ module ActiveAdmin
       end
 
       def form_inputs
-        attributes.reject { |a| %w(id created_at updated_at).include? a }.map { |a| form_input(a) }.join("\n")
+        assignable_attributes.map { |a| form_input(a) }.join("\n  ")
       end
 
       def form_input(name)

data/lib/active_admin/resource.rb

@@ -12,6 +12,7 @@ require 'active_admin/resource/scope_to'
 require 'active_admin/resource/sidebars'
 require 'active_admin/resource/belongs_to'
 require 'active_admin/resource/ordering'
+require 'active_admin/resource/model'
 
 module ActiveAdmin
 
@@ -104,6 +105,10 @@ module ActiveAdmin
       ActiveSupport::Dependencies.constantize(decorator_class_name) if decorator_class_name
     end
 
+    def resource_name_extension
+      @resource_name_extension ||= define_resource_name_extension(self)
+    end
+
     def resource_table_name
       resource_class.quoted_table_name
     end
@@ -133,6 +138,7 @@ module ActiveAdmin
     def belongs_to(target, options = {})
       @belongs_to = Resource::BelongsTo.new(self, target, options)
       self.menu_item_options = false if @belongs_to.required?
+      options[:class_name] ||= @belongs_to.resource.resource_class_name if @belongs_to.resource
       controller.send :belongs_to, target, options.dup
     end
 
@@ -203,5 +209,12 @@ module ActiveAdmin
       @default_csv_builder ||= CSVBuilder.default_for_resource(self)
     end
 
+    def define_resource_name_extension(resource)
+      Module.new do
+        define_method :model_name do
+          resource.resource_name
+        end
+      end
+    end
   end # class Resource
 end # module ActiveAdmin

data/lib/active_admin/resource/belongs_to.rb

@@ -14,6 +14,9 @@ module ActiveAdmin
       # The resource which initiated this relationship
       attr_reader :owner
 
+      # The name of the relation
+      attr_reader :target_name
+
       def initialize(owner, target_name, options = {})
         @owner = owner
         @target_name = target_name

data/lib/active_admin/resource/model.rb

@@ -0,0 +1,15 @@
+module ActiveAdmin
+  class Model
+    def initialize(resource, record)
+      @record = record
+
+      if resource
+        @record.extend(resource.resource_name_extension)
+      end
+    end
+
+    def to_model
+      @record
+    end
+  end
+end

data/lib/active_admin/resource/routes.rb

@@ -110,7 +110,7 @@ module ActiveAdmin
         # @return params to pass to instance path
         def route_instance_params(instance)
           if nested?
-            [instance.public_send(belongs_to_name).to_param, instance.to_param]
+            [instance.public_send(belongs_to_target_name).to_param, instance.to_param]
           else
             instance.to_param
           end
@@ -123,11 +123,19 @@ module ActiveAdmin
         end
 
         def nested?
-          resource.belongs_to? && resource.belongs_to_config.required?
+          resource.belongs_to? && belongs_to_config.required?
+        end
+
+        def belongs_to_target_name
+          belongs_to_config.target_name
         end
 
         def belongs_to_name
-          resource.belongs_to_config.target.resource_name.singular if nested?
+          belongs_to_config.target.resource_name.singular
+        end
+
+        def belongs_to_config
+          resource.belongs_to_config
         end
 
         def routes

data/lib/active_admin/resource_controller.rb

@@ -1,6 +1,7 @@
 require 'active_admin/resource_controller/action_builder'
 require 'active_admin/resource_controller/data_access'
 require 'active_admin/resource_controller/decorators'
+require 'active_admin/resource_controller/polymorphic_routes'
 require 'active_admin/resource_controller/scoping'
 require 'active_admin/resource_controller/streaming'
 require 'active_admin/resource_controller/sidebars'
@@ -18,6 +19,7 @@ module ActiveAdmin
     include ActionBuilder
     include Decorators
     include DataAccess
+    include PolymorphicRoutes
     include Scoping
     include Streaming
     include Sidebars

data/lib/active_admin/resource_controller/polymorphic_routes.rb

@@ -0,0 +1,36 @@
+require "active_admin/resource"
+require "active_admin/resource/model"
+
+module ActiveAdmin
+  class ResourceController < BaseController
+    module PolymorphicRoutes
+      def polymorphic_url(record_or_hash_or_array, options = {})
+        super(map_named_resources_for(record_or_hash_or_array), options)
+      end
+
+      def polymorphic_path(record_or_hash_or_array, options = {})
+        super(map_named_resources_for(record_or_hash_or_array), options)
+      end
+
+      private
+
+      def map_named_resources_for(record_or_hash_or_array)
+        return record_or_hash_or_array unless record_or_hash_or_array.is_a?(Array)
+
+        record_or_hash_or_array.map { |record| to_named_resource(record) }
+      end
+
+      def to_named_resource(record)
+        if record.is_a?(resource_class)
+          return ActiveAdmin::Model.new(active_admin_config, record)
+        end
+
+        if record.is_a?(parent.class)
+          return ActiveAdmin::Model.new(active_admin_config.belongs_to_config.resource, record)
+        end
+
+        record
+      end
+    end
+  end
+end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

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

@@ -92,7 +92,7 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = { theme: 'active_admin' }
+        options = { theme: @display_total ? 'active_admin' : 'active_admin_countless' }
         options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 

data/lib/active_admin/views/index_as_table.rb

@@ -192,6 +192,13 @@ module ActiveAdmin
     # end
     # ```
     #
+    # You can also define associated objects to include outside of the
+    # `scoped_collection` method:
+    #
+    # ```ruby
+    # includes :publisher
+    # ```
+    #
     # Then it's simple to sort by any Publisher attribute from within the index table:
     #
     # ```ruby

data/lib/generators/active_admin/resource/templates/admin.rb.erb

@@ -3,12 +3,14 @@ ActiveAdmin.register <%= class_name %> do
   # See permitted parameters documentation:
   # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
   #
-  # permit_params :list, :of, :attributes, :on, :model
+  # Uncomment all parameters which should be permitted for assignment
+  #
+  # permit_params <%= @boilerplate.permit_params %>
   #
   # or
   #
   # permit_params do
-  #   permitted = [:permitted, :attributes]
+  #   permitted = [<%= @boilerplate.permit_params %>]
   #   permitted << :other if params[:action] == 'create' && current_user.admin?
   #   permitted
   # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -139,20 +139,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +296,12 @@ files:
 - app/views/kaminari/active_admin/_page.html.erb
 - app/views/kaminari/active_admin/_paginator.html.erb
 - app/views/kaminari/active_admin/_prev_page.html.erb
+- app/views/kaminari/active_admin_countless/_first_page.html.erb
+- app/views/kaminari/active_admin_countless/_gap.html.erb
+- app/views/kaminari/active_admin_countless/_next_page.html.erb
+- app/views/kaminari/active_admin_countless/_page.html.erb
+- app/views/kaminari/active_admin_countless/_paginator.html.erb
+- app/views/kaminari/active_admin_countless/_prev_page.html.erb
 - app/views/layouts/active_admin.html.arb
 - app/views/layouts/active_admin_logged_out.html.erb
 - config/locales/ar.yml
@@ -471,6 +471,7 @@ files:
 - lib/active_admin/resource/controllers.rb
 - lib/active_admin/resource/includes.rb
 - lib/active_admin/resource/menu.rb
+- lib/active_admin/resource/model.rb
 - lib/active_admin/resource/naming.rb
 - lib/active_admin/resource/ordering.rb
 - lib/active_admin/resource/page_presenters.rb
@@ -484,6 +485,7 @@ files:
 - lib/active_admin/resource_controller/action_builder.rb
 - lib/active_admin/resource_controller/data_access.rb
 - lib/active_admin/resource_controller/decorators.rb
+- lib/active_admin/resource_controller/polymorphic_routes.rb
 - lib/active_admin/resource_controller/resource_class_methods.rb
 - lib/active_admin/resource_controller/scoping.rb
 - lib/active_admin/resource_controller/sidebars.rb
@@ -607,7 +609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style