editmode 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd3f1671097d61c5ea8a0cec5c6dda55f9417221c712020d0aaa5e9474f6f85
-  data.tar.gz: c102afb1932ae31933b7e6d4d0d2361b2853c8b4d0e0c863fcf915650c509f6b
+  metadata.gz: 834e252dd5d068562b8541a091e972404d759a2ae8cf9d80bedf33bdca22c167
+  data.tar.gz: bd7d10b6264e1ddca7e219587a7c08956b3a3ff8b1636ff18c6afc0aa70f8cfa
 SHA512:
-  metadata.gz: b45d8499eff5c5a1864baff10963aee1dac5d2c453d99583099fcbb1ffd86d62ae8a611da3427a86e88f262927afb4f0b8182ac06300550ecdf87398858cfe20
-  data.tar.gz: 12d16710fdeaffde83efedc2e15fb8035b7b3bd9412296541171510b2669ca913bc47469f3b9ab65606aae24ab47ccd8a3975c32a884372bfaae18048ffeaf52
+  metadata.gz: d87b5770f58dbc06f88bece3d32f966c3ba211b537c4a3050fe72513875016cdd3898c0aeb213136595a29b5be0987d9d34bd6189d967403301c8ef7999fc2b1
+  data.tar.gz: 793c609415a18dc4ff89f08037754b470356fe0f6cb5edf5dc680cbb8e3f934f56bd9cbd1c540112e382f1a93e6e0f798c1e21a17658f386addc0e9fe06d3f24

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -67,7 +67,11 @@ 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 custom_field_item.present?
             render_chunk_content(
@@ -88,6 +92,7 @@ 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]
 
@@ -102,7 +107,8 @@ module Editmode
           if options[:parent_identifier].present?
             chunk_data.merge!({parent_identifier: options[:parent_identifier]})
           end
-
+          
+          
           case display_type
           when "span"
             if chunk_type == "rich_text"
@@ -132,10 +138,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)
-
+          
           if !cached_content_present
             response = HTTParty.get(url)
             response_received = true if response.code == 200
@@ -144,15 +151,30 @@ 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 = field_content["identifier"]
+              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
 
+            options[:variable_fallbacks] = variable_fallbacks
+            options[:variable_values] = options[:variables]
+            
             render_chunk_content(identifier,chunk_content,chunk_type, options)
 
           end
@@ -168,18 +190,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/version.rb

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

metadata

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