administrate 0.8.1 → 0.9.0

data/lib/administrate/field/polymorphic.rb

@@ -2,11 +2,49 @@ require_relative "associative"
 
 module Administrate
   module Field
-    class Polymorphic < Associative
+    class Polymorphic < BelongsTo
+      def associated_resource_grouped_options
+        classes.map do |klass|
+          [klass.to_s, candidate_resources_for(klass).map do |resource|
+            [display_candidate_resource(resource), resource.to_global_id]
+          end]
+        end
+      end
+
+      def self.permitted_attribute(attr, _options = nil)
+        { attr => %i{type value} }
+      end
+
+      def permitted_attribute
+        { attribute => %i{type value} }
+      end
+
+      def selected_global_id
+        data ? data.to_global_id : nil
+      end
+
       protected
 
-      def associated_dashboard
-        "#{data.class.name}Dashboard".constantize.new
+      def associated_dashboard(klass = data.class)
+        "#{klass.name}Dashboard".constantize.new
+      end
+
+      def classes
+        options.fetch(:classes) || []
+      end
+
+      private
+
+      def order
+        @_order ||= options.delete(:order)
+      end
+
+      def candidate_resources_for(klass)
+        order ? klass.order(order) : klass.all
+      end
+
+      def display_candidate_resource(resource)
+        associated_dashboard(resource.class).display_resource(resource)
       end
     end
   end

data/lib/administrate/order.rb

@@ -6,11 +6,13 @@ module Administrate
     end
 
     def apply(relation)
-      if relation.columns_hash.keys.include?(attribute.to_s)
-        relation.order("#{attribute} #{direction}")
-      else
-        relation
-      end
+      return order_by_association(relation) unless
+        reflect_association(relation).nil?
+
+      return relation.reorder("#{attribute} #{direction}") if
+        relation.columns_hash.keys.include?(attribute.to_s)
+
+      relation
     end
 
     def ordered_by?(attr)
@@ -41,5 +43,36 @@ module Administrate
     def opposite_direction
       direction.to_sym == :asc ? :desc : :asc
     end
+
+    def order_by_association(relation)
+      return order_by_count(relation) if has_many_attribute?(relation)
+
+      return order_by_id(relation) if belongs_to_attribute?(relation)
+
+      relation
+    end
+
+    def order_by_count(relation)
+      relation.
+      left_joins(attribute.to_sym).
+      group(:id).
+      reorder("COUNT(#{attribute}.id) #{direction}")
+    end
+
+    def order_by_id(relation)
+      relation.reorder("#{attribute}_id #{direction}")
+    end
+
+    def has_many_attribute?(relation)
+      reflect_association(relation).macro == :has_many
+    end
+
+    def belongs_to_attribute?(relation)
+      reflect_association(relation).macro == :belongs_to
+    end
+
+    def reflect_association(relation)
+      relation.klass.reflect_on_association(attribute.to_s)
+    end
   end
 end

data/lib/administrate/resource_resolver.rb

@@ -5,7 +5,7 @@ module Administrate
     end
 
     def dashboard_class
-      Object.const_get(resource_class_name + "Dashboard")
+      ActiveSupport::Inflector.constantize("#{resource_class_name}Dashboard")
     end
 
     def namespace
@@ -13,7 +13,7 @@ module Administrate
     end
 
     def resource_class
-      Object.const_get(resource_class_name)
+      ActiveSupport::Inflector.constantize(resource_class_name)
     end
 
     def resource_name

data/lib/administrate/search.rb

@@ -24,7 +24,7 @@ module Administrate
         table_name = ActiveRecord::Base.connection.
           quote_table_name(@scoped_resource.table_name)
         attr_name = ActiveRecord::Base.connection.quote_column_name(attr)
-        "lower(#{table_name}.#{attr_name}) LIKE ?"
+        "LOWER(TEXT(#{table_name}.#{attr_name})) LIKE ?"
       end.join(" OR ")
     end
 

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.8.1".freeze
+  VERSION = "0.9.0".freeze
 end

data/lib/generators/administrate/dashboard/USAGE

@@ -3,7 +3,7 @@ Description:
     pulling the attributes from database columns.
 
 Example:
-    rails generate administrate:dashboard FooBar
+    rails generate administrate:dashboard FooBar [--namespace admin]
 
     This will create:
         app/dashboards/foo_bar_dashboard.rb

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

@@ -24,6 +24,8 @@ module Administrate
       COLLECTION_ATTRIBUTE_LIMIT = 4
       READ_ONLY_ATTRIBUTES = %w[id created_at updated_at]
 
+      class_option :namespace, type: :string, default: "admin"
+
       source_root File.expand_path("../templates", __FILE__)
 
       def create_dashboard_definition
@@ -35,7 +37,7 @@ module Administrate
 
       def create_resource_controller
         destination = Rails.root.join(
-          "app/controllers/admin/#{file_name.pluralize}_controller.rb",
+          "app/controllers/#{namespace}/#{file_name.pluralize}_controller.rb",
         )
 
         template("controller.rb.erb", destination)
@@ -43,6 +45,10 @@ module Administrate
 
       private
 
+      def namespace
+        options[:namespace]
+      end
+
       def attributes
         klass.reflections.keys + klass.attribute_names - redundant_attributes
       end

data/lib/generators/administrate/dashboard/templates/controller.rb.erb

@@ -1,5 +1,5 @@
-module Admin
-  class <%= class_name.pluralize %>Controller < Admin::ApplicationController
+module <%= namespace.classify %>
+  class <%= class_name.pluralize %>Controller < <%= namespace.classify %>::ApplicationController
     # To customize the behavior of this controller,
     # you can overwrite any of the RESTful actions. For example:
     #

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

@@ -8,34 +8,41 @@ module Administrate
       include Administrate::GeneratorHelpers
       source_root File.expand_path("../templates", __FILE__)
 
+      class_option :namespace, type: :string, default: "admin"
+
       def run_routes_generator
         if dashboard_resources.none?
-          call_generator("administrate:routes")
+          call_generator("administrate:routes", "--namespace", namespace)
           load Rails.root.join("config/routes.rb")
         end
       end
 
       def create_dashboard_controller
-        copy_file(
-          "application_controller.rb",
-          "app/controllers/admin/application_controller.rb"
+        template(
+          "application_controller.rb.erb",
+          "app/controllers/#{namespace}/application_controller.rb",
         )
       end
 
       def run_dashboard_generators
         singular_dashboard_resources.each do |resource|
-          call_generator("administrate:dashboard", resource)
+          call_generator "administrate:dashboard", resource,
+            "--namespace", namespace
         end
       end
 
       private
 
+      def namespace
+        options[:namespace]
+      end
+
       def singular_dashboard_resources
         dashboard_resources.map(&:to_s).map(&:singularize)
       end
 
       def dashboard_resources
-        Administrate::Namespace.new(:admin).resources
+        Administrate::Namespace.new(namespace).resources
       end
     end
   end

data/lib/generators/administrate/install/templates/{application_controller.rb → application_controller.rb.erb}

@@ -4,7 +4,7 @@
 #
 # If you want to add pagination or other controller-level concerns,
 # you're free to overwrite the RESTful controller actions.
-module Admin
+module <%= namespace.classify %>
   class ApplicationController < Administrate::ApplicationController
     before_action :authenticate_admin
 

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

@@ -6,6 +6,7 @@ module Administrate
   module Generators
     class RoutesGenerator < Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
+      class_option :namespace, type: :string, default: "admin"
 
       def insert_dashboard_routes
         if should_route_dashboard?
@@ -32,6 +33,10 @@ module Administrate
 
       private
 
+      def namespace
+        options[:namespace]
+      end
+
       def dashboard_resources
         valid_dashboard_models.map do |model|
           model.to_s.pluralize.underscore

data/lib/generators/administrate/routes/templates/routes.rb.erb

@@ -1,4 +1,4 @@
-namespace :admin do
+namespace :<%= namespace %> do
 <% dashboard_resources.each do |resource| %>    resources :<%= resource %>
 <%end%>
     root to: "<%= dashboard_resources.first %>#index"

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

@@ -14,15 +14,29 @@ module Administrate
         source_root template_source_path
 
         def copy_partials
-          copy_field_partial(:index)
-          copy_field_partial(:show)
-          copy_field_partial(:form)
+          resource_path = args.first.try(:underscore)
+
+          if resource_path == "all"
+            entries = Dir.entries(self.class.template_source_path)
+            field_types = entries.reject { |name| name[0] == "." }
+
+            field_types.each do |field_type|
+              copy_field_partials(field_type)
+            end
+          else
+            copy_field_partials(resource_path)
+          end
         end
 
         private
 
-        def copy_field_partial(partial_name)
-          resource_path = args.first.try(:underscore)
+        def copy_field_partials(resource_path)
+          copy_field_partial(resource_path, :index)
+          copy_field_partial(resource_path, :show)
+          copy_field_partial(resource_path, :form)
+        end
+
+        def copy_field_partial(resource_path, partial_name)
           template_file = "#{resource_path}/_#{partial_name}.html.erb"
 
           copy_file(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -218,6 +218,7 @@ files:
 - 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
 - app/views/administrate/application/_collection.html.erb
 - app/views/administrate/application/_flashes.html.erb
@@ -267,6 +268,8 @@ files:
 - app/views/layouts/administrate/application.html.erb
 - config/i18n-tasks.yml
 - config/locales/administrate.ar.yml
+- config/locales/administrate.bs.yml
+- config/locales/administrate.ca.yml
 - config/locales/administrate.da.yml
 - config/locales/administrate.de.yml
 - config/locales/administrate.en.yml
@@ -290,6 +293,7 @@ files:
 - config/unicorn.rb
 - docs/adding_custom_field_types.md
 - docs/authentication.md
+- docs/authorization.md
 - docs/customizing_attribute_partials.md
 - docs/customizing_controller_actions.md
 - docs/customizing_dashboards.md
@@ -338,7 +342,7 @@ files:
 - lib/generators/administrate/field/templates/_show.html.erb
 - lib/generators/administrate/field/templates/field_object.rb.erb
 - lib/generators/administrate/install/install_generator.rb
-- lib/generators/administrate/install/templates/application_controller.rb
+- lib/generators/administrate/install/templates/application_controller.rb.erb
 - lib/generators/administrate/routes/routes_generator.rb
 - lib/generators/administrate/routes/templates/routes.rb.erb
 - lib/generators/administrate/views/edit_generator.rb
@@ -371,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards