editmode 0.0.9.75 → 0.0.9.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d3a139a19d2ce3224a3dbde3caeeb86b855ee87af329adef40ec7ef73e6079
-  data.tar.gz: 6edf4098ee427cd1e0a535a25bca31685a63047e228cd36caea259822d133a1b
+  metadata.gz: cbecf78a24885247f80796ce982265a69506f3fc04ccf666663fa6398f9ab32d
+  data.tar.gz: 303b3219bfebcb4f319ec21eac3f036da0ccfeccb502390f460122df6c426777
 SHA512:
-  metadata.gz: 50ea5beedeb776512cc1e39d26eb0a1bea80a1418fe71487350c6d226ed97e3d0fe709a5e045e63a599d0bf52202b2485b0467e117e5d9b9fed00d22e6938379
-  data.tar.gz: c788b16ab084ca7be4c0392efa1561eebe878d6d7ebce6c8f982e3422645355d912e79b7e6e0a2a41ac6d6a365424db401472c80ebcbec68a23b5ccf68eda705
+  metadata.gz: 89215dc64c872980e04a77cb8c7cc56eb615cecf816c6718a9859ce70fed46fbcf8073580630a9ed4d6afc37679cc326156d620ee8e730af3aaa2e72a57d40db
+  data.tar.gz: d65542f04585308788f00d2add18774d242395069be3e0a7d7d421c8665f27ac8ea59e84f981b9398c2b6919060c37cd6c4b3b1967afdb35c45b64139b2bb902

data/app/controllers/editmode_controller.rb

@@ -1,8 +1,10 @@
 class EditmodeController < ApplicationController
 
   def clear_cache
-    
-    if params[:identifier]
+    if params[:full]
+      Rails.cache.clear
+      render status: 200, json: {:response => "success"}
+    elsif params[:identifier]
       Rails.cache.delete("chunk_#{params[:identifier]}")
       Rails.cache.delete("chunk_#{params[:identifier]}_type")
       render status: 200, json: {:response => "success"}

data/lib/editmode-rails/action_view_extensions/editmode_helper.rb

@@ -5,20 +5,17 @@ module EditModeRails
       require 'httparty'
 
       def api_version
-        "v1"
+        # Todo Add Header Version
       end
 
       def api_root_url
-        ENV["EDITMODE_OVERRIDE_API_URL"] || "https://www.editmode.app/api"
+        ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
       end
 
-      def versioned_api_url
-        "#{api_root_url}/#{api_version}"
-      end
-     
       def chunk_collection(collection_identifier,has_tags=[])
+        branch_params = params[:em_branch_id].present? ? "branch_id=#{params[:em_branch_id]}" : ""
         begin 
-          url = "#{versioned_api_url}/chunks?collection_identifier=#{collection_identifier}"
+          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"]
@@ -29,18 +26,18 @@ module EditModeRails
         end
       end
 
-      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].present? }
+          custom_field_item = parent_chunk_object["content"].detect {|f| f["custom_field_identifier"] == custom_field_identifier }
         
           if custom_field_item.present?
-            properties = custom_field_item[custom_field_identifier]
             render_chunk_content(
-              properties["identifier"],
-              properties["content"],
-              properties["chunk_type"]
+              custom_field_item["identifier"],
+              custom_field_item["content"],
+              custom_field_item["chunk_type"],
+              { parent_identifier: chunk_identifier }.merge(options)
             )
           end
         rescue => errors
@@ -64,39 +61,43 @@ module EditModeRails
             display_type = options[:display_type] || "span"
           end
 
+          chunk_data = { :chunk => chunk_identifier, :chunk_editable => false }
+
+          if options[:parent_identifier].present?
+            chunk_data.merge!({parent_identifier: options[:parent_identifier]})
+          end
+
           case display_type
           when "span"
             if chunk_type == "rich_text"
-              content_tag(:span, :class => css_class, :data => {:chunk => chunk_identifier, :chunk_editable => false} ) do
+              content_tag("em-span", :class => css_class, :data => chunk_data ) do
                 chunk_content.html_safe
               end
             else
-              content_tag(:span, :class => css_class, :data => {:chunk => chunk_identifier, :chunk_editable => true} ) do
+              content_tag("em-span", :class => css_class, :data => chunk_data.merge!({:chunk_editable => true}) ) do
                 chunk_content
               end
             end
           when "image"
-            content_tag(:span, :data => {:chunk => chunk_identifier, :chunk_editable => false} ) do 
-              image_tag(chunk_content, :class => css_class) 
-            end
+            image_tag(chunk_content, :data => chunk_data, :class => css_class) 
           end
         rescue => errors
           puts errors
-          content_tag(:span, "&nbsp".html_safe) 
+          content_tag("em-span", "&nbsp".html_safe) 
         end
 
       end
 
       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
         # We should just show blank content, not
         # prevent the page from loading.
-        begin 
-
-          cache_identifier = "chunk_#{identifier}"
-          url = "#{versioned_api_url}/chunks/#{identifier}"
+        begin
+          branch_params = branch_id.present? ? "branch_id=#{branch_id}" : ""
+          cache_identifier = "chunk_#{identifier}#{branch_id}"
+          url = "#{api_root_url}/chunks/#{identifier}?#{branch_params}"
           cached_content_present = Rails.cache.exist?(cache_identifier)
 
           if !cached_content_present
@@ -116,16 +117,16 @@ module EditModeRails
               response['chunk_type']
             end
 
-            render_chunk_content(identifier,chunk_content,chunk_type)
+            render_chunk_content(identifier,chunk_content,chunk_type, options)
 
           end
 
         rescue => error
           # Show fallback content by default
-          return content_tag(:span, &block) if block_given?
+          return content_tag("em-span", &block) if block_given?
           # Otherwise show a span with no content to 
           # maintain layout
-          content_tag(:span, "&nbsp".html_safe) 
+          content_tag("em-span", "&nbsp".html_safe) 
         end
 
       end

data/lib/editmode-rails/script_tag.rb

@@ -17,6 +17,7 @@ module EditModeRails
     def output
       
       str = <<-EDITMODE_SCRIPT
+  <script>window.chunksProjectIdentifier = '#{Editmode.project_id}'</script>
   <script src="#{script_url}" async ></script>
       EDITMODE_SCRIPT
 
@@ -25,7 +26,7 @@ module EditModeRails
     end
 
     def script_url 
-      ENV["EDITMODE_OVERRIDE_SCRIPT_URL"] || "https://www.editmode.app/assets/chunks.js"
+      ENV["EDITMODE_OVERRIDE_SCRIPT_URL"] || "https://static.editmode.com/editmode@1.0.0/dist/editmode.js"
     end
 
   end

data/lib/editmode-rails/version.rb

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

data/lib/editmode.rb

@@ -1,14 +1,63 @@
 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
+  class << self
+    include ::EditModeRails::ActionViewExtensions::EditModeHelper
+    def project_id
+      @config.project_id
+    end
+
+    def 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
+
+    def setup
+      yield config
+    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
 
-module EditModeRails
-  # Your code goes here...
-end
+        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"
+      end
+    end
+  end
 
-require 'editmode-rails/engine' if defined?(Rails)
+  class Configuration
+    attr_accessor :project_id, :access_token
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 0.0.9.75
+  version: 0.0.9.111
 platform: ruby
 authors:
 - Tony Ennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Editmode allows you to turn plain text in your rails app into easily inline-editable