administrate 0.9.0 → 0.14.0

data/lib/administrate/base_dashboard.rb

@@ -1,6 +1,7 @@
 require "administrate/field/belongs_to"
 require "administrate/field/boolean"
 require "administrate/field/date_time"
+require "administrate/field/date"
 require "administrate/field/email"
 require "administrate/field/has_many"
 require "administrate/field/has_one"
@@ -9,11 +10,26 @@ require "administrate/field/polymorphic"
 require "administrate/field/select"
 require "administrate/field/string"
 require "administrate/field/text"
+require "administrate/field/time"
+require "administrate/field/url"
+require "administrate/field/password"
 
 module Administrate
   class BaseDashboard
     include Administrate
 
+    DASHBOARD_SUFFIX = "Dashboard".freeze
+
+    class << self
+      def model
+        to_s.chomp(DASHBOARD_SUFFIX).classify.constantize
+      end
+
+      def resource_name(opts)
+        model.model_name.human(opts)
+      end
+    end
+
     def attribute_types
       self.class::ATTRIBUTE_TYPES
     end
@@ -30,6 +46,10 @@ module Administrate
       end
     end
 
+    def all_attributes
+      attribute_types.keys
+    end
+
     def form_attributes
       self.class::FORM_ATTRIBUTES
     end
@@ -52,15 +72,12 @@ module Administrate
       "#{resource.class} ##{resource.id}"
     end
 
-    def association_includes
-      association_classes = [Field::HasMany, Field::HasOne, Field::BelongsTo]
-
-      collection_attributes.map do |key|
-        field = self.class::ATTRIBUTE_TYPES[key]
+    def collection_includes
+      attribute_includes(collection_attributes)
+    end
 
-        next key if association_classes.include?(field)
-        key if association_classes.include?(field.try :deferred_class)
-      end.compact
+    def item_includes
+      attribute_includes(show_page_attributes)
     end
 
     private
@@ -68,5 +85,13 @@ module Administrate
     def attribute_not_found_message(attr)
       "Attribute #{attr} could not be found in #{self.class}::ATTRIBUTE_TYPES"
     end
+
+    def attribute_includes(attributes)
+      attributes.map do |key|
+        field = self.class::ATTRIBUTE_TYPES[key]
+
+        key if field.associative?
+      end.compact
+    end
   end
 end

data/lib/administrate/custom_dashboard.rb

@@ -0,0 +1,15 @@
+module Administrate
+  class CustomDashboard
+    include Administrate
+
+    class << self
+      def resource_name(_opts)
+        named_resource.pluralize.titleize
+      end
+
+      def resource(resource_name)
+        define_singleton_method(:named_resource) { resource_name }
+      end
+    end
+  end
+end

data/lib/administrate/engine.rb

@@ -2,7 +2,7 @@ require "datetime_picker_rails"
 require "jquery-rails"
 require "kaminari"
 require "momentjs-rails"
-require "sass-rails"
+require "sassc-rails"
 require "selectize-rails"
 require "sprockets/railtie"
 

data/lib/administrate/field/associative.rb

@@ -7,16 +7,16 @@ module Administrate
         associated_dashboard.display_resource(data)
       end
 
-      protected
+      def associated_class
+        associated_class_name.constantize
+      end
+
+      private
 
       def associated_dashboard
         "#{associated_class_name}Dashboard".constantize.new
       end
 
-      def associated_class
-        associated_class_name.constantize
-      end
-
       def associated_class_name
         options.fetch(:class_name, attribute.to_s.singularize.camelcase)
       end

data/lib/administrate/field/base.rb

@@ -12,10 +12,22 @@ module Administrate
         field_type.dasherize
       end
 
+      def self.associative?
+        self < Associative
+      end
+
       def self.searchable?
         false
       end
 
+      def self.field_type
+        to_s.split("::").last.underscore
+      end
+
+      def self.permitted_attribute(attr, _options = nil)
+        attr
+      end
+
       def initialize(attribute, data, page, options = {})
         @attribute = attribute
         @data = data
@@ -24,10 +36,6 @@ module Administrate
         @options = options
       end
 
-      def self.permitted_attribute(attr, _options = nil)
-        attr
-      end
-
       def html_class
         self.class.html_class
       end
@@ -40,15 +48,7 @@ module Administrate
         "/fields/#{self.class.field_type}/#{page}"
       end
 
-      attr_reader :attribute, :data, :page, :resource
-
-      protected
-
-      attr_reader :options
-
-      def self.field_type
-        to_s.split("::").last.underscore
-      end
+      attr_reader :attribute, :data, :options, :page, :resource
     end
   end
 end

data/lib/administrate/field/belongs_to.rb

@@ -24,8 +24,10 @@ module Administrate
       private
 
       def candidate_resources
+        scope = options[:scope] ? options[:scope].call : associated_class.all
+
         order = options.delete(:order)
-        order ? associated_class.order(order) : associated_class.all
+        order ? scope.reorder(order) : scope
       end
 
       def display_candidate_resource(resource)

data/lib/administrate/field/date.rb

@@ -0,0 +1,20 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class Date < Base
+      def date
+        I18n.localize(
+          data.to_date,
+          format: format,
+        )
+      end
+
+      private
+
+      def format
+        options.fetch(:format, :default)
+      end
+    end
+  end
+end

data/lib/administrate/field/date_time.rb

@@ -25,7 +25,7 @@ module Administrate
       end
 
       def timezone
-        options.fetch(:timezone, "UTC")
+        options.fetch(:timezone, ::Time.zone.name || "UTC")
       end
     end
   end

data/lib/administrate/field/deferred.rb

@@ -21,10 +21,29 @@ module Administrate
           options == other.options
       end
 
+      def associative?
+        deferred_class.associative?
+      end
+
       def searchable?
         options.fetch(:searchable, deferred_class.searchable?)
       end
 
+      def searchable_field
+        ActiveSupport::Deprecation.warn(
+          "searchable_field is deprecated, use searchable_fields instead",
+        )
+        options.fetch(:searchable_field)
+      end
+
+      def searchable_fields
+        if options.key?(:searchable_field)
+          [searchable_field]
+        else
+          options.fetch(:searchable_fields)
+        end
+      end
+
       def permitted_attribute(attr, _options = nil)
         options.fetch(:foreign_key,
           deferred_class.permitted_attribute(attr, options))

data/lib/administrate/field/has_many.rb

@@ -11,8 +11,8 @@ module Administrate
         { "#{attr.to_s.singularize}_ids".to_sym => [] }
       end
 
-      def associated_collection
-        Administrate::Page::Collection.new(associated_dashboard)
+      def associated_collection(order = self.order)
+        Administrate::Page::Collection.new(associated_dashboard, order: order)
       end
 
       def attribute_key
@@ -39,7 +39,7 @@ module Administrate
         self.class.permitted_attribute(attribute)
       end
 
-      def resources(page = 1)
+      def resources(page = 1, order = self.order)
         resources = order.apply(data).page(page).per(limit)
         includes.any? ? resources.includes(*includes) : resources
       end
@@ -49,13 +49,24 @@ module Administrate
       end
 
       def data
-        @data ||= associated_class.none 
+        @data ||= associated_class.none
+      end
+
+      def order_from_params(params)
+        Administrate::Order.new(
+          params.fetch(:order, sort_by),
+          params.fetch(:direction, direction),
+        )
+      end
+
+      def order
+        @order ||= Administrate::Order.new(sort_by, direction)
       end
 
       private
 
       def includes
-        associated_dashboard.association_includes
+        associated_dashboard.collection_includes
       end
 
       def candidate_resources
@@ -71,10 +82,6 @@ module Administrate
         associated_dashboard.display_resource(resource)
       end
 
-      def order
-        @_order ||= Administrate::Order.new(sort_by, direction)
-      end
-
       def sort_by
         options[:sort_by]
       end

data/lib/administrate/field/has_one.rb

@@ -3,13 +3,6 @@ require_relative "associative"
 module Administrate
   module Field
     class HasOne < Associative
-      def nested_form
-        @nested_form ||= Administrate::Page::Form.new(
-          resolver.dashboard_class.new,
-          data || resolver.resource_class.new,
-        )
-      end
-
       def self.permitted_attribute(attr, options = nil)
         associated_class_name =
           if options
@@ -24,6 +17,13 @@ module Administrate
         { "#{attr}_attributes": related_dashboard_attributes }
       end
 
+      def nested_form
+        @nested_form ||= Administrate::Page::Form.new(
+          resolver.dashboard_class.new,
+          data || resolver.resource_class.new,
+        )
+      end
+
       private
 
       def resolver

data/lib/administrate/field/password.rb

@@ -0,0 +1,25 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class Password < Field::Base
+      def self.searchable?
+        false
+      end
+
+      def truncate
+        data.to_s.gsub(/./, character)[0...truncation_length]
+      end
+
+      private
+
+      def truncation_length
+        options.fetch(:truncate, 50)
+      end
+
+      def character
+        options.fetch(:character, "•")
+      end
+    end
+  end
+end

data/lib/administrate/field/polymorphic.rb

@@ -3,6 +3,10 @@ require_relative "associative"
 module Administrate
   module Field
     class Polymorphic < BelongsTo
+      def self.permitted_attribute(attr, _options = nil)
+        { attr => %i{type value} }
+      end
+
       def associated_resource_grouped_options
         classes.map do |klass|
           [klass.to_s, candidate_resources_for(klass).map do |resource|
@@ -11,10 +15,6 @@ module Administrate
         end
       end
 
-      def self.permitted_attribute(attr, _options = nil)
-        { attr => %i{type value} }
-      end
-
       def permitted_attribute
         { attribute => %i{type value} }
       end
@@ -23,14 +23,14 @@ module Administrate
         data ? data.to_global_id : nil
       end
 
-      protected
+      private
 
       def associated_dashboard(klass = data.class)
         "#{klass.name}Dashboard".constantize.new
       end
 
       def classes
-        options.fetch(:classes) || []
+        options.fetch(:classes, [])
       end
 
       private

data/lib/administrate/field/select.rb

@@ -14,7 +14,12 @@ module Administrate
       private
 
       def collection
-        @collection ||= options.fetch(:collection, [])
+        values = options.fetch(:collection, [])
+        if values.respond_to? :call
+          return values.arity.positive? ? values.call(self) : values.call
+        end
+
+        @collection ||= values
       end
     end
   end

data/lib/administrate/field/time.rb

@@ -0,0 +1,8 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class Time < Base
+    end
+  end
+end

data/lib/administrate/field/url.rb

@@ -0,0 +1,21 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class Url < Field::Base
+      def self.searchable?
+        true
+      end
+
+      def truncate
+        data.to_s[0...truncation_length]
+      end
+
+      private
+
+      def truncation_length
+        options.fetch(:truncate, 50)
+      end
+    end
+  end
+end