Merge pull request #11 from cortex-cms/asset-field-type-config-and-refactor

AssetFieldType Dynamic Config and Refactor

Author: Alex Tharp

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true

app/cells/plugins/core/asset/input.haml

@@ -1,3 +1,9 @@
+%strong Allowed extensions:
+= render_allowed_asset_extensions
+%br
+%strong Allowed filesize:
+= render_max_asset_size
+%br
 = render_field_id
 = render_label
 = render_input

app/cells/plugins/core/asset_cell.rb

@@ -1,6 +1,7 @@
 module Plugins
   module Core
     class AssetCell < Plugins::Core::Cell
+      include ActionView::Helpers::NumberHelper
       include UtilityHelper
 
       def input
@@ -9,6 +10,14 @@ def input
 
       private
 
+      def render_allowed_asset_extensions
+        field.validations['allowed_extensions']&.join(', ')
+      end
+
+      def render_max_asset_size
+        number_to_human_size(field.validations['size']&.[]('less_than'))
+      end
+
       def input_classes
         @options[:input_options]&.[](:display)&.[](:classes)
       end

app/models/asset_field_type.rb

@@ -1,26 +1,22 @@
 class AssetFieldType < FieldType
-  VALIDATION_TYPES = {
-      presence: :valid_presence_validation?,
-      size: :valid_size_validation?,
-      content_type: :valid_content_type_validation?
-  }.freeze
-
   attr_accessor :asset_file_name,
                 :asset_content_type,
                 :asset_file_size,
                 :asset_updated_at,
-                :field_name
+                :asset
 
-  attr_reader :data, :validations, :dimensions
+  attr_reader :dimensions
 
-  has_attached_file :asset
-  do_not_validate_attachment_file_type :asset
   before_save :extract_dimensions
 
+  do_not_validate_attachment_file_type :asset
   validates :asset, attachment_presence: true, if: :validate_presence?
+  validate :validate_asset_size, if: :validate_size?
+  validate :validate_asset_content_type, if: :validate_content_type?
 
-  def validations=(validations_hash)
-    @validations = validations_hash.deep_symbolize_keys
+  def metadata=(metadata_hash)
+    @metadata = metadata_hash.deep_symbolize_keys
+    Paperclip::HasAttachedFile.define_on(self.class, :asset, metadata)
   end
 
   def data=(data_hash)
@@ -40,10 +36,6 @@ def data
     }
   end
 
-  def acceptable_validations?
-    valid_types? && valid_options?
-  end
-
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
     json[mapping_field_name] = asset_file_name
@@ -72,43 +64,53 @@ def extract_dimensions
     end
   end
 
+  def allowed_content_types
+    validations[:allowed_extensions].collect do |allowed_content_type|
+      MimeMagic.by_extension(allowed_content_type).type
+    end
+  end
+
   def mapping_field_name
     "#{field_name.parameterize('_')}_asset_file_name"
   end
 
-  def valid_types?
-    validations.all? do |type, options|
-      VALIDATION_TYPES.include?(type.to_sym)
-    end
+  def validate_presence?
+    @validations.key? :presence
   end
 
-  def valid_options?
-    validations.all? do |type, options|
-      self.send(VALIDATION_TYPES[type])
-    end
+  def attachment_size_validator
+    AttachmentSizeValidator.new(validations[:size].merge(attributes: :asset))
   end
 
-  def validate_presence?
-    @validations.key? :presence
+  def attachment_content_type_validator
+    AttachmentContentTypeValidator.new({content_type: allowed_content_types}.merge(attributes: :asset))
   end
 
   alias_method :valid_presence_validation?, :validate_presence?
 
-  def valid_size_validation?
+  def validate_size?
     begin
-      AttachmentSizeValidator.new(validations[:size].merge(attributes: :asset))
+      attachment_size_validator
       true
     rescue ArgumentError, NoMethodError
       false
     end
   end
 
-  def valid_content_type_validation?
+  def validate_content_type?
     begin
-      AttachmentContentTypeValidator.new(validations[:content_type].merge(attributes: :asset))
+      attachment_content_type_validator
       true
     rescue ArgumentError, NoMethodError
       false
     end
   end
+
+  def validate_asset_size
+    attachment_size_validator.validate_each(self, :asset, asset)
+  end
+
+  def validate_asset_content_type
+    attachment_content_type_validator.validate_each(self, :asset, asset)
+  end
 end

app/models/boolean_field_type.rb

@@ -1,19 +1,10 @@
 class BooleanFieldType < FieldType
-  attr_accessor :data, :value, :field_name
-  attr_reader :validations, :metadata
-
-  def validations=(validations_hash)
-    @validations = {}
-  end
+  attr_accessor :value
 
   def data=(data_hash)
     @value = data_hash.deep_symbolize_keys[:value]
   end
 
-  def metadata=(metadata_hash)
-    @metadata = metadata_hash.deep_symbolize_keys
-  end
-
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
     json[mapping_field_name] = field_item.data['boolean']
@@ -24,10 +15,6 @@ def mapping
     { name: mapping_field_name, type: :string, analyzer: :snowball }
   end
 
-  def acceptable_validations?
-    true
-  end
-
   private
 
   def mapping_field_name

app/models/date_time_field_type.rb

@@ -1,30 +1,13 @@
 class DateTimeFieldType < FieldType
-  VALIDATION_TYPES = {
-    presence: :valid_presence_validation?
-  }.freeze
-
-  attr_accessor :data, :timestamp, :field_name
-  attr_reader :validations, :metadata
+  attr_accessor :timestamp
 
   validates :timestamp, presence: true, if: :validate_presence?
-  validate :timestamp_is_valid?
-
-  def validations=(validations_hash)
-    @validations = validations_hash.deep_symbolize_keys
-  end
+  validate :timestamp_is_valid?, if: :validate_presence?
 
   def data=(data_hash)
     @timestamp = data_hash.deep_symbolize_keys[:timestamp]
   end
 
-  def metadata=(metadata_hash)
-    @metadata = metadata_hash.deep_symbolize_keys
-  end
-
-  def acceptable_validations?
-    valid_types? && valid_options?
-  end
-
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
     json[mapping_field_name] = field_item.data['date_time']
@@ -42,35 +25,15 @@ def mapping_field_name
   end
 
   def timestamp_is_valid?
-    if @timestamp.blank?
+    begin
+      DateTime.parse(@timestamp)
       true
-    else
-      begin
-        DateTime.parse(@timestamp)
-        true
-      rescue ArgumentError
-        errors.add(:timestamp, 'must be a valid date')
-        false
-      end
-    end
-  end
-
-  def valid_types?
-    validations.all? do |type, options|
-      VALIDATION_TYPES.include?(type)
-    end
-  end
-
-  def valid_options?
-    validations.all? do |type, options|
-      self.send(VALIDATION_TYPES[type])
+    rescue ArgumentError
+      errors.add(:timestamp, 'must be a valid date')
+      false
     end
   end
 
-  def valid_presence_validation?
-    @validations.key? :presence
-  end
-
   def validate_presence?
     @validations.key? :presence
   end

app/models/tag_field_type.rb

@@ -1,30 +1,13 @@
 class TagFieldType < FieldType
-  VALIDATION_TYPES = {
-    presence: :valid_presence_validation?
-  }.freeze
-
-  attr_accessor :data, :tag_list, :field_name
-  attr_reader :validations, :metadata
+  attr_accessor :tag_list
 
   validates :tag_list, presence: true, if: :validate_presence?
 
-  def validations=(validations_hash)
-    @validations = validations_hash.deep_symbolize_keys
-  end
-
   def data=(data_hash)
     @tag_list = data_hash.deep_symbolize_keys[:tag_list]
     @tag_list.nil? ? nil : (@tag_list = @tag_list.split(","))
   end
 
-  def metadata=(metadata_hash)
-    @metadata = metadata_hash.deep_symbolize_keys
-  end
-
-  def acceptable_validations?
-    valid_types? && valid_options?
-  end
-
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
     json[mapping_field_name] = field_item.data['tag']
@@ -41,22 +24,6 @@ def mapping_field_name
     "#{field_name.parameterize('_')}_tag"
   end
 
-  def valid_types?
-    validations.all? do |type, options|
-      VALIDATION_TYPES.include?(type)
-    end
-  end
-
-  def valid_options?
-    validations.all? do |type, options|
-      self.send(VALIDATION_TYPES[type])
-    end
-  end
-
-  def valid_presence_validation?
-    @validations.key? :presence
-  end
-
   def validate_presence?
     @validations.key? :presence
   end

app/models/text_field_type.rb

@@ -1,31 +1,13 @@
 class TextFieldType < FieldType
-  VALIDATION_TYPES = {
-    length: :valid_length_validation?,
-    presence: :valid_presence_validation?
-  }.freeze
-
-  attr_accessor :data, :text, :field_name
-  attr_reader :validations, :metadata
+  attr_accessor :text
 
   validates :text, presence: true, if: :validate_presence?
   validate :text_length, if: :validate_length?
 
-  def validations=(validations_hash)
-    @validations = validations_hash.deep_symbolize_keys
-  end
-
   def data=(data_hash)
     @text = data_hash.deep_symbolize_keys[:text]
   end
 
-  def metadata=(metadata_hash)
-    @metadata = metadata_hash.deep_symbolize_keys
-  end
-
-  def acceptable_validations?
-    valid_types? && valid_options?
-  end
-
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
     json[mapping_field_name] = field_item.data['text']
@@ -42,31 +24,6 @@ def mapping_field_name
     "#{field_name.parameterize('_')}_text"
   end
 
-  def valid_types?
-    validations.all? do |type, options|
-      VALIDATION_TYPES.include?(type)
-    end
-  end
-
-  def valid_options?
-    validations.all? do |type, options|
-      self.send(VALIDATION_TYPES[type])
-    end
-  end
-
-  def valid_length_validation?
-    begin
-      LengthValidator.new(validations[:length].merge(attributes: [:text]))
-      true
-    rescue ArgumentError, NoMethodError
-      false
-    end
-  end
-
-  def valid_presence_validation?
-    @validations.key? :presence
-  end
-
   def text_present
     errors.add(:text, "must be present") if @text.empty?
   end