cortex-plugins-core 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b88d7586b26e56ce255dafceb0124d01e9cf27c
-  data.tar.gz: 484b60478cfe4ce36b165d1513d8183affdcc5d3
+  metadata.gz: c977c3cd46774c8925c6214a86cb85f99ff8a29c
+  data.tar.gz: 84bbd9bd60aeae0bc11564589e6942e3b6f6516b
 SHA512:
-  metadata.gz: f3d3fefcc3428c74fbfe3b4b5271bca209a74cf0044c802e05260b8807f49f568c755c69e43b5597b2379160e54a61f77213028f1bb3c204763dadbfc2020fbf
-  data.tar.gz: d7a6a2894175c3195ea084a30d8f3cd4a380bf843fdad13352fa105aa939fbeb410bbba6556fea65557f6e47db96a2e6d35bf1e4b0b1f9a4521891a2963030e0
+  metadata.gz: 283db210452b4fbc6a6aac293ff267a34b20b0aa159955ac11ff6ca8c4cde7f8486a569c43b52f7e959f0f26effff3b4a55c9185921df15caf73081b8bd9fbc1
+  data.tar.gz: 8697b6460170cc789f21a74507f137db9a9eff1a869b4749283800daac2ef0124e4150dfd6e5913377a49fb742b0b1e8e2aa5bd3207690a2234445a8e05711e3

data/app/assets/javascripts/ckeditor/plugins/cortex_media_insert/plugin.js

@@ -1,4 +1,4 @@
-(function (global) { 
+(function (global) {
   'use strict';
 
   global.CKEDITOR.plugins.add('cortex_media_insert', {
@@ -6,14 +6,14 @@
     init: function (editor) {
       editor.addCommand('insertMedia', {
         exec: function (editor) {
-          window.MODALS.featured.open();
+          window.MODALS.wysiwyg.open();
 
           global.media_select = {};
           global.media_select_defer = $.Deferred();
           global.media_select_defer.promise(global.media_select);
 
           global.media_select.done(function (media) {
-            window.MODALS.featured.close();
+            window.MODALS.wysiwyg.close();
 
             var mediaTag = editor.document.createElement('media');
             mediaTag.setAttribute('id', media.id);

data/app/assets/javascripts/cortex-field_types-core/application.js

@@ -1,2 +1,4 @@
 //= require ckeditor/init
 //= require ../ckeditor/config
+
+//= require_tree ./cells

data/app/assets/javascripts/cortex-field_types-core/cells/content_item.js

@@ -0,0 +1,19 @@
+$('.media-select--featured').click(function (elem) {
+  var id = $(this).data().id;
+  var title = $(this).data().title;
+  var thumb_url = $(this).data().thumb;
+
+  $(".association_content_item_id").val(id);
+
+  $('.content-item-button__selection').remove();
+  $('.content-item-button').append(
+    '<div class="content-item-button__selection">' +
+    '<img src="' + thumb_url + '" height="50px">' +
+    '<div class="content-item-button__selection__text">' +
+    'Selected Media: ' +
+    title +
+    '</div></div>'
+  );
+
+  window.MODALS.featured.close();
+});

data/app/cells/plugins/core/asset/association.haml

@@ -0,0 +1,4 @@
+= render_associated_content_item_thumb
+.content-item-button__selection__text
+  Selected Media:
+  = associated_content_item_title

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

@@ -3,11 +3,16 @@ module Plugins
     class AssetCell < Plugins::Core::Cell
       include ActionView::Helpers::NumberHelper
       include UtilityHelper
+      include Cells::AssociationHelper
 
       def input
         render
       end
 
+      def association
+        render
+      end
+
       private
 
       def render_allowed_asset_extensions
@@ -33,6 +38,14 @@ module Plugins
       def render_input
         @options[:form].file_field 'data[asset]'
       end
+
+      def associated_content_item_thumb_url
+        data['asset']['style_urls']['mini']
+      end
+
+      def render_associated_content_item_thumb
+        image_tag(associated_content_item_thumb_url, height: '50px')
+      end
     end
   end
 end

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

@@ -41,7 +41,7 @@ module Plugins
       end
 
       def link_to_asset
-        link_to(asset['url'], asset['url'])
+        link_to asset['url'], asset['url'], target: '_blank'
       end
     end
   end

data/app/cells/plugins/core/content_item/popup.haml

@@ -1,13 +1,19 @@
+= render_field_id
+= render_content_item_id
+
 = render_label
 %br
-%button.content_item_button.text-center.popup--open
-  .button_content
+%button.content-item-button.popup--open
+  .content-item-button__select.content-item-button__select--selected
     %i{ class: "material-icons icon" }
       cloud_upload
     %br
-    %span.content_item_button-text
-      Click to add a
+    %span.content-item-button__select__text
+      Click to select a
       = field.name
-      from the media library
+      from the Media library
+  - if associated_content_item && associated_primary_field_type_class == AssetFieldType
+    .content-item-button__selection
+      = render_association_cell
 %small
   Recommended size: 1452px x 530px with a live area of 930px x 530px

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

@@ -7,8 +7,51 @@ module Plugins
 
       private
 
+      def value
+        data&.[]('content_item_id')
+      end
+
+      def associated_content_item
+        ContentItem.find_by_id(value)
+      end
+
+      def associated_primary_field
+        associated_content_item.content_type.fields.find_by_name(field.metadata['field_name'])
+      end
+
+      def associated_primary_field_type_class
+        associated_primary_field.field_type_instance.class
+      end
+
+      def associated_primary_field_item
+        associated_content_item.field_items.find_by_field_id associated_primary_field
+      end
+
+      def associated_content_item_title
+        # Gross hack, this should rely on 'primary title field' config feature in future, and should use a scope
+        title_field_item = associated_content_item.field_items.find do |field_item|
+          field_item.field.name == 'Title'
+        end
+
+        title_field_item.data['text']
+      end
+
       def render_label
-        "Add #{field.name}"
+        "Select #{field.name}"
+      end
+
+      def render_content_item_id
+        @options[:form].hidden_field 'data[content_item_id]', value: value, class: 'association_content_item_id'
+      end
+
+      def render_association_cell
+        cell(Plugins::Core::AssetCell, associated_primary_field_item,
+             associated_content_item: associated_content_item,
+             associated_primary_field: associated_primary_field,
+             associated_primary_field_type_class: associated_primary_field_type_class,
+             associated_primary_field_item: associated_primary_field_item,
+             associated_content_item_title: associated_content_item_title)
+        .(:association)
       end
     end
   end

data/app/models/boolean_field_type.rb

@@ -7,7 +7,7 @@ class BooleanFieldType < FieldType
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['boolean']
+    json[mapping_field_name] = field_item.data['value']
     json
   end
 

data/app/models/content_item_field_type.rb

@@ -1,4 +1,16 @@
 class ContentItemFieldType < FieldType
+  attr_accessor :content_item_id
+
+  def data=(data_hash)
+    @content_item_id = data_hash.deep_symbolize_keys[:content_item_id]
+  end
+
+  def field_item_as_indexed_json_for_field_type(field_item, options = {})
+    json = {}
+    json[mapping_field_name] = field_item.data['content_item_id']
+    json
+  end
+
   def mapping
     { name: mapping_field_name, type: :string, analyzer: :snowball }
   end

data/app/models/date_time_field_type.rb

@@ -10,7 +10,7 @@ class DateTimeFieldType < FieldType
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['date_time']
+    json[mapping_field_name] = field_item.data['timestamp']
     json
   end
 

data/app/models/tag_field_type.rb

@@ -10,7 +10,7 @@ class TagFieldType < FieldType
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['tag']
+    json[mapping_field_name] = field_item.data['tag_list']
     json
   end
 

data/app/models/text_field_type.rb

@@ -1,8 +1,10 @@
 class TextFieldType < FieldType
   attr_accessor :text
+  jsonb_accessor :data, text: :string
 
   validates :text, presence: true, if: :validate_presence?
   validate :text_length, if: :validate_length?
+  validate :text_unique, if: :validate_uniqueness?
 
   def data=(data_hash)
     @text = data_hash.deep_symbolize_keys[:text]
@@ -25,7 +27,7 @@ class TextFieldType < FieldType
   end
 
   def text_present
-    errors.add(:text, "must be present") if @text.empty?
+    errors.add(:text, 'must be present') if @text.empty?
   end
 
   def text_length
@@ -33,6 +35,16 @@ class TextFieldType < FieldType
     validator.validate_each(self, :text, text)
   end
 
+  def text_unique
+    unless field.field_items.jsonb_contains(:data, text: text).empty?
+      errors.add(:text, "#{field.name} Must be unique")
+    end
+  end
+
+  def validate_uniqueness?
+    @validations.key? :uniqueness
+  end
+
   def validate_presence?
     @validations.key? :presence
   end

data/app/models/tree_field_type.rb

@@ -21,7 +21,7 @@ class TreeFieldType < FieldType
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['tree']
+    json[mapping_field_name] = field_item.data['values']
     json
   end
 

data/app/models/user_field_type.rb

@@ -10,7 +10,7 @@ class UserFieldType < FieldType
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['user']
+    json[mapping_field_name] = field_item.data['user_id']
     json
   end
 

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

@@ -1,4 +1,5 @@
 require 'ckeditor'
+require 'jsonb_accessor'
 
 module Cortex
   module Plugins

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

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.5.0'
+      VERSION = '0.6.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cortex-plugins-core
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - CareerBuilder Employer Site & Content Products
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: jsonb_accessor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,8 @@ files:
 - app/assets/javascripts/ckeditor/plugins/cortex_media_insert/icons/media.png
 - app/assets/javascripts/ckeditor/plugins/cortex_media_insert/plugin.js
 - app/assets/javascripts/cortex-field_types-core/application.js
+- app/assets/javascripts/cortex-field_types-core/cells/content_item.js
+- app/cells/plugins/core/asset/association.haml
 - app/cells/plugins/core/asset/input.haml
 - app/cells/plugins/core/asset_cell.rb
 - app/cells/plugins/core/asset_info/index.haml
@@ -187,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The combined set of Core FieldTypes for the Cortex CMS platform