Merge branch 'master' of https://github.com/thoughtbot/administrate

.gitignore

@@ -25,3 +25,5 @@ pkg
 /.idea
 .byebug_history
 gemfiles/.bundle/
+.yardoc
+/doc

.yardopts

@@ -0,0 +1,13 @@
+-
+CHANGELOG.md
+docs/getting_started.md
+docs/rails_api.md
+docs/customizing_dashboards.md
+docs/customizing_page_views.md
+docs/customizing_attribute_partials.md
+docs/adding_controllers_without_related_model.md
+docs/adding_custom_field_types.md
+docs/authentication.md
+docs/authorization.md
+CODE_OF_CONDUCT.md
+LICENSE.md

Appraisals

@@ -1,14 +1,3 @@
-appraise "rails42" do
-  gem "actionpack", "~> 4.2.0"
-  gem "actionview", "~> 4.2.0"
-  gem "activerecord", "~> 4.2.0"
-  gem "pg", "0.21.0"
-
-  group :development, :test do
-    gem "rspec-rails"
-  end
-end
-
 appraise "rails50" do
   gem "actionpack", "~> 5.0.0"
   gem "actionview", "~> 5.0.0"

Gemfile

@@ -21,6 +21,7 @@ group :development, :test do
   gem "factory_bot_rails"
   gem "i18n-tasks", "0.9.31"
   gem "pry-rails"
+  gem "yard"
 end
 
 group :test do

Gemfile.lock

@@ -2,9 +2,9 @@ PATH
   remote: .
   specs:
     administrate (0.14.0)
-      actionpack (>= 4.2)
-      actionview (>= 4.2)
-      activerecord (>= 4.2)
+      actionpack (>= 5.0)
+      actionview (>= 5.0)
+      activerecord (>= 5.0)
       autoprefixer-rails (>= 6.0)
       datetime_picker_rails (~> 0.0.7)
       jquery-rails (>= 4.0)
@@ -53,7 +53,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.0)
-    autoprefixer-rails (9.8.6.1)
+    autoprefixer-rails (9.8.6.3)
       execjs
     awesome_print (1.8.0)
     builder (3.2.4)
@@ -92,7 +92,7 @@ GEM
       railties (>= 5.0.0)
     faker (2.13.0)
       i18n (>= 1.6, < 2)
-    faraday (1.0.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.13.1)
     formulaic (0.4.1)
@@ -212,7 +212,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sentry-raven (3.0.0)
+    sentry-raven (3.0.2)
       faraday (>= 1.0)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
@@ -243,6 +243,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    yard (0.9.25)
     zeitwerk (2.3.1)
 
 PLATFORMS
@@ -281,6 +282,7 @@ DEPENDENCIES
   unicorn
   webmock
   xpath (= 3.2.0)
+  yard
 
 BUNDLED WITH
    1.17.3

README.md

@@ -46,8 +46,7 @@ To accomplish these goals, Administrate follows a few guiding principles:
 
 ## Getting Started
 
-Administrate supports Rails from 4.2, up to 5.0 and beyond. We support Ruby
-2.4 and up.
+Administrate supports Rails 5.0 onwards. We support Ruby 2.4 and up.
 
 Add Administrate to your Gemfile and re-bundle:
 
@@ -104,7 +103,7 @@ git repository, too.
 
 Please see [CONTRIBUTING.md](/CONTRIBUTING.md).
 
-administrate was originally written by Grayson Wright and is now maintained by
+administrate was originally written by Grace Youngblood and is now maintained by
 Nick Charlton. Many improvements and bugfixes were contributed by the [open
 source
 community](https://github.com/thoughtbot/administrate/graphs/contributors).

administrate.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,docs}/**/*", "LICENSE", "Rakefile"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "actionpack", ">= 4.2"
-  s.add_dependency "actionview", ">= 4.2"
-  s.add_dependency "activerecord", ">= 4.2"
+  s.add_dependency "actionpack", ">= 5.0"
+  s.add_dependency "actionview", ">= 5.0"
+  s.add_dependency "activerecord", ">= 5.0"
 
   s.add_dependency "autoprefixer-rails", ">= 6.0"
   s.add_dependency "datetime_picker_rails", "~> 0.0.7"

app/views/fields/polymorphic/_show.html.erb

@@ -17,7 +17,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.attribute) %>
+  <% if valid_action?(:show, field.data.class) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

docs/adding_controllers_without_related_model.md

@@ -1,3 +1,7 @@
+---
+title: Adding Controllers without a related Model
+---
+
 # Adding Controllers without a related Model
 
 Sometimes you may want to add a custom controller that has no resource

gemfiles/rails50.gemfile

@@ -24,6 +24,7 @@ group :development, :test do
   gem "factory_bot_rails"
   gem "i18n-tasks", "0.9.31"
   gem "pry-rails"
+  gem "yard"
   gem "rspec-rails"
 end
 

gemfiles/rails51.gemfile

@@ -24,6 +24,7 @@ group :development, :test do
   gem "factory_bot_rails"
   gem "i18n-tasks", "0.9.31"
   gem "pry-rails"
+  gem "yard"
   gem "rspec-rails"
 end
 

gemfiles/rails52.gemfile

@@ -24,6 +24,7 @@ group :development, :test do
   gem "factory_bot_rails"
   gem "i18n-tasks", "0.9.31"
   gem "pry-rails"
+  gem "yard"
   gem "rspec-rails"
 end
 

gemfiles/rails60.gemfile

@@ -22,6 +22,7 @@ group :development, :test do
   gem "factory_bot_rails"
   gem "i18n-tasks", "0.9.31"
   gem "pry-rails"
+  gem "yard"
   gem "rspec-rails", "~> 4.0.0.beta2"
 end
 

lib/generators/administrate/dashboard/templates/dashboard.rb.erb

@@ -21,7 +21,7 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
   COLLECTION_ATTRIBUTES = %i[
 <%=
   attributes.first(COLLECTION_ATTRIBUTE_LIMIT).map do |attr|
-    "  #{attr}"
+    "    #{attr}"
   end.join("\n")
 %>
   ].freeze
@@ -31,7 +31,7 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
   SHOW_PAGE_ATTRIBUTES = %i[
 <%=
   attributes.map do |attr|
-    "  #{attr}"
+    "    #{attr}"
   end.join("\n")
 %>
   ].freeze
@@ -42,7 +42,7 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
   FORM_ATTRIBUTES = %i[
 <%=
   form_attributes.map do |attr|
-    "  #{attr}"
+    "    #{attr}"
   end.join("\n")
 %>
   ].freeze

spec/support/generator_spec_helpers.rb

@@ -55,7 +55,7 @@ def copy_to_generator_root(destination, template)
   config.include GeneratorSpecHelpers
 
   config.before(:example, :generator) do
-    destination File.expand_path("../../../tmp", __FILE__)
+    destination File.expand_path("../../tmp/generator_tests_output", __dir__)
     prepare_destination
   end
 end