avo 2.42.1 → 2.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51939693dbc8c900234d46dd2af7dde7a24df161ce3bd04ba1457c5da88fed8
-  data.tar.gz: a37af489a0a16ecd69e75c28991ee9fa9e2f04c2f40fffc67980cb0e257a9a15
+  metadata.gz: 85975e5896ef4f49e8ca3b4874470092dfd64eafd7c0282a8715162c9dfc42bc
+  data.tar.gz: c90db50a988c7cc7bf66cbc5671844390f28455f4d09f421b86d49caf86f588a
 SHA512:
-  metadata.gz: 803c67efc22f72214b54babeba81847faf04e74e4470afca772aa6d12ade34401a2dd6ece24fdc67905329d3d95d271e5a038c95ede9088de41f522e0e612b9f
-  data.tar.gz: 861e8802cf742a57f6bdb948e2d58bac5ef0dc852aa0afa23942408b0deda5c876bb6351d03cf76b46ad6b8910598106631002857e5455959a324eef949f10e4
+  metadata.gz: 98b4bc5ccb0193c5ef46da23c582a3da7ee3bf8fc8ae5516232b4ea6f0b98df0fa3a798be6498019e76aa735fd37b6cbfff1d6514d3be3a6628b6b7af56e6431
+  data.tar.gz: ef6fee4b84d1cbf589a0160785005e568c2c8f2a6dad77da7692170c8819e89ad7202ee4f26944180c34a4bd19e6953c50ad96534ce8ca33e2582745ec7bf3c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.42.1)
+    avo (2.42.2)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/lib/avo/app.rb

@@ -31,26 +31,7 @@ module Avo
       def boot
         init_fields
 
-        self.cache_store = get_cache_store
-      end
-
-      # When not in production we'll just use the MemoryStore which is good enough.
-      # When running in production we'll try to use memcached or redis if available.
-      # If not, we'll use the FileStore.
-      # We decided against the MemoryStore in production because it will not be shared between multiple processes (when using Puma).
-      def get_cache_store
-        if Rails.env.production?
-          case Rails.cache.class.to_s
-          when "ActiveSupport::Cache::MemCacheStore", "ActiveSupport::Cache::RedisCacheStore", "SolidCache::Store"
-            Rails.cache
-          else
-            ActiveSupport::Cache.lookup_store(:file_store, Rails.root.join("tmp", "cache"))
-          end
-        elsif Rails.env.test?
-          Rails.cache
-        else
-          ActiveSupport::Cache.lookup_store(:memory_store)
-        end
+        self.cache_store = Avo.configuration.cache_store
       end
 
       # Generate a dynamic root path using the URIService

data/lib/avo/configuration.rb

@@ -5,6 +5,7 @@ module Avo
     attr_writer :app_name
     attr_writer :branding
     attr_writer :root_path
+    attr_writer :cache_store
     attr_accessor :timezone
     attr_accessor :per_page
     attr_accessor :per_page_steps
@@ -96,6 +97,7 @@ module Avo
       @field_wrapper_layout = :inline
       @resources = nil
       @prefix_path = nil
+      @cache_store = computed_cache_store
     end
 
     def current_user_method(&block)
@@ -147,6 +149,33 @@ module Avo
         @app_name
       end
     end
+
+    def cache_store
+      Avo::ExecutionContext.new(
+        target: @cache_store,
+        production_rejected_cache_stores: %w[ActiveSupport::Cache::MemoryStore ActiveSupport::Cache::NullStore]
+      ).handle
+    end
+
+    # When not in production or test we'll just use the MemoryStore which is good enough.
+    # When running in production we'll use Rails.cache if it's not ActiveSupport::Cache::MemoryStore or ActiveSupport::Cache::NullStore.
+    # If it's one of rejected cache stores, we'll use the FileStore.
+    # We decided against the MemoryStore in production because it will not be shared between multiple processes (when using Puma).
+    def computed_cache_store
+      -> {
+        if Rails.env.production?
+          if Rails.cache.class.to_s.in?(production_rejected_cache_stores)
+            ActiveSupport::Cache.lookup_store(:file_store, Rails.root.join("tmp", "cache"))
+          else
+            Rails.cache
+          end
+        elsif Rails.env.test?
+          Rails.cache
+        else
+          ActiveSupport::Cache.lookup_store(:memory_store)
+        end
+      }
+    end
   end
 
   def self.configuration

data/lib/avo/execution_context.rb

@@ -30,9 +30,9 @@ module Avo
       @params ||= Avo::App.params
       @view_context ||= Avo::App.view_context
       @current_user ||= Avo::App.current_user
-      @request ||= view_context.request
-      @main_app ||= view_context.main_app
-      @avo ||= view_context.avo
+      @request ||= view_context&.request
+      @main_app ||= view_context&.main_app
+      @avo ||= view_context&.avo
     end
 
     # Return target if target is not callable, otherwise, execute target on this instance context

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.42.1" unless const_defined?(:VERSION)
+  VERSION = "2.42.2" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -47,6 +47,13 @@ Avo.configure do |config|
   # config.per_page_steps = [12, 24, 48, 72]
   # config.via_per_page = 8
   # config.id_links_to_resource = false
+
+  ## == Cache options ==
+  ## Provide a lambda to customize the cache store used by Avo.
+  ## We compute the cache store by default, this is NOT the default, just an example.
+  # config.cache_store = -> {
+  #   ActiveSupport::Cache.lookup_store(:solid_cache_store)
+  # }
   # config.cache_resources_on_index_view = true
   ## permanent enable or disable cache_resource_filters, default value is false
   # config.cache_resource_filters = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.42.1
+  version: 2.42.2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord