editmode 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbdfaaca69c2832debd4fb728c6684b48abe8e9337cbaa8f4323a20cf175cf77
-  data.tar.gz: 51841cadd3a89aea58a0089b9e7c541a286f9da46fa2d7db0f32e9d7a07797ed
+  metadata.gz: c56cee03d73400139003e5a7b643e5ba0cc87827dd8373f973e4e5bbbf41e234
+  data.tar.gz: 5cc247b0737cf3a34a7b7507895ff5b6b67d14363bd4ef328ab0630155ac8cd2
 SHA512:
-  metadata.gz: 9966ac6b514c9c237db8e2e1f77613431a365f2c4259565422892b9abdd749a2c294575bfd0e1242d9ac682a5340b940bacde295560fa1845e93ddd03ef500f1
-  data.tar.gz: fee7262f68522bb8e4f76d0de9f9da8c267c2a311105e89c72d7989408d46f124f6bbbf4170d712c0544aa4453b17f2837525c93f47da9afae2a729a0a2c47a5
+  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,15 +80,13 @@ 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 %>
 ```
 

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/action_view_extensions/editmode_helper.rb

@@ -113,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"
@@ -124,6 +125,7 @@ module Editmode
 
           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"
@@ -159,7 +161,8 @@ 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
@@ -173,7 +176,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
 
@@ -189,11 +194,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].presence || {}
             
+            options[:cache_identifier] =  parent_identifier.presence || identifier
+            
             render_chunk_content(identifier,chunk_content,chunk_type, options)
-
           end
 
         rescue => error

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?
@@ -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,7 +5,7 @@ module Editmode
       field, options = parse_arguments(args)
       begin
         chunk = Editmode::ChunkValue.new(identifier, options)
-        
+
         if chunk.chunk_type == 'collection_item'
           chunk.field(field)
         else

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.1.9"
+  VERSION = "1.2.0"
 end

metadata

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