editmode 0.0.10.1 → 0.0.10.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc05bbec2b009d428193136bed21d4691a02b7aa21ce14d791d0b903cc4776d
-  data.tar.gz: f3eccd293ed87c3f3b6755ff87bb129cdf9a202fb205d453dd968d23b97f527c
+  metadata.gz: 84e04c69c8b419dd68ae049388bdb37b578e6294b6cc28eda7cd9abd2c81ee08
+  data.tar.gz: a35062691fc6cfbf10b00090cd625e93fad33c73f875ebf89b4dd2280fb23ab4
 SHA512:
-  metadata.gz: 9935316b3dc3bbd2f170f1797c7b04dc1b83f23e1161ecc77a07fde824fae2fc1f0cf57742d8942fc6da1d831dc96ed1703ebfbd7dff886f0838a73adc26d7b3
-  data.tar.gz: d52d827d63a9db3046072c62add60d934b30833374593db1e97706b729b1b4b20cc34c17cd064d988c985df94cdac4a416451486820e11e824a0950e2359effe
+  metadata.gz: efd6cafe879df92901fd55b82f399a5e04b24a134c79a4156d5af93d34f202b7a63956b5c16a308effe9fd7994dd827f9cbf793c7cf43da0dcf79d069ce7cf69
+  data.tar.gz: ce0fd13d933885a3091dc08f81e7aef749ebf1b7ef9d3345332bd6e73775cef2c962eec7defdf4f6ce76774c05e5bdf8d5533a2b2e805ca5cce0fbeb4abd347b

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[: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("chunk_#{params[:identifier]}")
       Rails.cache.delete("chunk_#{params[:identifier]}_type")

data/lib/editmode.rb

@@ -3,12 +3,14 @@ require "editmode/version"
 require 'editmode/script_tag'
 require 'editmode/action_view_extensions/editmode_helper'
 require 'editmode/auto_include_filter'
+require 'editmode/chunk_value'
 require 'editmode/railtie' if defined? Rails
 require 'editmode/engine' if defined?(Rails)
-
+# Todo: Implement RSPEC
 module Editmode
   class << self
     include Editmode::ActionViewExtensions::EditmodeHelper
+
     def project_id=(id)
       config.project_id = id
     end
@@ -22,8 +24,6 @@ module Editmode
     end
 
     def config
-      # Todo: Instantiate in editmode initializer or base controllers
-      # Todo: Add a generator to create initializer an file? 
       @config ||= Configuration.new
     end
 
@@ -32,36 +32,21 @@ module Editmode
     end
 
     def chunk_value(identifier, **options)
-      body = options[:values].presence || {}
-      field_id = options[:field_id].presence
-      branch_id = options[:branch_id].presence
-
-      branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
-      cache_identifier = "chunk_#{identifier}#{branch_id}"
-      url = "#{api_root_url}/chunks/#{identifier}?#{branch_params}"
-
       begin
-        response = HTTParty.get(url, query: body)
-        response_received = true if response.code == 200
-
-        if !response_received
-          raise "No response received"
-        else
-          if field_id.present?
-            chunk = response["content"].detect {|f| f["custom_field_identifier"] == field_id }
-            chunk['content']
-          else
-            response['content']
-          end
-        end
-      rescue => error
-        # Todo: Send a log to editmode prob like sentry
-        return "No response received"
+        Editmode::ChunkValue.new(identifier, **options )
+      rescue => er
+        raise er
       end
     end
   end
 
   class Configuration
-    attr_accessor :project_id, :access_token
+    attr_accessor :access_token, :variable
+    attr_reader :project_id
+
+    def project_id=(id)
+      @project_id = id
+
+    end
   end
 end

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -12,13 +12,29 @@ module Editmode
         ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
       end
 
-      def chunk_collection(collection_identifier,has_tags=[])
+      def chunk_collection(collection_identifier, **options)
         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 = "#{api_root_url}/chunks?collection_identifier=#{collection_identifier}&#{branch_params}"
+          url_params = { 
+            :collection_identifier => collection_identifier,
+            :branch_id => branch_id,
+            :limit => limit,
+            :tags => tags
+          }.to_query
+
+          url = URI(api_root_url)
+          url.path = '/chunks'
+          url.query = url_params
+
           response = HTTParty.get(url)
+
           raise "No response received" unless response.code == 200
           chunks = response["chunks"]
+
           return chunks
         rescue => error
           puts error 
@@ -53,7 +69,7 @@ module Editmode
           # Always sanitize the content!!
           chunk_content = ActionController::Base.helpers.sanitize(chunk_content)
           
-          css_class = options[:css_class]
+          css_class = options[:class]
 
           if chunk_type == "image"
             display_type = "image"
@@ -133,6 +149,28 @@ module Editmode
 
       alias_method :chunk, :chunk_display
 
+      def variable_parse!(content, variables, values)
+        tokens = content.scan(/\{{(.*?)\}}/)
+        if tokens.any?
+          tokens.flatten! 
+          tokens.each do |token|
+            token_value = values[token.to_sym] || variables[token] || ""
+            sanitized_value = ActionController::Base.helpers.sanitize(token_value)
+
+            content.gsub!("{{#{token}}}", sanitized_value)
+          end
+        end
+
+        content
+      end
+
+      def no_response_received(id = "")
+        "Sorry, we can't find a chunk using this identifier: \"#{id}\". This can happen if you've deleted a chunk on editmode.com or if your local cache is out of date. If it persists, try running Rails.cache clear."
+      end
+      
+      def require_field_id
+        "Field ID or Field Name is required to retrieve a collection item"
+      end
     end
   end
 end

data/lib/editmode/chunk_value.rb

@@ -0,0 +1,67 @@
+module Editmode
+  class ChunkValue
+    include Editmode::ActionViewExtensions::EditmodeHelper
+
+    attr_accessor :identifier, :variable_values, :branch_id, 
+                  :variable_fallbacks, :chunk_type, :project_id, 
+                  :response, :content
+
+    def initialize(identifier, **options)
+      @identifier = identifier
+      @branch_id = options[:branch_id].presence
+      @variable_values = options[:values].presence || {}
+      get_content
+    end
+
+    def field(field = nil)
+      # Field ID can be a slug or field_name
+      if chunk_type == 'collection_item'
+        if field.present?
+          field.downcase!
+          field_content = content.detect {|f| f["custom_field_identifier"].downcase == field || f["custom_field_name"].downcase == field }
+          if field_content.present?
+            result = field_content['content']
+            result = variable_parse!(result, variable_fallbacks, variable_values)
+          else
+            raise no_response_received(field)
+          end
+        else
+          raise require_field_id
+        end
+      else
+        raise "undefined method field for chunk_type: #{chunk_type}"
+      end
+      result ||= content
+    end
+
+    private
+    def get_content
+      branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
+      url = "#{api_root_url}/chunks/#{identifier}?#{branch_params}"
+
+      cache_identifier = "chunk_value_#{identifier}#{branch_id}"
+      cached_content_present = Rails.cache.exist?(cache_identifier)
+
+      if !cached_content_present
+        http_response = HTTParty.get(url)
+        response_received = true if http_response.code == 200
+      end
+
+      if !cached_content_present && !response_received
+        raise no_response_received(identifier)
+      else
+        @response = Rails.cache.fetch(cache_identifier) do
+          http_response
+        end
+
+        @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
+      end      
+    end
+
+  end
+end

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "0.0.10.1"
+  VERSION = "0.0.10.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 0.0.10.1
+  version: 0.0.10.17
 platform: ruby
 authors:
 - Tony Ennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,7 @@ files:
 - lib/editmode.rb
 - lib/editmode/action_view_extensions/editmode_helper.rb
 - lib/editmode/auto_include_filter.rb
+- lib/editmode/chunk_value.rb
 - lib/editmode/engine.rb
 - lib/editmode/railtie.rb
 - lib/editmode/script_tag.rb