editmode 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f35d1a3250f58710c56b263924699ab3754f756421f69f226f76532402b2761
-  data.tar.gz: d6ee312d1bab76c93cf27f1a89b706832841e6423aff7594ba80e1497b824235
+  metadata.gz: 611f68ffcb87c0e259a2c087f322ac8477933621d8253c35e7c59c1a9515d8a4
+  data.tar.gz: 4427afba193aab085412cc8fb07ad01c4c7628721daef9f7b8183c325cb36e0a
 SHA512:
-  metadata.gz: ed579de54f72d27d3481c663a68bf267eecb2cd77824fa33cd2510096b92c9aeee8459ca1df7336284bb93c47ba8babedc2574a7ebc505fe5ff2d90c722a79ce
-  data.tar.gz: e50a3b41492043301caec5db7ee79cb4a7d67a19fe4f301138bb04a055d7c732e212ac92ae12891ff395b4805d7df5d26cdcb33f5444905c57553d5677112c4c
+  metadata.gz: ee37e1c259186a2592ca9bd6c643999a639d9e01866eeac03f904d1b102145c79949116a680a64bebb1509399164fe837d183a4474801ec555e8ba197d438718
+  data.tar.gz: b4f7fab610eafa729f0dea3c70d221aba14d593e79998b1253a07d19f09854f1ef11870a05b17b1db7c0af57091fbafb0fd11cabafa364fd117b1468d4418412

data/README.md

@@ -1,20 +1,125 @@
+<p align="center">
+  <img src="https://editmode.s3-eu-west-1.amazonaws.com/static/editmode-full-navy-bg-transparent.png" width="260" />
+</p>
+<br />
 
-# Editmode Rails Gem
+# EditMode for Rails
 
-To be completed
+Editmode is a smarter way to manage copy and other content in your rails app. It's syntax is similar to i18n, but it's built for copy updates, not internationalization (yet). It's built around the idea of moving your content out of your codebase.
 
 ## Installation
 
-## How It Works
-- Autoload editmode.js
-- Expose view helper
+#### 1. Add the gem to your Gemfile:
+```ruby
+gem 'editmode'
+```
+And run `bundle install`.
+
+#### 2. Create an initializer with your project_id
+
+<small>Don't have a project id? Sign up for one [here](https://editmode.com/rails?s=ghreadme)</small>
+
+```sh
+  rails generate editmode:config YOUR-PROJECT-ID
+```
+This command produces an initializer file 
+```ruby
+# config/initializers/editmode.rb
+Editmode.setup do |config|
+  config.project_id={project_id}
+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/>
+
+## Rendering Content
+
+Editmode provides helper methods for use in your rails views and controllers.
+
+### Render the content of a chunk
+```erb
+<%= e('cnk_x4ts............') %> # Using a chunk identifier
+<%= e('marketing_page_headline') %> # Using a content key 
+```
+
+### Render an *Editable* chunk. Wait, [what?](https://editmode.com/rails) 
+```erb
+<%= E('cnk_x4ts............') %> # Using a chunk identifier
+<%= E('marketing_page_headline') %> # Using a content key
+```
+
+### Content can also be accessed in Controllers
+```ruby
+@page_title = e("cnk_x4ts............")  # Using a chunk identifier
+@page_title = e("marketing_page_seo_title") # Using a content key
+```
+
+### Directly get the value of a custom field
+This works when a chunk is part of a collection.
+```ruby
+@email_subject = e("welcome_email","Subject")
+@email_content = e("welcome_email","Content")
+```
+
+### Working with variables
+```ruby
+variable_values = { first_name: "Dexter", last_name: "Morgan"}
+
+# Assume chunk content is "Hi {{first_name}} {{last_name}}"
+
+# Single Chunk with Variables
+e("cnk_d36415052285997e079b", variables: variable_values)
+
+# Collection Field with Variables
+e("cnk_16e04a02d577afb610ce", "Email Content", variables: variable_values)
+
+# Response: "Hi Dexter Morgan"
+```
+
+### Use collections for repeatable content
+```erb
+<%= c('col_j8fbs...') do |chunk| %>
+  <div class="user-profile">
+    <h3 class="name">
+      <%= F("Name") %>
+    </h3>
+    <p class="description">
+      <%= f("Description") %>
+    </p>
+  </div>
+<% end %>
+```
+
+|Parameter|Type|Description|
+|---|---|---|
+| identifier | string | The first argument of `c` takes the id of the collection you want to loop through |
+| limit | int |`optional` The number of collection items you want to display  |
+| tags | array |`optional` Filter collection items based on tags listed in this parameter  |
 
-## Helper methods
-- chunk_display
-- raw_chunk
-- chunk_list (coming soon)
 
 ## Caching
-- All chunks cached by default using Rails.cache
-- GET /editmode/clear_cache?identifier={} to clear cache
+In order to keep your application speedy, Editmode minimizes the amount of network calls it makes by caching content where it can. 
+
+#### What's cached
+- Any embedded content returned by the `e`, `E`, `f`, or `F` view helpers.
+
+#### Expiring the cache
+
+The editmode gem exposes a cache expiration endpoint in your application at `/editmode/clear_cache`.
+
+1. GET `/editmode/clear_cache?identifier={chunk_id}` clears the cache for a specific chunk.
+2. GET `/editmode/clear_cache?full=1` clears the full Editmode cache.
+
+- Editmode.js will automatically hit this endpoint when you update a chunk through your frontend.
+- You can configure cache expiration webhooks in Editmode.com to ensure your application is notified when content changes happen on Editmode.com
+
+The cache expiration endpoint is currently **not** authenticated.
+
+## Disabling editmode.js auto-include
+
+To disable automatic insertion for a particular controller or action you can:
+```ruby
+ skip_after_action :editmode_auto_include
+```
 

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,15 @@ 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
 
+        parent_class = options[:class] || ""
+        item_class = options[:item_class] || ""
+        
         begin 
           url_params = { 
             :collection_identifier => collection_identifier,
@@ -30,44 +35,82 @@ 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 #{parent_class}", data: {chunk_collection_identifier: collection_identifier} do
+                chunks.each do |chunk|
+                  @custom_field_chunk = chunk
+                  concat(content_tag(:div, class: "chunks-collection-item--wrapper #{item_class}") do
+                    yield
+                  end)
+                end
+
+                # Placeholder element for new collection item
+                @custom_field_chunk = chunks.first.merge!({placeholder: true})
+                concat(content_tag(:div, class: "chunks-hide chunks-col-placeholder-wrapper") do
+                  yield
+                end)
+              end 
+            else
+              content_tag(:span, "&nbsp".html_safe)
+            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 do |f|
+            f["custom_field_identifier"].try(:downcase) == custom_field_identifier.try(:downcase)  || f["custom_field_name"].try(:downcase)  == custom_field_identifier.try(:downcase)
+          end
+
+          options[:field] = custom_field_identifier
+          
+          if parent_chunk_object[:placeholder]
+            custom_field_item["identifier"] = ""
+            custom_field_item["content"] = ""
+          end
+
           if custom_field_item.present?
             render_chunk_content(
               custom_field_item["identifier"],
               custom_field_item["content"],
               custom_field_item["chunk_type"],
-              { parent_identifier: chunk_identifier }.merge(options)
+              { parent_identifier: chunk_identifier, custom_field_identifier:  custom_field_identifier}.merge(options)
             )
           end
         rescue => errors
           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!!
           chunk_content = ActionController::Base.helpers.sanitize(chunk_content) unless chunk_type == 'rich_text'
+          chunk_content = variable_parse!(chunk_content, options[:variable_fallbacks], options[:variable_values])
 
           css_class = options[:class]
 
@@ -79,9 +122,8 @@ module Editmode
 
           chunk_data = { :chunk => chunk_identifier, :chunk_editable => false, :chunk_type => chunk_type }
 
-          if options[:parent_identifier].present?
-            chunk_data.merge!({parent_identifier: options[:parent_identifier]})
-          end
+          chunk_data.merge!({parent_identifier: options[:parent_identifier]}) if options[:parent_identifier].present?
+          chunk_data.merge!({custom_field_identifier: options[:custom_field_identifier]}) if options[:custom_field_identifier].present?
 
           case display_type
           when "span"
@@ -95,6 +137,7 @@ module Editmode
               end
             end
           when "image"
+            chunk_content = chunk_content.blank? || chunk_content == "/images/original/missing.png" ? 'https://www.editmode.com/upload.png' : chunk_content
             image_tag(chunk_content, :data => chunk_data, :class => css_class) 
           end
         rescue => errors
@@ -104,7 +147,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
@@ -112,10 +155,11 @@ module Editmode
         # prevent the page from loading.
         begin
           branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
-          cache_identifier = "chunk_#{identifier}#{branch_id}"
-          url = "#{api_root_url}/chunks/#{identifier}?#{branch_params}"
+          field = options[:field].presence || ""          
+          cache_identifier = "chunk_#{identifier}#{branch_id}#{field}"
+          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
             response = HTTParty.get(url)
             response_received = true if response.code == 200
@@ -124,15 +168,30 @@ module Editmode
           if !cached_content_present && !response_received
             raise "No response received"
           else
-            
+            if field.present? && response.present?
+              field_content = response["content"].detect {|f| f["custom_field_identifier"].downcase == field.downcase || f["custom_field_name"].downcase == field.downcase }
+              if field_content
+                content = field_content["content"]
+                type = field_content["chunk_type"]
+                identifier = field_content["identifier"]
+              end
+            end
+
+            variable_fallbacks = Rails.cache.fetch("#{cache_identifier}_variables") do
+              response['variable_fallbacks'].presence || {}
+            end
+
             chunk_content = Rails.cache.fetch(cache_identifier) do  
-              response['content']
+              content.presence || response["content"]
             end
 
             chunk_type = Rails.cache.fetch("#{cache_identifier}_type") do  
-              response['chunk_type']
+              type.presence || response['chunk_type']
             end
 
+            options[:variable_fallbacks] = variable_fallbacks
+            options[:variable_values] = options[:variables].presence || {}
+            
             render_chunk_content(identifier,chunk_content,chunk_type, options)
 
           end
@@ -144,12 +203,27 @@ module Editmode
           # maintain layout
           content_tag("em-span", "&nbsp".html_safe) 
         end
+      end
+      alias_method :chunk, :chunk_display
+
 
+      def render_custom_field(field_name, options={})
+        options[:variable_fallbacks] = @custom_field_chunk["variable_fallbacks"] || {}
+        options[:variable_values] = options[:variables] || {}
+        
+        chunk_field_value(@custom_field_chunk, field_name, options)
       end
+      alias_method :F, :render_custom_field
+
+      def render_chunk(identifier, *args, &block)
+        field, options = parse_arguments(args)
+        options[:field] = field
+        chunk_display('label', identifier, options, &block)
+      end
+      alias_method :E, :render_chunk
 
-      alias_method :chunk, :chunk_display
 
-      def variable_parse!(content, variables, values)
+      def variable_parse!(content, variables = {}, values = {})
         tokens = content.scan(/\{{(.*?)\}}/)
         if tokens.any?
           tokens.flatten! 

data/lib/editmode/chunk_value.rb

@@ -3,15 +3,15 @@ module Editmode
     include Editmode::ActionViewExtensions::EditmodeHelper
 
     attr_accessor :identifier, :variable_values, :branch_id, 
-                  :variable_fallbacks, :chunk_type, :project_id, 
+                  :variable_fallbacks, :chunk_type, :project_id,
                   :response
-
+                  
     attr_writer :content
 
     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
 
@@ -43,9 +43,17 @@ module Editmode
     end
 
     private
+
+    def json?(json)
+      JSON.parse(json)
+      return true
+    rescue JSON::ParserError => e
+      return false
+    end
+
     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)
@@ -58,16 +66,16 @@ module Editmode
       if !cached_content_present && !response_received
         raise no_response_received(identifier)
       else
-        @response = Rails.cache.fetch(cache_identifier) do
-          http_response
+        cached_response = Rails.cache.fetch(cache_identifier) do
+          http_response.to_json
         end
 
+        @response = json?(cached_response) ? JSON.parse(cached_response) : cached_response
+
         @content = response['content']
         @chunk_type = response['chunk_type']
         @project_id = response['project_id']
-        @variable_fallbacks = Rails.cache.fetch("chunk_#{project_id}_variables") do
-          response['variable_fallbacks']
-        end
+        @variable_fallbacks = response['variable_fallbacks']
       end      
     end
 

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.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Tony Ennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-10-06 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