cortex-plugins-core 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f089c03d4b80a4d3bd54dccd4da4ba4b8dccbf4
-  data.tar.gz: ca7a62565eb7c1ff4199ea581999f041c1f80699
+  metadata.gz: e4bd07a0ea13aa49a90ed6a2dbf4afe23b84bf3b
+  data.tar.gz: ad25af70b6ae11d015c2f86d598d553b1d3b990f
 SHA512:
-  metadata.gz: 95eb8506ca3ca744985dd7fd7150e47688ae9bbd85787a5d3a385641da878490c51f5ec336e67809c71207970188c55a5eac59796e9e18a5c4e9daeabb13374c
-  data.tar.gz: 8fb95b08d25f0d21baf8ee63d95bbd18953feb5452a271168bad0c01ef633ae522539dea18fc4f3243d6d06a07ec0525ca6894c45a018dde50fdbfbae62807bf
+  metadata.gz: 4fb61b3e99019a6f57eef80df805a9518dd5785f15c3c1081156bc87fa593c8dd732d3bb1e5cc9bdbe5b4fd79f456139c3e7c34851e61134f9c26db03f943cfb
+  data.tar.gz: 2c63e3f1748256b1ee7da486582862be68bb18ee507e433129ce4989165f86757a0fb495eec9eb4c23dd06bef21a0e610feeddaca1cc0aa0bbae278641add3dc

data/app/cells/plugins/core/author/input.haml

@@ -0,0 +1,5 @@
+.mdl-textfield.mdl-js-textfield.authorfield
+  = render_field_id
+  = render_label
+  = render_input
+  = render_default_value

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

@@ -0,0 +1,29 @@
+module Plugins
+  module Core
+    class AuthorCell < Plugins::Core::Cell
+      include Devise::Controllers::Helpers
+
+      def input
+        render
+      end
+
+      private
+
+      def value
+        data&.[]('author_name') || current_user.fullname
+      end
+
+      def render_label
+        @options[:form].label 'data[author_name]', field.name, class: 'mdl-textfield__label'
+      end
+
+      def render_input
+        @options[:form].text_field 'data[author_name]', value: value, placeholder: @options[:placeholder], class: 'mdl-textfield__input', required: required?
+      end
+
+      def render_default_value
+        @options[:form].hidden_field 'data[default_author_name]', value: current_user.fullname
+      end
+    end
+  end
+end

data/app/models/asset_field_type.rb

@@ -36,6 +36,7 @@ class AssetFieldType < FieldType
         'file_size': asset_file_size,
         'updated_at': asset_updated_at
       },
+      'media_title': media_title,
       'asset_field_type_id': id
     }
   end
@@ -74,6 +75,10 @@ class AssetFieldType < FieldType
     end
   end
 
+  def media_title
+    existing_data['media_title'] || ContentItemService.form_fields[@metadata[:naming_data][:title]][:text].parameterize.underscore
+  end
+
   def mapping_field_name
     "#{field_name.parameterize('_')}_asset_file_name"
   end
@@ -128,11 +133,7 @@ class AssetFieldType < FieldType
 
   def existing_metadata
     metadata.except!(:existing_data)
-
-    unless existing_data.empty?
-      metadata[:path].gsub!(":id", existing_data['asset_field_type_id']) if metadata[:path]
-    end
-
+    metadata[:path].gsub!(":media_title", media_title) if metadata[:path]
     metadata
   end
 end

data/app/models/author_field_type.rb

@@ -0,0 +1,35 @@
+class AuthorFieldType < FieldType
+  attr_accessor :author_name
+  jsonb_accessor :data, author_name: :string
+
+  validates :author_name, presence: true, if: :validate_presence?
+
+  def data=(data_hash)
+    data_hash[:author_name] = data_hash[:default_author_name] if data_hash.deep_symbolize_keys[:author_name].blank?
+    @author_name = data_hash.deep_symbolize_keys[:author_name]
+  end
+
+  def field_item_as_indexed_json_for_field_type(field_item, options = {})
+    json = {}
+    json[mapping_field_name] = field_item.data['author_name']
+    json
+  end
+
+  def mapping
+    {author_name: mapping_field_name, type: :string, analyzer: :snowball}
+  end
+
+  private
+
+  def mapping_field_name
+    "#{field_name.parameterize('_')}_author_name"
+  end
+
+  def author_name_present
+    errors.add(:author_name, 'must be present') if @author_name.empty?
+  end
+
+  def validate_presence?
+    @validations.key? :presence
+  end
+end

data/app/models/tree_field_type.rb

@@ -36,19 +36,17 @@ class TreeFieldType < FieldType
   end
 
   def minimum
-    unless @values.nil?
-      if @values.length >= @validations[:minimum]
-        true
-      else
-        errors.add(:minimum, "You have selected too few values.")
-        false
-      end
+    if !@values.nil? && @values[:values].length >= @validations[:minimum]
+      true
+    else
+      errors.add(:minimum, "You have selected too few values.")
+      false
     end
   end
 
   def maximum
     unless @values.nil?
-      if @values.length <= @validations[:maximum]
+      if @values[:values].length <= @validations[:maximum]
         true
       else
         errors.add(:maximum, "You have selected too many values.")

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

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.11.0'
+      VERSION = '0.11.1'
     end
   end
 end

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

@@ -13,11 +13,13 @@ namespace :cortex do
                                   creator_id: 1,
                                   contract_id: 1
                                 })
-        media.save
+        media.save!
 
         puts "Creating Fields..."
 
         allowed_asset_content_types = %w(txt css js pdf doc docx ppt pptx csv xls xlsx svg ico png jpg gif bmp)
+        fieldTitle = media.fields.new(name: 'Title', field_type: 'text_field_type', validations: {presence: true, uniqueness: true})
+        fieldTitle.save
         media.fields.new(name: 'Asset', field_type: 'asset_field_type',
                          validations:
                            {
@@ -29,6 +31,9 @@ namespace :cortex do
                            },
                          metadata:
                            {
+                             naming_data: {
+                               title: fieldTitle.id
+                             },
                              styles: {
                                large: {geometry: '1800x1800>', format: :jpg},
                                medium: {geometry: '800x800>', format: :jpg},
@@ -39,15 +44,15 @@ namespace :cortex do
                              },
                              processors: [:thumbnail, :paperclip_optimizer],
                              preserve_files: true,
-                             path: ':class/:attachment/careerbuilder-:style-:id.:extension',
+                             path: ':class/:attachment/:media_title-:style.:extension',
                              s3_headers: {'Cache-Control': 'public, max-age=315576000'}
                            })
-        media.fields.new(name: 'Title', field_type: 'text_field_type', validations: {presence: true})
         media.fields.new(name: 'Description', field_type: 'text_field_type', validations: {presence: true})
         media.fields.new(name: 'Tags', field_type: 'tag_field_type')
         media.fields.new(name: 'Expiration Date', field_type: 'date_time_field_type')
         media.fields.new(name: 'Alt Tag', field_type: 'text_field_type')
-        media.save
+
+        media.save!
 
         puts "Creating Wizard Decorators..."
         wizard_hash = {
@@ -61,7 +66,7 @@ namespace :cortex do
                   "grid_width": 12,
                   "elements": [
                     {
-                      "id": media.fields[0].id
+                      "id": media.fields.find_by_name('Asset').id
                     }
                   ]
                 }
@@ -76,23 +81,23 @@ namespace :cortex do
                   "grid_width": 6,
                   "elements": [
                     {
-                      "id": media.fields[1].id
+                      "id": media.fields.find_by_name('Title').id
                     },
                     {
-                      "id": media.fields[2].id,
+                      "id": media.fields.find_by_name('Description').id,
                       "render_method": "multiline_input",
                       "display": {
                          "rows": 3
                       }
                     },
                     {
-                      "id": media.fields[3].id
+                      "id": media.fields.find_by_name('Tags').id
                     },
                     {
-                      "id": media.fields[4].id
+                      "id": media.fields.find_by_name('Expiration Date').id
                     },
                     {
-                      "id": media.fields[5].id
+                      "id": media.fields.find_by_name('Alt Tag').id
                     }
                   ]
                 },
@@ -116,9 +121,9 @@ namespace :cortex do
         }
 
         media_wizard_decorator = Decorator.new(name: "Wizard", data: wizard_hash)
-        media_wizard_decorator.save
+        media_wizard_decorator.save!
 
-        ContentableDecorator.create({
+        ContentableDecorator.create!({
                                       decorator_id: media_wizard_decorator.id,
                                       contentable_id: media.id,
                                       contentable_type: 'ContentType'
@@ -163,7 +168,7 @@ namespace :cortex do
                 "cells": [
                   {
                     "field": {
-                      "id": media.fields[1].id
+                      "id": media.fields.find_by_name('Title').id
                     },
                     "display": {
                       "classes": [
@@ -174,7 +179,7 @@ namespace :cortex do
                   },
                   {
                     "field": {
-                      "id": media.fields[2].id
+                      "id": media.fields.find_by_name('Description').id
                     }
                   }
                 ]
@@ -184,7 +189,7 @@ namespace :cortex do
                 "cells": [
                   {
                     "field": {
-                      "id": media.fields[3].id
+                      "id": media.fields.find_by_name('Tags').id
                     },
                     "display": {
                       "classes": [
@@ -199,9 +204,9 @@ namespace :cortex do
         }
 
         media_index_decorator = Decorator.new(name: "Index", data: index_hash)
-        media_index_decorator.save
+        media_index_decorator.save!
 
-        ContentableDecorator.create({
+        ContentableDecorator.create!({
                                       decorator_id: media_index_decorator.id,
                                       contentable_id: media.id,
                                       contentable_type: 'ContentType'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cortex-plugins-core
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - CareerBuilder Employer Site & Content Products
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -130,6 +130,8 @@ files:
 - 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/author/input.haml
+- app/cells/plugins/core/author_cell.rb
 - app/cells/plugins/core/boolean/checkbox.haml
 - app/cells/plugins/core/boolean/switch.haml
 - app/cells/plugins/core/boolean_cell.rb
@@ -158,6 +160,7 @@ files:
 - app/cells/plugins/core/user/dropdown.haml
 - app/cells/plugins/core/user_cell.rb
 - app/models/asset_field_type.rb
+- app/models/author_field_type.rb
 - app/models/boolean_field_type.rb
 - app/models/content_item_field_type.rb
 - app/models/date_time_field_type.rb
@@ -171,9 +174,10 @@ files:
 - lib/cortex/plugins/core.rb
 - lib/cortex/plugins/core/engine.rb
 - lib/cortex/plugins/core/version.rb
-- lib/cortex/plugins/core/version.rb.orig
 - 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

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

@@ -1,11 +0,0 @@
-module Cortex
-  module Plugins
-    module Core
-<<<<<<< HEAD
-      VERSION = '0.11.0'
-=======
-      VERSION = '0.10.4'
->>>>>>> develop
-    end
-  end
-end