editmode 1.2.4 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd467da504ef11a5ba029cc7dcf3b4957dbbc758fa37fe8cf38f2aed358fb17b
-  data.tar.gz: 577f1989ff49f7c624fd2d1864cc78c6bd0f3249e7c67951bf6b94e375794744
+  metadata.gz: f3c6615ff35d91086eb0774d03d3d5e90070f1f52456563b883b947c42182bdf
+  data.tar.gz: 067ea9cb9d9227d12cda1aa825fbce9987731ee720e9882386a9a1d6cdbb4e4c
 SHA512:
-  metadata.gz: 5466ebc92b03dde2acc135dd0e90ff54c2b18242a0eb5011889ff429fd5c168f9ec09b7181be3df8d8a864f78911a49b620b0ed239a3aec9330e4d3fb9b3a3f7
-  data.tar.gz: bd302d21b044b4927e787f5aaacc530bae2a811f5e72138519b6b2b5cc594dc6322ec9fa026a1fa256d5d65a26ee79877d0256e547a11ad6589197482d0e5fb1
+  metadata.gz: e3da11757cc4d252bd5222533c4e4fee807623a50c6913d968dec1ded22e3a653199b3b5b858f138440d62391e64048d22e1062837689c082b523c62beb82170
+  data.tar.gz: 367aace629ffe1363a1938a6bdec061976eeb2dda597916378f4c6385ee57e7dfa7a8e0efda7d873d8d1aafbb0cb5875a4328e478540b4abba775728e177c05f

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/README.md

@@ -50,6 +50,12 @@ Editmode provides helper methods for use in your rails views and controllers.
 <%= E('cnk_x4ts...', class: "a-css-class") %> # Render a chunk with inline css class 
 ```
 
+### Working with multiple projects in the same codebase
+If you want to include content from a different project to the one you've specified in the initializer, you can pass the project id in to the view helper.
+```erb
+<%= E("cnk_16e04a02d577afb610ce", project_id: "prj_02d577afb617hdb") %>
+```
+
 ### Content can also be accessed in Controllers
 ```ruby
 @page_title = e("cnk_x4ts............")  # Using a chunk identifier
@@ -78,6 +84,8 @@ e("cnk_16e04a02d577afb610ce", "Email Content", variables: variable_values)
 # Response: "Hi Dexter Morgan"
 ```
 
+
+
 ### Use collections for repeatable content
 ```erb
 <%= c('col_j8fbs...', class: "profiles-container", item_class: "profile-item") do %>

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,11 +1,17 @@
 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
@@ -56,14 +62,14 @@ module Editmode
                 chunks.each do |chunk|
                   @custom_field_chunk = chunk
                   concat(content_tag(:div, class: "chunks-collection-item--wrapper #{item_class}") do
-                    yield
+                    yield(@custom_field_chunk)
                   end)
                 end
 
                 # Placeholder element for new collection item
                 @custom_field_chunk = chunks.first.merge!({placeholder: true})
                 concat(content_tag(:div, class: "chunks-hide chunks-col-placeholder-wrapper") do
-                  yield
+                  yield(@custom_field_chunk)
                 end)
               end 
             else

data/lib/editmode/chunk_value.rb

@@ -1,3 +1,6 @@
+require 'action_view'
+require 'active_support'
+
 module Editmode
   class ChunkValue
     include ActionView::Helpers::TagHelper
@@ -10,13 +13,14 @@ module Editmode
 
     attr_writer :content
 
-    def initialize(identifier, **options)
+    def initialize(identifier, project_id: Editmode.project_id, **options)
       @identifier = identifier
       @branch_id = options[:branch_id].presence
-      @project_id = Editmode.project_id
+      @project_id = project_id
       @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 +66,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 +90,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 +107,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
@@ -114,17 +119,19 @@ module Editmode
     end
 
     def get_content
+
       if !cached?
         http_response = HTTParty.get(url, query: query_params)
         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

@@ -12,7 +12,7 @@ module Editmode
           chunk.content
         end 
       rescue => er
-        puts er
+        Rails.logger.info "#{er}: We can't render content for #{identifier}"
       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.4"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.9
 platform: ruby
 authors:
 - Tony Ennis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ homepage: https://github.com/tonyennis145/editmode-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+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
   bits of content that can be managed by anyone with no technical knowledge