obitum-rails_admin 0.0.1 → 0.0.2

data/lib/rails_admin/config/fields/base.rb

@@ -1,44 +1,51 @@
 require 'active_support/core_ext/string/inflections'
-require 'rails_admin/config/base'
+require 'active_model/mass_assignment_security'
+
+require 'rails_admin/config/proxyable'
+require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/association'
 require 'rails_admin/config/fields/groupable'
 
-
 module RailsAdmin
   module Config
     module Fields
-      class Base < RailsAdmin::Config::Base
-        attr_reader :name, :properties
+      class Base
+        include RailsAdmin::Config::Proxyable
+        include RailsAdmin::Config::Configurable
+        include RailsAdmin::Config::Hideable
+
+        attr_reader :name, :properties, :abstract_model
         attr_accessor :defined, :order, :section
+        attr_reader :parent, :root
 
         def self.inherited(klass)
           klass.instance_variable_set("@view_helper", :text_field)
         end
 
-        include RailsAdmin::Config::Hideable
-
         def initialize(parent, name, properties)
-          super(parent)
-          
+          @parent = parent
+          @root = parent.root
+
+          @abstract_model = parent.abstract_model
           @defined = false
           @name = name
           @order = 0
           @properties = properties
           @section = parent
-          
+
           extend RailsAdmin::Config::Fields::Groupable
         end
 
         register_instance_option(:css_class) do
           "#{self.name}_field"
         end
-        
+
         def type_css_class
           "#{type}_type"
         end
-        
+
         def virtual?
           properties.blank?
         end
@@ -46,17 +53,17 @@ module RailsAdmin
         register_instance_option(:column_width) do
           nil
         end
-        
+
         register_instance_option(:sortable) do
-          !virtual?
+          !virtual? || children_fields.first || false
         end
 
         register_instance_option(:searchable) do
-          !virtual?
+          !virtual? || children_fields.first || false
         end
 
         register_instance_option(:queryable?) do
-          !!searchable
+          !virtual?
         end
 
         register_instance_option(:filterable?) do
@@ -88,7 +95,7 @@ module RailsAdmin
                 table_name, column = f.split '.'
                 type = nil
               elsif f.is_a?(Hash)                                              #  <Model|table_name> => <attribute|column>
-                am = AbstractModel.new(f.keys.first.to_s.classify)
+                am = f.keys.first.is_a?(Class) && AbstractModel.new(f.keys.first)
                 table_name = am && am.model.table_name || f.keys.first
                 column = f.values.first
                 property = am && am.properties.find{ |p| p[:name] == f.values.first.to_sym }
@@ -129,7 +136,7 @@ module RailsAdmin
         register_instance_option(:html_attributes) do
           {}
         end
-        
+
         register_instance_option :default_value do
           nil
         end
@@ -155,7 +162,7 @@ module RailsAdmin
             v.is_a?(ActiveModel::Validations::LengthValidator)}.try{|v| v.options} || {}
         end
 
-        register_instance_option(:partial) do
+        register_instance_option :partial do
           :form_field
         end
 
@@ -163,9 +170,11 @@ module RailsAdmin
         #
         # @see RailsAdmin::AbstractModel.properties
         register_instance_option(:required?) do
-          @required ||= !!abstract_model.model.validators_on(name).find do |v|
-            v.is_a?(ActiveModel::Validations::PresenceValidator) && !v.options[:allow_nil] ||
-            v.is_a?(ActiveModel::Validations::NumericalityValidator) && !v.options[:allow_nil]
+          @required ||= !!([name] + children_fields).uniq.find do |column_name|
+            !!abstract_model.model.validators_on(column_name).find do |v|
+              v.is_a?(ActiveModel::Validations::PresenceValidator) && !v.options[:allow_nil] ||
+              v.is_a?(ActiveModel::Validations::NumericalityValidator) && !v.options[:allow_nil]
+            end
           end
         end
 
@@ -179,11 +188,16 @@ module RailsAdmin
         register_instance_option(:view_helper) do
           @view_helper ||= self.class.instance_variable_get("@view_helper")
         end
-        
+
         register_instance_option :read_only do
           not editable
         end
-        
+
+        # init status in the view
+        register_instance_option :active? do
+          false
+        end
+
         register_instance_option :visible? do
           returned = true
           (RailsAdmin.config.default_hidden_fields || {}).each do |section, fields|
@@ -193,20 +207,22 @@ module RailsAdmin
           end
           returned
         end
-        
+
+        # columns mapped (belongs_to, paperclip, etc.). First one is used for searching/sorting by default
+        register_instance_option :children_fields do
+          []
+        end
+
+        register_instance_option :render do
+          bindings[:view].render :partial => partial.to_s, :locals => {:field => self, :form => bindings[:form] }
+        end
+
         def editable
           return false if @properties && @properties[:read_only]
-          role = bindings[:view].controller.send(:_attr_accessible_role)
-          klass = bindings[:object].class
-          whitelist = klass.accessible_attributes(role).map(&:to_s)
-          blacklist = klass.protected_attributes(role).map(&:to_s)
-          !self.method_name.to_s.in?(blacklist) && (whitelist.any? ? self.method_name.to_s.in?(whitelist) : true)
-        end
-        
-        def render
-          bindings[:view].render :partial => partial.to_s, :locals => {:field => self, :form => bindings[:form] }
+          !bindings[:object].class.active_authorizer[bindings[:view].controller.send(:_attr_accessible_role)].deny?(self.method_name)
         end
 
+
         # Is this an association
         def association?
           kind_of?(RailsAdmin::Config::Fields::Association)
@@ -214,7 +230,9 @@ module RailsAdmin
 
         # Reader for validation errors of the bound object
         def errors
-          bindings[:object].errors[name]
+          ([name] + children_fields).uniq.map do |column_name|
+            bindings[:object].errors[column_name]
+          end.uniq.flatten
         end
 
         # Reader whether field is optional.
@@ -251,12 +269,12 @@ module RailsAdmin
         def value
           bindings[:object].safe_send(name)
         end
-        
+
         # Reader for nested attributes
-        def nested_form
+        register_instance_option :nested_form do
           false
         end
-        
+
         def inverse_of
           nil
         end
@@ -264,9 +282,9 @@ module RailsAdmin
         def method_name
           name
         end
-        
-        def _html_attributes
-          html_attributes.merge(!default_value.nil? ? { :value => default_value } : {})
+
+        def html_default_value
+          bindings[:object].new_record? && self.value.nil? && !self.default_value.nil? ? self.default_value : nil
         end
       end
     end

data/lib/rails_admin/config/fields/factories/belongs_to_association.rb

@@ -0,0 +1,26 @@
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types'
+require 'rails_admin/config/fields/types/belongs_to_association'
+
+RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  if association = parent.abstract_model.associations.find {|a| a[:child_key] == properties[:name] }
+    field = RailsAdmin::Config::Fields::Types.load("#{association[:polymorphic] ? :polymorphic : :belongs_to}_association").new(parent, association[:name], association)
+    fields << field
+
+    child_columns = []
+    id_column = parent.abstract_model.properties.find {|p| p[:name].to_s == association[:child_key].to_s }
+    child_columns << RailsAdmin::Config::Fields.default_factory.call(parent, id_column, fields)
+
+    if association[:polymorphic]
+      type_colum = parent.abstract_model.properties.find {|p| p[:name].to_s == association[:foreign_type].to_s }
+      child_columns << RailsAdmin::Config::Fields.default_factory.call(parent, type_colum, fields)
+    end
+
+    child_columns.each do |child_column|
+      child_column.hide
+      child_column.filterable(false)
+    end
+
+    field.children_fields child_columns.map(&:name)
+  end
+end

data/lib/rails_admin/config/fields/factories/carrierwave.rb

@@ -3,8 +3,27 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if defined?(::CarrierWave) && (model = parent.abstract_model.model).kind_of?(CarrierWave::Mount) && model.uploaders.include?(properties[:name])
-    fields << RailsAdmin::Config::Fields::Types.load(:carrierwave).new(parent, properties[:name], properties)
+  extensions = [nil, :file_name, ]
+  model = parent.abstract_model.model
+
+  if defined?(::CarrierWave) && (model = parent.abstract_model.model).kind_of?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties[:name].to_s.chomp('_file_name').to_sym)
+
+
+    columns = [model.uploader_options[attachment_name][:mount_on] || attachment_name, "#{attachment_name}_content_type".to_sym, "#{attachment_name}_file_size".to_sym]
+
+    field = RailsAdmin::Config::Fields::Types.load(:carrierwave).new(parent, attachment_name, properties)
+    fields << field
+    children_fields = []
+    columns.each do |children_column_name|
+      if child_properties = parent.abstract_model.properties.find {|p| p[:name].to_s == children_column_name.to_s }
+        children_field = fields.find{ |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+        children_field.hide unless field == children_field
+        children_field.filterable(false) unless field == children_field
+        children_fields << children_field.name
+      end
+    end
+    field.children_fields(children_fields)
+
     true
   else
     false

data/lib/rails_admin/config/fields/factories/devise.rb

@@ -4,23 +4,20 @@ require 'rails_admin/config/fields/types/password'
 
 # Register a custom field factory for devise model
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if :encrypted_password == properties[:name]
+  if properties[:name] == :encrypted_password
+    extensions = [:password_salt, :reset_password_token, :remember_token]
+    model = parent.abstract_model.model
+
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password, properties)
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password_confirmation, properties)
-    [:password_salt, :reset_password_token, :remember_token].each do |name|
-      properties = parent.abstract_model.properties.find {|p| name == p[:name]}
+    extensions.each do |ext|
+      properties = parent.abstract_model.properties.find {|p| ext == p[:name]}
       if properties
-        RailsAdmin::Config::Fields.default_factory.call(parent, properties, fields)
-        fields.last.hide
-      end
-    end
-    if parent.kind_of?(RailsAdmin::Config::Sections::Update)
-      [:remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, :last_sign_in_ip].each do |name|
-        properties = parent.abstract_model.properties.find {|p| name == p[:name]}
-        if properties
+        unless field = fields.find{ |f| f.name == ext }
           RailsAdmin::Config::Fields.default_factory.call(parent, properties, fields)
-          fields.last.hide
+          field = fields.last
         end
+        field.hide
       end
     end
     true

data/lib/rails_admin/config/fields/factories/dragonfly.rb

@@ -3,17 +3,23 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  extensions = [:name, :uid]
+  model = parent.abstract_model.model
 
   if (properties[:name].to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.dragonfly_attachment_classes.map(&:attribute).include?(attachment_name = $1.to_sym)
-    additionnal_dragonfly_columns = [:name]
-    additionnal_dragonfly_columns.each do |it|
-      if props = parent.abstract_model.properties.find {|p| "#{attachment_name}_#{it}" == p[:name].to_s }
-        RailsAdmin::Config::Fields.default_factory.call(parent, props, fields)
-        fields.last.hide
-        fields.last.filterable(false)
+    field = RailsAdmin::Config::Fields::Types.load(:dragonfly).new(parent, attachment_name, properties)
+    children_fields = []
+    extensions.each do |ext|
+      children_column_name = "#{attachment_name}_#{ext}".to_sym
+      if child_properties = parent.abstract_model.properties.find {|p| p[:name].to_s == children_column_name.to_s }
+        children_field = fields.find{ |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+        children_field.hide
+        children_field.filterable(false)
+        children_fields << children_field.name
       end
     end
-    fields << RailsAdmin::Config::Fields::Types::Dragonfly.new(parent, attachment_name, properties)
+    field.children_fields(children_fields)
+    fields << field
     true
   else
     false

data/lib/rails_admin/config/fields/factories/paperclip.rb

@@ -2,25 +2,24 @@ require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
-# Register a custom field factory
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  paperclip_columns = [:file_name, :content_type, :file_size, :updated_at]
+  extensions = [:file_name, :content_type, :file_size, :updated_at]
   model = parent.abstract_model.model
-  if defined?(::Paperclip) and model.kind_of?(Paperclip::ClassMethods)
-    if part = paperclip_columns.detect {|it| properties[:name].to_s.strip =~ /^(.+)_#{it}$/ }
-      attachment_name = properties[:name].to_s.scan(/^(.+)_#{part}$/).first.first.to_sym
-      if model.attachment_definitions && model.attachment_definitions.has_key?(attachment_name) && fields.find{|f| attachment_name == f.name}.nil?
-        paperclip_columns.each do |it|
-          if props = parent.abstract_model.properties.find {|p| "#{attachment_name}_#{it}" == p[:name].to_s }
-            RailsAdmin::Config::Fields.default_factory.call(parent, props, fields)
-            fields.last.hide
-            fields.last.filterable(false)
-          end
-        end
-        fields << RailsAdmin::Config::Fields::Types::Paperclip.new(parent, attachment_name, properties)
-        true
+  if (properties[:name].to_s =~ /^(.+)_file_name$/) and defined?(::Paperclip) and model.attachment_definitions and model.attachment_definitions.has_key?(attachment_name = $1.to_sym)
+    field = RailsAdmin::Config::Fields::Types.load(:paperclip).new(parent, attachment_name, properties)
+    children_fields = []
+    extensions.each do |ext|
+      children_column_name = "#{attachment_name}_#{ext}".to_sym
+      if child_properties = parent.abstract_model.properties.find {|p| p[:name].to_s == children_column_name.to_s }
+        children_field = fields.find{ |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+        children_field.hide
+        children_field.filterable(false)
+        children_fields << children_field.name
       end
     end
+    field.children_fields(children_fields)
+    fields << field
+    true
   else
     false
   end

data/lib/rails_admin/config/fields/group.rb

@@ -1,18 +1,26 @@
 require 'active_support/core_ext/string/inflections'
+require 'rails_admin/config/proxyable'
+require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
 
 module RailsAdmin
   module Config
     module Fields
       # A container for groups of fields in edit views
-      class Group < RailsAdmin::Config::Base
+      class Group
+        include RailsAdmin::Config::Proxyable
+        include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
 
-        attr_reader :name
+        attr_reader :name, :abstract_model
         attr_accessor :section
+        attr_reader :parent, :root
 
         def initialize(parent, name)
-          super(parent)
+          @parent = parent
+          @root = parent.root
+
+          @abstract_model = parent.abstract_model
           @section = parent
           @name = name.to_s.tr(' ', '_').downcase.to_sym
         end
@@ -50,6 +58,11 @@ module RailsAdmin
           section.with(bindings).visible_fields.select {|f| self == f.group }
         end
 
+        # Should it open by default
+        register_instance_option :active? do
+          true
+        end
+
         # Configurable group label which by default is group's name humanized.
         register_instance_option :label do
           (@label ||= {})[::I18n.locale] ||= (parent.fields.find{|f|f.name == self.name}.try(:label) || name.to_s.humanize)

data/lib/rails_admin/config/fields/types/belongs_to_association.rb

@@ -18,7 +18,7 @@ module RailsAdmin
           end
 
           register_instance_option :searchable do
-            @searchable ||= associated_model_config.abstract_model.properties.map{ |p| p[:name] }.include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {self.abstract_model.model.name => self.method_name}] : {self.abstract_model.model.name => self.method_name}
+            @searchable ||= associated_model_config.abstract_model.properties.map{ |p| p[:name] }.include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {self.abstract_model.model => self.method_name}] : {self.abstract_model.model => self.method_name}
           end
 
           register_instance_option :partial do
@@ -26,7 +26,7 @@ module RailsAdmin
           end
 
           def associated_model_config
-            @config ||= RailsAdmin.config(association[:parent_model])
+            @config ||= RailsAdmin.config(association[:parent_model_proc].call)
           end
 
           def selected_id

data/lib/rails_admin/config/fields/types/carrierwave.rb

@@ -5,7 +5,6 @@ module RailsAdmin
   module Config
     module Fields
       module Types
-        # Field type that supports Paperclip file uploads
         class Carrierwave < RailsAdmin::Config::Fields::Types::FileUpload
           RailsAdmin::Config::Fields::Types.register(self)
 
@@ -20,14 +19,6 @@ module RailsAdmin
           register_instance_option(:cache_method) do
             "#{name}_cache"
           end
-          
-          register_instance_option(:sortable) do
-            name
-          end
-          
-          register_instance_option(:searchable) do
-            name
-          end
 
           def resource_url(thumb = false)
             return nil unless (uploader = bindings[:object].send(name)).present?

data/lib/rails_admin/config/fields/types/color.rb

@@ -6,7 +6,7 @@ module RailsAdmin
       module Types
         class Color < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types::register(self)
-          
+
           register_instance_option :pretty_value do
             bindings[:view].content_tag :strong, (value.presence || ' - '), :style => "color: #{color}"
           end
@@ -14,7 +14,7 @@ module RailsAdmin
           register_instance_option :partial do
             :form_colorpicker
           end
-          
+
           register_instance_option :color do
             if value.present?
               if value =~ /^[0-9a-fA-F]{3,6}$/
@@ -26,7 +26,7 @@ module RailsAdmin
               'white'
             end
           end
-          
+
           register_instance_option :export_value do
             formatted_value
           end

data/lib/rails_admin/config/fields/types/dragonfly.rb

@@ -9,10 +9,6 @@ module RailsAdmin
         class Dragonfly < RailsAdmin::Config::Fields::Types::FileUpload
           RailsAdmin::Config::Fields::Types.register(self)
 
-          def errors
-            bindings[:object].errors["#{name}_uid"] + bindings[:object].errors["#{name}_name"]
-          end
-
           register_instance_option :image? do
             false unless value
             if abstract_model.model.new.respond_to?("#{name}_name")
@@ -22,12 +18,6 @@ module RailsAdmin
             end
           end
 
-          register_instance_option :required? do
-            @required ||= !!abstract_model.model.validators_on("#{name}_uid").find do |v|
-              v.is_a?(ActiveModel::Validations::PresenceValidator) && !v.options[:allow_nil]
-            end
-          end
-
           register_instance_option :delete_method do
             "remove_#{name}"
           end
@@ -39,15 +29,7 @@ module RailsAdmin
           register_instance_option :thumb_method do
             "100x100>"
           end
-          
-          register_instance_option :sortable do
-            "#{name}_name" if abstract_model.model.new.respond_to?("#{name}_name")
-          end
-          
-          register_instance_option :searchable do
-            "#{name}_name" if abstract_model.model.new.respond_to?("#{name}_name")
-          end
-          
+
           def resource_url thumb = false
             return nil unless (v = value)
             thumb ? v.thumb(thumb).try(:url) : v.url

data/lib/rails_admin/config/fields/types/file_upload.rb

@@ -26,14 +26,6 @@ module RailsAdmin
           register_instance_option(:export_value) do
             resource_url.to_s
           end
-          
-          register_instance_option(:searchable) do
-            false
-          end
-          
-          register_instance_option(:sortable) do
-            false
-          end
 
           register_instance_option(:pretty_value) do
             if value.presence
@@ -41,23 +33,27 @@ module RailsAdmin
               url = resource_url
               if self.image
                 thumb_url = resource_url(thumb_method)
-                (url != thumb_url) ? v.link_to(v.image_tag(thumb_url), url, :target => 'blank') : v.image_tag(thumb_url)
+                (url != thumb_url) ? v.link_to(v.image_tag(thumb_url), url, :class => 'thumbnail', :target => 'blank') : v.image_tag(thumb_url)
               else
                 v.link_to(nil, url, :target => 'blank')
               end
             else
-              ' - '
+              nil
             end
           end
 
           register_instance_option :image? do
             (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif/i
           end
-          
+
           # virtual class
           def resource_url
             raise 'not implemented'
           end
+
+          def virtual?
+            true
+          end
         end
       end
     end

data/lib/rails_admin/config/fields/types/has_many_association.rb

@@ -8,11 +8,6 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          # Accessor for field's help text displayed below input field.
-          register_instance_option :help do
-            ""
-          end
-
           register_instance_option :partial do
             nested_form ? :form_nested_many : :form_filtering_multiselect
           end
@@ -21,7 +16,7 @@ module RailsAdmin
           register_instance_option :orderable do
             false
           end
-          
+
           def method_name
             nested_form ? "#{super}_attributes" : "#{super.to_s.singularize}_ids" # name_ids
           end

data/lib/rails_admin/config/fields/types/has_one_association.rb

@@ -7,7 +7,7 @@ module RailsAdmin
         class HasOneAssociation < RailsAdmin::Config::Fields::Association
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
-          
+
           register_instance_option :partial do
             nested_form ? :form_nested_one : :form_filtering_select
           end
@@ -16,15 +16,15 @@ module RailsAdmin
           register_instance_option(:formatted_value) do
             (o = value) && o.send(associated_model_config.object_label_method)
           end
-          
+
           def editable
             (nested_form || abstract_model.model.new.respond_to?("#{self.name}_id=")) && super
           end
-          
+
           def selected_id
             value.try :id
           end
-          
+
           def method_name
             nested_form ? "#{self.name}_attributes" : "#{self.name}_id"
           end

data/lib/rails_admin/config/fields/types/paperclip.rb

@@ -18,27 +18,9 @@ module RailsAdmin
             @thumb_method ||= @styles.find{|s| [:thumb, 'thumb', :thumbnail, 'thumbnail'].include?(s)} || @styles.first || :original
           end
 
-          register_instance_option(:required?) do
-            @required ||= !!abstract_model.model.validators_on("#{name}_file_name").find do |v|
-              v.is_a?(ActiveModel::Validations::PresenceValidator) && !v.options[:allow_nil]
-            end
-          end
-          
-          register_instance_option(:sortable) do
-            "#{name}_file_name"
-          end
-          
-          register_instance_option(:searchable) do
-            "#{name}_file_name"
-          end
-          
           def resource_url(thumb = false)
             value.try(:url, (thumb || :original))
           end
-
-          def errors
-            bindings[:object].errors["#{name}_file_name"] + bindings[:object].errors["#{name}_content_type"] + bindings[:object].errors["#{name}_file_size"]
-          end
         end
       end
     end