editmode 1.2.3 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78dda874aecacc9edfdf0e96598019e7dad8cc44693336d94511083238b55a91
-  data.tar.gz: d111ab02c60c737e5711139473e7be988f02ffdb3a8ed01a7876174348bf5d83
+  metadata.gz: 68357d9af1673886733d966a8c6bad378f2f0a9242b810b9e61560ab8b793b75
+  data.tar.gz: d7f45153fe466bb03b68a7b1428cc245883fbd033a4a0e9e449133a14c4480d5
 SHA512:
-  metadata.gz: e896421ca91061b25d28bc0ea217a2891df5f06d109b00301364ad67c3813caf2de47219f0be1b13ac335b6a8b76bcdaa5dc10b5ad4a9308722e90939613cbaf
-  data.tar.gz: 9ad90b4008998f64e52cfe34c73c74db62633b468764f0939df16ffb4fbeb1a9acbbdee0acfe053e793ff66b316f9c8ecde7bb64544b81013828e61383995f69
+  metadata.gz: cf0d706724b4d3fd92b7e3926af60e491adc248b3ac1b36b1913f3bf22eac78e82e8967182b29c8ba86984a0c5ce8b3124fecce2b8695e79fca0b098c72d9d77
+  data.tar.gz: a2af19294f5625257a5d94239a16bbb68035863404c951f9aa1d2728d0e16e57071f00ac1cecc1c560950505e2b8c9552d802fd16dbaaf6312403cc8db8302aa

data/README.md

@@ -50,6 +50,12 @@ Editmode provides helper methods for use in your rails views and controllers.
 <%= E('cnk_x4ts...', class: "a-css-class") %> # Render a chunk with inline css class 
 ```
 
+### Working with multiple projects in the same codebase
+If you want to include content from a different project to the one you've specified in the initializer, you can pass the project id in to the view helper.
+```erb
+<%= E("cnk_16e04a02d577afb610ce", project_id: "prj_02d577afb617hdb") %>
+```
+
 ### Content can also be accessed in Controllers
 ```ruby
 @page_title = e("cnk_x4ts............")  # Using a chunk identifier
@@ -78,6 +84,8 @@ e("cnk_16e04a02d577afb610ce", "Email Content", variables: variable_values)
 # Response: "Hi Dexter Morgan"
 ```
 
+
+
 ### Use collections for repeatable content
 ```erb
 <%= c('col_j8fbs...', class: "profiles-container", item_class: "profile-item") do %>

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -56,14 +56,14 @@ module Editmode
                 chunks.each do |chunk|
                   @custom_field_chunk = chunk
                   concat(content_tag(:div, class: "chunks-collection-item--wrapper #{item_class}") do
-                    yield
+                    yield(@custom_field_chunk)
                   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
+                  yield(@custom_field_chunk)
                 end)
               end 
             else

data/lib/editmode/chunk_value.rb

@@ -10,12 +10,14 @@ module Editmode
 
     attr_writer :content
 
-    def initialize(identifier, **options)
+    def initialize(identifier, project_id: Editmode.project_id, **options)
       @identifier = identifier
       @branch_id = options[:branch_id].presence
-      @project_id = Editmode.project_id
+      @project_id = project_id
       @variable_values = options[:variables].presence || {}
       @raw = options[:raw].present?
+      @skip_sanitize = options[:dangerously_skip_sanitization]
+      @skip_cache = options[:skip_cache]
 
       @url = "#{api_root_url}/chunks/#{identifier}"
       @cache_identifier = set_cache_identifier(identifier)
@@ -35,7 +37,7 @@ module Editmode
           field_chunk = field_chunk(field)
           if field_chunk.present?
             result = field_chunk['content']
-            result = variable_parse!(result, variable_fallbacks, variable_values, @raw)
+            result = variable_parse!(result, variable_fallbacks, variable_values, @raw, @skip_sanitize)
           else
             raise no_response_received(field)
           end
@@ -57,7 +59,7 @@ module Editmode
     def content
       raise "undefined method 'content' for chunk_type: collection_item \nDid you mean? field" if chunk_type == 'collection_item'
 
-      result = variable_parse!(@content, variable_fallbacks, variable_values, @raw)
+      result = variable_parse!(@content, variable_fallbacks, variable_values, @raw, @skip_sanitize)
       result.try(:html_safe)
     end
 
@@ -79,8 +81,7 @@ module Editmode
       return false
     end
 
-    def variable_parse!(content, variables = {}, values = {}, raw = true)
-      content = ActionController::Base.helpers.sanitize(content)
+    def variable_parse!(content, variables = {}, values = {}, raw = true, skip_sanitize=false)
       tokens = content.scan(/\{{(.*?)\}}/)
       if tokens.any?
         tokens.flatten!
@@ -98,10 +99,12 @@ module Editmode
         end
       end
 
-      content
+      content = ActionController::Base.helpers.sanitize(content) unless skip_sanitize
+      return content
     end
 
     def cached?
+      return false if @skip_cache
       Rails.cache.exist?(cache_identifier)
     end
 
@@ -113,6 +116,7 @@ module Editmode
     end
 
     def get_content
+
       if !cached?
         http_response = HTTParty.get(url, query: query_params)
         response_received = true if http_response.code == 200
@@ -121,9 +125,8 @@ module Editmode
       if !cached? && !response_received
         raise no_response_received(identifier)
       else
-        cached_response = Rails.cache.fetch(cache_identifier) do
-          http_response.to_json
-        end
+        Rails.cache.write(cache_identifier, http_response.to_json) if http_response.present?
+        cached_response = Rails.cache.fetch(cache_identifier)
 
         @response = json?(cached_response) ? JSON.parse(cached_response) : cached_response
         set_response_attributes!

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.2.3"
-end
+  VERSION = "1.2.8"
+end

metadata

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