editmode 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd3f1671097d61c5ea8a0cec5c6dda55f9417221c712020d0aaa5e9474f6f85
-  data.tar.gz: c102afb1932ae31933b7e6d4d0d2361b2853c8b4d0e0c863fcf915650c509f6b
+  metadata.gz: c56cee03d73400139003e5a7b643e5ba0cc87827dd8373f973e4e5bbbf41e234
+  data.tar.gz: 5cc247b0737cf3a34a7b7507895ff5b6b67d14363bd4ef328ab0630155ac8cd2
 SHA512:
-  metadata.gz: b45d8499eff5c5a1864baff10963aee1dac5d2c453d99583099fcbb1ffd86d62ae8a611da3427a86e88f262927afb4f0b8182ac06300550ecdf87398858cfe20
-  data.tar.gz: 12d16710fdeaffde83efedc2e15fb8035b7b3bd9412296541171510b2669ca913bc47469f3b9ab65606aae24ab47ccd8a3975c32a884372bfaae18048ffeaf52
+  metadata.gz: 909f2860b00987679e572d4c7c3202fe208fc7cc99ae75df7b698e5371b97f90861f65598193a0882fd924ec653978c0547d57bdc66ec2ad76651b6d1358aff1
+  data.tar.gz: 6ccc29e44f1cd14ad281c182a78904f74a199b1b9fc22fe5cf7757753b24b3ac5eeb9a0db2098e34662b0e1448a49831e9bc99db7f78ff931485ae64cded024b

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
@@ -67,14 +80,23 @@ module Editmode
       def chunk_field_value(parent_chunk_object, custom_field_identifier, options = {})
         begin 
           chunk_identifier = parent_chunk_object["identifier"]
-          custom_field_item = parent_chunk_object["content"].detect {|f| f["custom_field_identifier"] == custom_field_identifier || f["custom_field_name"] == custom_field_identifier }
+          custom_field_item = parent_chunk_object["content"].detect do |f|
+            f["custom_field_identifier"].try(:downcase) == custom_field_identifier.try(:downcase)  || f["custom_field_name"].try(:downcase)  == custom_field_identifier.try(:downcase)
+          end
+
+          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
@@ -88,8 +110,10 @@ module Editmode
         begin 
           # Always sanitize the content!!
           chunk_content = ActionController::Base.helpers.sanitize(chunk_content) unless chunk_type == 'rich_text'
+          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"
@@ -99,9 +123,9 @@ 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"
@@ -115,6 +139,7 @@ module Editmode
               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
@@ -132,9 +157,11 @@ module Editmode
         # prevent the page from loading.
         begin
           branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
-          cache_identifier = "chunk_#{identifier}#{branch_id}"
+          field = options[:field].presence || ""          
+          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)
@@ -144,17 +171,39 @@ module Editmode
           if !cached_content_present && !response_received
             raise "No response received"
           else
-            
+            if field.present? && response.present?
+              field_content = response["content"].detect {|f| f["custom_field_identifier"].downcase == field.downcase || f["custom_field_name"].downcase == field.downcase }
+              if field_content
+                content = field_content["content"]
+                type = field_content["chunk_type"]
+                identifier = Rails.cache.fetch("#{cache_identifier}_field_identifier") do
+                  field_content["identifier"]
+                end
+              end
+            end
+
+            variable_fallbacks = Rails.cache.fetch("#{cache_identifier}_variables") do
+              response['variable_fallbacks'].presence || {}
+            end
+
             chunk_content = Rails.cache.fetch(cache_identifier) do  
-              response['content']
+              content.presence || response["content"]
             end
 
             chunk_type = Rails.cache.fetch("#{cache_identifier}_type") do  
-              response['chunk_type']
+              type.presence || response['chunk_type']
             end
 
-            render_chunk_content(identifier,chunk_content,chunk_type, options)
+            identifier = Rails.cache.fetch("#{cache_identifier}_field_identifier") do
+              identifier
+            end
 
+            options[:variable_fallbacks] = variable_fallbacks
+            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
@@ -168,18 +217,23 @@ module Editmode
       alias_method :chunk, :chunk_display
 
 
-      def render_custom_field(label, options={})
-        chunk_field_value(@custom_field_chunk, label, options)
+      def render_custom_field(field_name, options={})
+        options[:variable_fallbacks] = @custom_field_chunk["variable_fallbacks"] || {}
+        options[:variable_values] = options[:variables] || {}
+        
+        chunk_field_value(@custom_field_chunk, field_name, options)
       end
       alias_method :F, :render_custom_field
 
-      def render_chunk(identifier, options = {}, &block)
+      def render_chunk(identifier, *args, &block)
+        field, options = parse_arguments(args)
+        options[:field] = field
         chunk_display('label', identifier, options, &block)
       end
       alias_method :E, :render_chunk
 
 
-      def variable_parse!(content, variables, values)
+      def variable_parse!(content, variables = {}, values = {})
         tokens = content.scan(/\{{(.*?)\}}/)
         if tokens.any?
           tokens.flatten! 

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?
@@ -31,13 +31,13 @@ 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
     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)
     end
@@ -75,7 +75,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.5"
+  VERSION = "1.2.0"
 end

metadata

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