cortex-plugins-core 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2fbd483fbe77ceb7449d7418525b09fd3a4199
-  data.tar.gz: d9ed217a4598a60feceadad5e48560c28f83f5b0
+  metadata.gz: 94cebb14cba585c69240da175861cf9f988b3ef5
+  data.tar.gz: c08ca77752ae8d36768e3f292287b38a067fe53c
 SHA512:
-  metadata.gz: c3393e2cef77fc903a3d8f8c7c2b9a97f15f4ae106807c3c0a46ad59cb772151212045f4b93a2a698208f7a362d09860e9fa6449b1e1fdeb33231d0e507351d5
-  data.tar.gz: f53b7e7a120c9d21b76d641d13e6e03316b7a12a952dcfa093360521a87c150e35fa828b487303e0e4fabb7107ced69ff5c8c8f37d5f63dd106534774addeb88
+  metadata.gz: 737c74d7227248643d50daf8465392d863d1ef490e8b1346a56115549dcdfa28b066a350e4cc8afaabbcf4f33832751ac185eb14248955073c53f2b7d2af0c62
+  data.tar.gz: d28804c3678c07474bcc2e4a792c73b6e3f5602343e6115df22756e7d686860b4811da38d3e89dbc5f43d9486448124ff3555383d1edcf504509abd0cd513b8c

data/app/models/asset_field_type.rb

@@ -9,6 +9,10 @@ class AssetFieldType < FieldType
   validate :asset_presence, if: :validate_presence?
   validate :asset_errors
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :string, analyzer: :keyword }
+  end
+
   def data=(data_hash)
     assign data_hash['asset'] if data_hash['asset']
     @asset = attacher.get
@@ -32,10 +36,6 @@ class AssetFieldType < FieldType
     json
   end
 
-  def mapping
-    { name: mapping_field_name, type: :string, analyzer: :keyword }
-  end
-
   private
 
   def image?

data/app/models/author_field_type.rb

@@ -4,9 +4,13 @@ class AuthorFieldType < FieldType
 
   validates :author_name, presence: true, if: :validate_presence?
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :string, analyzer: :keyword }
+  end
+
   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]
+    data_hash[:author_name] = data_hash[:default_author_name] if data_hash['author_name'].blank?
+    @author_name = data_hash['author_name']
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
@@ -15,10 +19,6 @@ class AuthorFieldType < FieldType
     json
   end
 
-  def mapping
-    { name: mapping_field_name, type: :string, analyzer: :snowball }
-  end
-
   private
 
   def mapping_field_name

data/app/models/boolean_field_type.rb

@@ -1,8 +1,12 @@
 class BooleanFieldType < FieldType
   attr_accessor :value
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :boolean }
+  end
+
   def data=(data_hash)
-    @value = data_hash.deep_symbolize_keys[:value]
+    @value = data_hash['value']
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
@@ -11,10 +15,6 @@ class BooleanFieldType < FieldType
     json
   end
 
-  def mapping
-    { name: mapping_field_name, type: :string, analyzer: :snowball }
-  end
-
   private
 
   def mapping_field_name

data/app/models/content_item_field_type.rb

@@ -1,8 +1,12 @@
 class ContentItemFieldType < FieldType
   attr_accessor :content_item_id
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :keyword, index: :not_analyzed }
+  end
+
   def data=(data_hash)
-    @content_item_id = data_hash.deep_symbolize_keys[:content_item_id]
+    @content_item_id = data_hash['content_item_id']
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
@@ -11,13 +15,9 @@ class ContentItemFieldType < FieldType
     json
   end
 
-  def mapping
-    { name: mapping_field_name, type: :string, analyzer: :snowball }
-  end
-
   private
 
   def mapping_field_name
-    "#{field_name.parameterize(separator: '_')}_content_item"
+    "#{field_name.parameterize(separator: '_')}_content_item_id"
   end
 end

data/app/models/date_time_field_type.rb

@@ -4,6 +4,10 @@ class DateTimeFieldType < FieldType
   validates :timestamp, presence: true, if: :validate_presence?
   validate :timestamp_is_valid?, if: :validate_presence?
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :string, analyzer: :snowball }
+  end
+
   def data=(data_hash)
     @timestamp = data_hash.deep_symbolize_keys[:timestamp]
   end
@@ -14,10 +18,6 @@ class DateTimeFieldType < FieldType
     json
   end
 
-  def mapping
-    {name: mapping_field_name, type: :string, analyzer: :snowball}
-  end
-
   private
 
   def mapping_field_name

data/app/models/float_field_type.rb

@@ -6,8 +6,12 @@ class FloatFieldType < FieldType
   validate :less_than, if: Proc.new { |float| validate_key(:max) }
   validate :greater_than, if: Proc.new { |float| validate_key(:min) }
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :float }
+  end
+
   def data=(data_hash)
-    @float = data_hash.deep_symbolize_keys[:float]
+    @float = data_hash['float']
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
@@ -16,10 +20,6 @@ class FloatFieldType < FieldType
     json
   end
 
-  def mapping
-    {name: mapping_field_name, type: :float}
-  end
-
   private
 
   def mapping_field_name
@@ -31,10 +31,10 @@ class FloatFieldType < FieldType
   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

@@ -4,10 +4,14 @@ class IntegerFieldType < FieldType
   validates :integer, presence: true, if: Proc.new { |int| validate_key(:presence) }
   validates_numericality_of :integer, unless: "integer.nil?"
   validate :less_than, if: Proc.new { |int| validate_key(:max) }
-  validate :greater_than, if:  Proc.new { |int| validate_key(:min) }
+  validate :greater_than, if: Proc.new { |int| validate_key(:min) }
+
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :integer }
+  end
 
   def data=(data_hash)
-    @integer = data_hash.deep_symbolize_keys[:integer]
+    @integer = data_hash['integer']
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
@@ -16,10 +20,6 @@ class IntegerFieldType < FieldType
     json
   end
 
-  def mapping
-    {name: mapping_field_name, type: :integer}
-  end
-
   private
 
   def mapping_field_name
@@ -31,10 +31,10 @@ class IntegerFieldType < FieldType
   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

@@ -3,28 +3,31 @@ class TagFieldType < FieldType
 
   validates :tag_list, presence: true, if: :validate_presence?
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, analyzer: :keyword }
+  end
+
   def data=(data_hash)
-    @tag_list = data_hash.deep_symbolize_keys[:tag_list]
-    @tag_list.nil? ? nil : (@tag_list = @tag_list.split(","))
+    @tag_list = tag_list_to_a data_hash['tag_list']
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['tag_list']
+    json[mapping_field_name] = tag_list_to_a field_item.data['tag_list']
     json
   end
 
-  def mapping
-    {name: mapping_field_name, type: :string, analyzer: :snowball}
-  end
-
   private
 
   def mapping_field_name
-    "#{field_name.parameterize(separator: '_')}_tag"
+    "#{field_name.parameterize(separator: '_')}_tags"
   end
 
   def validate_presence?
     validations.key? :presence
   end
+
+  def tag_list_to_a(string)
+    string&.split(',')&.map(&:strip)
+  end
 end

data/app/models/text_field_type.rb

@@ -1,4 +1,6 @@
 class TextFieldType < FieldType
+  PRIMARY_DATA_KEY = 'text'.freeze
+
   attr_accessor :text
   jsonb_accessor :data, text: :string
 
@@ -6,20 +8,28 @@ class TextFieldType < FieldType
   validate :text_length, if: :validate_length?
   validate :text_unique, if: :validate_uniqueness?
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :string, analyzer: :snowball }
+  end
+
+  def graphql_value
+    text
+  end
+
+  def graphql_type
+    types.String
+  end
+
   def data=(data_hash)
-    @text = data_hash.deep_symbolize_keys[:text]
+    @text = data_hash[PRIMARY_DATA_KEY]
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['text']
+    json[mapping_field_name] = field_item.data[PRIMARY_DATA_KEY]
     json
   end
 
-  def mapping
-    {name: mapping_field_name, type: :string, analyzer: :snowball}
-  end
-
   private
 
   def mapping_field_name

data/app/models/tree_field_type.rb

@@ -5,12 +5,16 @@ class TreeFieldType < FieldType
   validate  :minimum, if: :validate_minimum?
   validate  :maximum, if: :validate_maximum?
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :string, analyzer: :snowball }
+  end
+
   def data
     @values
   end
 
   def data=(data_hash)
-    values = data_hash.deep_symbolize_keys[:values]
+    values = data_hash['values']
 
     if values.is_a?(Hash)
       @values = { values: values.keys }
@@ -25,10 +29,6 @@ class TreeFieldType < FieldType
     json
   end
 
-  def mapping
-    { name: mapping_field_name, type: :string, analyzer: :snowball }
-  end
-
   private
 
   def mapping_field_name

data/app/models/user_field_type.rb

@@ -4,8 +4,12 @@ class UserFieldType < FieldType
   validates :user_id, presence: true, if: :validate_presence?
   validate :valid_user_id?
 
+  def elasticsearch_mapping
+    { name: mapping_field_name, type: :keyword, index: :not_analyzed }
+  end
+
   def data=(data_hash)
-    @user_id = data_hash.deep_symbolize_keys[:user_id]
+    @user_id = data_hash['user_id']
   end
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
@@ -14,14 +18,10 @@ class UserFieldType < FieldType
     json
   end
 
-  def mapping
-    {name: mapping_field_name, type: :string, analyzer: :snowball}
-  end
-
   private
 
   def mapping_field_name
-    "#{field_name.parameterize(separator: '_')}_user"
+    "#{field_name.parameterize(separator: '_')}_user_id"
   end
 
   def valid_user_id?

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

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '2.0.1'
+      VERSION = '2.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cortex-plugins-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - CareerBuilder Employer Site & Content Products
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails