Bump version to v0.4.6

Author: toastercup

app/models/asset_field_type.rb.orig

@@ -0,0 +1,154 @@
+class AssetFieldType < FieldType
+  attr_accessor :asset_file_name,
+                :asset_content_type,
+                :asset_file_size,
+                :asset_updated_at,
+                :asset
+
+  attr_reader :dimensions,
+              :existing_data
+
+  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 metadata=(metadata_hash)
+    @metadata = metadata_hash.deep_symbolize_keys
+    @existing_data = metadata_hash[:existing_data]
+    Paperclip::HasAttachedFile.define_on(self.class, :asset, existing_metadata)
+  end
+
+  def data=(data_hash)
+    self.asset = data_hash.deep_symbolize_keys[:asset]
+  end
+
+  def data
+    {
+<<<<<<< HEAD
+        'asset': {
+            'file_name': asset_file_name,
+            'url': asset.url,
+            'dimensions': dimensions,
+            'content_type': asset_content_type,
+            'file_size': asset_file_size,
+            'updated_at': asset_updated_at
+        },
+        'asset_field_type_id': id
+=======
+      'asset': {
+        'file_name': asset_file_name,
+        'url': asset.url,
+        'style_urls': style_urls,
+        'dimensions': dimensions,
+        'content_type': asset_content_type,
+        'file_size': asset_file_size,
+        'updated_at': asset_updated_at
+      }
+>>>>>>> Implement storage of thumbnail/style URLs, asset wizard info box, and asset thumbnail in index
+    }
+  end
+
+  def field_item_as_indexed_json_for_field_type(field_item, options = {})
+    json = {}
+    json[mapping_field_name] = asset_file_name
+    json
+  end
+
+  def mapping
+    {name: mapping_field_name, type: :string, analyzer: :keyword}
+  end
+
+  private
+
+  def image?
+    asset_content_type =~ %r{^(image|(x-)?application)/(bmp|gif|jpeg|jpg|pjpeg|png|x-png)$}
+  end
+
+  def extract_dimensions
+    return unless image?
+    tempfile = asset.queued_for_write[:original]
+    unless tempfile.nil?
+      geometry = Paperclip::Geometry.from_file(tempfile)
+      @dimensions = {
+        width: geometry.width.to_i,
+        height: geometry.height.to_i
+      }
+    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 validate_presence?
+    validations.key? :presence
+  end
+
+  def attachment_size_validator
+    AttachmentSizeValidator.new(validations[:size].merge(attributes: :asset))
+  end
+
+  def attachment_content_type_validator
+    AttachmentContentTypeValidator.new({content_type: allowed_content_types}.merge(attributes: :asset))
+  end
+
+  alias_method :valid_presence_validation?, :validate_presence?
+
+  def validate_size?
+    begin
+      attachment_size_validator
+      true
+    rescue ArgumentError, NoMethodError
+      false
+    end
+  end
+
+  def validate_content_type?
+    begin
+      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
+
+  def style_urls
+    if existing_data.empty?
+      (metadata[:styles].map { |key, value| [key, asset.url(key)] }).to_h
+    else
+      existing_data[:asset][:style_urls]
+    end
+  end
+
+  def existing_metadata
+    metadata.except!(:existing_data)
+
+<<<<<<< HEAD
+    unless @existing_data.empty?
+      metadata[:path].gsub(":id", @existing_data['asset_field_type_id']) if metadata[:path]
+=======
+    unless existing_data.empty?
+      metadata[:path] = updated_url(existing_data['asset']['url'])
+>>>>>>> Implement storage of thumbnail/style URLs, asset wizard info box, and asset thumbnail in index
+    end
+
+    metadata
+  end
+end

lib/cortex/plugins/core/version.rb

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.4.5'
+      VERSION = '0.4.6'
     end
   end
 end