workarea-core 3.4.35 → 3.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b8b3b13aaa5cdef9ff862caeccdd738d6f094d405f67ab2e65bb76534b0eb84f
-  data.tar.gz: 84ef70baa8f39380254e2c9e763a81e6643726a5103c6d0b33255b51720b81a4
+SHA1:
+  metadata.gz: 1373c61a73f6d680811a7d550880438838dfc1cf
+  data.tar.gz: 8896491055161cf76bbc7a754ca6915ab7d9efbf
 SHA512:
-  metadata.gz: 5c308fb6e8617c7f4fc819a42be2b5ae99d442093506c8846c62a146d6a911786d937e8e07ccd1d149b57aff2409b414943868cc35ba8d1a9c190a935fefe0da
-  data.tar.gz: 7c740a240da58b656345c601741309ff2af41a5571c29d5162d20a122a91a14844967c1254edf1a992f4597fd1d560a8c72150236e2c4effcd465cee571eea8d
+  metadata.gz: 1af722113dc9bf6ae7efb1cae8abb3c961c2e9c6ac1232b9aee2c88629d0cf4d7d2b2865559750f314497e278c2973b25edccf957e1e0141741316f86d8b4d30
+  data.tar.gz: cb2186de83c1f83fef21b96356d0e0ea41f67bd848faa7db2fe8eba77d4e7848038570343c71f5ed178c4d093e19beb0b3fb2960b235a332bd508b565f4d5b3d

data/lib/workarea/core.rb

@@ -139,6 +139,7 @@ require 'workarea/ext/mongoid/audit_log_entry.decorator'
 require 'workarea/ext/mongoid/find_ordered'
 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 = 4
-    PATCH = 35
+    PATCH = 36
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/workarea-core.gemspec

@@ -92,7 +92,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'logstasher', '~> 1.2.2'
   s.add_dependency 'chartkick', '~> 3.3.0'
   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.4.35
+  version: 3.4.36
 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
@@ -882,22 +882,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -1114,14 +1114,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
@@ -1864,6 +1864,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/error.rb
@@ -2613,7 +2614,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform