editmode 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68357d9af1673886733d966a8c6bad378f2f0a9242b810b9e61560ab8b793b75
-  data.tar.gz: d7f45153fe466bb03b68a7b1428cc245883fbd033a4a0e9e449133a14c4480d5
+  metadata.gz: f3c6615ff35d91086eb0774d03d3d5e90070f1f52456563b883b947c42182bdf
+  data.tar.gz: 067ea9cb9d9227d12cda1aa825fbce9987731ee720e9882386a9a1d6cdbb4e4c
 SHA512:
-  metadata.gz: cf0d706724b4d3fd92b7e3926af60e491adc248b3ac1b36b1913f3bf22eac78e82e8967182b29c8ba86984a0c5ce8b3124fecce2b8695e79fca0b098c72d9d77
-  data.tar.gz: a2af19294f5625257a5d94239a16bbb68035863404c951f9aa1d2728d0e16e57071f00ac1cecc1c560950505e2b8c9552d802fd16dbaaf6312403cc8db8302aa
+  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/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

data/lib/editmode/chunk_value.rb

@@ -1,3 +1,6 @@
+require 'action_view'
+require 'active_support'
+
 module Editmode
   class ChunkValue
     include ActionView::Helpers::TagHelper
@@ -63,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
@@ -103,11 +111,6 @@ module Editmode
       return content
     end
 
-    def cached?
-      return false if @skip_cache
-      Rails.cache.exist?(cache_identifier)
-    end
-
     def query_params
       the_params = { 'project_id' => project_id }
       the_params['branch_id'] = branch_id if branch_id.present?
@@ -123,7 +126,9 @@ module Editmode
       end
 
       if !cached? && !response_received
-        raise no_response_received(identifier)
+        message = http_response.try(:[], 'message') || no_response_received(identifier)
+
+        raise message
       else
         Rails.cache.write(cache_identifier, http_response.to_json) if http_response.present?
         cached_response = Rails.cache.fetch(cache_identifier)
@@ -141,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.8"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editmode
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Tony Ennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-01-14 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