Merge branch 'develop'

Author: toastercup

Gemfile

@@ -12,6 +12,7 @@ gem 'rails', '~> 4.2.6'
 
 # Cortex-specific
 gem 'cortex-exceptions', '~> 0.0.4'
+gem 'cortex-field_types-core', '~> 0.1.1'
 
 # API
 gem 'grape', '~> 0.16'
@@ -42,7 +43,7 @@ gem 'pg', '~> 0.18.4'
 gem 'hashie-forbidden_attributes', '~> 0.1.1'
 gem 'ranked-model', '~> 0.4.0'
 gem 'redis-rails', '~> 4.0'
-gem 'pomona', '~> 0.6.0'
+gem 'pomona', '~> 0.7'
 
 # Middleware
 gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'

Gemfile.lock

@@ -142,6 +142,11 @@ GEM
     concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
     cortex-exceptions (0.0.4)
+    cortex-field_types-core (0.1.1)
+      cells (~> 4.1)
+      cells-haml (~> 0.0.10)
+      cells-rails (~> 0.0.6)
+      rails (~> 4.2.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
     descendants_tracker (0.0.4)
@@ -511,7 +516,7 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    pomona (0.6.0)
+    pomona (0.7.0)
     progress (3.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -739,6 +744,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.6)
   codeclimate-test-reporter (~> 0.4.8)
   cortex-exceptions (~> 0.0.4)
+  cortex-field_types-core (~> 0.1.1)
   database_cleaner (~> 1.5.1)
   devise (~> 4.1.1)
   doorkeeper (~> 3.1)
@@ -786,7 +792,7 @@ DEPENDENCIES
   pg (~> 0.18.4)
   phantomjs (~> 1.9.8)
   poltergeist
-  pomona (~> 0.6.0)
+  pomona (~> 0.7)
   pry-doc
   pry-nav
   pry-rails

app/cells/field_cell.rb app/cells/field_type_cell.rbapp/cells/field_cell.rb renamed to app/cells/field_type_cell.rb

@@ -1,6 +1,4 @@
-class FieldCell < Cell::ViewModel
-  self.view_paths << 'lib'
-
+class FieldTypeCell < Cell::ViewModel
   property :field
   property :data
 

app/cells/wizard/field/show.haml

@@ -1,13 +1,13 @@
 = context[:form].fields_for 'field_items', field_item do |field_item_form|
-  - if field_item.field.field_type == "text_field_type"
-    = cell('cortex/field_types/core/text/text', field_item, form: field_item_form, default_value: '').(:input)
-  - if field_item.field.field_type == "boolean_field_type"
-    = cell('cortex/field_types/core/boolean/boolean', field_item, form: field_item_form, field_name: field_item.field.name, default_value: false).(:checkbox)
-  - if field_item.field.field_type == "tree_field_type"
-    = # cell('cortex/field_types/core/tree/tree', FieldItem.new(field: field), form: field_item_form, index: index).(:tree)
-  - if field_item.field.field_type == "date_time_field_type"
-    = cell('cortex/field_types/core/date_time/date_time', field_item, form: field_item_form, default_value: '').(:datepicker)
-  - if field_item.field.field_type == "tag_field_type"
-    = cell('cortex/field_types/core/tag/tag', field_item, form: field_item_form, default_value: []).(:tag_picker)
-  - if field_item.field.field_type == "user_field_type"
-    = cell('cortex/field_types/core/user/user', field_item, form: field_item_form, default_value: User.all.first.id, user_data: User.all).(:dropdown)
+  - if field_item.field.field_type_instance.class == TextFieldType
+    = cell(FieldTypes::Core::TextCell, field_item, form: field_item_form).(:input)
+  - if field_item.field.field_type_instance.class == BooleanFieldType
+    = cell(FieldTypes::Core::BooleanCell, field_item, form: field_item_form, field_name: field_item.field.name, default_value: false).(:checkbox)
+  - if field_item.field.field_type_instance.class == TreeFieldType
+    = cell(FieldTypes::Core::TreeCell, field_item, form: field_item_form, metadata: field_item.field.metadata["allowed_values"], field: field).(display_format)
+  - if field_item.field.field_type_instance.class == DateTimeFieldType
+    = cell(FieldTypes::Core::DateTimeCell, field_item, form: field_item_form, default_value: '').(:datepicker)
+  - if field_item.field.field_type_instance.class == TagFieldType
+    = cell(FieldTypes::Core::TagCell, field_item, form: field_item_form, default_value: []).(:tag_picker)
+  - if field_item.field.field_type_instance.class == UserFieldType
+    = cell(FieldTypes::Core::UserCell, field_item, form: field_item_form, default_value: User.all.first.id, user_data: User.all).(:dropdown)

app/cells/wizard/field_cell.rb

@@ -3,6 +3,7 @@ class FieldCell < Cell::ViewModel
     property :id
     property :label
     property :input
+    property :display_format
 
     def show
       render

app/helpers/content_item_helper.rb

@@ -17,7 +17,7 @@ def field_items_attributes_params
     end
 
     permitted_keys = {}
-    field_items_attributes_as_array.each {|hash| hash.each_key {|key| permitted_keys [key.to_s] = [] } }
+    field_items_attributes_as_array.each { |hash| hash.each_key { |key| permitted_keys[key.to_s] = [] } }
 
     permit_attribute_params(field_items_attributes_as_array, permitted_keys)
   end
@@ -26,21 +26,29 @@ def permit_attribute_params(param_array, permitted_keys)
     param_array.each do |param_hash|
       permitted_keys.keys.each do |key|
         if param_hash[key].is_a?(Hash)
-          permitted_keys[key] << param_hash[key].keys
+          permitted_keys[key] << permit_param(param_hash[key])
         end
         permitted_keys[key].flatten!
       end
     end
-
+    
     sanitize_parameters(permitted_keys)
   end
 
+  def permit_param(param)
+    if param.values[0].is_a?(Hash)
+      { param.keys[0].to_sym => param.values[0].keys }
+    else
+      param.keys[0]
+    end
+  end
+
   def sanitize_parameters(permitted_keys)
     permitted_keys.map do |key, value|
       if value.empty?
         key
       else
-        { key => value }
+        { key => value.uniq }
       end
     end
   end

app/models/category_tree.rb

@@ -25,7 +25,7 @@ def self.permissions
 
   def content_items_index_name
     content_type_name_sanitized = name.parameterize('_')
-    "#{Rails.env}_content_type_#{content_type_name_sanitized}_content_items"
+    "#{Rails.env}_content_type_#{content_type_name_sanitized}_#{id}_content_items"
   end
 
   def wizard_decorator

app/models/content_type.rb

@@ -33,7 +33,7 @@ class Media < ActiveRecord::Base
                       :micro => {geometry: '50x50>', format: :jpg},
                       :ar_post => {geometry: '1140x', format: :jpg}
                     },
-                    :processors => [:thumbnail, :paperclip_optimizer],
+                    :processors => [:thumbnail],
                     :preserve_files => 'true',
                     # :path => ':class/:attachment/:style-:id.:extension'
                     :path => ':class/:attachment/careerbuilder-:style-:id.:extension',