avo 3.0.0.pre11 → 3.0.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1674354633c9b8113bfdeba7a9e53ac54bd3f75af78c9492655c485c43a0ff
-  data.tar.gz: 53bd8bb7f50267e0b4756164fb85ffa1fe013a1c7642c4417dabd9d2320e4b57
+  metadata.gz: 76b9e80370d7cd7011b456fe12affdd877ac7ea71d44ae1774ff661a2a0a5452
+  data.tar.gz: 1ce30818dee6f87d249f1e23e5d0c7ee73c9b8e67862c77f393a7598e5d712b4
 SHA512:
-  metadata.gz: 857ed520648c9cbe1d2361c11bd6f48266c25c1c8fc0175b0843de23edbb7518eff352f8495c95bb6238a7d4e93e7a003fa1d86467d4999524baa6c1cb19042d
-  data.tar.gz: 32bf4c5d55be3aeae79411fd30df1a550eb8b417fd76680cee40925b4a1a9265c5a7b9d241182d638b333666fea00c95d811d9bc868a8f80b32aba3457f48e21
+  metadata.gz: c90992abccb5192dec1ce3414f4c14bf51dc7e665a08320df9c4a154c7539b55d4bdfa4c6d23322ffc5a550b27f9eb15815298ad07b23a2e7f7fc8ed8be4f16e
+  data.tar.gz: 390a9b9988437466ced356326a811d6cabdfa360d0982e8dfc464254cf3025bd6660d5ef1656fc44cee2d0fffcffd8f2907488379eb3d817cf6ea2493c976a72

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.0.pre11)
+    avo (3.0.0.pre12)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/views/resource_edit_component.html.erb

@@ -18,7 +18,7 @@
     multipart: true do |form| %>
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
     <%= content_tag :div, class: 'space-y-12' do %>
-      <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+      <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
         <% c.with_tools do %>
           <% @resource.render_edit_controls.each do |control| %>
             <%= render_control control %>

data/app/components/avo/views/resource_index_component.rb

@@ -121,7 +121,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
       return
     end
 
-    @resource.resource_description
+    @resource.description
   end
 
   def show_search_input

data/app/components/avo/views/resource_show_component.html.erb

@@ -7,7 +7,7 @@
     selected_resources: [@resource.record.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+  <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
     <% c.with_tools do %>
       <% @resource.render_show_controls.each do |control| %>
         <%= render_control control %>

data/app/controllers/avo/actions_controller.rb

@@ -82,13 +82,7 @@ module Avo
           flash_messages messages
 
           if response[:type] == :redirect
-            path = response[:path]
-
-            if path.respond_to? :call
-              path = instance_eval(&path)
-            end
-
-            redirect_to path
+            redirect_to Avo::ExecutionContext.new(target: response[:path]).handle
           elsif response[:type] == :reload
             redirect_back fallback_location: resources_path(resource: @resource)
           end

data/app/controllers/avo/base_controller.rb

@@ -47,7 +47,7 @@ module Avo
         field_id = @index_params[:sort_by].to_sym
         field = @resource.get_field_definitions.find { |field| field.id == field_id }
         @query = if field&.sortable.is_a?(Proc)
-          field.sortable.call(@query, @index_params[:sort_direction])
+          Avo::ExecutionContext.new(target: field.sortable, query: @query, direction: @index_params[:sort_direction]).handle
         else
           @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
         end

data/lib/avo/app.rb

@@ -38,7 +38,7 @@ module Avo
           when "ActiveSupport::Cache::MemCacheStore", "ActiveSupport::Cache::RedisCacheStore"
             Rails.cache
           else
-            ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
+            ActiveSupport::Cache.lookup_store(:file_store, Rails.root.join("tmp", "cache"))
           end
         elsif Rails.env.test?
           Rails.cache

data/lib/avo/base_resource.rb

@@ -8,6 +8,7 @@ module Avo
     include Avo::Concerns::HasControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
+    include Avo::Concerns::HasDescription
 
     # Avo::Current methods
     delegate :context, to: Avo::Current
@@ -38,7 +39,6 @@ module Avo
 
     class_attribute :id, default: :id
     class_attribute :title, default: :id
-    class_attribute :description, default: :id
     class_attribute :search_query, default: nil
     class_attribute :search_query_help, default: ""
     class_attribute :search_result_path
@@ -280,16 +280,6 @@ module Avo
       name
     end
 
-    def resource_description
-      return instance_exec(&self.class.description) if self.class.description.respond_to? :call
-
-      # Show the description only on the resource index view.
-      # If the user wants to conditionally it on all pages, they should use a block.
-      if view == :index
-        return self.class.description if self.class.description.is_a? String
-      end
-    end
-
     def translation_key
       self.class.translation_key || "avo.resource_translations.#{class_name.underscore}"
     end
@@ -515,7 +505,7 @@ module Avo
       nil
     end
 
-    def description
+    def search_description
       description_field&.value
     end
 
@@ -543,5 +533,13 @@ module Avo
     def record_id
       record.send(id_attribute)
     end
+
+    def description_attributes
+      {
+        view: view,
+        resource: self,
+        record: record
+      }
+    end
   end
 end

data/lib/avo/concerns/breadcrumbs.rb

@@ -50,7 +50,7 @@ module Avo
           when Symbol
             context.send(name)
           when Proc
-            name.call(context)
+            Avo::ExecutionContext.new(target: name, context: context).handle
           else
             name.to_s
           end
@@ -61,7 +61,7 @@ module Avo
           when Symbol
             context.send(path)
           when Proc
-            path.call(context)
+            Avo::ExecutionContext.new(target: path, context: context).handle
           else
             context.url_for(path)
           end

data/lib/avo/concerns/filters_session_handler.rb

@@ -34,9 +34,11 @@ module Avo
       end
 
       def cache_resource_filters?
-        return Avo.configuration.cache_resource_filters unless Avo.configuration.cache_resource_filters.is_a?(Proc)
-
-        Avo.configuration.cache_resource_filters.call(current_user: current_user, resource: @resource)
+        Avo::ExecutionContext.new(
+          target: Avo.configuration.cache_resource_filters,
+          current_user: current_user,
+          resource: @resource
+        ).handle
       end
     end
   end

data/lib/avo/concerns/has_description.rb

@@ -0,0 +1,23 @@
+# Adds the ability to set the visibility of an item in the execution context.
+module Avo
+  module Concerns
+    module HasDescription
+      extend ActiveSupport::Concern
+
+      class_methods do
+        attr_accessor :description
+      end
+
+      def description
+        Avo::ExecutionContext.new(target: @description || self.class.description, **description_attributes).handle
+      end
+
+      private
+
+      # Override this method to add custom attributes to the description execution context.
+      def description_attributes
+        {}
+      end
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.0.pre11" unless const_defined?(:VERSION)
+  VERSION = "3.0.0.pre12" unless const_defined?(:VERSION)
 end

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

@@ -51,7 +51,7 @@ Avo.configure do |config|
   ## permanent enable or disable cache_resource_filters, default value is false
   # config.cache_resource_filters = false
   ## provide a lambda to enable or disable cache_resource_filters per user/resource.
-  # config.cache_resource_filters = ->(current_user:, resource:) { current_user.cache_resource_filters?}
+  # config.cache_resource_filters = -> { current_user.cache_resource_filters? }
 
   ## == Customization ==
   # config.app_name = 'Avocadelicious'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre11
+  version: 3.0.0.pre12
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1710,6 +1710,7 @@ files:
 - lib/avo/concerns/can_replace_items.rb
 - lib/avo/concerns/filters_session_handler.rb
 - lib/avo/concerns/has_controls.rb
+- lib/avo/concerns/has_description.rb
 - lib/avo/concerns/has_item_type.rb
 - lib/avo/concerns/has_items.rb
 - lib/avo/concerns/has_stimulus_controllers.rb