editmode 1.3.2 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9965c96f8c7fb66afae65725f82fbb536fae3981924b090643e9899735627c
-  data.tar.gz: 75bc30d9f5bb9575780e43a3f2f8776fc35ad55f328c7fd5c7134c9685487727
+  metadata.gz: 7fbb861dabf26cb4d95d4a0b56f2cd791849ffcb305d6e762ad787bb728b40fb
+  data.tar.gz: d34a6147915164dadadac1495984b4a964bfe5d145d36c8c7c498fa4522903bd
 SHA512:
-  metadata.gz: 8ffb62bd7347c80679acdcc57fa50d3ce1c266557f3f88f27d08d0cc646b5297e8a4dceb36f6f36cb229a58888230cc9be8220f80832346607c49dfda5475c39
-  data.tar.gz: 0375dc9c6098596aead8445fc4d57b8f53ee57d820ccd1db2c61cf3c214171472cbee29e2f7b39b019e212c0968077702b50d99e261ef82e4722080f46d0d82b
+  metadata.gz: 5cece1f007bb9224ced9a4bee87c29716d2b5c1457814f6b70dcb6ae3784fd4703960ae87d8d87cb218886e023592e6521bc857ac115eadb0607cd5ff904332b
+  data.tar.gz: f3967f25a4989c74f5b58b764b03820b7451d80234594eb12beb73265bd4ce8d6bf3d7d716113face40b691924ff6268b31f056b6595ecb133e52f39479a85f8

data/README.md

@@ -107,6 +107,20 @@ e("cnk_16e04a02d577afb610ce", "Email Content", variables: variable_values)
 | item_class | string | `optional` Class name(s) that will be added along with "chunks-collection-item--wrapper" to all collection items |
 
 
+### Working with Image Transformation
+Use `transformation` attribute to perform real-time image transformations to deliver perfect images to the end-users.
+
+```ruby
+# This chunk should render an image with 200 x 200 dimension
+= E('id-of-some-image', transformation: "w-200 h-200")
+
+# For image inside a collection
+= c('some-collection-id') do
+  = F('Avatar', transformation: "w-200 h-200")
+```
+
+Please see the complete list of [transformation parameters](https://editmode.com/docs#/imagekit_properties).
+
 ## Caching
 In order to keep your application speedy, Editmode minimizes the amount of network calls it makes by caching content where it can. 
 
@@ -125,6 +139,8 @@ The editmode gem exposes a cache expiration endpoint in your application at `/ed
 
 The cache expiration endpoint is currently **not** authenticated.
 
+?> We are using a method called `delete_matched` to purge your caches when a content gets updated, and this method isn't supported in `memcached`. We highly recommend using `redis_store` or `file_store`.
+
 ## Disabling editmode.js auto-include
 
 To disable automatic insertion for a particular controller or action you can:

data/app/controllers/editmode_controller.rb

@@ -6,14 +6,14 @@ class EditmodeController < ApplicationController
       render status: 200, json: {:response => "success"}
     elsif params[:collection]
       cache_id = "collection_#{params[:identifier]}"
-      Rails.cache.delete_matched("#{cache_id}*")
+      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")
       render status: 200, json: {:response => "success"}
     elsif params[:identifier]
-      Rails.cache.delete_matched("#{params[:identifier]}")
+      Rails.cache.delete_matched("*#{params[:identifier]}*")
       render status: 200, json: {:response => "success"}
     else
       render status: 404, json: {:response => "no identifier specified"}

data/lib/editmode.rb

@@ -6,12 +6,19 @@ require 'editmode/auto_include_filter'
 require 'editmode/chunk_value'
 require 'editmode/railtie' if defined? Rails
 require 'editmode/engine' if defined?(Rails)
-# Todo: Implement RSPEC
+require 'editmode/monkey_patches'
+require 'editmode/logger'
+require 'editmode/chunk'
+
 module Editmode
   class << self
     include Editmode::ActionViewExtensions::EditmodeHelper
     include Editmode::Helper
 
+    def api_root_url
+      ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
+    end
+
     def project_id=(id)
       config.project_id = id
     end
@@ -20,6 +27,18 @@ module Editmode
       config.project_id
     end
 
+    def logger
+      config.logger
+    end
+
+    def log_level
+      config.log_level
+    end
+
+    def log_level=(level)
+      config.log_level = level
+    end
+
     def access_token
       config.access_token
     end
@@ -39,15 +58,46 @@ module Editmode
         puts er
       end
     end
+
+    def cache_all!(chunks)
+      chunks.each do |chunk|
+        project_id = chunk["project_id"]
+        identifier = chunk["identifier"]
+        content_key = chunk["content_key"]
+        json_data = chunk.to_json
+        Rails.cache.write("chunk_#{project_id}#{identifier}", json_data)
+        Rails.cache.write("chunk_#{project_id}#{content_key}", json_data) if content_key.present?
+      end
+    end
   end
 
   class Configuration
     attr_accessor :access_token, :variable
-    attr_reader :project_id
+    attr_reader :project_id, :log_level, :preload
+
+    def preload=(bool)
+      @preload = bool
+      if bool
+        chunks = Editmode::Chunk.retrieve
+        Editmode.cache_all!(chunks)
+      end
+    end
+
+    def logger
+      @logger ||= Editmode::Logger.new
+    end
 
     def project_id=(id)
       @project_id = id
+      if preload
+        chunks = Editmode::Chunk.retrieve(id)
+        Editmode.cache_all!(chunks)
+      end
+    end
 
+    def log_level=(level)
+      @log_level = level
+      logger.log_level = level
     end
   end
 end

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -163,7 +163,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 +182,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.rb

@@ -0,0 +1,26 @@
+class Editmode::Chunk
+  def initialize
+  end
+
+  class << self
+    def retrieve(project_id = Editmode.project_id, options = {})
+      begin
+        root_url = Editmode.api_root_url
+        chunk_id = options[:identifier] || options[:content_key]
+
+        url = "#{root_url}/chunks/#{chunk_id}?project_id=#{project_id}"
+        response = HTTParty.get(url)
+
+        if chunk_id.present?
+          return response
+        else
+          chunks = response.try(:[], "chunks")
+          chunks ||= []
+        end
+      rescue => er
+        Rails.logger.info er
+        []
+      end
+    end
+  end
+end

data/lib/editmode/chunk_value.rb

@@ -9,7 +9,7 @@ module Editmode
     attr_accessor :identifier, :variable_values, :branch_id,
       :variable_fallbacks, :chunk_type, :project_id,
       :url, :collection_id, :cache_identifier,
-      :response
+      :response, :transformation
 
     attr_writer :content
 
@@ -22,6 +22,7 @@ module Editmode
       @raw = options[:raw].present?
       @skip_sanitize = options[:dangerously_skip_sanitization]
       @skip_cache = options[:skip_cache]
+      @transformation = options[:transformation]
 
       @url = "#{api_root_url}/chunks/#{identifier}"
       @cache_identifier = set_cache_identifier(identifier)
@@ -40,7 +41,7 @@ module Editmode
         if field.present?
           field_chunk = field_chunk(field)
           if field_chunk.present?
-            result = field_chunk['content']
+            result = field_chunk['chunk_type'] == 'image' ? set_transformation_properties!(field_chunk['content']) : field_chunk['content']
             result = variable_parse!(result, variable_fallbacks, variable_values, @raw, @skip_sanitize)
           else
             raise no_response_received(field)
@@ -73,6 +74,20 @@ module Editmode
     end
 
     private
+    def set_transformation_properties!(url)
+      if transformation.present? && url.present?
+        transformation.gsub!(" ", ",")
+        transformation.gsub!(/\s/, '')
+  
+        uri = URI(url)
+        uri.query = [uri.query, "tr=#{transformation}"].compact.join("&")
+        
+        url = uri.to_s
+      end
+
+      url
+    end
+
     def allowed_tag_attributes
       %w(style href title src alt width height class target)
     end
@@ -142,8 +157,9 @@ module Editmode
     end
 
     def set_response_attributes!
-      @content = response['content']
       @chunk_type = response['chunk_type']
+      
+      @content = @chunk_type == 'image' ? set_transformation_properties!(response['content']) : response['content'] 
       @variable_fallbacks = response['variable_fallbacks'].presence || {}
       @collection_id = response["collection"]["identifier"] if chunk_type == 'collection_item'
       @branch_id = response['branch_id']

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,11 +13,12 @@ module Editmode
         end 
       rescue => er
         Rails.logger.info "#{er}: We can't render content for #{identifier}"
+        return ""
       end
     end
 
     def render_custom_field_raw(label, options={})
-      e(@custom_field_chunk["identifier"], label, options.merge({response: @custom_field_chunk}))
+      e(@custom_field_chunk["identifier"], label, options.merge({response: @custom_field_chunk}))      
     end
     alias_method :f, :render_custom_field_raw
 

data/lib/editmode/logger.rb

@@ -0,0 +1,28 @@
+require 'active_support'
+
+module Editmode
+  class Logger
+    attr_accessor :httparty_subscription
+
+    def log_level=(level)
+      if level == :normal
+        # Add more subscription here
+        enable_httparty!
+      end
+    end
+
+    def enable_httparty!
+      @httparty_subscription = ActiveSupport::Notifications.subscribe('request.httparty') do |name, start, ending, transaction_id, payload|
+        event = ActiveSupport::Notifications::Event.new(name, start, ending, transaction_id, payload)
+        Rails.logger.info "  HTTParty -- " + "#{event.payload[:method]} #{event.payload[:url]} (Duration: #{event.duration}ms)"
+        Thread.current[:http_runtime] ||= 0
+        Thread.current[:http_runtime] += event.duration
+        payload[:http_runtime] = event.duration
+      end
+    end
+
+    def unsubscribe(subscriber)
+      ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber.present?
+    end
+  end
+end

data/lib/editmode/monkey_patches.rb

@@ -0,0 +1,17 @@
+require 'httparty'
+
+# Support logging on httparty requests
+module HTTParty
+  class Request
+    alias_method :_original_perform, :perform
+    def perform(&block)
+      payload = {
+        method: http_method.const_get(:METHOD),
+        url: uri
+      }
+      ActiveSupport::Notifications.instrument 'request.httparty', payload do
+        _original_perform(&block)
+      end
+    end
+  end
+end

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.3.2"
+  VERSION = "1.3.7"
 end

data/lib/generators/editmode/templates/editmode.rb.erb

@@ -1,5 +1,11 @@
 Editmode.setup do |config|
-  # Replace TodoProjectId with your Editmode Project ID, 
-  # visit https://editmode.com/projects
   config.project_id = "<%= @project_id %>"
+
+  # Enables logging on every API request
+  # config.log_level = :silence
+
+  # Preload contents - this will take all the contents
+  # from the project specified in config.project_id
+  # and store it to your Application cache.
+  # config.preload = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.7
 platform: ruby
 authors:
 - Tony Ennis
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,12 @@ files:
 - lib/editmode.rb
 - lib/editmode/action_view_extensions/editmode_helper.rb
 - lib/editmode/auto_include_filter.rb
+- lib/editmode/chunk.rb
 - lib/editmode/chunk_value.rb
 - lib/editmode/engine.rb
 - lib/editmode/helper.rb
+- lib/editmode/logger.rb
+- lib/editmode/monkey_patches.rb
 - lib/editmode/railtie.rb
 - lib/editmode/script_tag.rb
 - lib/editmode/version.rb
@@ -94,7 +97,7 @@ homepage: https://github.com/tonyennis145/editmode-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
-signing_key:
+rubygems_version: 3.0.3
+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