editmode 1.2.6 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84c4ada25fc650fcb7f2a9b9c8322562bda944bd1180815e60bf3f3ef7534d94
-  data.tar.gz: 246e38a66ff7fb77ca953ef0e222720defdc72447eac982bdf5e39c7c0b34a0f
+  metadata.gz: 392f282609e410c8656791b6120245b8b4c790ed8ba102d6dfe1c5d2062acd6f
+  data.tar.gz: 94246ddabf9aadcdf65ceab231e83a6704a7d89f39ce5039685b7f44ea4e18c9
 SHA512:
-  metadata.gz: 9c891c169c1759113a86a6cf8daa6f7910b676e5296b036784cf37a2dec35f6d82b3237d8284027ecb3bb6126c9e168de5dcbceedc8f6829161bd6a7b844cb25
-  data.tar.gz: a674897c9c9a1c5ef04f95fb378982343557dd14f03e4b5e55a6093cbf470b56ef663aa7c3bed30bb7e475c53b5a4ee3b1164143bc7e1e83e545cb8ef74feeac
+  metadata.gz: 7a1f7f6442b1109fedbd94be59a08c0658d3aa6d9570a5e21f36a32da45c6befacdab23da75670618034c95ceace95262e440807ccafc0c847544b96600497be
+  data.tar.gz: b89dc6f25b53ef930ed66c752947a539157cd4cda959a8288366431cb2ea0987ac7d5af6e3b5ab0a5ee49e341046fc47877133ade9c1fa05a8ba0a833add5368

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chunks.gemspec
+  gem 'pry-rails'
+  gem 'rails', '~> 5.2.0'
 gemspec

data/Rakefile

@@ -1,2 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
+task :test do
+  Dir['test/*_test.rb'].each do |testfile|
+    load testfile
+  end
+end
+
+task :default => :test

data/lib/editmode/action_view_extensions/editmode_helper.rb

@@ -1,15 +1,25 @@
 require 'editmode/helper'
+require 'action_view'
+require 'httparty'
 
 module Editmode
   module ActionViewExtensions
     module EditmodeHelper
-      require 'httparty'
+      include ::ActionView::Helpers::TagHelper
+      include ::ActionView::Helpers::TextHelper
+      include ::ActionView::Helpers::AssetTagHelper
+      include ::ActionView::Context
       include Editmode::Helper
 
+
       def api_version
         # Todo Add Header Version
       end
 
+      def allowed_tag_attributes
+        [:style, :href, :title, :src, :alt, :width, :height]
+      end
+
       def api_root_url
         ENV["EDITMODE_OVERRIDE_API_URL"] || "https://api.editmode.com"
       end
@@ -104,7 +114,7 @@ module Editmode
         end
       end
 
-      def render_chunk_content(chunk_identifier, chunk_content, chunk_type,options = {})
+      def render_chunk_content(chunk_identifier, chunk_content, chunk_type, options = {})
         begin 
           css_class = options[:class]
           cache_id = options[:cache_identifier]
@@ -126,17 +136,17 @@ module Editmode
           case display_type
           when "span"
             if chunk_type == "rich_text"
-              content = content_tag("em-span", :class => "editmode-richtext-editor #{css_class}", :data => chunk_data.merge!({:chunk_editable => true}) ) do
+              content = content_tag("em-span", :class => "editmode-richtext-editor #{css_class}", :data => chunk_data.merge!({:chunk_editable => true}), **options.slice(*allowed_tag_attributes) ) do
                 chunk_content.html_safe
               end
             else
-              content_tag("em-span", :class => css_class, :data => chunk_data.merge!({:chunk_editable => true}) ) do
+              content_tag("em-span", :class => css_class, :data => chunk_data.merge!({:chunk_editable => true}), **options.slice(*allowed_tag_attributes) ) do
                 chunk_content.html_safe
               end
             end
           when "image"
             chunk_content = chunk_content.blank? || chunk_content == "/images/original/missing.png" ? 'https://www.editmode.com/upload.png' : chunk_content
-            image_tag(chunk_content, :data => chunk_data, :class => css_class) 
+            image_tag(chunk_content, :data => chunk_data, :class => css_class, **options.slice(*allowed_tag_attributes)) 
           end
         rescue => errors
           puts errors
@@ -153,7 +163,7 @@ module Editmode
         # prevent the page from loading.
         begin
           field = options[:field].presence || ""          
-
+          options[:referrer] = request.url
           chunk_value = Editmode::ChunkValue.new(identifier, options)
           
           if field.present? && chunk_value.chunk_type == 'collection_item'

data/lib/editmode/chunk_value.rb

@@ -1,3 +1,6 @@
+require 'action_view'
+require 'active_support'
+
 module Editmode
   class ChunkValue
     include ActionView::Helpers::TagHelper
@@ -14,9 +17,11 @@ module Editmode
       @identifier = identifier
       @branch_id = options[:branch_id].presence
       @project_id = project_id
+      @referrer = options[:referrer].presence || ""
       @variable_values = options[:variables].presence || {}
       @raw = options[:raw].present?
       @skip_sanitize = options[:dangerously_skip_sanitization]
+      @skip_cache = options[:skip_cache]
 
       @url = "#{api_root_url}/chunks/#{identifier}"
       @cache_identifier = set_cache_identifier(identifier)
@@ -62,6 +67,11 @@ module Editmode
       result.try(:html_safe)
     end
 
+    def cached?
+      return false if @skip_cache
+      Rails.cache.exist?(cache_identifier)
+    end
+
     private
 
     # Todo: Transfer to helper utils
@@ -81,7 +91,6 @@ module Editmode
     end
 
     def variable_parse!(content, variables = {}, values = {}, raw = true, skip_sanitize=false)
-      content = ActionController::Base.helpers.sanitize(content) unless skip_sanitize
       tokens = content.scan(/\{{(.*?)\}}/)
       if tokens.any?
         tokens.flatten!
@@ -99,11 +108,8 @@ module Editmode
         end
       end
 
-      content
-    end
-
-    def cached?
-      Rails.cache.exist?(cache_identifier)
+      content = ActionController::Base.helpers.sanitize(content) unless skip_sanitize
+      return content
     end
 
     def query_params
@@ -115,16 +121,17 @@ module Editmode
 
     def get_content
       if !cached?
-        http_response = HTTParty.get(url, query: query_params)
+        http_response = HTTParty.get(url, query: query_params, headers: {referrer: @referrer})
         response_received = true if http_response.code == 200
       end
 
       if !cached? && !response_received
-        raise no_response_received(identifier)
+        message = http_response.try(:[], 'message') || no_response_received(identifier)
+
+        raise message
       else
-        cached_response = Rails.cache.fetch(cache_identifier) do
-          http_response.to_json
-        end
+        Rails.cache.write(cache_identifier, http_response.to_json) if http_response.present?
+        cached_response = Rails.cache.fetch(cache_identifier)
 
         @response = json?(cached_response) ? JSON.parse(cached_response) : cached_response
         set_response_attributes!
@@ -139,5 +146,8 @@ module Editmode
       @branch_id = response['branch_id']
     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
   end
 end

data/lib/editmode/engine.rb

@@ -1,4 +1,5 @@
-require 'editmode/chunk_value'
+require 'rails/engine'
+require 'action_controller'
 require 'editmode/helper'
 
 module Editmode

data/lib/editmode/helper.rb

@@ -5,34 +5,17 @@ module Editmode
       field, options = parse_arguments(args)
       begin
         chunk = Editmode::ChunkValue.new(identifier, options.merge({raw: true}))
-        render_noneditable_chunk(chunk, field, options)
+
+        if chunk.chunk_type == 'collection_item'
+          chunk.field(field)
+        else
+          chunk.content
+        end 
       rescue => er
-        puts er
+        Rails.logger.info "#{er}: We can't render content for #{identifier}"
       end
     end
 
-    def render_noneditable_chunk(chunk, field=nil, options=nil)
-      return render_collection_item(chunk, field, options) if chunk.chunk_type == 'collection_item'
-
-      render_content(chunk, options)
-    end
-
-    def render_collection_item(chunk, field=nil, options=nil)
-      return render_image(chunk.field(field), options[:class]) if chunk.field_chunk(field)['chunk_type'] == 'image'
-
-      chunk.field(field)
-    end
-
-    def render_content(chunk, options=nil)
-      return render_image(chunk.content, options[:class]) if chunk.chunk_type == 'image'
-
-      chunk.content
-    end
-
-    def render_image(content, css_class=nil)
-      image_tag(content, class: css_class)
-    end
-
     def render_custom_field_raw(label, options={})
       e(@custom_field_chunk["identifier"], label, options.merge({response: @custom_field_chunk}))
     end
@@ -50,4 +33,4 @@ module Editmode
       return field, options
     end
   end
-end
+end

data/lib/editmode/railtie.rb

@@ -1,3 +1,4 @@
+require 'rails/railtie'
 module Editmode
   class Railtie < Rails::Railtie
     initializer "editmode" do |app|

data/lib/editmode/version.rb

@@ -1,3 +1,3 @@
 module Editmode
-  VERSION = "1.2.6"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.1
 platform: ruby
 authors:
 - Tony Ennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.4
 signing_key:
 specification_version: 4
 summary: Editmode allows you to turn plain text in your rails app into easily inline-editable