cortex-plugins-core 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad03faa329368738afd7686e52d7e6f372d8b79
-  data.tar.gz: ab0a2bd0e9d66d960fb8523f5112af6743b07b3d
+  metadata.gz: 1d1a73688bdd9211a0a2d10cc2684e1f4da60273
+  data.tar.gz: e90bb298eded507752ba92394a8060c79caf98b3
 SHA512:
-  metadata.gz: 28a8bef94abea9e65bd54ea129ca375b2d976ad6221d46325df071cbafe66b5b91a77cfb74c06bc4da16e32f4f3acb52c9eeccb325984655fec90c18f0cf1891
-  data.tar.gz: 9ab399e6f59acf27a72db85da70c6263ed649495e4a665a1188b32e0de1391879ad00bcc0c543fd192d155656ad855153554eb0884ab8988270608ec5df28ea3
+  metadata.gz: 6583a84706ff696839b07effd2a6a972e8a7d4be9d0ebcbec729d33bd6942daa1a016ead31411f8b99c0a5222f94542fdd8d4f651e64dd59d5f001e496abc310
+  data.tar.gz: a29a15fa4cf916975acd3b6b4c1d011486764a5d5da7f31c8bf174ff5595beb4ba9f95447600dfa38bced1b683aeeda859b8d6a987b53d6de0a1180179317b86

data/app/cells/plugins/core/asset_info/index.haml

@@ -0,0 +1,2 @@
+- if asset
+  = image_tag(asset['style_urls'][config[:thumbnail_style]], height: '50px')

data/app/cells/plugins/core/asset_info/show.haml

@@ -0,0 +1,41 @@
+- if asset
+  :javascript
+    document.addEventListener("DOMContentLoaded", function(event) {
+      new Clipboard('#copy-asset-url');
+    });
+
+  .asset-info.mdl-card.mdl-shadow--2dp
+    .mdl-card__title
+      %h2.mdl-card__title-text
+        = image_tag(asset['url'], style: 'max-height: 200px;')
+    .mdl-card__supporting-text
+      %dl
+        %dt Original Filename
+        %dd
+          = asset['file_name']
+        %dt File Type
+        %dd
+          = asset['content_type']
+        %dt File Size
+        %dd
+          = number_to_human_size(asset['file_size'])
+        %dt Dimensions
+        %dd
+          = dimensions
+        %dt Creator
+        %dd
+          = creator.fullname
+        %dt Created
+        %dd
+          = created_at
+        %dt Last Modified
+        %dd
+          = updated_at
+        %dt URL
+        %dd
+          = link_to_asset
+    .mdl-card__menu
+      .mdl-button.mdl-button--icon.mdl-js-button.mdl-js-ripple-effect#copy-asset-url{data: {'clipboard-text': asset['url']}}
+        %i.material-icons content_copy
+      .mdl-tooltip{for: 'copy-asset-url'}
+        Copy Asset URL

data/app/cells/plugins/core/asset_info_cell.rb

@@ -0,0 +1,48 @@
+module Plugins
+  module Core
+    class AssetInfoCell < Plugins::Core::Cell
+      include ActionView::Helpers::NumberHelper
+
+      property :data
+      property :content_item
+
+      def show
+        render
+      end
+
+      def index
+        render
+      end
+
+      private
+
+      def config
+        @options[:config] || {}
+      end
+
+      def asset
+        data['asset']
+      end
+
+      def dimensions
+        "#{asset['dimensions']['width']} x #{asset['dimensions']['width']}"
+      end
+
+      def creator
+        content_item.creator
+      end
+
+      def created_at
+        content_item.created_at.to_formatted_s(:long_ordinal)
+      end
+
+      def updated_at
+        DateTime.parse(asset['updated_at']).to_formatted_s(:long_ordinal)
+      end
+
+      def link_to_asset
+        link_to(asset['url'], asset['url'])
+      end
+    end
+  end
+end

data/app/models/asset_field_type.rb

@@ -5,7 +5,8 @@ class AssetFieldType < FieldType
                 :asset_updated_at,
                 :asset
 
-  attr_reader :dimensions
+  attr_reader :dimensions,
+              :existing_data
 
   before_save :extract_dimensions
 
@@ -26,14 +27,16 @@ class AssetFieldType < FieldType
 
   def data
     {
-        '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': {
+        '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
+      },
+      'asset_field_type_id': id
     }
   end
 
@@ -59,8 +62,8 @@ class AssetFieldType < FieldType
     unless tempfile.nil?
       geometry = Paperclip::Geometry.from_file(tempfile)
       @dimensions = {
-          width: geometry.width.to_i,
-          height: geometry.height.to_i
+        width: geometry.width.to_i,
+        height: geometry.height.to_i
       }
     end
   end
@@ -76,7 +79,7 @@ class AssetFieldType < FieldType
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 
   def attachment_size_validator
@@ -115,21 +118,21 @@ class AssetFieldType < FieldType
     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)
 
-    unless @existing_data.empty?
-      metadata[:path] = updated_url(@existing_data['asset']['url'])
+    unless existing_data.empty?
+      metadata[:path].gsub(":id", existing_data['asset_field_type_id']) if metadata[:path]
     end
 
     metadata
   end
-
-  def updated_url(path)
-    # Take the parse path of the existing URL and drop the first '/',
-    # that will be added later and we don't want to duplicate it
-    # Then remove the old file extension and replace it with the paperclipp'd new one
-    new_path = URI.parse(path).path.slice(1..-1)
-    new_path.gsub(File.extname(path), ".:extension")
-  end
 end

data/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

data/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

data/lib/tasks/cortex/core/media.rake

@@ -73,7 +73,7 @@ namespace :cortex do
               "description": "Provide details and metadata that will enhance search or inform end-users.",
               "columns": [
                 {
-                  "grid_width": 12,
+                  "grid_width": 6,
                   "elements": [
                     {
                       "id": media.fields[1].id
@@ -95,6 +95,20 @@ namespace :cortex do
                       "id": media.fields[5].id
                     }
                   ]
+                },
+                {
+                  "grid_width": 6,
+                  "elements": [
+                    {
+                      "plugin": {
+                        "class_name": "plugins/core/asset_info",
+                        "render_method": "show",
+                        "data": {
+                          "field_id": media.fields.find_by_name('Asset').id
+                        }
+                      }
+                    },
+                  ]
                 }
               ]
             }
@@ -118,12 +132,16 @@ namespace :cortex do
                 "name": "Thumbnail",
                 "cells": [{
                             "field": {
-                              "method": "author_image"
-                            },
-                            "display": {
-                              "classes": [
-                                "circular"
-                              ]
+                              "plugin": {
+                                "class_name": "plugins/core/asset_info",
+                                "render_method": "index",
+                                "data": {
+                                  "field_id": media.fields.find_by_name('Asset').id
+                                },
+                                "config": {
+                                  "thumbnail_style": "mini"
+                                }
+                              }
                             }
                           }]
               },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cortex-plugins-core
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - CareerBuilder Employer Site & Content Products
@@ -121,6 +121,9 @@ files:
 - app/assets/javascripts/cortex-field_types-core/application.js
 - app/cells/plugins/core/asset/input.haml
 - app/cells/plugins/core/asset_cell.rb
+- app/cells/plugins/core/asset_info/index.haml
+- app/cells/plugins/core/asset_info/show.haml
+- app/cells/plugins/core/asset_info_cell.rb
 - app/cells/plugins/core/boolean/checkbox.haml
 - app/cells/plugins/core/boolean/switch.haml
 - app/cells/plugins/core/boolean_cell.rb
@@ -141,6 +144,7 @@ files:
 - app/cells/plugins/core/user/dropdown.haml
 - app/cells/plugins/core/user_cell.rb
 - app/models/asset_field_type.rb
+- app/models/asset_field_type.rb.orig
 - app/models/boolean_field_type.rb
 - app/models/date_time_field_type.rb
 - app/models/tag_field_type.rb