editmode 1.2.2 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2beab37962d65855d3ecfd66b6d9731fd4f1826eac260d97a30d8c1b022b9ff8
-  data.tar.gz: b05b7f2425a796262ec31e2d8cc447405d9bb2ed339b37a6f71cc2d52cd10ad7
+  metadata.gz: aac6adb5e24a89664dc5939ddb97606ac0003f33fb329b7d00b507c98a8ebc98
+  data.tar.gz: ae22fe6ff1b9cf07ea3a1d7761c298f856482b051a080111fa9e29a7965633ee
 SHA512:
-  metadata.gz: 75944607fde64c8da7a99751a421d43fbc473b7f0c0c7ce34297b16d70869d2d393de8731fed85dfd6387ba22977ef3e92ae892370b07a13a9ed41bad7d6472b
-  data.tar.gz: c2109b7ca239fce3ddb025348bc534201002d6396a18e4eec9357fdc992f64489efed095e4568db984148e5ff45aafad70b1026cf93111d9c04aa20bed329924
+  metadata.gz: 1264161505c4cb1ded693b68231825962f686420817244d427510e76ac71950b78ba5a4da5ab85bb02c8a163f724e012f4232b397bdaa7fcef74bedea9ea8e03
+  data.tar.gz: 3a5afb3beac64da0120e296b3bd41747031b6a1d662aa24df1b56f82eb3e29e1f44665df76ce29a6cd87848a4ebd3e9b61df79ad6112feb7747a30bca3816b84

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

@@ -3,22 +3,23 @@ module Editmode
     include ActionView::Helpers::TagHelper
     include ActionView::Context
 
-    attr_accessor :identifier, :variable_values, :branch_id, 
-                  :variable_fallbacks, :chunk_type, :project_id,
-                  :url, :collection_id, :cache_identifier,
-                  :response
+    attr_accessor :identifier, :variable_values, :branch_id,
+      :variable_fallbacks, :chunk_type, :project_id,
+      :url, :collection_id, :cache_identifier,
+      :response
 
     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]
 
-      branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
-      @url = "#{api_root_url}/chunks/#{identifier}?project_id=#{project_id}&#{branch_params}"
+      @url = "#{api_root_url}/chunks/#{identifier}"
       @cache_identifier = set_cache_identifier(identifier)
 
       if options[:response].present?
@@ -29,14 +30,14 @@ module Editmode
       end
     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?
           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
@@ -56,13 +57,14 @@ module Editmode
     end
 
     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)
+      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, @skip_sanitize)
       result.try(:html_safe)
     end
 
     private
+
     # Todo: Transfer to helper utils
     def api_root_url
       ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
@@ -79,11 +81,10 @@ 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! 
+        tokens.flatten!
         tokens.each do |token|
           token_value = values[token.to_sym] || variables[token] || ""
           sanitized_value = ActionController::Base.helpers.sanitize(token_value)
@@ -93,30 +94,39 @@ module Editmode
               sanitized_value
             end
           end
-          
+
           content.gsub!("{{#{token}}}", sanitized_value)
         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
 
+    def query_params
+      the_params = { 'project_id' => project_id }
+      the_params['branch_id'] = branch_id if branch_id.present?
+
+      the_params
+    end
+
     def get_content
+
       if !cached?
-        http_response = HTTParty.get(url)
+        http_response = HTTParty.get(url, query: query_params)
         response_received = true if http_response.code == 200
       end
 
       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!
@@ -128,7 +138,8 @@ module Editmode
       @chunk_type = response['chunk_type']
       @variable_fallbacks = response['variable_fallbacks'].presence || {}
       @collection_id = response["collection"]["identifier"] if chunk_type == 'collection_item'
+      @branch_id = response['branch_id']
     end
 
   end
-end
+end

data/lib/editmode/helper.rb

@@ -5,17 +5,34 @@ module Editmode
       field, options = parse_arguments(args)
       begin
         chunk = Editmode::ChunkValue.new(identifier, options.merge({raw: true}))
-
-        if chunk.chunk_type == 'collection_item'
-          chunk.field(field)
-        else
-          chunk.content
-        end 
+        render_noneditable_chunk(chunk, field, options)
       rescue => er
         puts er
       end
     end
 
+    def render_noneditable_chunk(chunk, field=nil, options=nil)
+      return render_collection_item(chunk, field, options) if chunk.chunk_type == 'collection_item'
+
+      render_content(chunk, options)
+    end
+
+    def render_collection_item(chunk, field=nil, options=nil)
+      return render_image(chunk.field(field), options[:class]) if chunk.field_chunk(field)['chunk_type'] == 'image'
+
+      chunk.field(field)
+    end
+
+    def render_content(chunk, options=nil)
+      return render_image(chunk.content, options[:class]) if chunk.chunk_type == 'image'
+
+      chunk.content
+    end
+
+    def render_image(content, css_class=nil)
+      image_tag(content, class: css_class)
+    end
+
     def render_custom_field_raw(label, options={})
       e(@custom_field_chunk["identifier"], label, options.merge({response: @custom_field_chunk}))
     end
@@ -33,4 +50,4 @@ module Editmode
       return field, options
     end
   end
-end
+end

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.2.2"
+  VERSION = "1.2.7"
 end

metadata

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