editmode 0.0.10.15 → 0.0.10.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb3922328fd985e4aec3156ba98021dbd194c3fdf58a9b51b63de2b7f7dc535
-  data.tar.gz: f52847ef24647300e4bde80f71a90f557e67e7caa40b55ded07fe1276ca759e2
+  metadata.gz: 6436b313b030cf81d23b8272298001445eb96fe03cdece2493ab493b7b03353b
+  data.tar.gz: d277cd2ca885fd8e082f17cde5afaab63db7cef4e67a7f131785a29d0c013006
 SHA512:
-  metadata.gz: 573b7952ccdb805057e3cdeffe11f9d19af12fc578d166916a95f14e0d3508b868b8c4f37348a2550bc1563abba2bd218b53d416f628c9422a19db6c08e656c2
-  data.tar.gz: 3a690c5d2a0427596f29fdf1154f1715da067611c27ad95dbe86a8ef4c5a296e5cbc6c96e170ce0442f9f32c9fea835233ab276a5cc28be98e7f7caa2e84c8ee
+  metadata.gz: 920b13e489ef97f223550ec25d9fe0ee6015d97cd442c448317a01ecc4d11d3c22c5bb56ae89c2e107978d4fe570385c81fb97515dcded68c70f5767808e214f
+  data.tar.gz: a1c1d9d60c1bfbe1f8b6bccf715aca23d03fcf14a60e3eeeb55c88a34e1110ed65f4affb37bd12d8cbdfcefd18e05f2709f744555eec7ded5bbce89a0a14f1ba

data/lib/editmode.rb

@@ -33,7 +33,6 @@ module Editmode
 
     def chunk_value(identifier, **options)
       begin
-        options.merge!(project_id: project_id)
         Editmode::ChunkValue.new(identifier, **options )
       rescue => er
         raise er

data/lib/editmode/chunk_value.rb

@@ -4,12 +4,11 @@ module Editmode
 
     attr_accessor :identifier, :variable_values, :branch_id, 
                   :variable_fallbacks, :chunk_type, :project_id, 
-                  :content
+                  :response, :content
 
     def initialize(identifier, **options)
       @identifier = identifier
       @branch_id = options[:branch_id].presence
-      @project_id = options[:project_id].presence
       @variable_values = options[:values].presence || {}
       get_content
     end
@@ -18,7 +17,8 @@ module Editmode
       # Field ID can be a slug or field_name
       if chunk_type == 'collection_item'
         if field.present?
-          field_content = content.detect {|f| f["custom_field_identifier"] == field || f["custom_field_name"] == field }
+          field.downcase!
+          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)
@@ -39,28 +39,24 @@ module Editmode
       branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
       url = "#{api_root_url}/chunks/#{identifier}?#{branch_params}"
 
-      cache_identifier = "chunk_#{identifier}#{branch_id}"
+      cache_identifier = "chunk_value_#{identifier}#{branch_id}"
       cached_content_present = Rails.cache.exist?(cache_identifier)
-      cached_content_present = Rails.cache.exist?("chunk_#{project_id}_variables") if cached_content_present
 
       if !cached_content_present
-        response = HTTParty.get(url)
-        response_received = true if response.code == 200
+        http_response = HTTParty.get(url)
+        response_received = true if http_response.code == 200
       end
 
       if !cached_content_present && !response_received
         raise no_response_received(identifier)
       else
-        @content = Rails.cache.fetch(cache_identifier) do
-          response['content']
+        @response = Rails.cache.fetch(cache_identifier) do
+          http_response
         end
 
-        @chunk_type = Rails.cache.fetch("#{cache_identifier}_type") do
-          response['chunk_type']
-        end
-
-        # Since variables are defined in the project level,
-        # We use project_id as cache identifier
+        @content = response['content']
+        @chunk_type = response['chunk_type']
+        @project_id = response['project_id']
         @variable_fallbacks = Rails.cache.fetch("chunk_#{project_id}_variables") do
           response['variable_fallbacks']
         end

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "0.0.10.15"
+  VERSION = "0.0.10.16"
 end

metadata

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