administrate-field-nested_has_many 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b4e4495fbe9f39dff627f5b1ddf7d82bc89d5e3a05433cc318f12ab7f02d004
-  data.tar.gz: f328a1f6dea3d663ee0d80454bf04a4d55530b1d2a520f1c884c1c6d78b714e5
+  metadata.gz: d33edd4a1e1c3c4170b7456ec5bf0cc4786fd034d6c6cb23a6f4e41d5b4c47ac
+  data.tar.gz: 4d31e5f64c770656674a05a1f985ca6ae73fc4264617b32e865b82712d0735d4
 SHA512:
-  metadata.gz: 5c1a6222bc8d033f871610444425f7c90b015f5b05c9ff2c47187d1f96b0a787a75dbf4f4442335c5f24788713c33f0f67e5e1d6d2677952e5970524366578d1
-  data.tar.gz: cc1b62f1e2eb55ca307c7ed7e1f41d5e6f172d604a8e8a986c98d05c0fa3115bdd3f2603d2a339af8c726a6c7404689fed09c4a483e56a24d513b91e0f733f18
+  metadata.gz: 9a90171dfc15780d5005e247ef2c46c439aa8598bc39da3a23bb572a145d19f1cd1027a964c06f507daef85e4d6e5aa4b869dbbe1f0738f87955b65a6c0c11d2
+  data.tar.gz: 2f39cc39ac3e8d91ab5e415b9622a09cdbf3da226aad8dcfe1d9bee19822f66173d6853798d2e4693b4bce8683e8a34812f00bf868d07fb00c692c09ac96e8f6

data/.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     working_directory: ~/administrate-field-nested_has_many
     docker:
-      - image: circleci/ruby:2.7.0-node-browsers
+      - image: cimg/ruby:3.3-browsers
         environment:
           PGHOST: localhost
           PGUSER: administrate-field-nested_has_many

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.0
+ruby-3.3.0

data/Appraisals

@@ -1,13 +1,5 @@
 #!/usr/bin/env ruby
 
-appraise "administrate-0.10" do
-  gem "administrate", "0.10.0"
-end
-
-appraise "administrate-0.13" do
-  gem "administrate", "0.13.0"
-end
-
-appraise "administrate-master" do
-  gem "administrate", git: "https://github.com/thoughtbot/administrate", branch: "master"
+appraise "administrate-0.19" do
+  gem "administrate", "0.19.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## 2.0.0
+
+* Add CONTRIBUTING (#78)
+* Add the thoughtbot CoC (#76)
+* Add SECURITY (#77)
+* Add LICENSE (#75)
+* Add a script to build the changelog (#74)
+* Add a bin/setup script (#73)
+* Drop Administrate support below v0.19.0 (#72)
+* Upgrade Ruby to v3.3.0 (#67)
+* Drop SQLite development dependency (#70)
+* Refresh Appraisals (properly) (#71)
+* Refresh Appraisals (#69)
+* Pin Administrate below 0.20.0 (#68)
+* Add German locale (#53)
+* Align #show pagination with 0.16.0 (#52)
+* Let Administrate figure out the associations (#44)
+* Avoid having to add assets to the host manifest (#45)
+* Add French locale (#51)
+* Fix build to work with Rails 6.1 (#47)
+* Remove old compatibility (#46)
+* Remind users to declare accepts_nested_attributes_for (#48)
+
 ## 1.3.0
 
 * Cover more test cases ([#43][])

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,6 @@
+# Code of conduct
+
+By participating in this project, you agree to abide by the
+[thoughtbot code of conduct][1].
+
+[1]: https://thoughtbot.com/open-source-code-of-conduct

data/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+# Contributing Guide
+
+## Code of Conduct
+
+We welcome pull requests from everyone. By participating in this project, you
+agree to abide by the thoughtbot [code of conduct].
+
+We expect everyone to follow the code of conduct anywhere in thoughtbot's
+project codebases, issue trackers, chat-rooms, and mailing lists.
+
+[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
+
+## Getting Started
+
+`administrate-field-nested_has_many` is a field plugin for [Administrate][],
+that allows for nested `has_many` forms.
+
+To maintain compatibility with different dependency versions, we use
+[Appraisal][].
+
+[Administrate]: https://github.com/thoughtbot/administrate
+[Appraisal]: https://github.com/thoughtbot/appraisal
+
+### Opening a PR
+
+1. Fork the repo,
+2. Run `./bin/setup` to install the base dependencies and setup a local
+   database,
+3. Run the test suite: `bundle exec rspec && bundle exec appraisal rspec`,
+4. Make your changes,
+5. Push your fork and open a pull request.
+
+A good PR will solve the smallest problem it possibly can, have good test
+coverage and (where necessary) have internationalisation support.
+
+## Security
+
+See the [security policy](./SECURITY.md).

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2024 thoughtbot, inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -2,6 +2,22 @@
 
 A plugin for nested has_many forms in [Administrate].
 
+[Administrate]: https://github.com/thoughtbot/administrate
+
+## Compatibility
+
+This gem depends on Administrate APIs that may change over time. For this reason,
+some versions of this gem will be compatible only with some versions of Administrate.
+
+This is a table of known compatibilities. It is accurate to the best of our knowledge.
+Please let us know if you detect other incompatibilities:
+
+| `nested_has_many` | Administrate  |
+|-------------------|---------------|
+| v1.3.0            | up to v0.15   |
+| `#726d8gc`        | from v0.16    |
+| `master`          | up to v0.19.0 |
+
 ## Usage
 
 Add to your `Gemfile`:
@@ -35,4 +51,25 @@ Otherwise, Administrate will try to render a field
 for the order's `:customer` attribute,
 which breaks the nested form logic.
 
-[Administrate]: https://github.com/thoughtbot/administrate
+## Troubleshooting
+
+### `undefined method 'new_record?' for nil:NilClass`
+
+This field assumes that your models are setup for nested assignment as per
+Rails conventions. For example, if you have a `Recipe` that
+`has_many :ingredients`, you would have something like this:
+
+```ruby
+class Recipe < ApplicationRecord
+  has_many :ingredients
+
+  accepts_nested_attributes_for(
+    :ingredients,
+    reject_if: :all_blank,
+    allow_destroy: true
+  )
+end
+```
+
+Specifically, you'll see this `new_record?` error if you forget the
+`accepts_nested_attributes_for` declaration.

data/SECURITY.md

@@ -0,0 +1,16 @@
+# Security Policy
+
+## Supported Versions
+
+We only expect to support the latest version of Administrate (and it's related
+projects) as a given time. If you find a security issue with an older version,
+please try updating to the latest version first.
+
+If for some reason you can't update to the latest version, please let us know
+your reasons so that we can have a better understanding of your situation.
+
+## Reporting a Vulnerability
+
+For security inquiries or vulnerability reports, please email
+<security@thoughtbot.com>.
+If you'd like, you can use our PGP key when reporting vulnerabilities.

data/administrate-field-nested_has_many.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = "administrate-field-nested_has_many"
-  gem.version = "1.3.0"
+  gem.version = "2.0.0"
   gem.authors = ["Nick Charlton", "Grayson Wright"]
   gem.email = ["nick@nickcharlton.net", "wright.grayson@gmail.com"]
   gem.homepage = "https://github.com/nickcharlton/" \
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.files = `git ls-files`.split("\n")
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  gem.add_dependency "administrate", "> 0.8", "< 1"
+  gem.add_dependency "administrate", ">= 0.15", "< 0.20.0"
   gem.add_dependency "cocoon", "~> 1.2", ">= 1.2.11"
 
   gem.add_development_dependency "appraisal"
@@ -25,5 +25,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "i18n-tasks"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec-rails"
-  gem.add_development_dependency "sqlite3"
 end

data/app/views/fields/nested_has_many/_show.html.erb

@@ -1,9 +1,38 @@
-<%
-  current = Gem::Version.new(Administrate::VERSION)
-  v0_10 = Gem::Version.new("0.10")
+<%#
+# HasMany Show Partial
+
+This partial renders a has_many relationship,
+to be displayed on a resource's show page.
+
+By default, the relationship is rendered
+as a table of the first few associated resources.
+The columns of the table are taken
+from the associated resource class's dashboard.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::HasMany][1].
+  Contains methods to help display a table of associated resources.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasMany
 %>
-<% if current <= v0_10 %>
-  <%= render "fields/nested_has_many/show_old", **local_assigns %>
+
+<% if field.resources.any? %>
+  <% order = field.order_from_params(params.fetch(field.name, {})) %>
+  <% page_number = params.fetch(field.name, {}).fetch(:page, nil) %>
+  <%= render(
+    "collection",
+    collection_presenter: field.associated_collection(order),
+    collection_field_name: field.name,
+    page: page,
+    resources: field.resources(page_number, order),
+    table_title: field.name,
+  ) %>
+
+  <% if field.more_than_limit? %>
+    <%= paginate field.resources(page_number), param_name: "#{field.name}[page]" %>
+  <% end %>
 <% else %>
-  <%= render "fields/nested_has_many/show_current", **local_assigns %>
+  <%= t("administrate.fields.has_many.none", default: "–") %>
 <% end %>

data/bin/build-changelog

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+if ! command -v gh > /dev/null; then
+  echo "Please install the GitHub CLI: https://cli.github.com/"
+  exit 1
+fi
+
+last_release=$(git describe --tag --abbrev=0)
+
+revision_range="${last_release}..origin/main"
+commit_format="--pretty=tformat:%h %s"
+commits_since=$(git log --author="^(?!dependabot).*$" --perl-regexp "${revision_range}" "${commit_format}")
+
+echo "$commits_since" | while read -r line; do
+	sha=$(echo "${line}" | awk '{print $1}')
+	commit_message=$(echo "${line}" | awk '{print substr($0, index($0, " ")+1)}')
+
+	pr_number=$(gh pr list --search "$sha" --state merged --json number --jq '.[].number')
+	trimmed_commit=$(echo "${commit_message}"| sed "s/ (\#$pr_number)//g")
+
+	echo "* ${trimmed_commit} (#${pr_number})"
+done

data/bin/setup

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+gem install bundler --conservative
+bundle check || bundle install
+
+bundle exec appraisal install
+
+bundle exec rake db:setup
+
+# Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
+mkdir -p .git/safe

data/config/locales/administrate-field-nested_has_many.de.yml

@@ -0,0 +1,7 @@
+---
+de:
+  administrate:
+    fields:
+      nested_has_many:
+        add: "%{resource} hinzufügen"
+        remove: "%{resource} entfernen"

data/config/locales/administrate-field-nested_has_many.fr.yml

@@ -0,0 +1,7 @@
+---
+fr:
+  administrate:
+    fields:
+      nested_has_many:
+        add: Ajouter %{resource}
+        remove: Supprimer %{resource}

data/gemfiles/{administrate_0.13.gemfile → administrate_0.19.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "pg"
-gem "administrate", "0.13.0"
+gem "administrate", "0.19.0"
 
 gemspec path: "../"

data/gemfiles/administrate_0.19.gemfile.lock

@@ -0,0 +1,260 @@
+PATH
+  remote: ..
+  specs:
+    administrate-field-nested_has_many (2.0.0)
+      administrate (>= 0.15, < 0.20.0)
+      cocoon (~> 1.2, >= 1.2.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.1.3)
+      actionview (= 7.1.3)
+      activesupport (= 7.1.3)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.3)
+      activesupport (= 7.1.3)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    administrate (0.19.0)
+      actionpack (>= 5.0)
+      actionview (>= 5.0)
+      activerecord (>= 5.0)
+      jquery-rails (>= 4.0)
+      kaminari (>= 1.0)
+      sassc-rails (~> 2.1)
+      selectize-rails (~> 0.6)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    better_html (2.0.2)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
+    bigdecimal (3.1.6)
+    builder (3.2.4)
+    capybara (3.39.2)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
+    cocoon (1.2.15)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
+    erubi (1.12.0)
+    factory_bot (6.4.5)
+      activesupport (>= 5.0.0)
+    ffi (1.16.3)
+    highline (3.0.1)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    i18n-tasks (1.0.13)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 3.2.2.1)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
+    jquery-rails (4.6.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    kaminari (1.2.2)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
+      actionview
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
+      activerecord
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    matrix (0.4.2)
+    mini_mime (1.1.5)
+    minitest (5.21.2)
+    mutex_m (0.2.0)
+    nokogiri (1.16.0-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.0-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.0-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86_64-linux)
+      racc (~> 1.4)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
+    pg (1.5.4)
+    psych (5.1.2)
+      stringio
+    public_suffix (5.0.4)
+    racc (1.7.3)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rails-i18n (7.0.8)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 8)
+    railties (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.0)
+    reline (0.4.2)
+      io-console (~> 0.5)
+    rexml (3.2.6)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.1.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    selectize-rails (0.12.6)
+    selenium-webdriver (4.17.0)
+      base64 (~> 0.2)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    smart_properties (1.17.0)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    stringio (3.1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.3.0)
+    tilt (2.3.0)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
+    websocket (1.2.10)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  administrate (= 0.19.0)
+  administrate-field-nested_has_many!
+  appraisal
+  capybara
+  factory_bot
+  i18n-tasks
+  pg
+  rake
+  rspec-rails
+  selenium-webdriver
+
+BUNDLED WITH
+   2.5.3

data/lib/administrate/field/nested_has_many.rb

@@ -15,6 +15,13 @@ module Administrate
         Administrate::Engine.add_stylesheet(
           "administrate-field-nested_has_many/application",
         )
+
+        initializer "administrate-field-nested_has_many.assets.precompile" do |app|
+          app.config.assets.precompile += [
+            "administrate-field-nested_has_many/application.js",
+            "administrate-field-nested_has_many/application.css",
+          ]
+        end
       end
 
       DEFAULT_ATTRIBUTES = %i(id _destroy).freeze
@@ -44,32 +51,39 @@ module Administrate
         data
       end
 
-      def self.dashboard_for_resource(resource, options)
-        class_name = options && options[:class_name] || resource.to_s.classify
-        "#{class_name}Dashboard".constantize
+      def self.dashboard_for_resource(resource_class, attr)
+        "#{associated_class_name(resource_class, attr)}Dashboard".constantize
       end
 
-      def self.associated_attributes(associated_resource, options)
-        dashboard_class = dashboard_for_resource(associated_resource, options)
+      def self.associated_attributes(resource_class, attr)
+        dashboard_class = dashboard_for_resource(resource_class, attr)
         DEFAULT_ATTRIBUTES + dashboard_class.new.permitted_attributes
       end
 
-      def self.permitted_attribute(associated_resource, options = nil)
+      def self.permitted_attribute(attr, options = {})
+        given_class_name = options[:class_name]
+        _resource_class =
+          if given_class_name
+            Administrate.warn_of_deprecated_option(:class_name)
+            given_class_name.classify
+          else
+            options[:resource_class]
+          end
+
         {
-          "#{associated_resource}_attributes".to_sym =>
-          associated_attributes(associated_resource, options),
+          "#{attr}_attributes".to_sym =>
+            associated_attributes(_resource_class, attr),
         }
       end
 
       def associated_class_name
-        options.fetch(:class_name, attribute.to_s.singularize.camelcase)
+        self.class.associated_class_name(resource.class, attribute)
       end
 
       def association_name
-        options.fetch(
-          :association_name,
-          associated_class_name.underscore.pluralize[/([^\/]*)$/, 1],
-        )
+        options.fetch(:association_name) do
+          associated_class_name.underscore.pluralize[/([^\/]*)$/, 1]
+        end
       end
 
       def associated_form
@@ -79,7 +93,7 @@ module Administrate
       private
 
       def new_resource
-        @new_resource ||= associated_class_name.constantize.new
+        @new_resource ||= associated_class.new
       end
 
       def skipped_fields