editmode 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2beab37962d65855d3ecfd66b6d9731fd4f1826eac260d97a30d8c1b022b9ff8
-  data.tar.gz: b05b7f2425a796262ec31e2d8cc447405d9bb2ed339b37a6f71cc2d52cd10ad7
+  metadata.gz: 78dda874aecacc9edfdf0e96598019e7dad8cc44693336d94511083238b55a91
+  data.tar.gz: d111ab02c60c737e5711139473e7be988f02ffdb3a8ed01a7876174348bf5d83
 SHA512:
-  metadata.gz: 75944607fde64c8da7a99751a421d43fbc473b7f0c0c7ce34297b16d70869d2d393de8731fed85dfd6387ba22977ef3e92ae892370b07a13a9ed41bad7d6472b
-  data.tar.gz: c2109b7ca239fce3ddb025348bc534201002d6396a18e4eec9357fdc992f64489efed095e4568db984148e5ff45aafad70b1026cf93111d9c04aa20bed329924
+  metadata.gz: e896421ca91061b25d28bc0ea217a2891df5f06d109b00301364ad67c3813caf2de47219f0be1b13ac335b6a8b76bcdaa5dc10b5ad4a9308722e90939613cbaf
+  data.tar.gz: 9ad90b4008998f64e52cfe34c73c74db62633b468764f0939df16ffb4fbeb1a9acbbdee0acfe053e793ff66b316f9c8ecde7bb64544b81013828e61383995f69

data/lib/editmode/chunk_value.rb

@@ -3,10 +3,10 @@ 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
 
@@ -17,8 +17,7 @@ module Editmode
       @variable_values = options[:variables].presence || {}
       @raw = options[:raw].present?
 
-      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,7 +28,7 @@ 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?
@@ -56,13 +55,14 @@ module Editmode
     end
 
     def content
-      raise "undefined method 'content` for chunk_type: collection_item \nDid you mean? field" if chunk_type == 'collection_item'
-      
+      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.try(:html_safe)
     end
 
     private
+
     # Todo: Transfer to helper utils
     def api_root_url
       ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
@@ -83,7 +83,7 @@ module Editmode
       content = ActionController::Base.helpers.sanitize(content)
       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,7 +93,7 @@ module Editmode
               sanitized_value
             end
           end
-          
+
           content.gsub!("{{#{token}}}", sanitized_value)
         end
       end
@@ -105,9 +105,16 @@ module Editmode
       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
 
@@ -128,7 +135,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/version.rb

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

metadata

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