administrate 0.20.1 → 1.0.0.beta2

data/lib/generators/administrate/dashboard/dashboard_generator.rb

@@ -13,14 +13,14 @@ module Administrate
         time: "Field::Time",
         text: "Field::Text",
         string: "Field::String",
-        uuid: "Field::String",
+        uuid: "Field::String"
       }
 
       ATTRIBUTE_OPTIONS_MAPPING = {
         # procs must be defined in one line!
-        enum: {  searchable: false,
-                 collection: ->(field) { field.resource.class.send(field.attribute.to_s.pluralize).keys } },
-        float: { decimals: 2 },
+        enum: {searchable: false,
+               collection: ->(field) { field.resource.class.send(field.attribute.to_s.pluralize).keys }},
+        float: {decimals: 2}
       }
 
       DEFAULT_FIELD_TYPE = "Field::String.with_options(searchable: false)"
@@ -31,21 +31,24 @@ module Administrate
         :namespace,
         type: :string,
         desc: "Namespace where the admin dashboards live",
-        default: "admin",
+        default: "admin"
       )
 
       source_root File.expand_path("../templates", __FILE__)
 
       def create_dashboard_definition
+        scope = regular_class_path.join("/")
+
         template(
           "dashboard.rb.erb",
-          Rails.root.join("app/dashboards/#{file_name}_dashboard.rb"),
+          Rails.root.join("app/dashboards/#{scope}/#{file_name}_dashboard.rb")
         )
       end
 
       def create_resource_controller
+        scope = "#{namespace}/#{regular_class_path.join("/")}"
         destination = Rails.root.join(
-          "app/controllers/#{namespace}/#{file_name.pluralize}_controller.rb",
+          "app/controllers/#{scope}/#{file_name.pluralize}_controller.rb"
         )
 
         template("controller.rb.erb", destination)
@@ -72,7 +75,7 @@ module Administrate
           primary_key,
           *attrs.sort,
           created_at,
-          updated_at,
+          updated_at
         ].compact
       end
 
@@ -116,7 +119,7 @@ module Administrate
 
       def enum_column?(attr)
         klass.respond_to?(:defined_enums) &&
-          klass.defined_enums.keys.include?(attr)
+          klass.defined_enums.key?(attr)
       end
 
       def column_types(attr)

data/lib/generators/administrate/field/field_generator.rb

@@ -6,7 +6,7 @@ module Administrate
       def template_field_object
         template(
           "field_object.rb.erb",
-          "app/fields/#{file_name}_field.rb",
+          "app/fields/#{file_name}_field.rb"
         )
       end
 
@@ -23,7 +23,7 @@ module Administrate
 
         copy_file(
           partial,
-          "app/views/fields/#{file_name}_field/#{partial}",
+          "app/views/fields/#{file_name}_field/#{partial}"
         )
       end
     end

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

@@ -18,7 +18,7 @@ module Administrate
         :namespace,
         type: :string,
         desc: "Namespace where the admin dashboards will live",
-        default: "admin",
+        default: "admin"
       )
 
       def run_routes_generator
@@ -31,7 +31,7 @@ module Administrate
       def create_dashboard_controller
         template(
           "application_controller.rb.erb",
-          "app/controllers/#{namespace}/application_controller.rb",
+          "app/controllers/#{namespace}/application_controller.rb"
         )
       end
 

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

@@ -18,7 +18,7 @@ module Administrate
         :namespace,
         type: :string,
         desc: "Namespace where the admin dashboards live",
-        default: "admin",
+        default: "admin"
       )
 
       def insert_dashboard_routes
@@ -61,10 +61,10 @@ module Administrate
       end
 
       def database_models
-        ActiveRecord::Base.descendants.
-          reject(&:abstract_class?).
-          reject { |k| k < Administrate::Generators::TestRecord }.
-          sort_by(&:to_s)
+        ActiveRecord::Base.descendants
+          .reject(&:abstract_class?)
+          .reject { |k| k < Administrate::Generators::TestRecord }
+          .sort_by(&:to_s)
       end
 
       def invalid_dashboard_models

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

@@ -7,7 +7,7 @@ module Administrate
         def self.template_source_path
           File.expand_path(
             "../../../../../app/views/fields/",
-            __FILE__,
+            __FILE__
           )
         end
 
@@ -41,7 +41,7 @@ module Administrate
 
           copy_file(
             template_file,
-            "app/views/fields/#{template_file}",
+            "app/views/fields/#{template_file}"
           )
         end
       end

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

@@ -9,6 +9,7 @@ module Administrate
         def copy_template
           copy_resource_template("index")
           copy_resource_template("_collection")
+          copy_resource_template("_index_header")
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Administrate
         def copy_template
           copy_file(
             "../../layouts/administrate/application.html.erb",
-            "app/views/layouts/admin/application.html.erb",
+            "app/views/layouts/#{namespace}/application.html.erb"
           )
 
           call_generator("administrate:views:navigation")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -71,20 +71,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -99,34 +85,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: sassc-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: selectize-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 description: |
   Administrate is heavily inspired by projects like Rails Admin and ActiveAdmin,
   but aims to provide a better user experience for site admins,
@@ -148,10 +106,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
+- app/assets/builds/administrate-internal/docs.css
+- app/assets/builds/administrate-internal/docs.css.map
+- app/assets/builds/administrate/application.css
+- app/assets/builds/administrate/application.css.map
+- app/assets/builds/administrate/application.js
+- app/assets/builds/administrate/application.js.map
+- app/assets/config/administrate_manifest.js
+- app/assets/javascripts/administrate/add_jquery.js
 - app/assets/javascripts/administrate/application.js
-- app/assets/javascripts/administrate/components/associative.js
-- app/assets/javascripts/administrate/components/select.js
-- app/assets/javascripts/administrate/components/table.js
+- app/assets/javascripts/administrate/controllers/application.js
+- app/assets/javascripts/administrate/controllers/index.js
+- app/assets/javascripts/administrate/controllers/select_controller.js
+- app/assets/javascripts/administrate/controllers/table_controller.js
+- app/assets/stylesheets/administrate-internal/docs.scss
 - app/assets/stylesheets/administrate/application.scss
 - app/assets/stylesheets/administrate/base/_forms.scss
 - app/assets/stylesheets/administrate/base/_layout.scss
@@ -173,8 +141,6 @@ files:
 - app/assets/stylesheets/administrate/library/_data-label.scss
 - app/assets/stylesheets/administrate/library/_variables.scss
 - app/assets/stylesheets/administrate/reset/_normalize.scss
-- app/assets/stylesheets/administrate/utilities/_text-color.scss
-- app/assets/stylesheets/docs.scss
 - app/controllers/administrate/application_controller.rb
 - app/controllers/concerns/administrate/punditize.rb
 - app/helpers/administrate/application_helper.rb
@@ -224,6 +190,9 @@ files:
 - app/views/fields/polymorphic/_form.html.erb
 - app/views/fields/polymorphic/_index.html.erb
 - app/views/fields/polymorphic/_show.html.erb
+- app/views/fields/rich_text/_form.html.erb
+- app/views/fields/rich_text/_index.html.erb
+- app/views/fields/rich_text/_show.html.erb
 - app/views/fields/select/_form.html.erb
 - app/views/fields/select/_index.html.erb
 - app/views/fields/select/_show.html.erb
@@ -298,6 +267,7 @@ files:
 - lib/administrate/field/number.rb
 - lib/administrate/field/password.rb
 - lib/administrate/field/polymorphic.rb
+- lib/administrate/field/rich_text.rb
 - lib/administrate/field/select.rb
 - lib/administrate/field/string.rb
 - lib/administrate/field/text.rb
@@ -317,9 +287,6 @@ files:
 - lib/administrate/search.rb
 - lib/administrate/version.rb
 - lib/administrate/view_generator.rb
-- lib/generators/administrate/assets/assets_generator.rb
-- lib/generators/administrate/assets/javascripts_generator.rb
-- lib/generators/administrate/assets/stylesheets_generator.rb
 - lib/generators/administrate/dashboard/USAGE
 - lib/generators/administrate/dashboard/dashboard_generator.rb
 - lib/generators/administrate/dashboard/templates/controller.rb.erb
@@ -363,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards

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

@@ -1,5 +0,0 @@
-$(function() {
-  $('.field-unit--belongs-to select').selectize({});
-  $(".field-unit--has-many select").selectize({});
-  $('.field-unit--polymorphic select').selectize({});
-});

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

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

data/app/assets/stylesheets/administrate/utilities/_text-color.scss

@@ -1,3 +0,0 @@
-.text-color-red {
-  color: $red;
-}

data/lib/generators/administrate/assets/assets_generator.rb

@@ -1,12 +0,0 @@
-require "administrate/view_generator"
-
-module Administrate
-  module Generators
-    class AssetsGenerator < Administrate::ViewGenerator
-      def copy_assets
-        call_generator("administrate:assets:javascripts")
-        call_generator("administrate:assets:stylesheets")
-      end
-    end
-  end
-end

data/lib/generators/administrate/assets/javascripts_generator.rb

@@ -1,17 +0,0 @@
-require "rails/generators/base"
-
-module Administrate
-  module Generators
-    module Assets
-      class JavascriptsGenerator < Rails::Generators::Base
-        JAVASCRIPTS_PATH = "app/assets/javascripts/administrate"
-
-        source_root File.expand_path("../../../../../", __FILE__)
-
-        def copy_javascripts
-          directory JAVASCRIPTS_PATH, JAVASCRIPTS_PATH
-        end
-      end
-    end
-  end
-end

data/lib/generators/administrate/assets/stylesheets_generator.rb

@@ -1,17 +0,0 @@
-require "rails/generators/base"
-
-module Administrate
-  module Generators
-    module Assets
-      class StylesheetsGenerator < Rails::Generators::Base
-        STYLESHEETS_PATH = "app/assets/stylesheets/administrate"
-
-        source_root File.expand_path("../../../../../", __FILE__)
-
-        def copy_stylesheets
-          directory STYLESHEETS_PATH, STYLESHEETS_PATH
-        end
-      end
-    end
-  end
-end