workarea-core 3.5.14 → 3.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f457800d2f9e59fb315b3bdedde57f90d04ea6befdd4cf04dc5b4c78838eaf
-  data.tar.gz: 564f64759f19ea4d0db9b1ea4b7a2c12cdebf629ea2f52b5916519a3c958d611
+  metadata.gz: c18e8846e0d53604a413bfebe9180793059f63eef7478a6efb5e3c0762e95112
+  data.tar.gz: 6bc004faf032a0172b6d6495ef3d666944cef5726f91a9d41fca8fc69ce03af3
 SHA512:
-  metadata.gz: 6ae82b803bfe0daffc1e54953aa54f0c3a045cbe83fbb7b2e0c3d68961746950f442f7d87bee7c6b31c4fb697f685b0db3aa5277b0e6b430e6adabfbab4d9837
-  data.tar.gz: '094e9624ee3213c17dc554e263dc79538c5c09d2db4868d0f1aaa827db8559e60e46728c171364db364d2ff323f6100e0b2edaeea5746a4f59a73cbc51b16832'
+  metadata.gz: b367c165ee4ead94e2969e1ced60328c3fe0696bcac53df7a0a67f0eea1faad9e6b82c1eb6a4d1de2530460a7424326357ab6173c70fb7f0362e5c6435bb7f20
+  data.tar.gz: c7a378a34ebc05ee82b12bf92c85b89e22ca1035ed01a429986d4f82ad7cc664cc54ba411eef0419c9773848296dab6f5beae749e7206e33c5c88c9e032279ad

data/lib/workarea/core.rb

@@ -146,6 +146,7 @@ require 'workarea/ext/mongoid/find_ordered'
 require 'workarea/ext/mongoid/embedded_children'
 require 'workarea/ext/sprockets/ruby_processor'
 require 'workarea/ext/jbuilder/jbuilder_append_partials'
+require 'workarea/ext/jbuilder/jbuilder_cache'
 
 if Rails.env.development?
   require 'workarea/ext/freedom_patches/routes_reloader'

data/lib/workarea/ext/jbuilder/jbuilder_cache.rb

@@ -0,0 +1,29 @@
+decorate JbuilderTemplate, with: :workarea do
+  def _cache_fragment_for(*)
+    return yield if workarea_admin?
+
+    super
+  end
+
+  def _cache_key(*)
+    super.tap do |result|
+      result << workarea_cache_varies if workarea_cache_varies.present?
+    end
+  end
+
+  private
+
+  def workarea_admin?
+    @context&.controller&.current_user&.admin?
+  rescue ::RuntimeError
+    false
+  end
+
+  def workarea_cache_varies
+    workarea_request_env['workarea.cache_varies']
+  end
+
+  def workarea_request_env
+    @context.controller.request.env || {}
+  end
+end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 14
+    PATCH = 15
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

data/workarea-core.gemspec

@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'chartkick', '~> 3.3.0'
   s.add_dependency 'browser', '~> 2.6.1'
   s.add_dependency 'puma', '>= 4.3.1'
-  s.add_dependency 'rack', '>= 2.0.8'
+  s.add_dependency 'rack' , '>= 2.1.4'
 
   # HACK for vendoring active_shipping
   s.add_dependency 'active_utils', '~> 3.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.14
+  version: 3.5.15
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1142,14 +1142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1946,6 +1946,7 @@ files:
 - lib/workarea/ext/freedom_patches/string.rb
 - lib/workarea/ext/freedom_patches/uri.rb
 - lib/workarea/ext/jbuilder/jbuilder_append_partials.rb
+- lib/workarea/ext/jbuilder/jbuilder_cache.rb
 - lib/workarea/ext/mongoid/audit_log_entry.decorator
 - lib/workarea/ext/mongoid/each_by.rb
 - lib/workarea/ext/mongoid/embedded_children.rb