editmode 0.0.10.14 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a65751ad76225c8f430e7ff2a34b956ed7f656ba601d160f59878b4b53f655e
-  data.tar.gz: 5f443b35f70f917bd0616de2a59202abb78b3c16c73302611a98a794dbf7e74b
+  metadata.gz: 452e72be1c8aa82c61d586889928894d5449f69cfdaa11f80d7b6305982aa8df
+  data.tar.gz: 93ea8e03602162ebf4c3676e272b8febc7dfbfcd77f461847f719f9da8b9d287
 SHA512:
-  metadata.gz: 57028a84200543b6dba3d732af81c36be495ad55f1d6f85e34f2f4a082d995634cd2edf7e533882d0616f68fbba5ca17e153a31a602ede1b5978a01e7fee696d
-  data.tar.gz: 2c5da69cd042ccc113591d6cba2c5c05cf8ddfd835bc80d226d7c323082129fa3740c2b22fe1ff30e379b068aa591b3a5020f5328e5e1e14c2d82c9d0a38ae83
+  metadata.gz: 1a892994c140a9dc97d37b7a1bfad68698ae7a241c00483fc81a0d7c3f2698fb27458bacc8dcf067586d8dbe058758305a7ee8bbea6fe11f2ef09edd398f0df6
+  data.tar.gz: f9b9acb5b89db4c5b707a674aef1e49f6ed3cad428bf37d7b2de055d72b27c436e15fa568bbd024835687f60ff196f127075c3fa4ef00c2b2a7a98f0625aa76e

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

@@ -14,23 +14,26 @@ module Editmode
 
       def chunk_collection(collection_identifier, **options)
         branch_params = params[:em_branch_id].present? ? "branch_id=#{params[:em_branch_id]}" : ""
-        tags = options[:tags] || []
+        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"]
-          if chunks.any?
-            # Collection item limit
-            limit = options[:limit] || chunks.size
-
-            chunks = chunks.take(limit)
-            chunks.shuffle! if options[:shuffle]
-          end
-
-          if tags.any?
-            chunks.select!{|c| (tags - c['tags']).size < tags.size }
-          end
 
           return chunks
         rescue => error
@@ -74,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]})
@@ -83,7 +86,7 @@ module Editmode
           case display_type
           when "span"
             if chunk_type == "rich_text"
-              content_tag("em-span", :class => css_class, :data => chunk_data ) do
+              content_tag("em-span", :class => "editmode-richtext-editor #{css_class}", :data => chunk_data.merge!({:chunk_editable => true}) ) do
                 chunk_content.html_safe
               end
             else
@@ -162,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.14"
+  VERSION = "1.0.21"
 end

metadata

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