Merge pull request #70 from cortex-cms/topic/CE-728-Refactors

toastercup · web-flow · commit 41b28d78ac97 · 2018-08-05T05:08:55.000-04:00
CE-728: Refactors
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,18 @@
+{
+  "presets": [
+    ["env", {
+      "modules": false,
+      "targets": {
+        "browsers": "> 1%",
+        "uglify": true
+      },
+      "useBuiltIns": true
+    }]
+  ],
+
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-object-rest-spread",
+    ["transform-class-properties", { "spec": true }]
+  ]
+}
diff --git a/.postcssrc.yml b/.postcssrc.yml
@@ -0,0 +1,3 @@
+plugins:
+  postcss-import: {}
+  postcss-cssnext: {}
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,74 +2,80 @@ PATH
   remote: .
   specs:
     cortex-plugins-core (3.0.0)
-      aws-sdk-s3 (~> 1.5)
+      aws-sdk-s3 (~> 1.17)
       cells (~> 4.1)
       cells-haml (~> 0.0)
       cells-rails (~> 0.0)
       fastimage (~> 2.1)
-      image_optim (~> 0.25)
+      image_optim (~> 0.26)
       image_optim_pack (~> 0.5)
-      image_processing (~> 0.4)
+      image_processing (~> 1.6)
       jsonb_accessor (~> 1.0)
       mimemagic (~> 0.3)
       mini_magick (~> 4.8)
       rails (>= 5)
-      shrine (~> 2.7)
+      shrine (~> 2.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.4)
-      actionpack (= 5.1.4)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.4)
-      activesupport (= 5.1.4)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
       globalid (>= 0.3.6)
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
-      arel (~> 8.0)
-    activesupport (5.1.4)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
-    aws-partitions (1.58.0)
-    aws-sdk-core (3.14.0)
+    arel (9.0.0)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.97.0)
+    aws-sdk-core (3.23.0)
+      aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.4.0)
+    aws-sdk-kms (1.7.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.8.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-s3 (1.17.0)
+      aws-sdk-core (~> 3, >= 3.21.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sigv4 (1.0.3)
     builder (3.2.3)
     cells (4.1.7)
       declarative-builder (< 0.2.0)
@@ -79,89 +85,97 @@ GEM
     cells-haml (0.0.10)
       cells (>= 4.0.1, <= 6.0.0)
       haml (>= 4.1.0.beta.1)
-    cells-rails (0.0.8)
+    cells-rails (0.0.9)
       actionpack (>= 3.0)
       cells (>= 4.1.6, < 5.0.0)
     concurrent-ruby (1.0.5)
-    crass (1.0.3)
+    crass (1.0.4)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
     declarative-option (0.1.0)
-    down (4.2.1)
-    erubi (1.7.0)
-    exifr (1.3.3)
-    fastimage (2.1.1)
+    down (4.5.0)
+    erubi (1.7.1)
+    exifr (1.3.4)
+    fastimage (2.1.3)
+    ffi (1.9.25)
     fspath (3.1.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    i18n (0.9.3)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     image_optim (0.26.1)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.5.0.20180124)
+    image_optim_pack (0.5.1)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_processing (0.4.5)
+    image_processing (1.6.0)
+      mini_magick (~> 4.0)
+      ruby-vips (>= 2.0.11, < 3)
     image_size (1.5.0)
     in_threads (1.5.0)
-    jmespath (1.3.1)
+    jmespath (1.4.0)
     jsonb_accessor (1.0.0)
       activerecord (>= 5.0)
       activesupport (>= 5.0)
       pg (>= 0.18.1)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
     mini_magick (4.8.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nio4r (2.2.0)
-    nokogiri (1.8.2)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     pg (1.0.0)
     progress (3.4.0)
-    rack (2.0.4)
-    rack-test (0.8.2)
+    rack (2.0.5)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.4)
-      actioncable (= 5.1.4)
-      actionmailer (= 5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
-      activemodel (= 5.1.4)
-      activerecord (= 5.1.4)
-      activesupport (= 5.1.4)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
       bundler (>= 1.3.0)
-      railties (= 5.1.4)
+      railties (= 5.2.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    shrine (2.9.0)
+    rake (12.3.1)
+    ruby-vips (2.0.12)
+      ffi (~> 1.9)
+    shrine (2.11.0)
       down (~> 4.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -175,7 +189,7 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
 
@@ -186,4 +200,4 @@ DEPENDENCIES
   cortex-plugins-core!
 
 BUNDLED WITH
-   1.16.1
+   1.16.3
diff --git a/app/cells/plugins/core/asset_cell.rb b/app/cells/plugins/core/asset_cell.rb
@@ -1,9 +1,11 @@
+require 'helpers/utility_helper'
+
 module Plugins
   module Core
     class AssetCell < Plugins::Core::Cell
       include ActionView::Helpers::NumberHelper
+      include Cortex::Cells::AssociationHelper
       include UtilityHelper
-      include Cells::AssociationHelper
 
       def input
         render
diff --git a/app/transactions/get_field_tree_list_transaction.rb b/app/transactions/get_field_tree_list_transaction.rb
@@ -5,14 +5,14 @@ class GetFieldTreeListTransaction < Cortex::ApplicationTransaction
   def init(input)
     field = Field.find_by_id(input[:args]['field_id'])
 
-    field ? Right({ content_item: input[:content_item], field: field }) : Left(:not_found)
+    field ? Success({ content_item: input[:content_item], field: field }) : Failure(:not_found)
   end
 
   def process(input)
     tree_array = input[:field].metadata['allowed_values']['data']['tree_array']
     tree_values = input[:content_item].field_items.find {|field_item| field_item.field_id == input[:field].id}.data['values']
 
     tree_list = tree_values.map {|value| tree_array.find {|node| node['id'] == value.to_i}['node']['name']}.join(',')
-    Right(tree_list)
+    Success(tree_list)
   end
 end
diff --git a/app/transactions/new_tag_field_item_transaction.rb b/app/transactions/new_tag_field_item_transaction.rb
@@ -2,6 +2,6 @@ class NewTagFieldItemTransaction < Cortex::ApplicationTransaction
   step :process
 
   def process(field_item)
-    Right(field_item)
+    Success(field_item)
   end
 end
diff --git a/app/transactions/new_user_field_item_transaction.rb b/app/transactions/new_user_field_item_transaction.rb
@@ -2,6 +2,6 @@ class NewUserFieldItemTransaction < Cortex::ApplicationTransaction
   step :process
 
   def process(field_item)
-    Right(field_item)
+    Success(field_item)
   end
 end
diff --git a/app/transactions/update_tag_field_item_transaction.rb b/app/transactions/update_tag_field_item_transaction.rb
@@ -2,6 +2,6 @@ class UpdateTagFieldItemTransaction < Cortex::ApplicationTransaction
   step :process
 
   def process(field_item)
-    Right(field_item)
+    Success(field_item)
   end
 end
diff --git a/app/widgets/plugins/core/media_widget_parser.rb b/app/widgets/plugins/core/media_widget_parser.rb
@@ -0,0 +1,53 @@
+# TODO: Refactor namespacing
+
+module Plugins
+  module Core
+    module MediaWidgetParser
+      def self.parse(body)
+        body_document = document_for body
+
+        widget_nodes_for(body_document).each do |widget_node|
+          widget_node.inner_html = render_widget_inner widget_node
+        end
+
+        body_document.to_html
+      end
+
+      def self.document_for(html)
+        Nokogiri::HTML::DocumentFragment.parse html
+      end
+
+      def self.widget_nodes_for(document)
+        document.css 'media'
+      end
+
+      def self.render_widget_inner(widget)
+        Nokogiri::HTML::Builder.new do |doc|
+          element, tag_type = content_item_element(widget['id'])
+          element.merge!({ width: widget['width'], height: widget['height'], alt: widget['alt'], style: widget['style'], class: widget['class'] })
+
+          doc.send(tag_type, element)
+        end.doc.root
+      end
+
+      def self.content_item_element(id)
+        asset_field_item = ContentItem.find(id).field_items.find { |field_item| field_item.field.field_type_instance.is_a?(AssetFieldType) }
+        url = asset_field_item.data['asset']['versions']['original']['url']
+
+        if image? asset_field_item.data['asset']['versions']['original']['mime_type']
+          element = { src: url }
+          tag_type = 'img'
+        else
+          element = { href: url }
+          tag_type = 'a'
+        end
+
+        [element, tag_type]
+      end
+
+      def self.image?(mime_type)
+        MimeMagic.new(mime_type).mediatype == 'image'
+      end
+    end
+  end
+end
diff --git a/config/initializers/tag_parsers.rb b/config/initializers/tag_parsers.rb
@@ -0,0 +1 @@
+Cortex.tag_parsers << 'Plugins::Core::MediaWidgetParser'
diff --git a/cortex-plugins-core.gemspec b/cortex-plugins-core.gemspec
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+plugins:`
	`2`	`+ postcss-import: {}`
	`3`	`+ postcss-cssnext: {}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Cortex.tag_parsers << 'Plugins::Core::MediaWidgetParser'`