editmode 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c56cee03d73400139003e5a7b643e5ba0cc87827dd8373f973e4e5bbbf41e234
-  data.tar.gz: 5cc247b0737cf3a34a7b7507895ff5b6b67d14363bd4ef328ab0630155ac8cd2
+  metadata.gz: 64a20fe2b3a8ccf1cd1dafc516a2484b6f4ce6701ecdd2d4f2b8a431137959bd
+  data.tar.gz: 683549e7c9085dda0d1ef74ff7e2b142fa746372c1da288af5e154017b69b957
 SHA512:
-  metadata.gz: 909f2860b00987679e572d4c7c3202fe208fc7cc99ae75df7b698e5371b97f90861f65598193a0882fd924ec653978c0547d57bdc66ec2ad76651b6d1358aff1
-  data.tar.gz: 6ccc29e44f1cd14ad281c182a78904f74a199b1b9fc22fe5cf7757753b24b3ac5eeb9a0db2098e34662b0e1448a49831e9bc99db7f78ff931485ae64cded024b
+  metadata.gz: 92953c97a18f6fb3b91389f4beab95ffc75f92bf91e4a603094a016c6673724c49442a46643259b0e9a9c4b48c855f9821eee7e19b7801cf2fca2b1d8c2cce4b
+  data.tar.gz: 3763c6e47edd0cd6c326a7cc80a0583b20d3a9db66d652b3416c643548a3356e45896846ea321b4a63f3b605e07a6f1df3dc6b8f070b63939d5b6b86fbb3c2a6

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -135,7 +135,7 @@ 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"
@@ -162,7 +162,6 @@ module Editmode
           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
@@ -233,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! 
@@ -241,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

@@ -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
@@ -33,13 +33,15 @@ module Editmode
       else
         raise "undefined method 'field` for chunk_type: #{chunk_type} \n"
       end
-      result || @content
+      result ||= @content
+      result.try(:html_safe)
     end
 
     def content
       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

data/lib/editmode/version.rb

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

metadata

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