administrate 0.19.0 → 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.table_name}.#{attribute} #{direction}"
+      order = relation.arel_table[sorting_column].public_send(direction)
 
-      return relation.reorder(Arel.sql(order)) if
-        column_exist?(relation, attribute)
+      return relation.reorder(order) if
+        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
@@ -48,7 +48,7 @@ module Administrate
     end
 
     def opposite_direction
-      direction == :asc ? :desc : :asc
+      (direction == :asc) ? :desc : :asc
     end
 
     def order_by_association(relation)
@@ -66,16 +66,16 @@ module Administrate
 
     def order_by_count(relation)
       klass = reflect_association(relation).klass
-      query = "COUNT(#{klass.table_name}.#{klass.primary_key}) #{direction}"
-      relation.
-        left_joins(attribute.to_sym).
-        group(:id).
-        reorder(Arel.sql(query))
+      query = klass.arel_table[klass.primary_key].count.public_send(direction)
+      relation
+        .left_joins(attribute.to_sym)
+        .group(:id)
+        .reorder(query)
     end
 
     def order_by_belongs_to(relation)
       if ordering_by_association_column?(relation)
-        order_by_attribute(relation)
+        order_by_association_attribute(relation)
       else
         order_by_id(relation)
       end
@@ -83,30 +83,20 @@ module Administrate
 
     def order_by_has_one(relation)
       if ordering_by_association_column?(relation)
-        order_by_attribute(relation)
+        order_by_association_attribute(relation)
       else
         order_by_association_id(relation)
       end
     end
 
-    def order_by_attribute(relation)
-      relation.joins(
-        attribute.to_sym,
-      ).reorder(Arel.sql(order_by_attribute_query))
-    end
-
     def order_by_id(relation)
-      relation.reorder(Arel.sql(order_by_id_query(relation)))
-    end
-
-    def order_by_association_id(relation)
-      relation.reorder(Arel.sql(order_by_association_id_query))
+      relation.reorder(order_by_id_query(relation))
     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
 
@@ -115,15 +105,26 @@ module Administrate
     end
 
     def order_by_id_query(relation)
-      "#{relation.table_name}.#{foreign_key(relation)} #{direction}"
+      relation.arel_table[association_foreign_key(relation)].public_send(direction)
     end
 
-    def order_by_association_id_query
-      "#{association_table_name}.id #{direction}"
+    def order_by_association_id(relation)
+      order_by_association_column(relation, association_primary_key(relation))
     end
 
-    def order_by_attribute_query
-      "#{association_table_name}.#{association_attribute} #{direction}"
+    def order_by_association_attribute(relation)
+      order_by_association_column(relation, sorting_column)
+    end
+
+    def order_by_association_column(relation, column_name)
+      relation.joins(
+        attribute.to_sym
+      ).reorder(order_by_association_column_query(relation, column_name))
+    end
+
+    def order_by_association_column_query(relation, column)
+      table = Arel::Table.new(association_table_name(relation))
+      table[column].public_send(direction)
     end
 
     def relation_type(relation)
@@ -134,12 +135,16 @@ module Administrate
       relation.klass.reflect_on_association(attribute.to_s)
     end
 
-    def foreign_key(relation)
+    def association_foreign_key(relation)
       reflect_association(relation).foreign_key
     end
 
-    def association_table_name
-      attribute.tableize
+    def association_primary_key(relation)
+      reflect_association(relation).association_primary_key
+    end
+
+    def association_table_name(relation)
+      reflect_association(relation).table_name
     end
   end
 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
@@ -30,13 +30,8 @@ module Administrate
       private
 
       def attribute_field(dashboard, resource, attribute_name, page)
-        value = get_attribute_value(resource, attribute_name)
         field = dashboard.attribute_type_for(attribute_name)
-        field.new(attribute_name, value, page, resource: resource)
-      end
-
-      def get_attribute_value(resource, attribute_name)
-        resource.public_send(attribute_name)
+        field.new(attribute_name, nil, page, resource: resource)
       end
 
       attr_reader :dashboard, :options

data/lib/administrate/page/collection.rb

@@ -4,7 +4,8 @@ module Administrate
   module Page
     class Collection < Page::Base
       def attribute_names
-        dashboard.collection_attributes
+        options.fetch(:collection_attributes, nil) ||
+          dashboard.collection_attributes
       end
 
       def attributes_for(resource)
@@ -24,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

@@ -11,8 +11,16 @@ module Administrate
       attr_reader :resource
 
       def attributes(action = nil)
-        dashboard.form_attributes(action).map do |attribute|
-          attribute_field(dashboard, resource, attribute, :form)
+        attributes = dashboard.form_attributes(action)
+
+        if attributes.is_a? Array
+          attributes = {"" => attributes}
+        end
+
+        attributes.transform_values do |attrs|
+          attrs.map do |attribute|
+            attribute_field(dashboard, resource, attribute, :form)
+          end
         end
       end
 

data/lib/administrate/page/show.rb

@@ -15,8 +15,16 @@ module Administrate
       end
 
       def attributes
-        dashboard.show_page_attributes.map do |attr_name|
-          attribute_field(dashboard, resource, attr_name, :show)
+        attributes = dashboard.show_page_attributes
+
+        if attributes.is_a? Array
+          attributes = {"" => attributes}
+        end
+
+        attributes.transform_values do |attrs|
+          attrs.map do |attr_name|
+            attribute_field(dashboard, resource, attr_name, :show)
+          end
         end
       end
     end

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,15 @@ module Administrate
         @scoped_resource.all
       else
         results = search_results(@scoped_resource)
-        results = filter_results(results)
-        results
+        filter_results(results)
+      end
+    end
+
+    def valid_filters
+      if @dashboard.class.const_defined?(:COLLECTION_FILTERS)
+        @dashboard.class.const_get(:COLLECTION_FILTERS).stringify_keys
+      else
+        {}
       end
     end
 
@@ -112,17 +119,9 @@ module Administrate
     end
 
     def search_results(resources)
-      resources.
-        left_joins(tables_to_join).
-        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
+      resources
+        .left_joins(tables_to_join)
+        .where(query_template, *query_values)
     end
 
     def attribute_types
@@ -134,15 +133,14 @@ 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
           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.19.0".freeze
+  VERSION = "1.0.0".freeze
 end

data/lib/administrate/view_generator.rb

@@ -5,17 +5,18 @@ require "administrate/namespace"
 module Administrate
   class ViewGenerator < Rails::Generators::Base
     include Administrate::GeneratorHelpers
+
     class_option(
       :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 +31,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

@@ -1,41 +1,8 @@
 require "administrate/engine"
+require "administrate/version"
 
 module Administrate
-  def self.warn_of_missing_resource_class
-    ActiveSupport::Deprecation.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)
-    ActiveSupport::Deprecation.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)
-    ActiveSupport::Deprecation.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)
-    ActiveSupport::Deprecation.warn(
-      "The method `#{method}` is deprecated. " +
-      "Please use `accessible_action?` instead, " +
-      "or see the documentation for other options.",
-    )
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new(VERSION, "Administrate")
   end
 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,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

@@ -12,13 +12,14 @@ module Administrate
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Administrate::GeneratorHelpers
+
       source_root File.expand_path("../templates", __FILE__)
 
       class_option(
         :namespace,
         type: :string,
         desc: "Namespace where the admin dashboards will live",
-        default: "admin",
+        default: "admin"
       )
 
       def run_routes_generator
@@ -31,7 +32,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

@@ -13,12 +13,13 @@ module Administrate
   module Generators
     class RoutesGenerator < Rails::Generators::Base
       include Administrate::GeneratorHelpers
+
       source_root File.expand_path("../templates", __FILE__)
       class_option(
         :namespace,
         type: :string,
         desc: "Namespace where the admin dashboards live",
-        default: "admin",
+        default: "admin"
       )
 
       def insert_dashboard_routes
@@ -61,10 +62,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,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

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")