avo 2.28.1.pre.pr1642 → 2.28.2.pre.pr1642

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3bb2ce2c32ddbba4f8bbeb6106e8bba29345090ccb6fb373372bd8d23afa5cf
-  data.tar.gz: 6230460ca9c90b5195b384df63d96feac645e863c3821648425eb7ee2d108c11
+  metadata.gz: 2afd7fab61f56b5df63d0776f412e50efbf64bb0e45f9d011ec03f21978581c3
+  data.tar.gz: 69ea4d9a6097b88268f6058f0978a9ff938876d0c6837f41e5896411a2447db0
 SHA512:
-  metadata.gz: 0d91aceda8772221c07996c3c1538b378451a8cf0726ad93ef593394335d833070135ef5412fdc40f09024805c2c05582a70d7cca481ee0e28d03aacd350ac5d
-  data.tar.gz: 5f7a86dc730ddb524274a91d0ec6781e02b9e2a93867c02e798f70c838081305140f5a70fdab806c023fed3ec91e018759a86f74eb639b47dd7f83f74c5c9fd4
+  metadata.gz: 3a324a98e38853c7b2cb4339f6c8d8c84efd7d4668248c1fd6e360f0fe7827a537108909c965241a080491fb6b18ac2d39c6b4e536de35708a495eb0484c0927
+  data.tar.gz: 0ddeccf56e54a0cd30214d69c1a02182d909b8731bf98ee95b4548ab1734ee1ff6c5b7d361b64e05a163a2cb0e957dfdcef88b3c156b7bc129ff06a452c4d90a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.28.1.pre.pr1642)
+    avo (2.28.2.pre.pr1642)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/controllers/avo/application_controller.rb

@@ -28,7 +28,7 @@ module Avo
     rescue_from Avo::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path, :mount_path
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path
     add_flash_types :info, :warning, :success, :error
 
     def init_app
@@ -101,10 +101,6 @@ module Avo
       instance_eval(&Avo.configuration.context)
     end
 
-    def mount_path
-      Avo::Engine.routes.find_script_name(params.permit!.to_h.symbolize_keys)
-    end
-
     # This is coming from Turbo::Frames::FrameRequest module.
     # Exposing it as public method
     def turbo_frame_request?

data/app/helpers/avo/application_helper.rb

@@ -102,16 +102,15 @@ module Avo
     end
 
     def root_path_without_url
-      Avo::App.root_path
-        .to_s
-        .delete_prefix(request.base_url.to_s)
-        .delete_suffix("/")
-        .gsub("/?", "?")
-        .query = ""
+      "#{Avo.configuration.prefix_path}#{mount_path}"
     rescue
       Avo.configuration.root_path
     end
 
+    def mount_path
+      Avo::Engine.routes.find_script_name(params.permit!.to_h.symbolize_keys)
+    end
+
     private
 
     # Taken from the original library

data/app/views/avo/partials/_javascript.html.erb

@@ -1,7 +1,7 @@
 <%= javascript_tag nonce: true do %>
   window.Avo = window.Avo || { configuration: {} }
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
-  Avo.configuration.root_path = '<%= mount_path %>'
+  Avo.configuration.root_path = '<%= root_path_without_url %>'
   Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
   Avo.configuration.cookies_key = '<%= Avo::COOKIES_KEY %>'
 <% end %>

data/lib/avo/configuration.rb

@@ -42,6 +42,7 @@ module Avo
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
     attr_accessor :resources
+    attr_accessor :prefix_path
     attr_writer :branding
 
     def initialize
@@ -94,6 +95,7 @@ module Avo
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
       @resources = nil
+      @prefix_path = nil
     end
 
     def current_user_method(&block)
@@ -117,8 +119,8 @@ module Avo
     end
 
     def namespace
-      if computed_root_path.present?
-        computed_root_path.delete "/"
+      if Avo.configuration.root_path.present?
+        Avo.configuration.root_path.delete "/"
       else
         root_path.delete "/"
       end
@@ -130,10 +132,6 @@ module Avo
       @root_path
     end
 
-    def computed_root_path
-      Avo.configuration.root_path
-    end
-
     def feature_enabled?(feature)
       !@disabled_features.map(&:to_sym).include?(feature.to_sym)
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.28.1.pre.pr1642" unless const_defined?(:VERSION)
+  VERSION = "2.28.2.pre.pr1642" unless const_defined?(:VERSION)
 end

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

@@ -2,6 +2,8 @@
 Avo.configure do |config|
   ## == Routing ==
   config.root_path = '/<%= options[:path] %>'
+  # used only when you have custom `map` configuration in your config.ru
+  # config.prefix_path = "/internal"
 
   # Where should the user be redirected when visting the `/<%= options[:path] %>` url
   # config.home_path = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.28.1.pre.pr1642
+  version: 2.28.2.pre.pr1642
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord