editmode 0.0.9.39 → 0.0.9.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5efc7a653779c9512a8d0e280f41f2e95bfedfd09eb242ff755a3cfdb5c7ac7e
-  data.tar.gz: 8d1503bd4bc148b966abd4f662153015130d9297210f1a2eab5ea5ee6f9cd602
+  metadata.gz: cbecf78a24885247f80796ce982265a69506f3fc04ccf666663fa6398f9ab32d
+  data.tar.gz: 303b3219bfebcb4f319ec21eac3f036da0ccfeccb502390f460122df6c426777
 SHA512:
-  metadata.gz: 58b77302710392b9fd1fd01d15e719e24cd1abbe21c38cd041050a479d5717c8a670024c0a0877719e72d5bba49e72aa56092523b2e1dfc23ec1040cca7aef66
-  data.tar.gz: 8cc0ca43f7a1de0e4719e962e5d52692e1f413561092853d675eb960487e08a8bd48125da3a3eab526925bbf0251c25ab9f4de56cade9d948e93ffa45a68a21d
+  metadata.gz: 89215dc64c872980e04a77cb8c7cc56eb615cecf816c6718a9859ce70fed46fbcf8073580630a9ed4d6afc37679cc326156d620ee8e730af3aaa2e72a57d40db
+  data.tar.gz: d65542f04585308788f00d2add18774d242395069be3e0a7d7d421c8665f27ac8ea59e84f981b9398c2b6919060c37cd6c4b3b1967afdb35c45b64139b2bb902

data/app/controllers/editmode_controller.rb

@@ -1,10 +1,12 @@
 class EditmodeController < ApplicationController
 
   def clear_cache
-
-    Rails.cache.delete("bit_#{params[:identifier]}")
-    
-    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"}
     else
       render status: 404, json: {:response => "no identifier specified"}

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

@@ -1,111 +1,138 @@
 module EditModeRails
-
   module ActionViewExtensions
     module EditModeHelper
 
       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"]
           return chunks
         rescue => error
           puts error 
-          []
+          return []
         end
       end
 
-      def chunk_property(chunk_info,custom_field_identifier=nil,options={})
-
-        chunk_identifier = chunk_info["identifier"]
+      def chunk_field_value(parent_chunk_object, custom_field_identifier,options={})
 
-        if custom_field_identifier
-          custom_field_info = chunk_info["custom_fields"].select{|custom_field| custom_field["custom_field_identifier"] == custom_field_identifier }[0]
-          if custom_field_info.present? 
-            chunk_display("",chunk_identifier,options,custom_field_info)
+        begin 
+          chunk_identifier = parent_chunk_object["identifier"]
+          custom_field_item = parent_chunk_object["content"].detect {|f| f["custom_field_identifier"] == custom_field_identifier }
+        
+          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)
+            )
           end
-        else 
-          chunk_display("",chunk_identifier,options)
+        rescue => errors
+          puts errors
+          content_tag(:span, "&nbsp".html_safe) 
         end
+      
       end
 
-      def chunk_display(label,identifier,options={},custom_field_info={})
-        
-        begin 
-          if custom_field_info.present?
-            chunk_content = custom_field_info["value"]
-          else
-            chunk_content = Rails.cache.fetch("bit_#{identifier}") do  
-              url = "#{versioned_api_url}/bits/#{identifier}"
-              response = HTTParty.get(url)
-              chunk_content = response['content']
-            end
-          end
+      def render_chunk_content(chunk_identifier,chunk_content,chunk_type,options={})
 
-          display_type = options[:display_type] || "span"
+        begin 
+          # Always sanitize the content!!
+          chunk_content = ActionController::Base.helpers.sanitize(chunk_content)
+          
           css_class = options[:css_class]
-          content_type = "plain"
-
-          # Simple check to see if returned chunk contains html. Regex will need to be improved
-          if /<[a-z][\s\S]*>/i.match(chunk_content)
-            content_type = "rich"
-            chunk_content = sanitize chunk_content.html_safe
-          elsif chunk_content.include? "\n"
-            content_type = "rich"
-            renderer = Redcarpet::Render::HTML.new(no_links: true, hard_wrap: true)
-            markdown = Redcarpet::Markdown.new(renderer, extensions = {})
-            chunk_content = markdown.render(chunk_content).html_safe
+
+          if chunk_type == "image"
+            display_type = "image"
+          else 
+            display_type = options[:display_type] || "span"
           end
 
-          additional_data_properties = custom_field_info.present? ? { :custom_field_identifier => custom_field_info["custom_field_identifier"] } : {}
+          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 content_type == "rich"
-              content_tag(:span, :class => css_class, :data => {:chunk => identifier, :chunk_editable => false}.merge(additional_data_properties) ) do
-                chunk_content
+            if chunk_type == "rich_text"
+              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 => identifier, :chunk_editable => true}.merge(additional_data_properties)) do
+              content_tag("em-span", :class => css_class, :data => chunk_data.merge!({:chunk_editable => true}) ) do
                 chunk_content
               end
             end
-          when "raw"
-            chunk_content
+          when "image"
+            image_tag(chunk_content, :data => chunk_data, :class => css_class) 
           end
-       rescue => error
-        puts error
-       end
+        rescue => errors
+          puts errors
+          content_tag("em-span", "&nbsp".html_safe) 
+        end
 
       end
 
-      def bit(label,identifier,options={})
-        chunk_display(label,identifier)
-      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
+          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
+            response = HTTParty.get(url)
+            response_received = true if response.code == 200
+          end
 
-      def chunk(label,identifier,options={})
-        chunk_display(label,identifier)
-      end
+          if !cached_content_present && !response_received
+            raise "No response received"
+          else
+            
+            chunk_content = Rails.cache.fetch(cache_identifier) do  
+              response['content']
+            end
+
+            chunk_type = Rails.cache.fetch("#{cache_identifier}_type") do  
+              response['chunk_type']
+            end
+
+            render_chunk_content(identifier,chunk_content,chunk_type, options)
+
+          end
+
+        rescue => 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) 
+        end
 
-      def raw_chunk(label,identifier,options={})
-        chunk_display(label,identifier,options.merge(:display_type => "raw"))
       end
-      
+
+      alias_method :chunk, :chunk_display
+
     end
   end
-
 end

data/lib/editmode-rails/auto_include_filter.rb

@@ -41,7 +41,7 @@ module EditModeRails
       end
 
       def html_content_type?
-        response.content_type == 'text/html'
+        response.content_type.try(:include?,'text/html')
       end
 
       def response_has_closing_body_tag?

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.39"
+  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.39
+  version: 0.0.9.111
 platform: ruby
 authors:
 - Tony Ennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 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