cortex-plugins-core 0.12.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d305ae51534e0eb527d14f4c66dfc6dc2b69801
-  data.tar.gz: bc5ca64125c5ca11529873d603070bd84c977dd5
+  metadata.gz: e86996214ab1af991435ee71b2289eed0d776400
+  data.tar.gz: c08a47c80f73e4d5cbc1a35227ebea1d72e57c3d
 SHA512:
-  metadata.gz: e64174a622f1559e62112cd799bed061a580390f1c014b72f50866f0106059c7024603753c9362fa8b7163e0d53ca1b71c872cbb79de8f13983b9a4d1e755724
-  data.tar.gz: 982c1eb55daff97862f59fe2b4e6cd46002afa027ac6dc660423e9e08319819b7a1939d26f53ddc7c7602f2858bbf3cbd85527d88b7638ce168661182f71cbea
+  metadata.gz: da4e0d5fe38e0cdb08eea25590481494c3cd8e6fcd4f195367f70d1b2233512cc8418de0c429256f84a2791ca183853ac2db5e0a19264a0e74125cd1cee064f7
+  data.tar.gz: de2b55abef7fbe6f5e4e83ca5101973650e176d2869dd4128463135db8c512eb8e3717438deef3c2c7b9fe354d5bebfcde04e19281a59d9ec96dec4acc6b752a

data/app/assets/stylesheets/cortex-plugins-core/application.scss

@@ -2,4 +2,5 @@
 @import 'variables/colors';
 @import 'variables/typography';
 
+@import 'components/tags-input';
 @import 'components/thumbnail-placeholder';

data/app/assets/stylesheets/cortex-plugins-core/components/tags-input.scss

@@ -0,0 +1,21 @@
+.bootstrap-tagsinput {
+  width: 100%;
+  border-radius: 0 !important;
+  border-top: none;
+  border-right: none;
+  border-left: none;
+  border-bottom: 1px solid $color-grey-light;
+  box-shadow: none;
+}
+.cortex-bootstrap .label {
+  border-radius: 0.75em;
+  font-weight: normal;
+}
+
+.cortex-bootstrap .label-info {
+  background-color: $color-grey;
+}
+
+.bootstrap-tagsinput .tag {
+  text-transform: uppercase;
+}

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

@@ -8,7 +8,7 @@
     - if asset_is_image?
       .mdl-card__title
         %h2.mdl-card__title-text
-          = image_tag(asset['versions']['original']['url'], style: 'max-height: 200px;')
+          = image_tag(asset['versions']['original']['url'], style: 'min-height: 50px; max-height: 200px;')
     .mdl-card__supporting-text
       %dl
         %dt Original Filename

data/app/cells/plugins/core/tree/checkboxes.haml

@@ -1,9 +1,6 @@
 = render_label
 = render_tooltip unless @options[:tooltip].nil?
 
-%p
-  Please select 1-2 Categories.
-
 - @options[:metadata]["data"]["tree_array"].each do |node|
   = render_field_id
   = cell(Plugins::Core::CheckboxCell, nil, form: @options[:form], node: node, data: data).(:checkbox)

data/app/models/asset_field_type.rb

@@ -88,7 +88,7 @@ class AssetFieldType < FieldType
   end
 
   def host_alias
-    metadata[:storage][:host_alias] unless metadata[:storage][:host_alias].empty?
+    metadata&.[](:storage)&.[](:host_alias)
   end
 
   def versions_data

data/app/models/author_field_type.rb

@@ -30,6 +30,6 @@ class AuthorFieldType < FieldType
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 end

data/app/models/date_time_field_type.rb

@@ -35,6 +35,6 @@ class DateTimeFieldType < FieldType
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 end

data/app/models/float_field_type.rb

@@ -1,6 +1,6 @@
 class FloatFieldType < FieldType
   attr_accessor :float
- 
+
   validates :float, presence: true, if: Proc.new { |float| validate_key(:presence) }
   validates_numericality_of :float, unless: "float.nil?"
   validate :less_than, if: Proc.new { |float| validate_key(:max) }
@@ -27,14 +27,14 @@ class FloatFieldType < FieldType
   end
 
   def validate_key(key)
-    @validations.key? key
+    validations.key? key
   end
 
   def less_than
-     errors.add(:float, "must be less_than #{@validations[:max]}") if :float <= @validations[:max]
+     errors.add(:float, "must be less_than #{validations[:max]}") if :float <= validations[:max]
   end
 
   def greater_than
-     errors.add(:float, "must be greater_than #{@validations[:min]}") if :float >= @validations[:min]
+     errors.add(:float, "must be greater_than #{validations[:min]}") if :float >= validations[:min]
   end
 end

data/app/models/integer_field_type.rb

@@ -27,14 +27,14 @@ class IntegerFieldType < FieldType
   end
 
   def validate_key
-    @validations.key? key
+    validations.key? key
   end
 
   def less_than
-     errors.add(:integer, "must be less_than #{@validations[:max]}") if :integer <= @validations[:max]
+     errors.add(:integer, "must be less_than #{validations[:max]}") if :integer <= validations[:max]
   end
 
   def greater_than
-     errors.add(:integer, "must be greater_than #{@validations[:min]}") if :integer >= @validations[:min]
+     errors.add(:integer, "must be greater_than #{validations[:min]}") if :integer >= validations[:min]
   end
 end

data/app/models/tag_field_type.rb

@@ -25,6 +25,6 @@ class TagFieldType < FieldType
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 end

data/app/models/text_field_type.rb

@@ -39,14 +39,14 @@ class TextFieldType < FieldType
   end
 
   def validate_uniqueness?
-    @validations.key? :uniqueness
+    validations.key? :uniqueness
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 
   def validate_length?
-    @validations.key? :length
+    validations.key? :length
   end
 end

data/app/models/tree_field_type.rb

@@ -36,7 +36,7 @@ class TreeFieldType < FieldType
   end
 
   def minimum
-    if !@values.nil? && @values[:values].length >= @validations[:minimum]
+    if !@values.nil? && @values[:values].length >= validations[:minimum]
       true
     else
       errors.add(:minimum, "You have selected too few values.")
@@ -46,7 +46,7 @@ class TreeFieldType < FieldType
 
   def maximum
     unless @values.nil?
-      if @values[:values].length <= @validations[:maximum]
+      if @values[:values].length <= validations[:maximum]
         true
       else
         errors.add(:maximum, "You have selected too many values.")
@@ -56,14 +56,14 @@ class TreeFieldType < FieldType
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 
   def validate_minimum?
-    @validations.key? :minimum
+    validations.key? :minimum
   end
 
   def validate_maximum?
-    @validations.key? :maximum
+    validations.key? :maximum
   end
 end

data/app/models/user_field_type.rb

@@ -34,6 +34,6 @@ class UserFieldType < FieldType
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 end

data/app/transactions/concerns/update_tags.rb

@@ -0,0 +1,6 @@
+module UpdateTags
+  extend ActiveSupport::Concern
+
+  included do
+  end
+end

data/app/transactions/get_field_tree_list_transaction.rb

@@ -0,0 +1,18 @@
+class GetFieldTreeListTransaction < ApplicationTransaction
+  step :init
+  step :process
+
+  def init(input)
+    field = Field.find_by_id(input[:args]['field_id'])
+
+    field ? Right({ content_item: input[:content_item], field: field }) : Left(:not_found)
+  end
+
+  def process(input)
+    tree_array = input[:field].metadata['allowed_values']['data']['tree_array']
+    tree_values = input[:content_item].field_items.find {|field_item| field_item.field_id == input[:field].id}.data['values']
+
+    tree_list = tree_values.map {|value| tree_array.find {|node| node['id'] == value.to_i}['node']['name']}.join(',')
+    Right(tree_list)
+  end
+end

data/app/transactions/new_tag_field_item_transaction.rb

@@ -0,0 +1,7 @@
+class NewTagFieldItemTransaction < ApplicationTransaction
+  step :process
+
+  def process(field_item)
+    Right(field_item)
+  end
+end

data/app/transactions/new_user_field_item_transaction.rb

@@ -0,0 +1,7 @@
+class NewUserFieldItemTransaction < ApplicationTransaction
+  step :process
+
+  def process(field_item)
+    Right(field_item)
+  end
+end

data/app/transactions/update_tag_field_item_transaction.rb

@@ -0,0 +1,7 @@
+class UpdateTagFieldItemTransaction < ApplicationTransaction
+  step :process
+
+  def process(field_item)
+    Right(field_item)
+  end
+end

data/app/uploaders/asset_uploader.rb

@@ -1,7 +1,9 @@
 require 'image_processing/mini_magick'
+require 'image_optim'
 
 class AssetUploader < Shrine
   include ImageProcessing::MiniMagick
+  include Imageable
 
   plugin :determine_mime_type
   plugin :store_dimensions
@@ -25,14 +27,15 @@ class AssetUploader < Shrine
   end
 
   process(:store) do |io, context|
-    # TODO: Perform image optimizations (build plugin), support versions without processors or formatters
+    # TODO: support versions without processors
     context[:generated_hex] = SecureRandom.hex(8)
     versions = { original: io.download }
 
     if image?(io)
+      image_optim = image_optim_for(context[:config][:metadata][:image_optim_config])
       versions.merge!(context[:config][:metadata][:versions].transform_values do |version|
         processed_version = send("#{version[:process][:method]}!", io.download, *version[:process][:config].values)
-        convert!(processed_version, version[:format])
+        optimize_image!(processed_version, image_optim) # TODO: per-version image_optim_config
       end)
     end
 
@@ -48,8 +51,4 @@ class AssetUploader < Shrine
 
     ERB.new(context[:config][:metadata][:path]).result(binding)
   end
-
-  def image?(io)
-    MimeMagic.new(io.data['metadata']['mime_type']).mediatype == 'image'
-  end
 end

data/app/uploaders/concerns/imageable.rb

@@ -0,0 +1,30 @@
+module Imageable
+  extend ActiveSupport::Concern
+
+  included do
+    def image?(io)
+      MimeMagic.new(io.data['metadata']['mime_type']).mediatype == 'image'
+    end
+
+    def optimize_image!(image, image_optim)
+      pathname = image_optim.optimize_image!(image) # TODO: move to ActiveJob
+      pathname ? pathname.open : image
+    end
+
+    def image_optim_for(image_optim_config)
+      ImageOptim.new(process_image_optim_config(image_optim_config))
+    end
+
+    def process_image_optim_config(image_optim_config)
+      processed_image_optim_config = image_optim_config.merge(pngout: false, svgo: false, verbose: true, skip_missing_workers: false)
+      processed_image_optim_config.extend(Hashie::Extensions::DeepLocate)
+      quality_range_hashes = processed_image_optim_config.deep_locate -> (key, value, object) { key == :quality_range }
+      quality_range_hashes.each do |quality_range_hash|
+        quality_range_hash[:quality] = quality_range_hash[:quality_range][:begin]..quality_range_hash[:quality_range][:end]
+        quality_range_hash.delete(:quality_range)
+      end
+
+      processed_image_optim_config
+    end
+  end
+end

data/lib/cortex/plugins/core/version.rb

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.12.4'
+      VERSION = '1.0.0'
     end
   end
 end

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

@@ -32,16 +32,17 @@ namespace :cortex do
                              naming_data: {
                                title: fieldTitle.id
                              },
-                             versions: {
-                               large: { process: { method: 'resize_to_limit', config: { width: '1800', height: '1800' } }, format: :jpg },
-                               medium: { process: { method: 'resize_to_limit', config: { width: '800', height: '800' } }, format: :jpg },
-                               default: { process: { method: 'resize_to_limit', config: { width: '300', height: '300' } }, format: :jpg },
-                               mini: { process: { method: 'resize_to_limit', config: { width: '100', height: '100' } }, format: :jpg },
-                               micro: { process: { method: 'resize_to_limit', config: { width: '50', height: '50' } }, format: :jpg },
+                             versions: { # Move to YAML
+                               large: { process: { method: 'resize_to_limit', config: { width: '1800', height: '1800' } } },
+                               medium: { process: { method: 'resize_to_limit', config: { width: '800', height: '800' } } },
+                               default: { process: { method: 'resize_to_limit', config: { width: '300', height: '300' } } },
+                               mini: { process: { method: 'resize_to_limit', config: { width: '100', height: '100' } } },
+                               micro: { process: { method: 'resize_to_limit', config: { width: '50', height: '50' } } },
+                               rss: { process: { method: 'resize_to_limit', config: { width: '840', height: '840' } } },
                              },
                              keep_files: [:destroyed, :replaced],
                              path: 'media/<%= attachment %>/<%= original_name %>-<%= style %>-<%= generated_hex %>.<%= extension %>',
-                             storage: {
+                             storage: { # Move to YAML
                                type: 's3',
                                host_alias: ENV['HOST_ALIAS'],
                                config: {
@@ -54,6 +55,33 @@ namespace :cortex do
                                    cache_control: 'public, max-age=315576000'
                                  }
                                }
+                             },
+                             image_optim_config: {  # Move to YAML
+                               allow_lossy: true,
+                               jpegoptim: {
+                                 allow_lossy: true,
+                                 strip: 'all',
+                                 max_quality: 60
+                               },
+                               pngquant: {
+                                 allow_lossy: true,
+                                 quality_range: {
+                                   begin: 33,
+                                   end: 50
+                                 },
+                                 speed: 3
+                               },
+                               gifsicle: {
+                                 interlace: true
+                               },
+                               advpng: false,
+                               jhead: false,
+                               jpegrecompress: false,
+                               jpegtran: false,
+                               optipng: false,
+                               pngcrush: false,
+                               pngout: false,
+                               svgo: false
                              }
                            })
         media.fields.new(name: 'Description', field_type: 'text_field_type', validations: {presence: true})
@@ -76,7 +104,7 @@ namespace :cortex do
                   "elements": [
                     {
                       "id": media.fields.find_by_name('Asset').id,
-                      "tooltip": "Recommended blog featured image size: 1452px x 530px with a live area of 930px x 530px"
+                      "tooltip": "Recommended Size: 840 x 400 if you want to use a single image as your tile and blog header image."
                     }
                   ]
                 }
@@ -164,7 +192,7 @@ namespace :cortex do
                 "name": "Creator",
                 "cells": [{
                             "field": {
-                              "method": "author_email"
+                              "method": "creator.email"
                             },
                             "display": {
                               "classes": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cortex-plugins-core
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 1.0.0
 platform: ruby
 authors:
 - CareerBuilder Employer Site & Content Products
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: image_optim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.25'
+- !ruby/object:Gem::Dependency
+  name: image_optim_pack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: 
 email:
 - EmployerSiteContentProducts@cb.com
@@ -181,6 +209,7 @@ files:
 - app/assets/javascripts/cortex-plugins-core/cells/content_item.js
 - app/assets/javascripts/cortex-plugins-core/cells/text.js
 - app/assets/stylesheets/cortex-plugins-core/application.scss
+- app/assets/stylesheets/cortex-plugins-core/components/tags-input.scss
 - app/assets/stylesheets/cortex-plugins-core/components/thumbnail-placeholder.scss
 - app/assets/stylesheets/cortex-plugins-core/variables/_colors.scss
 - app/assets/stylesheets/cortex-plugins-core/variables/_typography.scss
@@ -232,7 +261,14 @@ files:
 - app/models/text_field_type.rb
 - app/models/tree_field_type.rb
 - app/models/user_field_type.rb
+- app/transactions/concerns/update_tags.rb
+- app/transactions/get_content_item_tags_transaction.rb
+- app/transactions/get_field_tree_list_transaction.rb
+- app/transactions/new_tag_field_item_transaction.rb
+- app/transactions/new_user_field_item_transaction.rb
+- app/transactions/update_tag_field_item_transaction.rb
 - app/uploaders/asset_uploader.rb
+- app/uploaders/concerns/imageable.rb
 - config/initializers/react_on_rails.rb
 - config/initializers/shrine.rb
 - lib/cortex/plugins/core.rb
@@ -241,8 +277,6 @@ files:
 - lib/shrine/plugins/cortex_validation_helpers.rb
 - lib/tasks/cortex/core/db.rake
 - lib/tasks/cortex/core/media.rake
-- lib/tasks/cortex/test/dummy/db/development.sqlite3
-- lib/tasks/cortex/test/dummy/db/test.sqlite3
 homepage: https://github.com/cortex-cms/cortex-plugins-core
 licenses:
 - Apache-2.0
@@ -263,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The combined set of Core FieldTypes for the Cortex CMS platform