editmode 0.0.9.61 → 0.0.9.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce997b779bf5eaa50e09fe58d37f34e8af99c84563bc924f96383cd122444480
-  data.tar.gz: a5a6a81f255a310da5d3903ad23f08a5d388a831304ffda5ec90a0be995abb89
+  metadata.gz: 26f96a0bfe674f27bb92438c188449cb788da1c848ca42188ad55b08215b5282
+  data.tar.gz: 82929aa1471f71a6f93c80fa1f987735c0fe85efce664adb4244f46a2234af44
 SHA512:
-  metadata.gz: 4c00859b98407d53afd1b3bd1dec620a0d2c8bdb72a38331fb28ae2cd765412f39f1450f28194ef30a3c29bace62290b4ad418d3134cd722834490851bf4597d
-  data.tar.gz: 3dd0c905ea7eb2356387c70eeac7cca415de719c5080ed2c753a7c26044bf449c2c572d45992e2006f15eb73fc11775f8d00e8f54edf7f3d3058cd0e12953ab4
+  metadata.gz: 6f4352a5e5cfa504e5f3fe3cdc0d0bbc62ea472b580751b4415ece76ab431902ea2cb06e82f8cb408551c6df1d7c2f056313b6cd22893fe472874e0854394cdd
+  data.tar.gz: 95f1ccb5fe2b1b83b257eae7bb96cd280720ca5093fafbbdce1819e2998c808a963e84c9adf3b96b926aaa2fee3db56bfb8bc100cc26c58ddf3446dc3c81956d

data/app/controllers/editmode_controller.rb

@@ -1,7 +1,6 @@
 class EditmodeController < ApplicationController
 
   def clear_cache
-
     
     if params[:identifier]
       Rails.cache.delete("chunk_#{params[:identifier]}")

data/lib/editmode-rails/action_view_extensions/editmode_helper.rb

@@ -1,5 +1,4 @@
 module EditModeRails
-
   module ActionViewExtensions
     module EditModeHelper
 
@@ -21,111 +20,118 @@ module EditModeRails
         begin 
           url = "#{versioned_api_url}/chunks?collection_identifier=#{collection_identifier}"
           response = HTTParty.get(url)
+          raise "No response received" unless response.code == 200
           chunks = response["chunks"]
           return chunks
         rescue => error
           puts error 
-          []
+          return []
         end
       end
 
-      def chunk_property(chunk_info,custom_field_identifier=nil,options={})
-
-        chunk_identifier = chunk_info["identifier"]
+      def chunk_field_value(parent_chunk_object,custom_field_identifier,options={})
 
-        if custom_field_identifier
-          custom_field_info = chunk_info["custom_fields"].select{|custom_field| custom_field["custom_field_identifier"] == custom_field_identifier }[0]
-          if custom_field_info.present? 
-            chunk_display("",chunk_identifier,options,custom_field_info)
+        begin 
+          chunk_identifier = parent_chunk_object["identifier"]
+          custom_field_item = parent_chunk_object["content"].detect {|f| f[custom_field_identifier].present? }
+        
+          if custom_field_item.present?
+            properties = custom_field_item[custom_field_identifier]
+            render_chunk_content(
+              properties["identifier"],
+              properties["content"],
+              properties["chunk_type"]
+            )
           end
-        else 
-          chunk_display("",chunk_identifier,options)
+        rescue => errors
+          puts errors
+          content_tag(:span, "&nbsp".html_safe) 
         end
+      
       end
 
-      def chunk_display(label,identifier,options={},custom_field_info={})
-        
-        begin 
-
-          if custom_field_info.present?
-            chunk_content = custom_field_info["value"]
-          else
-
-            cache_identifier = "chunk_#{identifier}"
-            url = "#{versioned_api_url}/bits/#{identifier}"
-
-            if !Rails.cache.exist?(cache_identifier)
-              response = HTTParty.get(url)
-            end
-              
-            chunk_content = Rails.cache.fetch(cache_identifier) do  
-              response['content']
-            end
-
-            chunk_type = Rails.cache.fetch("#{cache_identifier}_type") do  
-              response['chunk_type']
-            end
+      def render_chunk_content(chunk_identifier,chunk_content,chunk_type,options={})
 
-          end
+        begin 
+          # Always sanitize the content!!
+          chunk_content = ActionController::Base.helpers.sanitize(chunk_content)
+          
+          css_class = options[:css_class]
 
           if chunk_type == "image"
             display_type = "image"
           else 
             display_type = options[:display_type] || "span"
           end
-          css_class = options[:css_class]
-          content_type = "plain"
-
-          # Simple check to see if returned chunk contains html. Regex will need to be improved
-          if /<[a-z][\s\S]*>/i.match(chunk_content)
-            content_type = "rich"
-            chunk_content = sanitize chunk_content.html_safe
-          elsif chunk_content.include? "\n"
-            content_type = "rich"
-            renderer = Redcarpet::Render::HTML.new(no_links: true, hard_wrap: true)
-            markdown = Redcarpet::Markdown.new(renderer, extensions = {})
-            chunk_content = markdown.render(chunk_content).html_safe
-          end
-
-          additional_data_properties = custom_field_info.present? ? { :custom_field_identifier => custom_field_info["custom_field_identifier"] } : {}
 
           case display_type
           when "span"
-            if content_type == "rich"
-              content_tag(:span, :class => css_class, :data => {:chunk => identifier, :chunk_editable => false}.merge(additional_data_properties) ) do
-                chunk_content
+            if chunk_type == "rich_text"
+              content_tag(:span, :class => css_class, :data => {:chunk => chunk_identifier, :chunk_editable => false} ) do
+                chunk_content.html_safe
               end
             else
-              content_tag(:span, :class => css_class, :data => {:chunk => identifier, :chunk_editable => true}.merge(additional_data_properties)) do
+              content_tag(:span, :class => css_class, :data => {:chunk => chunk_identifier, :chunk_editable => true} ) do
                 chunk_content
               end
             end
-          when "raw"
-            chunk_content
           when "image"
-            content_tag(:span, :data => {:chunk => identifier, :chunk_editable => false}.merge(additional_data_properties)) do 
+            content_tag(:span, :data => {:chunk => chunk_identifier, :chunk_editable => false} ) do 
               image_tag(chunk_content, :class => css_class) 
             end
           end
-       rescue => error
-        puts error
-       end
+        rescue => errors
+          puts errors
+          content_tag(:span, "&nbsp".html_safe) 
+        end
 
       end
 
-      def bit(label,identifier,options={})
-        chunk_display(label,identifier,options)
-      end
+      def chunk_display(label,identifier,options={},&block)
 
-      def chunk(label,identifier,options={})
-        chunk_display(label,identifier,options)
-      end
+        # This method should never show an error. 
+        # If anything goes wrong fetching content
+        # We should just show blank content, not
+        # prevent the page from loading.
+        begin 
+
+          cache_identifier = "chunk_#{identifier}"
+          url = "#{versioned_api_url}/chunks/#{identifier}"
+          cached_content_present = Rails.cache.exist?(cache_identifier)
+
+          if !cached_content_present
+            response = HTTParty.get(url)
+            response_received = true if response.code == 200
+          end
+
+          if !cached_content_present && !response_received
+            raise "No response received"
+          else
+            
+            chunk_content = Rails.cache.fetch(cache_identifier) do  
+              response['content']
+            end
+
+            chunk_type = Rails.cache.fetch("#{cache_identifier}_type") do  
+              response['chunk_type']
+            end
+
+            render_chunk_content(identifier,chunk_content,chunk_type)
+
+          end
+
+        rescue => error
+          # Show fallback content by default
+          return content_tag(:span, &block) if block_given?
+          # Otherwise show a span with no content to 
+          # maintain layout
+          content_tag(:span, "&nbsp".html_safe) 
+        end
 
-      def raw_chunk(label,identifier,options={})
-        chunk_display(label,identifier,options.merge(:display_type => "raw"))
       end
-      
+
+      alias_method :chunk, :chunk_display
+
     end
   end
-
 end

data/lib/editmode-rails/version.rb

@@ -1,3 +1,3 @@
 module EditModeRails
-  VERSION = "0.0.9.61"
+  VERSION = "0.0.9.72"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 0.0.9.61
+  version: 0.0.9.72
 platform: ruby
 authors:
 - Tony Ennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler