administrate 1.0.0.beta2 → 1.0.0

data/lib/administrate/order.rb

@@ -1,19 +1,19 @@
 module Administrate
   class Order
-    def initialize(attribute = nil, direction = nil, association_attribute: nil)
+    def initialize(attribute = nil, direction = nil, sorting_column: nil)
       @attribute = attribute
       @direction = sanitize_direction(direction)
-      @association_attribute = association_attribute
+      @sorting_column = sorting_column || attribute
     end
 
     def apply(relation)
       return order_by_association(relation) unless
         reflect_association(relation).nil?
 
-      order = relation.arel_table[attribute].public_send(direction)
+      order = relation.arel_table[sorting_column].public_send(direction)
 
       return relation.reorder(order) if
-        column_exist?(relation, attribute)
+        column_exist?(relation, sorting_column)
 
       relation
     end
@@ -33,7 +33,7 @@ module Administrate
 
     private
 
-    attr_reader :attribute, :association_attribute
+    attr_reader :attribute, :sorting_column
 
     def sanitize_direction(direction)
       %w[asc desc].include?(direction.to_s) ? direction.to_sym : :asc
@@ -94,9 +94,9 @@ module Administrate
     end
 
     def ordering_by_association_column?(relation)
-      association_attribute &&
+      (attribute != sorting_column) &&
         column_exist?(
-          reflect_association(relation).klass, association_attribute.to_sym
+          reflect_association(relation).klass, sorting_column.to_sym
         )
     end
 
@@ -113,7 +113,7 @@ module Administrate
     end
 
     def order_by_association_attribute(relation)
-      order_by_association_column(relation, association_attribute)
+      order_by_association_column(relation, sorting_column)
     end
 
     def order_by_association_column(relation, column_name)

data/lib/administrate/search.rb

@@ -63,6 +63,14 @@ module Administrate
       end
     end
 
+    def valid_filters
+      if @dashboard.class.const_defined?(:COLLECTION_FILTERS)
+        @dashboard.class.const_get(:COLLECTION_FILTERS).stringify_keys
+      else
+        {}
+      end
+    end
+
     private
 
     def apply_filter(filter, filter_param, resources)
@@ -116,14 +124,6 @@ module Administrate
         .where(query_template, *query_values)
     end
 
-    def valid_filters
-      if @dashboard.class.const_defined?(:COLLECTION_FILTERS)
-        @dashboard.class.const_get(:COLLECTION_FILTERS).stringify_keys
-      else
-        {}
-      end
-    end
-
     def attribute_types
       @dashboard.class.const_get(:ATTRIBUTE_TYPES)
     end
@@ -133,7 +133,6 @@ module Administrate
         provided_class_name = attribute_types[attr].options[:class_name]
         unquoted_table_name =
           if provided_class_name
-            Administrate.warn_of_deprecated_option(:class_name)
             provided_class_name.constantize.table_name
           else
             @scoped_resource.reflect_on_association(attr).klass.table_name

data/lib/administrate/version.rb

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

data/lib/administrate/view_generator.rb

@@ -5,6 +5,7 @@ require "administrate/namespace"
 module Administrate
   class ViewGenerator < Rails::Generators::Base
     include Administrate::GeneratorHelpers
+
     class_option(
       :namespace,
       type: :string,

data/lib/administrate.rb

@@ -2,44 +2,6 @@ require "administrate/engine"
 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"
-    )
-  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."
-    )
-  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"
-    )
-  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."
-    )
-  end
-
   def self.deprecator
     @deprecator ||= ActiveSupport::Deprecation.new(VERSION, "Administrate")
   end

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

@@ -12,6 +12,7 @@ module Administrate
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Administrate::GeneratorHelpers
+
       source_root File.expand_path("../templates", __FILE__)
 
       class_option(

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

@@ -13,6 +13,7 @@ module Administrate
   module Generators
     class RoutesGenerator < Rails::Generators::Base
       include Administrate::GeneratorHelpers
+
       source_root File.expand_path("../templates", __FILE__)
       class_option(
         :namespace,

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

@@ -9,7 +9,11 @@ module Administrate
         def copy_template
           copy_resource_template("index")
           copy_resource_template("_collection")
+          copy_resource_template("_collection_header_actions")
+          copy_resource_template("_collection_item_actions")
           copy_resource_template("_index_header")
+          copy_resource_template("_pagination")
+          copy_resource_template("_search")
         end
       end
     end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0
 platform: ruby
 authors:
 - Nick Charlton
-- Grayson Wright
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -20,7 +18,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +28,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +38,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +48,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +58,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +68,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -86,21 +84,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.2
 description: |
-  Administrate is heavily inspired by projects like Rails Admin and ActiveAdmin,
-  but aims to provide a better user experience for site admins,
-  and to be easier for developers to customize.
-
-  To do that, we're following a few simple rules:
-
-  - No DSLs (domain-specific languages)
-  - Support the simplest use cases,
-    and let the user override defaults with standard tools
-    such as plain Rails controllers and views.
-  - Break up the library into core components and plugins,
-    so each component stays small and easy to maintain.
+  Administrate is a library for Rails that generates admin dashboards. These
+  give users clean interfaces that allow them to create, edit, search, and
+  delete records for any model in the application. Administrate aims to
+  provide the best user experience, and doing as much work as possible for
+  you, whilst also being flexible to customise.
 email:
 - nick@nickcharlton.net
-- grayson@thoughtbot.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,6 +109,8 @@ files:
 - 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/javascripts/administrate/controllers/tooltip_controller.js
+- app/assets/javascripts/administrate/vendor/css-anchor-positioning.js
 - app/assets/stylesheets/administrate-internal/docs.scss
 - app/assets/stylesheets/administrate/application.scss
 - app/assets/stylesheets/administrate/base/_forms.scss
@@ -249,6 +241,8 @@ files:
 - docs/guides/customising_search.md
 - docs/guides/hiding_dashboards_from_sidebar.md
 - docs/guides/scoping_has_many_relations.md
+- docs/guides/switching_templates_with_view_variants.md
+- docs/migrating-to-v1.md
 - docs/rails_api.md
 - lib/administrate.rb
 - lib/administrate/base_dashboard.rb
@@ -315,7 +309,6 @@ homepage: https://administrate-demo.herokuapp.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -330,8 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards
 test_files: []