editmode 1.3.6 → 1.6.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32d49f4215168d36260f8b3f363c12d7ba6948fd7e9f97e8dae1e1b58ddb7ef8
-  data.tar.gz: ed1cf4a9c60ae63973ed9e3f98b5c2a7e66eb4b273e1a392509574aa7ae3f86a
+  metadata.gz: 7025b651a7a15300b25ee1f151a510ccc12ed7f934240b4103b6ec6980b23a85
+  data.tar.gz: cb4c278ac603a883e7c7a6a8abb84362cda6c374d3dae2ef5ba6d21763468560
 SHA512:
-  metadata.gz: b2036241a90a7d9eff95d2da0553918d278f37c5336b181bcf62d076bb7a4184f87b8dac5a286026dc88f5beaf46e54db5020f6228877d88b0a72592bd85ee2c
-  data.tar.gz: 6f0354be4a33de404b01f0b1611a87e95c4916b59f0034356cc647192b99f77b113424c5b463d1542c6e405306c959a4477c93949d92392e382c9f7fa98000f1
+  metadata.gz: afbb6a9a44136b626e60207ebeab2e54a32249587cf26d7d104aeee78c60a84e5e4386d4e951719d2959b95cb38339dddf608ab5479fbb09b4e3e21820d34d0c
+  data.tar.gz: 19bafb08bd133a91a2eff430a9c49ea265737ec819d17f5e1d3ebe9e3a76021c6b32145ce514ed13e976b76531192795299bda4ef1772de0af94d5eb490b5fe0

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -63,11 +63,15 @@ 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)
-                  end)
+                  if options[:without_item_wrapper].present?
+                    yield(@custom_field_chunk, index)
+                  else
+                    concat(content_tag(:div, class: "chunks-collection-item--wrapper #{item_class}") do
+                      yield(@custom_field_chunk, index)
+                    end)
+                  end
                 end
 
                 # Placeholder element for new collection item
@@ -163,7 +167,7 @@ module Editmode
         # prevent the page from loading.
         begin
           field = options[:field].presence || ""          
-          options[:referrer] = request.url
+          options[:referrer] = request.present? && request.url || ""
           chunk_value = Editmode::ChunkValue.new(identifier, options)
           
           if field.present? && chunk_value.chunk_type == 'collection_item'
@@ -182,11 +186,12 @@ module Editmode
           render_chunk_content(identifier, chunk_content, chunk_type, options)
 
         rescue => error
+          puts error
           # Show fallback content by default
           return content_tag("em-span", &block) if block_given?
           # Otherwise show a span with no content to 
           # maintain layout
-          content_tag("em-span", "&nbsp".html_safe) 
+          content_tag("em-span", "&nbsp".html_safe)
         end
       end
       alias_method :chunk, :chunk_display

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/helper.rb

@@ -5,7 +5,7 @@ module Editmode
       field, options = parse_arguments(args)
       begin
         chunk = Editmode::ChunkValue.new(identifier, options.merge({raw: true}))
-
+        
         if chunk.chunk_type == 'collection_item'
           chunk.field(field)
         else
@@ -13,6 +13,7 @@ module Editmode
         end 
       rescue => er
         Rails.logger.info "#{er}: We can't render content for #{identifier}"
+        return ""
       end
     end
 

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.3.6"
+  VERSION = "1.6.0.pre.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.6.0.pre.1
 platform: ruby
 authors:
 - Tony Ennis
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ homepage: https://github.com/tonyennis145/editmode-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -108,12 +108,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.4
-signing_key:
+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
   bits of content that can be managed by anyone with no technical knowledge