editmode 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f35d1a3250f58710c56b263924699ab3754f756421f69f226f76532402b2761
-  data.tar.gz: d6ee312d1bab76c93cf27f1a89b706832841e6423aff7594ba80e1497b824235
+  metadata.gz: 5d4e7090d2da1935453260320513e82439c6815295621646a1ebdc7378895abe
+  data.tar.gz: 8e96d36c0c479a4ebd89c4efb74896270c3cbae9ea75353adf491e00fdd51943
 SHA512:
-  metadata.gz: ed579de54f72d27d3481c663a68bf267eecb2cd77824fa33cd2510096b92c9aeee8459ca1df7336284bb93c47ba8babedc2574a7ebc505fe5ff2d90c722a79ce
-  data.tar.gz: e50a3b41492043301caec5db7ee79cb4a7d67a19fe4f301138bb04a055d7c732e212ac92ae12891ff395b4805d7df5d26cdcb33f5444905c57553d5677112c4c
+  metadata.gz: 28475295b70e1e65c3472f74d0b3ee4a5765bb52727843dc478c1239f9fd09fe399d43fd0db2c63814e14623f5f225344aea474421e3c73ff6feba3ec84123e6
+  data.tar.gz: d3d787c71c390a115b9470c06f2e48cdd5089fb7a788dc03e862d6090453b0a41a75a41812297b4a66dddae77b86a59e7415a8145245a0edebd72740c79ae1df

data/app/controllers/editmode_controller.rb

@@ -4,6 +4,10 @@ class EditmodeController < ApplicationController
     if params[:full]
       Rails.cache.clear
       render status: 200, json: {:response => "success"}
+    elsif params[:collection]
+      cache_id = "collection_#{params[:identifier]}"
+      Rails.cache.delete_matched("#{cache_id}*")
+      render status: 200, json: {:response => "success"}
     elsif params[:variable_cache_project_id]
       project_id = params[:variable_cache_project_id]
       Rails.cache.delete("chunk_#{project_id}_variables")

data/lib/editmode.rb

@@ -10,6 +10,7 @@ require 'editmode/engine' if defined?(Rails)
 module Editmode
   class << self
     include Editmode::ActionViewExtensions::EditmodeHelper
+    include Editmode::Helper
 
     def project_id=(id)
       config.project_id = id

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -1,8 +1,10 @@
+require 'editmode/helper'
+
 module Editmode
   module ActionViewExtensions
     module EditmodeHelper
-
       require 'httparty'
+      include Editmode::Helper
 
       def api_version
         # Todo Add Header Version
@@ -12,12 +14,12 @@ module Editmode
         ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
       end
 
-      def chunk_collection(collection_identifier, **options)
+      def chunk_collection(collection_identifier, **options, &block)
         branch_params = params[:em_branch_id].present? ? "branch_id=#{params[:em_branch_id]}" : ""
         branch_id = params[:em_branch_id].presence
         tags = options[:tags].presence || []
         limit = options[:limit].presence
-
+        
         begin 
           url_params = { 
             :collection_identifier => collection_identifier,
@@ -30,24 +32,43 @@ module Editmode
           url.path = '/chunks'
           url.query = url_params
 
-          response = HTTParty.get(url)
+          cache_identifier = "collection_#{collection_identifier}#{branch_id}#{limit}#{tags.join}"
+          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
 
-          raise "No response received" unless response.code == 200
-          chunks = response["chunks"]
+            chunks = Rails.cache.fetch(cache_identifier) do  
+              response['chunks']
+            end
 
-          return chunks
+            if chunks.any?
+              content_tag :div, class: "chunks-collection-wrapper", data: {chunk_collection_identifier: collection_identifier} do
+                chunks.each do |chunk|
+                  @custom_field_chunk = chunk
+                  yield
+                end
+              end
+            end
+          end
         rescue => error
           puts error 
           return []
         end
       end
+      alias_method :c, :chunk_collection
 
-      def chunk_field_value(parent_chunk_object, custom_field_identifier,options={})
-
+      def chunk_field_value(parent_chunk_object, custom_field_identifier, options = {})
         begin 
           chunk_identifier = parent_chunk_object["identifier"]
-          custom_field_item = parent_chunk_object["content"].detect {|f| f["custom_field_identifier"] == custom_field_identifier }
-        
+          custom_field_item = parent_chunk_object["content"].detect {|f| f["custom_field_identifier"] == custom_field_identifier || f["custom_field_name"] == custom_field_identifier }
+          
           if custom_field_item.present?
             render_chunk_content(
               custom_field_item["identifier"],
@@ -60,10 +81,9 @@ module Editmode
           puts errors
           content_tag(:span, "&nbsp".html_safe) 
         end
-      
       end
 
-      def render_chunk_content(chunk_identifier,chunk_content,chunk_type,options={})
+      def render_chunk_content(chunk_identifier, chunk_content, chunk_type,options = {})
 
         begin 
           # Always sanitize the content!!
@@ -104,7 +124,7 @@ module Editmode
 
       end
 
-      def chunk_display(label,identifier,options={},&block)
+      def chunk_display(label, identifier, options = {}, &block)
         branch_id = params[:em_branch_id]
         # This method should never show an error. 
         # If anything goes wrong fetching content
@@ -113,7 +133,7 @@ module Editmode
         begin
           branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
           cache_identifier = "chunk_#{identifier}#{branch_id}"
-          url = "#{api_root_url}/chunks/#{identifier}?#{branch_params}"
+          url = "#{api_root_url}/chunks/#{identifier}?project_id=#{Editmode.project_id}&#{branch_params}"
           cached_content_present = Rails.cache.exist?(cache_identifier)
 
           if !cached_content_present
@@ -144,10 +164,20 @@ module Editmode
           # maintain layout
           content_tag("em-span", "&nbsp".html_safe) 
         end
+      end
+      alias_method :chunk, :chunk_display
+
 
+      def render_custom_field(label, options={})
+        chunk_field_value(@custom_field_chunk, label, options)
       end
+      alias_method :F, :render_custom_field
+
+      def render_chunk(identifier, options = {}, &block)
+        chunk_display('label', identifier, options, &block)
+      end
+      alias_method :E, :render_chunk
 
-      alias_method :chunk, :chunk_display
 
       def variable_parse!(content, variables, values)
         tokens = content.scan(/\{{(.*?)\}}/)

data/lib/editmode/chunk_value.rb

@@ -11,7 +11,7 @@ module Editmode
     def initialize(identifier, **options)
       @identifier = identifier
       @branch_id = options[:branch_id].presence
-      @variable_values = options[:values].presence || {}
+      @variable_values = options[:variables].presence || {}
       get_content
     end
 
@@ -45,7 +45,7 @@ module Editmode
     private
     def get_content
       branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
-      url = "#{api_root_url}/chunks/#{identifier}?#{branch_params}"
+      url = "#{api_root_url}/chunks/#{identifier}?project_id=#{Editmode.project_id}&#{branch_params}"
 
       cache_identifier = "chunk_value_#{identifier}#{branch_id}"
       cached_content_present = Rails.cache.exist?(cache_identifier)

data/lib/editmode/engine.rb

@@ -1,8 +1,10 @@
-module Editmode
+require 'editmode/chunk_value'
+require 'editmode/helper'
 
+module Editmode
   class Engine < Rails::Engine
-
-  
+    ActionController::Base.class_eval do
+      include Editmode::Helper
+    end
   end
-
 end

data/lib/editmode/helper.rb

@@ -0,0 +1,36 @@
+module Editmode
+  module Helper
+    # Render non-editable content
+    def e(identifier, *args)
+      field, options = parse_arguments(args)
+      begin
+        chunk = Editmode::ChunkValue.new(identifier, options)
+        
+        if chunk.chunk_type == 'collection_item'
+          chunk.field(field)
+        else
+          chunk.content
+        end 
+      rescue => er
+        raise er
+      end
+    end
+
+    def render_custom_field_raw(label, options={})
+      e(@custom_field_chunk["identifier"], label, options)
+    end
+    alias_method :f, :render_custom_field_raw
+
+    def parse_arguments(args)
+      field = nil
+      options = {}
+      if args[0].class.name == 'String'
+        field = args[0]
+        options =  args[1] || {}
+      elsif args[0].class.name == 'Hash'
+        options =  args[0] || {}
+      end
+      return field, options
+    end
+  end
+end

data/lib/editmode/script_tag.rb

@@ -27,7 +27,7 @@ module Editmode
     end
 
     def script_url 
-      ENV["EDITMODE_OVERRIDE_SCRIPT_URL"] || "https://static.editmode.com/editmode@^1.0.0/dist/editmode.js"
+      ENV["EDITMODE_OVERRIDE_SCRIPT_URL"] || "https://static.editmode.com/editmode@2.0.0/dist/editmode.js"
     end
 
   end

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Tony Ennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - lib/editmode/auto_include_filter.rb
 - lib/editmode/chunk_value.rb
 - lib/editmode/engine.rb
+- lib/editmode/helper.rb
 - lib/editmode/railtie.rb
 - lib/editmode/script_tag.rb
 - lib/editmode/version.rb