administrate 0.14.0 → 0.15.0

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

@@ -5,16 +5,18 @@ 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
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-02 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
@@ -282,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
@@ -294,6 +281,7 @@ files:
 - 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
@@ -304,12 +292,14 @@ files:
 - docs/adding_custom_field_types.md
 - docs/authentication.md
 - docs/authorization.md
-- docs/contributing.md
 - docs/customizing_attribute_partials.md
 - 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
@@ -372,7 +362,7 @@ 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: {}
@@ -391,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards

data/docs/contributing.md

@@ -1 +0,0 @@
-../CONTRIBUTING.md