editmode 1.3.7 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fbb861dabf26cb4d95d4a0b56f2cd791849ffcb305d6e762ad787bb728b40fb
-  data.tar.gz: d34a6147915164dadadac1495984b4a964bfe5d145d36c8c7c498fa4522903bd
+  metadata.gz: 3562a1b7e78951687db2ceb19bdb9ff6553f744e982f4e4b59306aca5dc67a98
+  data.tar.gz: 89994562d87db5aace1b901e19a4b73cbffa31121ee19370ba26d9c98a86cec3
 SHA512:
-  metadata.gz: 5cece1f007bb9224ced9a4bee87c29716d2b5c1457814f6b70dcb6ae3784fd4703960ae87d8d87cb218886e023592e6521bc857ac115eadb0607cd5ff904332b
-  data.tar.gz: f3967f25a4989c74f5b58b764b03820b7451d80234594eb12beb73265bd4ce8d6bf3d7d716113face40b691924ff6268b31f056b6595ecb133e52f39479a85f8
+  metadata.gz: 4181d73541784b2eccb1fe141c3905c0cf95b255fc719912ac77de504357f751a4b591090da84719c4b0d7eb3d238c1ca914330132195e4c834a6c7336021923
+  data.tar.gz: 409ddeaac99feea4a855e2722544cbfa82bd23c4283b537a65dce606f70d843f59c99a967f6e75adbb2f93e16c5d1cb5e9ee799be07e6248a5d657efc1f1952e

data/README.md

@@ -33,6 +33,11 @@ end
 That's it, you're all set up. By default Editmode will now include editmode.js in every page of your rails application, unless you disable auto-include.
 <hr/>
 
+#### 3. (Rails 6) Ensuring the Magic Editor works with Content Security Policy
+
+- Add "https://static.editmode.com" to `style_src` and `script_src` in your content security policy.
+- Add "https://api.editmode.com" to `connect_src` in your content security policy.
+
 ## Rendering Content
 
 Editmode provides helper methods for use in your rails views and controllers.

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -38,7 +38,8 @@ module Editmode
             :collection_identifier => collection_identifier,
             :branch_id => branch_id,
             :limit => limit,
-            :tags => tags
+            :tags => tags,
+            :project_id => Editmode.project_id
           }.to_query
 
           url = URI(api_root_url)
@@ -63,10 +64,10 @@ module Editmode
 
             if chunks.any?
               content_tag :div, class: "chunks-collection-wrapper #{parent_class}", data: {chunk_collection_identifier: collection_identifier} do
-                chunks.each do |chunk|
+                chunks.each_with_index do |chunk, index|
                   @custom_field_chunk = chunk
                   concat(content_tag(:div, class: "chunks-collection-item--wrapper #{item_class}") do
-                    yield(@custom_field_chunk)
+                    yield(@custom_field_chunk, index)
                   end)
                 end
 

data/lib/editmode/chunk_value.rb

@@ -139,19 +139,22 @@ module Editmode
 
     def get_content
       if !cached?
-        http_response = HTTParty.get(url, query: query_params, headers: {referrer: @referrer})
-        response_received = true if http_response.code == 200
+        @response = HTTParty.get(url, query: query_params, headers: {referrer: @referrer})
+        response_received = true if @response.code == 200
       end
 
       if !cached? && !response_received
-        message = http_response.try(:[], 'message') || no_response_received(identifier)
+        message = @response.try(:[], 'message') || no_response_received(identifier)
 
         raise message
       else
-        Rails.cache.write(cache_identifier, http_response.to_json) if http_response.present?
+        Rails.cache.write(cache_identifier, @response.to_json) if @response.present?
         cached_response = Rails.cache.fetch(cache_identifier)
 
-        @response = json?(cached_response) ? JSON.parse(cached_response) : cached_response
+        if cached_response.present?
+          @response = json?(cached_response) ? JSON.parse(cached_response) : cached_response
+        end
+
         set_response_attributes!
       end
     end

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.3.7"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.6.1
 platform: ruby
 authors:
 - Tony Ennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Editmode allows you to turn plain text in your rails app into easily inline-editable