Merge branch 'develop'

Author: ElliottAYoung

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.1'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
-gem 'cortex-plugins-core', '= 0.10.2'
+gem 'cortex-plugins-core', '= 0.10.4'
 
 # API
 gem 'grape', '~> 0.17'

Gemfile.lock

@@ -136,7 +136,7 @@ GEM
     concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     cortex-exceptions (0.0.4)
-    cortex-plugins-core (0.10.2)
+    cortex-plugins-core (0.10.4)
       cells (~> 4.1)
       cells-haml (~> 0.0.10)
       cells-rails (~> 0.0.6)
@@ -704,7 +704,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.6)
   codeclimate-test-reporter (~> 0.6)
   cortex-exceptions (= 0.0.4)
-  cortex-plugins-core (= 0.10.2)
+  cortex-plugins-core (= 0.10.4)
   database_cleaner (~> 1.5)
   devise (~> 4.2.0)
   doorkeeper (~> 4.2)

app/controllers/rss/v2/rss_controller.rb

@@ -4,7 +4,7 @@ class RssController < ApplicationController
       include RssHelper
 
       def index
-        @content_items = rss_content_type.content_items
+        @content_items = rss_content_type.content_items.select { |content_item| content_item.state == "published" }
       end
     end
   end

app/helpers/rss_helper.rb

@@ -25,19 +25,39 @@ def tag_data(tag_data_hash, rss_content_item)
     if tag_data_hash.keys.include?("string")
       tag_data_hash["string"]
     elsif tag_data_hash.keys.include?("field")
-      field_item_data(tag_data_hash["field"], rss_content_item)
+      field_item_data(tag_data_hash["field"], rss_content_item, tag_data_hash)
     elsif tag_data_hash.keys.include?("method")
       method_data(tag_data_hash["method"], rss_content_item)
+    elsif tag_data_hash.keys.include?("media")
+      media_data(tag_data_hash["media"], rss_content_item)
     end
   end
 
   private
 
-  def field_item_data(field_id, rss_content_item)
-    rss_content_item.field_items.find_by_field_id(field_id).data.values.join
+  def field_item_data(field_id, rss_content_item, tag_data_hash)
+    values = rss_content_item.field_items.find_by_field_id(field_id).data.values
+    tag_data_hash.has_key?("multiple") ? (values.join(tag_data_hash["multiple"])) : (values.join)
   end
 
   def method_data(method_hash, rss_content_item)
     rss_content_item.send(method_hash["name"], *method_hash["args"])
   end
+
+  def media_data(media_hash, rss_content_item)
+    linked_field_item = rss_content_item.field_items.find_by_field_id(media_hash["field"])
+
+    field_name = linked_field_item.field.metadata["field_name"]
+    asset_content_item_id = linked_field_item.data["content_item_id"]
+
+    asset_data = Field.find_by_name(field_name).field_items.find { |field_item| field_item.content_item_id == asset_content_item_id }.data["asset"]
+
+    {
+      "url": asset_data["url"],
+      "type": asset_data["content_type"],
+      "medium": media_hash["medium"],
+      "width": media_hash["width"] || asset_data["dimensions"]["width"],
+      "height": media_hash["height"] || asset_data["dimensions"]["height"]
+    }
+  end
 end

app/models/concerns/cortex_rss_spec/item.rb

@@ -2,7 +2,7 @@ module CortexRssSpec
   module Item
     def self.feed
       %w(
-        title link description author category comments enclosure guid pubDate source
+        title link description author category comments enclosure guid pubDate source media:content
       )
     end
   end

app/models/content_item.rb

@@ -100,6 +100,13 @@ def tag_field_items
     field_items.select { |field_item| field_item.field.field_type_instance.is_a?(TagFieldType) }
   end
 
+  def tree_list(field_id)
+    tree_array = Field.find(field_id).metadata["allowed_values"]["data"]["tree_array"]
+    tree_values = field_items.find { |field_item| field_item.field_id == field_id }.data["values"]
+
+    tree_values.map { |value| tree_array.find { |node| node["id"] == value.to_i }["node"]["name"] }.join(",")
+  end
+
   def update_tag_lists
     tag_data = tag_field_items.map { |field_item| {tag_name: field_item.field.name, tag_list: field_item.data["tag_list"]} }
 

app/views/rss/v2/rss/index.rss.builder

@@ -10,27 +10,29 @@ Rails.cache.fetch("rss-v2-#{content_type.name}", expires_in: 30.minutes, race_co
           'xmlns:dc': 'http://purl.org/dc/elements/1.1/',
           'xmlns:atom': 'http://www.w3.org/2005/Atom',
           'xmlns:sy': 'http://purl.org/rss/1.0/modules/syndication/',
-          'xmlns:slash': 'http://purl.org/rss/1.0/modules/slash/' do
+          'xmlns:slash': 'http://purl.org/rss/1.0/modules/slash/',
+          'xmlns:media': 'http://search.yahoo.com/mrss/' do
     xml.channel do
       rss_decorator["channel"].each_pair do |key, value|
         xml.tag! key_name(key), tag_data(value, nil) if channel_spec.include?(key_name(key))
       end
 
       @content_items.each do |rss_content_item|
+
         xml.item do
           rss_decorator["item"].each_pair do |key, value|
             tag_data = tag_data(value, rss_content_item)
             unless tag_data.blank?
               if value.has_key?('multiple')
                 tag_data.split(value["multiple"]).each do |multi_value|
-                  xml.tag! key_name(key), multi_value, value['attributes'] if item_spec.include?(key_name(key))
+                  xml.tag! key, multi_value, value['attributes'] if item_spec.include?(key)
                 end
               elsif value.has_key?('encode')
-                xml.tag! "#{key_name(key)}:encoded", value['attributes'] do
+                xml.tag! "#{key}:encoded", value['attributes'] do
                   xml.cdata! tag_data
                 end
-              elsif item_spec.include?(key_name(key))
-                xml.tag! key_name(key), tag_data, value['attributes']
+              elsif item_spec.include?(key)
+                xml.tag! key, tag_data, value['attributes']
               end
             end
           end

lib/tasks/employer/blog.rake

@@ -344,37 +344,34 @@ namespace :employer do
       rss_hash = {
         "channel": {
           "title": { "string": "Employer Blog" },
-          "link": { "string": "https://hiring.careerbuilder.com/promotions/" },
-          "description": { "string": "A Blog for Employers" },
-          "category:1": { "string": "Employers" },
-          "category:2": { "string": "Blog" },
-          "docs": { "string": "https://api.cbcortex.com/rss/v2/docs" },
-          "ttl": { "string": "30" },
-          "not_in_spec": { "string": "Should Not Be Included" }
+          "link": { "string": "http://resources.careerbuilder.com" },
+          "description": { "string": "News and trends, best practices, product news and more from CareerBuilder's experts." },
+          "language": { "string": "en-US" }
         },
         "item": {
           "title": { "field": blog.fields.find_by_name('Title').id },
           "link": { "method": {
                       "name": "rss_url",
-                      "args": ["https://hiring.careerbuilder.com/promotions/", blog.fields.find_by_name('Slug').id]
+                      "args": ["https://resources.careerbuilder.com/", blog.fields.find_by_name('Slug').id]
                    }
-            },
-          "description": { "field": blog.fields.find_by_name('Description').id },
-          "content": { "field": blog.fields.find_by_name('Body').id, "encode": true },
-          "author": { "method": {
-                        "name": "user_email",
-                        "args": [blog.fields.find_by_name('Author').id]
-                      }
           },
-          "category:1": { "field": blog.fields.find_by_name('Tags').id, "multiple": "," },
-          # "category": { "field": blog.fields.find_by_name('Categories').id, "multiple": true }, Data not persisting, pending bugfix
-          "guid": { "attributes": {
-                      "isPermaLink": false
-                    },
-                    "method": { "name": "id" }
-                  },
           "pubDate": { "field": blog.fields.find_by_name('Publish Date').id },
-          "other_thing_that's_not_in_spec": { "string": "Should not appear in RSS Feed for Items" }
+          "author": { "method": {
+            "name": "user_email",
+            "args": [blog.fields.find_by_name('Author').id]
+            }, "encode": true
+          },
+          "category": { "method": {
+            "name": "tree_list",
+            "args": [blog.fields.find_by_name('Categories').id]
+            }, "multiple": ","
+          },
+          "content": { "field": blog.fields.find_by_name('Body').id, "encode": true },
+          "media:content": { "media":
+            { "field": blog.fields.find_by_name('Featured Image').id,
+              "medium": "image"
+            }
+          }
         }
       }