editmode 1.1.6 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834e252dd5d068562b8541a091e972404d759a2ae8cf9d80bedf33bdca22c167
-  data.tar.gz: bd7d10b6264e1ddca7e219587a7c08956b3a3ff8b1636ff18c6afc0aa70f8cfa
+  metadata.gz: 64a20fe2b3a8ccf1cd1dafc516a2484b6f4ce6701ecdd2d4f2b8a431137959bd
+  data.tar.gz: 683549e7c9085dda0d1ef74ff7e2b142fa746372c1da288af5e154017b69b957
 SHA512:
-  metadata.gz: d87b5770f58dbc06f88bece3d32f966c3ba211b537c4a3050fe72513875016cdd3898c0aeb213136595a29b5be0987d9d34bd6189d967403301c8ef7999fc2b1
-  data.tar.gz: 793c609415a18dc4ff89f08037754b470356fe0f6cb5edf5dc680cbb8e3f934f56bd9cbd1c540112e382f1a93e6e0f798c1e21a17658f386addc0e9fe06d3f24
+  metadata.gz: 92953c97a18f6fb3b91389f4beab95ffc75f92bf91e4a603094a016c6673724c49442a46643259b0e9a9c4b48c855f9821eee7e19b7801cf2fca2b1d8c2cce4b
+  data.tar.gz: 3763c6e47edd0cd6c326a7cc80a0583b20d3a9db66d652b3416c643548a3356e45896846ea321b4a63f3b605e07a6f1df3dc6b8f070b63939d5b6b86fbb3c2a6

data/README.md

@@ -47,6 +47,7 @@ Editmode provides helper methods for use in your rails views and controllers.
 ```erb
 <%= E('cnk_x4ts............') %> # Using a chunk identifier
 <%= E('marketing_page_headline') %> # Using a content key
+<%= E('cnk_x4ts...', class: "a-css-class") %> # Render a chunk with inline css class 
 ```
 
 ### Content can also be accessed in Controllers
@@ -79,23 +80,23 @@ e("cnk_16e04a02d577afb610ce", "Email Content", variables: variable_values)
 
 ### Use collections for repeatable content
 ```erb
-<%= c('col_j8fbs...') do |chunk| %>
-  <div class="user-profile">
-    <h3 class="name">
-      <%= F("Name") %>
-    </h3>
-    <p class="description">
-      <%= f("Description") %>
-    </p>
-  </div>
+<%= c('col_j8fbs...', class: "profiles-container", item_class: "profile-item") do %>
+  <h3 class="name">
+    <%= F("Name", class: "profile-name") %>
+  </h3>
+  <p class="description">
+    <%= f("Description"), class: "profile-description" %>
+  </p>
 <% end %>
 ```
 
 |Parameter|Type|Description|
 |---|---|---|
 | identifier | string | The first argument of `c` takes the id of the collection you want to loop through |
-| limit | int |`optional` The number of collection items you want to display  |
+| limit | int/string |`optional` The number of collection items you want to display  |
 | tags | array |`optional` Filter collection items based on tags listed in this parameter  |
+| class | string | `optional` Class name(s) that will be added along with "chunks-collection-wrapper" to the main collection `<div>` element |
+| item_class | string | `optional` Class name(s) that will be added along with "chunks-collection-item--wrapper" to all collection items |
 
 
 ## Caching

data/app/controllers/editmode_controller.rb

@@ -13,8 +13,7 @@ class EditmodeController < ApplicationController
       Rails.cache.delete("chunk_#{project_id}_variables")
       render status: 200, json: {:response => "success"}
     elsif params[:identifier]
-      Rails.cache.delete("chunk_#{params[:identifier]}")
-      Rails.cache.delete("chunk_#{params[:identifier]}_type")
+      Rails.cache.delete_matched("#{params[:identifier]}")
       render status: 200, json: {:response => "success"}
     else
       render status: 404, json: {:response => "no identifier specified"}

data/lib/editmode.rb

@@ -36,7 +36,7 @@ module Editmode
       begin
         Editmode::ChunkValue.new(identifier, **options )
       rescue => er
-        raise er
+        puts er
       end
     end
   end

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -19,6 +19,9 @@ module Editmode
         branch_id = params[:em_branch_id].presence
         tags = options[:tags].presence || []
         limit = options[:limit].presence
+
+        parent_class = options[:class] || ""
+        item_class = options[:item_class] || ""
         
         begin 
           url_params = { 
@@ -49,12 +52,22 @@ module Editmode
             end
 
             if chunks.any?
-              content_tag :div, class: "chunks-collection-wrapper", data: {chunk_collection_identifier: collection_identifier} do
+              content_tag :div, class: "chunks-collection-wrapper #{parent_class}", data: {chunk_collection_identifier: collection_identifier} do
                 chunks.each do |chunk|
                   @custom_field_chunk = chunk
-                  yield
+                  concat(content_tag(:div, class: "chunks-collection-item--wrapper #{item_class}") do
+                    yield
+                  end)
                 end
-              end
+
+                # Placeholder element for new collection item
+                @custom_field_chunk = chunks.first.merge!({placeholder: true})
+                concat(content_tag(:div, class: "chunks-hide chunks-col-placeholder-wrapper") do
+                  yield
+                end)
+              end 
+            else
+              content_tag(:span, "&nbsp".html_safe)
             end
           end
         rescue => error
@@ -73,12 +86,17 @@ module Editmode
 
           options[:field] = custom_field_identifier
           
+          if parent_chunk_object[:placeholder]
+            custom_field_item["identifier"] = ""
+            custom_field_item["content"] = ""
+          end
+
           if custom_field_item.present?
             render_chunk_content(
               custom_field_item["identifier"],
               custom_field_item["content"],
               custom_field_item["chunk_type"],
-              { parent_identifier: chunk_identifier }.merge(options)
+              { parent_identifier: chunk_identifier, custom_field_identifier:  custom_field_identifier}.merge(options)
             )
           end
         rescue => errors
@@ -95,6 +113,7 @@ module Editmode
           chunk_content = variable_parse!(chunk_content, options[:variable_fallbacks], options[:variable_values])
 
           css_class = options[:class]
+          cache_id = options[:cache_identifier]
 
           if chunk_type == "image"
             display_type = "image"
@@ -104,11 +123,10 @@ module Editmode
 
           chunk_data = { :chunk => chunk_identifier, :chunk_editable => false, :chunk_type => chunk_type }
 
-          if options[:parent_identifier].present?
-            chunk_data.merge!({parent_identifier: options[:parent_identifier]})
-          end
-          
-          
+          chunk_data.merge!({parent_identifier: options[:parent_identifier]}) if options[:parent_identifier].present?
+          chunk_data.merge!({custom_field_identifier: options[:custom_field_identifier]}) if options[:custom_field_identifier].present?
+          chunk_data.merge!({chunk_cache_id: cache_id}) if cache_id.present?
+
           case display_type
           when "span"
             if chunk_type == "rich_text"
@@ -117,10 +135,11 @@ module Editmode
               end
             else
               content_tag("em-span", :class => css_class, :data => chunk_data.merge!({:chunk_editable => true}) ) do
-                chunk_content
+                chunk_content.html_safe
               end
             end
           when "image"
+            chunk_content = chunk_content.blank? || chunk_content == "/images/original/missing.png" ? 'https://www.editmode.com/upload.png' : chunk_content
             image_tag(chunk_content, :data => chunk_data, :class => css_class) 
           end
         rescue => errors
@@ -142,7 +161,7 @@ module Editmode
           cache_identifier = "chunk_#{identifier}#{branch_id}#{field}"
           url = "#{api_root_url}/chunks/#{identifier}?project_id=#{Editmode.project_id}&#{branch_params}"
           cached_content_present = Rails.cache.exist?(cache_identifier)
-          
+          parent_identifier = identifier if field.present?
           if !cached_content_present
             response = HTTParty.get(url)
             response_received = true if response.code == 200
@@ -156,7 +175,9 @@ module Editmode
               if field_content
                 content = field_content["content"]
                 type = field_content["chunk_type"]
-                identifier = field_content["identifier"]
+                identifier = Rails.cache.fetch("#{cache_identifier}_field_identifier") do
+                  field_content["identifier"]
+                end
               end
             end
 
@@ -172,11 +193,16 @@ module Editmode
               type.presence || response['chunk_type']
             end
 
+            identifier = Rails.cache.fetch("#{cache_identifier}_field_identifier") do
+              identifier
+            end
+
             options[:variable_fallbacks] = variable_fallbacks
-            options[:variable_values] = options[:variables]
+            options[:variable_values] = options[:variables].presence || {}
+            
+            options[:cache_identifier] =  parent_identifier.presence || identifier
             
             render_chunk_content(identifier,chunk_content,chunk_type, options)
-
           end
 
         rescue => error
@@ -206,7 +232,7 @@ module Editmode
       alias_method :E, :render_chunk
 
 
-      def variable_parse!(content, variables = {}, values = {})
+      def variable_parse!(content, variables = {}, values = {}, raw = false)
         tokens = content.scan(/\{{(.*?)\}}/)
         if tokens.any?
           tokens.flatten! 
@@ -214,6 +240,12 @@ module Editmode
             token_value = values[token.to_sym] || variables[token] || ""
             sanitized_value = ActionController::Base.helpers.sanitize(token_value)
 
+            unless raw
+              sanitized_value = content_tag("em-var", :data => {chunk_variable: token, chunk_variable_value: sanitized_value}) do
+                sanitized_value
+              end
+            end
+            
             content.gsub!("{{#{token}}}", sanitized_value)
           end
         end

data/lib/editmode/chunk_value.rb

@@ -15,7 +15,7 @@ module Editmode
       get_content
     end
 
-    def field(field = nil)
+    def field(field = nil)      
       # Field ID can be a slug or field_name
       if chunk_type == 'collection_item'
         if field.present?
@@ -23,7 +23,7 @@ module Editmode
           field_content = @content.detect {|f| f["custom_field_identifier"].downcase == field || f["custom_field_name"].downcase == field }
           if field_content.present?
             result = field_content['content']
-            result = variable_parse!(result, variable_fallbacks, variable_values)
+            result = variable_parse!(result, variable_fallbacks, variable_values, true)
           else
             raise no_response_received(field)
           end
@@ -31,15 +31,17 @@ module Editmode
           raise require_field_id
         end
       else
-        raise NoMethodError.new "undefined method 'field` for chunk_type: #{chunk_type} \n"
+        raise "undefined method 'field` for chunk_type: #{chunk_type} \n"
       end
-      result || @content
+      result ||= @content
+      result.try(:html_safe)
     end
 
     def content
-      raise NoMethodError.new "undefined method 'content` for chunk_type: collection_item \nDid you mean? field" if chunk_type == 'collection_item'
+      raise "undefined method 'content` for chunk_type: collection_item \nDid you mean? field" if chunk_type == 'collection_item'
       
-      variable_parse!(@content, variable_fallbacks, variable_values)
+      result = variable_parse!(@content, variable_fallbacks, variable_values, true)
+      result.try(:html_safe)
     end
 
     private
@@ -75,7 +77,7 @@ module Editmode
         @content = response['content']
         @chunk_type = response['chunk_type']
         @project_id = response['project_id']
-        @variable_fallbacks = response['variable_fallbacks']
+        @variable_fallbacks = response['variable_fallbacks'].presence || {}
       end      
     end
 

data/lib/editmode/helper.rb

@@ -5,14 +5,14 @@ module Editmode
       field, options = parse_arguments(args)
       begin
         chunk = Editmode::ChunkValue.new(identifier, options)
-        
+
         if chunk.chunk_type == 'collection_item'
           chunk.field(field)
         else
           chunk.content
         end 
       rescue => er
-        raise er
+        puts er
       end
     end
 

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.1.6"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.1
 platform: ruby
 authors:
 - Tony Ennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler