editmode 0.0.9.14 → 0.0.9.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0cf8b16aa5b0b0ac38337020ced29f5cc3e9c1251c55755cefd1f84ff68c1e
-  data.tar.gz: 34cdb07294694a3fb0db501fe2e72f0555a8bfe43d24a584f89d7396c05ca876
+  metadata.gz: 2ef8bb95a914ee4e0c030cb365bb2f2ae661be5e38a4c6638f1ed07e28f38714
+  data.tar.gz: 5ccaa0a98155e222241adf0f85b12c2975d832d912902776fd84a919d6a9d649
 SHA512:
-  metadata.gz: 884e0dbc8219b37b6b632a722626c5665192c0c6db0ddab202ea5f0da3b1943309dd08ada6531f2062e009becd40ae18ab441466e3b5787de493c0a519830b7b
-  data.tar.gz: dc033fcea9c660de77b94cb317ec05cb17deebbbf590967a7759e1857aa6f1c9ea487fd11a0249fbc9ff19ca7e8545522926ea92396bc9150e67ffb0cce82e3b
+  metadata.gz: 4db8788bbcf384cb5e8d5e57fe494688a990f02b33850c4febd722b70d54739d283cb1411af7873eb15f75858ab48aab1745053fc2c20e766df245f8d1717f2a
+  data.tar.gz: f13ae77f68463f0b7650bdd07743f5eccb5b93132dcd42327b5268c1f3588f12e7ea47f2fd302910e1b23f47e4d260cc8646babc59f80853ebc96321e84fc947

data/app/controllers/editmode_controller.rb

@@ -1,4 +1,4 @@
-class EditModeController < ApplicationController
+class EditmodeController < ApplicationController
 
   def clear_cache
 

data/config/routes.rb

@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
   # Use a namespaced url because /:generic can easily be overwritten by app default routes
   get "/editmode/clear_cache" => "editmode#clear_cache" , :as => :editmode_clear_cache
+  # Support older route structure. To be expired
+  get "/chunksapp/clear_cache" => "editmode#clear_cache" , :as => :chunksapp_clear_cache
 end

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

@@ -3,6 +3,8 @@ module EditModeRails
   module ActionViewExtensions
     module EditModeHelper
 
+      require 'httparty'
+
       def api_version
         "v1"
       end
@@ -15,12 +17,39 @@ module EditModeRails
         "#{api_root_url}/#{api_version}"
       end
      
-      def chunk_display(label,identifier,options={})
+      def chunk_collection(collection_identifier,has_tags=[])
+        
+        url = "#{versioned_api_url}/chunks?collection_identifier=#{collection_identifier}"
+        response = HTTParty.get(url)
+        chunks = response["chunks"]
+        return chunks
+
+      end
 
-        chunk_content = Rails.cache.fetch("bit_#{identifier}") do  
-          url = "#{versioned_api_url}/bits/#{identifier}"
-          response = HTTParty.get(url)
-          chunk_content = response['content']
+      def chunk_property(chunk_info,custom_field_identifier=nil,options={})
+
+        chunk_identifier = chunk_info["identifier"]
+
+        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)
+          end
+        else 
+          chunk_display("",chunk_identifier,options)
+        end
+      end
+
+      def chunk_display(label,identifier,options={},custom_field_info={})
+        
+        if custom_field_info.present?
+          chunk_content = custom_field_info["value"]
+        else
+          chunk_content = Rails.cache.fetch("bit_#{identifier}") do  
+            url = "#{versioned_api_url}/bits/#{identifier}"
+            response = HTTParty.get(url)
+            chunk_content = response['content']
+          end
         end
 
         display_type = options[:display_type] || "span"
@@ -30,7 +59,7 @@ module EditModeRails
         # 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 = chunk_content.html_safe
+          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)
@@ -38,14 +67,16 @@ module EditModeRails
           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 }) do
+            content_tag(:span, :class => css_class, :data => {:chunk => identifier, :chunk_editable => false}.merge(additional_data_properties) ) do
               chunk_content
             end
           else
-            content_tag(:span, :class => css_class, :data => {:chunk => identifier, :chunk_editable => true }) do
+            content_tag(:span, :class => css_class, :data => {:chunk => identifier, :chunk_editable => true}.merge(additional_data_properties)) do
               chunk_content
             end
           end

data/lib/editmode-rails/railtie.rb

@@ -4,7 +4,6 @@ module EditModeRails
 
       ActiveSupport.on_load :action_view do
         include EditModeRails::ActionViewExtensions::EditModeHelper
-        Rails.logger.info("lkjlkjkljkl")
       end
       ActiveSupport.on_load :action_controller do
         include AutoInclude::Method

data/lib/editmode-rails/version.rb

@@ -1,3 +1,3 @@
 module EditModeRails
-  VERSION = "0.0.9.14"
+  VERSION = "0.0.9.37"
 end

metadata

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