administrate 0.12.0 → 0.15.0

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

@@ -1,3 +1,9 @@
+if defined?(Zeitwerk)
+  Zeitwerk::Loader.eager_load_all
+else
+  Rails.application.eager_load!
+end
+
 require "rails/generators/base"
 require "administrate/generator_helpers"
 require "administrate/namespace"
@@ -13,7 +19,7 @@ module Administrate
       def run_routes_generator
         if dashboard_resources.none?
           call_generator("administrate:routes", "--namespace", namespace)
-          load Rails.root.join("config/routes.rb")
+          Rails.application.reload_routes!
         end
       end
 
@@ -31,6 +37,12 @@ module Administrate
         end
       end
 
+      def model_check
+        if valid_dashboard_models.none?
+          puts "WARNING: Add models before installing Administrate."
+        end
+      end
+
       private
 
       def namespace
@@ -44,6 +56,30 @@ module Administrate
       def dashboard_resources
         Administrate::Namespace.new(namespace).resources
       end
+
+      def valid_dashboard_models
+        database_models - invalid_dashboard_models
+      end
+
+      def database_models
+        ActiveRecord::Base.descendants.reject(&:abstract_class?)
+      end
+
+      def invalid_dashboard_models
+        (models_without_tables + namespaced_models + unnamed_constants).uniq
+      end
+
+      def models_without_tables
+        database_models.reject(&:table_exists?)
+      end
+
+      def namespaced_models
+        database_models.select { |model| model.to_s.include?("::") }
+      end
+
+      def unnamed_constants
+        ActiveRecord::Base.descendants.reject { |d| d.name == d.to_s }
+      end
     end
   end
 end

data/lib/generators/administrate/install/templates/application_controller.rb.erb

@@ -1,6 +1,6 @@
-# All Administrate controllers inherit from this `Admin::ApplicationController`,
-# making it the ideal place to put authentication logic or other
-# before_actions.
+# All Administrate controllers inherit from this
+# `Administrate::ApplicationController`, making it the ideal place to put
+# authentication logic or other before_actions.
 #
 # If you want to add pagination or other controller-level concerns,
 # you're free to overwrite the RESTful controller actions.

data/lib/generators/administrate/routes/routes_generator.rb

@@ -5,30 +5,32 @@ else
 end
 
 require "rails/generators/base"
+require "administrate/generator_helpers"
 require "administrate/namespace"
 
 module Administrate
   module Generators
     class RoutesGenerator < Rails::Generators::Base
+      include Administrate::GeneratorHelpers
       source_root File.expand_path("../templates", __FILE__)
       class_option :namespace, type: :string, default: "admin"
 
       def insert_dashboard_routes
-        if should_route_dashboard?
+        if valid_dashboard_models.any?
           route(dashboard_routes)
         end
       end
 
       def warn_about_invalid_models
-        namespaced_models.each do |invalid_model|
-          puts "WARNING: Unable to generate a dashboard for #{invalid_model}."
-          puts "         Administrate does not yet support namespaced models."
-        end
-
-        models_without_tables.each do |invalid_model|
-          puts "WARNING: Unable to generate a dashboard for #{invalid_model}."
-          puts "         It is not connected to a database table."
-          puts "         Make sure your database migrations are up to date."
+        invalid_dashboard_models.each do |model|
+          puts "WARNING: Unable to generate a dashboard for #{model}."
+          if namespaced_models.include?(model)
+            puts "       - Administrate does not yet support namespaced models."
+          end
+          if models_without_tables.include?(model)
+            puts "       - It is not connected to a database table."
+            puts "         Make sure your database migrations are up to date."
+          end
         end
 
         unnamed_constants.each do |invalid_model|
@@ -49,15 +51,15 @@ module Administrate
       end
 
       def valid_dashboard_models
-        database_models - invalid_database_models
+        database_models - invalid_dashboard_models
       end
 
       def database_models
         ActiveRecord::Base.descendants.reject(&:abstract_class?)
       end
 
-      def invalid_database_models
-        models_without_tables + namespaced_models + unnamed_constants
+      def invalid_dashboard_models
+        (models_without_tables + namespaced_models + unnamed_constants).uniq
       end
 
       def models_without_tables
@@ -76,21 +78,9 @@ module Administrate
         ERB.new(File.read(routes_file_path)).result(binding)
       end
 
-      def routes_includes_resources?
-        File.read(rails_routes_file_path).include?(dashboard_routes)
-      end
-
-      def rails_routes_file_path
-        Rails.root.join("config/routes.rb")
-      end
-
       def routes_file_path
         File.expand_path(find_in_source_paths("routes.rb.erb"))
       end
-
-      def should_route_dashboard?
-        routes_includes_resources? || valid_dashboard_models.any?
-      end
     end
   end
 end

data/lib/generators/administrate/views/views_generator.rb

@@ -4,10 +4,11 @@ module Administrate
   module Generators
     class ViewsGenerator < Administrate::ViewGenerator
       def copy_templates
-        call_generator("administrate:views:index", resource_path)
-        call_generator("administrate:views:show", resource_path)
-        call_generator("administrate:views:new", resource_path)
-        call_generator("administrate:views:edit", resource_path)
+        view = "administrate:views:"
+        call_generator("#{view}index", resource_path, "--namespace", namespace)
+        call_generator("#{view}show", resource_path, "--namespace", namespace)
+        call_generator("#{view}new", resource_path, "--namespace", namespace)
+        call_generator("#{view}edit", resource_path, "--namespace", namespace)
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Nick Charlton
 - Grayson Wright
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,56 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: datetime_picker_rails
   requirement: !ruby/object:Gem::Requirement
@@ -187,8 +173,8 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - app/assets/javascripts/administrate/application.js
+- app/assets/javascripts/administrate/components/associative.js
 - app/assets/javascripts/administrate/components/date_time_picker.js
-- app/assets/javascripts/administrate/components/has_many_form.js
 - app/assets/javascripts/administrate/components/table.js
 - app/assets/stylesheets/administrate/application.scss
 - app/assets/stylesheets/administrate/base/_forms.scss
@@ -234,6 +220,9 @@ files:
 - app/views/fields/boolean/_form.html.erb
 - app/views/fields/boolean/_index.html.erb
 - app/views/fields/boolean/_show.html.erb
+- app/views/fields/date/_form.html.erb
+- app/views/fields/date/_index.html.erb
+- app/views/fields/date/_show.html.erb
 - app/views/fields/date_time/_form.html.erb
 - app/views/fields/date_time/_index.html.erb
 - app/views/fields/date_time/_show.html.erb
@@ -272,7 +261,6 @@ files:
 - app/views/fields/url/_show.html.erb
 - app/views/layouts/administrate/application.html.erb
 - config/i18n-tasks.yml
-- config/locales/administrate.al.yml
 - config/locales/administrate.ar.yml
 - config/locales/administrate.bs.yml
 - config/locales/administrate.ca.yml
@@ -280,6 +268,7 @@ files:
 - config/locales/administrate.de.yml
 - config/locales/administrate.en.yml
 - config/locales/administrate.es.yml
+- config/locales/administrate.fi.yml
 - config/locales/administrate.fr.yml
 - config/locales/administrate.id.yml
 - config/locales/administrate.it.yml
@@ -290,13 +279,16 @@ files:
 - config/locales/administrate.pt-BR.yml
 - config/locales/administrate.pt.yml
 - config/locales/administrate.ru.yml
+- config/locales/administrate.sq.yml
 - config/locales/administrate.sv.yml
+- config/locales/administrate.tr.yml
 - config/locales/administrate.uk.yml
 - config/locales/administrate.vi.yml
 - config/locales/administrate.zh-CN.yml
 - config/locales/administrate.zh-TW.yml
 - config/routes.rb
 - config/unicorn.rb
+- docs/adding_controllers_without_related_model.md
 - docs/adding_custom_field_types.md
 - docs/authentication.md
 - docs/authorization.md
@@ -304,15 +296,20 @@ files:
 - docs/customizing_controller_actions.md
 - docs/customizing_dashboards.md
 - docs/customizing_page_views.md
+- docs/extending_administrate.md
 - docs/getting_started.md
+- docs/guides.md
+- docs/guides/hiding_dashboards_from_sidebar.md
 - docs/rails_api.md
 - lib/administrate.rb
 - lib/administrate/base_dashboard.rb
+- lib/administrate/custom_dashboard.rb
 - lib/administrate/engine.rb
 - lib/administrate/field/associative.rb
 - lib/administrate/field/base.rb
 - lib/administrate/field/belongs_to.rb
 - lib/administrate/field/boolean.rb
+- lib/administrate/field/date.rb
 - lib/administrate/field/date_time.rb
 - lib/administrate/field/deferred.rb
 - lib/administrate/field/email.rb
@@ -365,11 +362,11 @@ files:
 - lib/generators/administrate/views/show_generator.rb
 - lib/generators/administrate/views/views_generator.rb
 - lib/tasks/administrate_tasks.rake
-homepage: https://administrate-prototype.herokuapp.com/
+homepage: https://administrate-demo.herokuapp.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -384,8 +381,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards
 test_files: []

data/app/assets/javascripts/administrate/components/has_many_form.js

@@ -1,3 +0,0 @@
-$(function() {
-  $(".field-unit--has-many select").selectize({});
-});