editmode 0.0.10.12 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e17da0620f2d013a83300d7984ace6b9badd0716bc3187b1125fe7497e8c99a0
-  data.tar.gz: 39e552edd8fc95c2ba238b0fe7575432603b4e6f7e7e46328c5ff5836987ce31
+  metadata.gz: 4ae0438c959f508fa801802027178522476c93f3f4484f48693ecbc2719d879a
+  data.tar.gz: 3cc41e671a7c2c21b4a37b324163ff24494ca88d6381b1779aee14fc79386594
 SHA512:
-  metadata.gz: ff2bd59f92ff2389577e23888d092f1097daebc95e4f6e8cd56c3ce5df1e2dd6221705849301a0b6865a3fac8709530d6198d4a04137e9496720bac6b715f376
-  data.tar.gz: 69e56b6950e2e8c2f1907b7fd4a2c9626cf5b4777ddceadc720a002efbc15d1a6b3ae041117841e7b8c3351c3af825d12fcd558345ac5a8d49e53e727caf235d
+  metadata.gz: a1fa2d9118f2d4e9e47aedb3ec0b65dd0c88a5cc3becd945414103380de431f34b0010531fe64a23cc32b39e52bba0d57fef0e2b80cf406402b552c388c5924f
+  data.tar.gz: 329caa75d6c8a8fe11fabaf5d3a7a182da3b6112e04dd4831a5f96fb7f28c7125b3250144ab0a5b60bd59187353566bd28c656007f625c66437366dd92971389

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/action_view_extensions/editmode_helper.rb

@@ -12,13 +12,29 @@ module Editmode
         ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
       end
 
-      def chunk_collection(collection_identifier,has_tags=[])
+      def chunk_collection(collection_identifier, **options)
         branch_params = params[:em_branch_id].present? ? "branch_id=#{params[:em_branch_id]}" : ""
+        branch_id = params[:em_branch_id].presence
+        tags = options[:tags].presence || []
+        limit = options[:limit].presence
+
         begin 
-          url = "#{api_root_url}/chunks?collection_identifier=#{collection_identifier}&#{branch_params}"
+          url_params = { 
+            :collection_identifier => collection_identifier,
+            :branch_id => branch_id,
+            :limit => limit,
+            :tags => tags
+          }.to_query
+
+          url = URI(api_root_url)
+          url.path = '/chunks'
+          url.query = url_params
+
           response = HTTParty.get(url)
+
           raise "No response received" unless response.code == 200
           chunks = response["chunks"]
+
           return chunks
         rescue => error
           puts error 
@@ -53,7 +69,7 @@ module Editmode
           # Always sanitize the content!!
           chunk_content = ActionController::Base.helpers.sanitize(chunk_content)
           
-          css_class = options[:css_class]
+          css_class = options[:class]
 
           if chunk_type == "image"
             display_type = "image"
@@ -61,7 +77,7 @@ module Editmode
             display_type = options[:display_type] || "span"
           end
 
-          chunk_data = { :chunk => chunk_identifier, :chunk_editable => false }
+          chunk_data = { :chunk => chunk_identifier, :chunk_editable => false, :chunk_type => chunk_type }
 
           if options[:parent_identifier].present?
             chunk_data.merge!({parent_identifier: options[:parent_identifier]})
@@ -149,7 +165,7 @@ module Editmode
       end
 
       def no_response_received(id = "")
-        "Sorry, we can't find a content using this identifier: \"#{id}\""
+        "Sorry, we can't find a chunk using this identifier: \"#{id}\". This can happen if you've deleted a chunk on editmode.com or if your local cache is out of date. If it persists, try running Rails.cache clear."
       end
       
       def require_field_id

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.12"
+  VERSION = "1.0.18"
 end

metadata

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