administrate 0.20.1 → 1.0.0.beta1

data/lib/administrate/field/has_many.rb

@@ -18,14 +18,14 @@ module Administrate
         # be `country_ids` instead.
         #
         # See https://github.com/rails/rails/blob/b30a23f53b52e59d31358f7b80385ee5c2ba3afe/activerecord/lib/active_record/associations/builder/collection_association.rb#L48
-        { "#{attr.to_s.singularize}_ids".to_sym => [] }
+        {"#{attr.to_s.singularize}_ids": []}
       end
 
       def associated_collection(order = self.order)
         Administrate::Page::Collection.new(
           associated_dashboard,
           order: order,
-          collection_attributes: options[:collection_attributes],
+          collection_attributes: options[:collection_attributes]
         )
       end
 
@@ -37,7 +37,7 @@ module Administrate
         candidate_resources.map do |associated_resource|
           [
             display_candidate_resource(associated_resource),
-            associated_resource.send(association_primary_key),
+            associated_resource.send(association_primary_key)
           ]
         end
       end
@@ -59,7 +59,7 @@ module Administrate
       def permitted_attribute
         self.class.permitted_attribute(
           attribute,
-          resource_class: resource.class,
+          resource_class: resource.class
         )
       end
 
@@ -82,7 +82,7 @@ module Administrate
       def order_from_params(params)
         Administrate::Order.new(
           params.fetch(:order, sort_by),
-          params.fetch(:direction, direction),
+          params.fetch(:direction, direction)
         )
       end
 

data/lib/administrate/field/has_one.rb

@@ -20,10 +20,10 @@ module Administrate
             end
           end
         related_dashboard_attributes =
-          Administrate::ResourceResolver.
-            new("admin/#{final_associated_class_name}").
-            dashboard_class.new.permitted_attributes + [:id]
-        { "#{attr}_attributes": related_dashboard_attributes }
+          Administrate::ResourceResolver
+            .new("admin/#{final_associated_class_name}")
+            .dashboard_class.new.permitted_attributes + [:id]
+        {"#{attr}_attributes": related_dashboard_attributes}
       end
 
       def self.eager_load?
@@ -33,14 +33,14 @@ module Administrate
       def nested_form
         @nested_form ||= Administrate::Page::Form.new(
           resolver.dashboard_class.new,
-          data || resolver.resource_class.new,
+          data || resolver.resource_class.new
         )
       end
 
       def nested_show
         @nested_show ||= Administrate::Page::Show.new(
           resolver.dashboard_class.new,
-          data || resolver.resource_class.new,
+          data || resolver.resource_class.new
         )
       end
 

data/lib/administrate/field/number.rb

@@ -38,8 +38,8 @@ module Administrate
         formatter = options[:format][:formatter]
         formatter_options = options[:format][:formatter_options].to_h
 
-        ActiveSupport::NumberHelper.
-          try(formatter, result, **formatter_options) || result
+        ActiveSupport::NumberHelper
+          .try(formatter, result, **formatter_options) || result
       end
     end
   end

data/lib/administrate/field/polymorphic.rb

@@ -4,7 +4,7 @@ module Administrate
   module Field
     class Polymorphic < BelongsTo
       def self.permitted_attribute(attr, _options = {})
-        { attr => %i{type value} }
+        {attr => %i[type value]}
       end
 
       def associated_resource_grouped_options
@@ -16,11 +16,11 @@ module Administrate
       end
 
       def permitted_attribute
-        { attribute => %i{type value} }
+        {attribute => %i[type value]}
       end
 
       def selected_global_id
-        data ? data.to_global_id : nil
+        data&.to_global_id
       end
 
       private

data/lib/administrate/generator_helpers.rb

@@ -7,7 +7,7 @@ module Administrate
     private
 
     def generator_options
-      { behavior: behavior }
+      {behavior: behavior}
     end
   end
 end

data/lib/administrate/namespace/resource.rb

@@ -21,7 +21,7 @@ module Administrate
       end
 
       def path
-        name.to_s.gsub("/", "_")
+        name.to_s.tr("/", "_")
       end
     end
   end

data/lib/administrate/order.rb

@@ -48,7 +48,7 @@ module Administrate
     end
 
     def opposite_direction
-      direction == :asc ? :desc : :asc
+      (direction == :asc) ? :desc : :asc
     end
 
     def order_by_association(relation)
@@ -67,10 +67,10 @@ module Administrate
     def order_by_count(relation)
       klass = reflect_association(relation).klass
       query = klass.arel_table[klass.primary_key].count.public_send(direction)
-      relation.
-        left_joins(attribute.to_sym).
-        group(:id).
-        reorder(query)
+      relation
+        .left_joins(attribute.to_sym)
+        .group(:id)
+        .reorder(query)
     end
 
     def order_by_belongs_to(relation)
@@ -91,7 +91,7 @@ module Administrate
 
     def order_by_attribute(relation)
       relation.joins(
-        attribute.to_sym,
+        attribute.to_sym
       ).reorder(order_by_attribute_query)
     end
 

data/lib/administrate/page/base.rb

@@ -12,7 +12,7 @@ module Administrate
       end
 
       def resource_path
-        @resource_path ||= resource_name.gsub("/", "_")
+        @resource_path ||= resource_name.tr("/", "_")
       end
 
       def collection_includes

data/lib/administrate/page/collection.rb

@@ -5,7 +5,7 @@ module Administrate
     class Collection < Page::Base
       def attribute_names
         options.fetch(:collection_attributes, nil) ||
-        dashboard.collection_attributes
+          dashboard.collection_attributes
       end
 
       def attributes_for(resource)
@@ -25,7 +25,7 @@ module Administrate
       delegate :ordered_by?, to: :order
 
       def order_params_for(attr, key: resource_name)
-        { key => order.order_params_for(attr) }
+        {key => order.order_params_for(attr)}
       end
 
       private

data/lib/administrate/page/form.rb

@@ -14,7 +14,7 @@ module Administrate
         attributes = dashboard.form_attributes(action)
 
         if attributes.is_a? Array
-          attributes = { "" => attributes }
+          attributes = {"" => attributes}
         end
 
         attributes.transform_values do |attrs|

data/lib/administrate/page/show.rb

@@ -18,7 +18,7 @@ module Administrate
         attributes = dashboard.show_page_attributes
 
         if attributes.is_a? Array
-          attributes = { "" => attributes }
+          attributes = {"" => attributes}
         end
 
         attributes.transform_values do |attrs|

data/lib/administrate/resource_resolver.rb

@@ -35,7 +35,7 @@ module Administrate
     end
 
     def controller_path_parts
-      path_parts = controller_path.split("/")[1..-1]
+      path_parts = controller_path.split("/")[1..]
       path_parts << path_parts.pop.singularize
     end
 

data/lib/administrate/search.rb

@@ -59,8 +59,7 @@ module Administrate
         @scoped_resource.all
       else
         results = search_results(@scoped_resource)
-        results = filter_results(results)
-        results
+        filter_results(results)
       end
     end
 
@@ -112,9 +111,9 @@ module Administrate
     end
 
     def search_results(resources)
-      resources.
-        left_joins(tables_to_join).
-        where(query_template, *query_values)
+      resources
+        .left_joins(tables_to_join)
+        .where(query_template, *query_values)
     end
 
     def valid_filters
@@ -141,8 +140,8 @@ module Administrate
           end
         ActiveRecord::Base.connection.quote_table_name(unquoted_table_name)
       else
-        ActiveRecord::Base.connection.
-          quote_table_name(@scoped_resource.table_name)
+        ActiveRecord::Base.connection
+          .quote_table_name(@scoped_resource.table_name)
       end
     end
 

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.20.1".freeze
+  VERSION = "1.0.0.beta1".freeze
 end

data/lib/administrate/view_generator.rb

@@ -9,13 +9,13 @@ module Administrate
       :namespace,
       type: :string,
       desc: "Namespace where the admin dashboards live",
-      default: "admin",
+      default: "admin"
     )
 
     def self.template_source_path
       File.expand_path(
         "../../../app/views/administrate/application",
-        __FILE__,
+        __FILE__
       )
     end
 
@@ -30,7 +30,7 @@ module Administrate
 
       copy_file(
         template_file,
-        "app/views/#{namespace}/#{resource_path}/#{template_file}",
+        "app/views/#{namespace}/#{resource_path}/#{template_file}"
       )
     end
 

data/lib/administrate.rb

@@ -4,39 +4,39 @@ require "administrate/version"
 module Administrate
   def self.warn_of_missing_resource_class
     deprecator.warn(
-      "Calling Field::Base.permitted_attribute without the option " +
-      ":resource_class is deprecated. If you are seeing this " +
-      "message, you are probably using a custom field type that" +
-      "does this. Please make sure to update it to a version that " +
-      "does not use a deprecated API",
+      "Calling Field::Base.permitted_attribute without the option " \
+      ":resource_class is deprecated. If you are seeing this " \
+      "message, you are probably using a custom field type that" \
+      "does this. Please make sure to update it to a version that " \
+      "does not use a deprecated API"
     )
   end
 
   def self.warn_of_deprecated_option(name)
     deprecator.warn(
-      "The option :#{name} is deprecated. " +
-      "Administrate should detect it automatically. " +
-      "Please file an issue at " +
-      "https://github.com/thoughtbot/administrate/issues " +
-      "if you think otherwise.",
+      "The option :#{name} is deprecated. " \
+      "Administrate should detect it automatically. " \
+      "Please file an issue at " \
+      "https://github.com/thoughtbot/administrate/issues " \
+      "if you think otherwise."
     )
   end
 
   def self.warn_of_deprecated_method(klass, method)
     deprecator.warn(
-      "The method #{klass}##{method} is deprecated. " +
-      "If you are seeing this message you are probably " +
-      "using a dashboard that depends explicitly on it. " +
-      "Please make sure you update it to a version that " +
-      "does not use a deprecated API",
+      "The method #{klass}##{method} is deprecated. " \
+      "If you are seeing this message you are probably " \
+      "using a dashboard that depends explicitly on it. " \
+      "Please make sure you update it to a version that " \
+      "does not use a deprecated API"
     )
   end
 
   def self.warn_of_deprecated_authorization_method(method)
     deprecator.warn(
-      "The method `#{method}` is deprecated. " +
-      "Please use `accessible_action?` instead, " +
-      "or see the documentation for other options.",
+      "The method `#{method}` is deprecated. " \
+      "Please use `accessible_action?` instead, " \
+      "or see the documentation for other options."
     )
   end
 

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,7 +31,7 @@ module Administrate
         :namespace,
         type: :string,
         desc: "Namespace where the admin dashboards live",
-        default: "admin",
+        default: "admin"
       )
 
       source_root File.expand_path("../templates", __FILE__)
@@ -39,13 +39,13 @@ module Administrate
       def create_dashboard_definition
         template(
           "dashboard.rb.erb",
-          Rails.root.join("app/dashboards/#{file_name}_dashboard.rb"),
+          Rails.root.join("app/dashboards/#{file_name}_dashboard.rb")
         )
       end
 
       def create_resource_controller
         destination = Rails.root.join(
-          "app/controllers/#{namespace}/#{file_name.pluralize}_controller.rb",
+          "app/controllers/#{namespace}/#{file_name.pluralize}_controller.rb"
         )
 
         template("controller.rb.erb", destination)
@@ -72,7 +72,7 @@ module Administrate
           primary_key,
           *attrs.sort,
           created_at,
-          updated_at,
+          updated_at
         ].compact
       end
 
@@ -116,7 +116,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/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/admin/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.beta1
 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-02-05 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,19 @@ 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/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
@@ -174,7 +141,6 @@ files:
 - 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
@@ -359,9 +325,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.20
 signing_key: