editmode 0.0.9.111 → 0.0.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbecf78a24885247f80796ce982265a69506f3fc04ccf666663fa6398f9ab32d
-  data.tar.gz: 303b3219bfebcb4f319ec21eac3f036da0ccfeccb502390f460122df6c426777
+  metadata.gz: 5a65751ad76225c8f430e7ff2a34b956ed7f656ba601d160f59878b4b53f655e
+  data.tar.gz: 5f443b35f70f917bd0616de2a59202abb78b3c16c73302611a98a794dbf7e74b
 SHA512:
-  metadata.gz: 89215dc64c872980e04a77cb8c7cc56eb615cecf816c6718a9859ce70fed46fbcf8073580630a9ed4d6afc37679cc326156d620ee8e730af3aaa2e72a57d40db
-  data.tar.gz: d65542f04585308788f00d2add18774d242395069be3e0a7d7d421c8665f27ac8ea59e84f981b9398c2b6919060c37cd6c4b3b1967afdb35c45b64139b2bb902
+  metadata.gz: 57028a84200543b6dba3d732af81c36be495ad55f1d6f85e34f2f4a082d995634cd2edf7e533882d0616f68fbba5ca17e153a31a602ede1b5978a01e7fee696d
+  data.tar.gz: 2c5da69cd042ccc113591d6cba2c5c05cf8ddfd835bc80d226d7c323082129fa3740c2b22fe1ff30e379b068aa591b3a5020f5328e5e1e14c2d82c9d0a38ae83

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

@@ -1,25 +1,29 @@
 require "active_support/dependencies"
-require "editmode-rails/version"
-require 'editmode-rails/script_tag'
-require 'editmode-rails/action_view_extensions/editmode_helper'
-require 'editmode-rails/auto_include_filter'
-require 'editmode-rails/railtie' if defined? Rails
-require 'editmode-rails/engine' if defined?(Rails)
-
-class Editmode
+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 ::EditModeRails::ActionViewExtensions::EditModeHelper
+    include Editmode::ActionViewExtensions::EditmodeHelper
+
+    def project_id=(id)
+      config.project_id = id
+    end
+
     def project_id
-      @config.project_id
+      config.project_id
     end
 
     def access_token
-      @config.access_token
+      config.access_token
     end
 
     def config
-      # Todo: Instantiate in editmode initializer or base controllers
-      # Todo: Add a generator to create initializer an file? 
       @config ||= Configuration.new
     end
 
@@ -28,36 +32,22 @@ class 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"
+        options.merge!(project_id: project_id)
+        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-rails → editmode}/action_view_extensions/editmode_helper.rb

@@ -1,6 +1,6 @@
-module EditModeRails
+module Editmode
   module ActionViewExtensions
-    module EditModeHelper
+    module EditmodeHelper
 
       require 'httparty'
 
@@ -12,13 +12,26 @@ module EditModeRails
         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]}" : ""
+        tags = options[:tags] || []
         begin 
           url = "#{api_root_url}/chunks?collection_identifier=#{collection_identifier}&#{branch_params}"
           response = HTTParty.get(url)
           raise "No response received" unless response.code == 200
           chunks = response["chunks"]
+          if chunks.any?
+            # Collection item limit
+            limit = options[:limit] || chunks.size
+
+            chunks = chunks.take(limit)
+            chunks.shuffle! if options[:shuffle]
+          end
+
+          if tags.any?
+            chunks.select!{|c| (tags - c['tags']).size < tags.size }
+          end
+
           return chunks
         rescue => error
           puts error 
@@ -53,7 +66,7 @@ module EditModeRails
           # 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 +146,28 @@ module EditModeRails
 
       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 content using this identifier: \"#{id}\""
+      end
+      
+      def require_field_id
+        "Field ID or Field Name is required to retrieve a collection item"
+      end
     end
   end
 end

data/lib/{editmode-rails → editmode}/auto_include_filter.rb

@@ -1,10 +1,10 @@
-module EditModeRails
+module Editmode
 
   module AutoInclude
 
     module Method
       def editmode_auto_include
-        EditModeRails::AutoInclude::Filter.filter(self)
+        Editmode::AutoInclude::Filter.filter(self)
       end
     end
 
@@ -49,7 +49,7 @@ module EditModeRails
       end
 
       def editmode_script_tag
-        @script_tag ||= EditModeRails::ScriptTag.new()
+        @script_tag ||= Editmode::ScriptTag.new()
       end
 
       def enabled_for_environment?

data/lib/editmode/chunk_value.rb

@@ -0,0 +1,71 @@
+module Editmode
+  class ChunkValue
+    include Editmode::ActionViewExtensions::EditmodeHelper
+
+    attr_accessor :identifier, :variable_values, :branch_id, 
+                  :variable_fallbacks, :chunk_type, :project_id, 
+                  :content
+
+    def initialize(identifier, **options)
+      @identifier = identifier
+      @branch_id = options[:branch_id].presence
+      @project_id = options[:project_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_content = content.detect {|f| f["custom_field_identifier"] == field || f["custom_field_name"] == 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_#{identifier}#{branch_id}"
+      cached_content_present = Rails.cache.exist?(cache_identifier)
+      cached_content_present = Rails.cache.exist?("chunk_#{project_id}_variables") if cached_content_present
+
+      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(identifier)
+      else
+        @content = Rails.cache.fetch(cache_identifier) do
+          response['content']
+        end
+
+        @chunk_type = Rails.cache.fetch("#{cache_identifier}_type") do
+          response['chunk_type']
+        end
+
+        # Since variables are defined in the project level,
+        # We use project_id as cache identifier
+        @variable_fallbacks = Rails.cache.fetch("chunk_#{project_id}_variables") do
+          response['variable_fallbacks']
+        end
+      end      
+    end
+
+  end
+end

data/lib/{editmode-rails → editmode}/engine.rb

@@ -1,4 +1,4 @@
-module EditMode
+module Editmode
 
   class Engine < Rails::Engine
 

data/lib/{editmode-rails → editmode}/railtie.rb

@@ -1,9 +1,9 @@
-module EditModeRails
+module Editmode
   class Railtie < Rails::Railtie
-    initializer "editmode-rails" do |app|
+    initializer "editmode" do |app|
 
       ActiveSupport.on_load :action_view do
-        include EditModeRails::ActionViewExtensions::EditModeHelper
+        include Editmode::ActionViewExtensions::EditmodeHelper
       end
       ActiveSupport.on_load :action_controller do
         include AutoInclude::Method

data/lib/{editmode-rails → editmode}/script_tag.rb

@@ -1,4 +1,4 @@
-module EditModeRails
+module Editmode
 
   class ScriptTag
 

data/lib/editmode/version.rb

@@ -0,0 +1,3 @@
+module Editmode
+  VERSION = "0.0.10.14"
+end

data/lib/generators/editmode/config_generator.rb

@@ -0,0 +1,26 @@
+
+require 'rails/generators/base'
+
+module Editmode
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :project_id, :desc => "Your Editmode project_id, which can be found here: https://www.editmode.com/projects"
+
+      def create_config_file
+        @project_id = project_id
+        
+        introduction = <<-intro
+Editmode will automatically insert its javascript before the closing '</body>'
+tag on every page.
+
+        intro
+
+        print "#{introduction} "
+
+        template "editmode.rb.erb", "config/initializers/editmode.rb"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+Editmode.setup do |config|
+  # Replace TodoProjectId with your Editmode Project ID, 
+  # visit https://editmode.com/projects
+  config.project_id = "<%= @project_id %>"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 0.0.9.111
+  version: 0.0.10.14
 platform: ruby
 authors:
 - Tony Ennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,13 +79,16 @@ files:
 - Rakefile
 - app/controllers/editmode_controller.rb
 - config/routes.rb
-- lib/editmode-rails/action_view_extensions/editmode_helper.rb
-- lib/editmode-rails/auto_include_filter.rb
-- lib/editmode-rails/engine.rb
-- lib/editmode-rails/railtie.rb
-- lib/editmode-rails/script_tag.rb
-- lib/editmode-rails/version.rb
 - 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
+- lib/editmode/version.rb
+- lib/generators/editmode/config_generator.rb
+- lib/generators/editmode/templates/editmode.rb.erb
 homepage: https://github.com/tonyennis145/editmode-rails
 licenses:
 - MIT

data/lib/editmode-rails/version.rb

@@ -1,3 +0,0 @@
-module EditModeRails
-  VERSION = "0.0.9.111"
-end