avo 2.17.0 → 2.17.1.pre.1.zeitwerk.eager.load.dir

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1ecba413a03866498a9f2992647e7f1ab99a55b854a67ba86154fde854f7d1
-  data.tar.gz: a060cca4fd407dd9d479fa5aa5bd1c6688d6c3eaab3ca23bdfc7b338341452f6
+  metadata.gz: 8ce480a1789187841a9bcca025afdb3cfab7f153ba672409d23e7f8cefdfbfa3
+  data.tar.gz: 5737e02acb4959d6a5313dc9534ebb7a6903efeba06b1b923a9902ceaf64c2ee
 SHA512:
-  metadata.gz: 703bc0074a7db187b5d5d75e4cb9a1db908b7eb5c2381c97f668993320b499d8a4b5fee55799576f087ecd712ccfca8896a59334a5d526167a8ba74771b5fb00
-  data.tar.gz: d90939f46f227a5a3e14d7bf5ee77b621f4311121ea6fbad75f8db2fb6905b6254d6a3efe553083bd9d552e441bae43d1615f652532344e2fdb414d7fb776dbd
+  metadata.gz: 2c6dd37752b3279c05f68bd1c78751303b517339ecd06c93d35b33d1384527556e046a5680bff507f48a37f8d7a737e9687692d88623e39631d33cbe1266765f
+  data.tar.gz: b29f21327fb24141d7acb656f031decf4320e19944eb7e47d47d5d9fd6bf72148af7a46cc2ec7e0042717940b64d748ad176b0eab2e8f13145020338751c51dc

data/Gemfile

@@ -90,6 +90,7 @@ end
 group :development, :test do
   gem "awesome_print"
   gem "faker", require: false
+  gem "i18n-tasks", "~> 1.0.12"
 end
 
 group :test do
@@ -113,7 +114,7 @@ end
 gem "rubocop"
 gem "rubocop-shopify", require: false
 
-gem "zeitwerk", "~> 2.3"
+# gem "zeitwerk", "~> 2.3"
 
 gem "httparty"
 
@@ -152,3 +153,4 @@ gem 'acts-as-taggable-on', '~> 9.0'
 gem "bundler-integrity", "~> 1.0"
 
 gem 'erb-formatter'
+gem "zeitwerk", github: "fxn/zeitwerk"

data/Gemfile.lock

@@ -1,7 +1,13 @@
+GIT
+  remote: https://github.com/fxn/zeitwerk.git
+  revision: 50515063d309bf50cb1fdcffa7558ca26d124b3f
+  specs:
+    zeitwerk (2.6.1)
+
 PATH
   remote: .
   specs:
-    avo (2.17.0)
+    avo (2.17.1.pre.1.zeitwerk.eager.load.dir)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -17,8 +23,7 @@ PATH
       pundit
       rails (>= 6.0)
       turbo-rails
-      view_component (= 2.60)
-      zeitwerk
+      view_component
 
 GEM
   remote: https://rubygems.org/
@@ -119,6 +124,13 @@ GEM
     aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.18)
+    better_html (2.0.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
     bindex (0.8.1)
     bootsnap (1.13.0)
       msgpack (~> 1.2)
@@ -189,6 +201,7 @@ GEM
     groupdate (6.1.0)
       activesupport (>= 5.2)
     hashdiff (1.0.1)
+    highline (2.0.3)
     hightop (0.3.0)
       activesupport (>= 5.2)
     hotwire-livereload (1.2.2)
@@ -200,6 +213,17 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    i18n-tasks (1.0.12)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 2.2.3.0)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -249,6 +273,8 @@ GEM
     nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.8-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -289,6 +315,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
+    rails-i18n (7.0.5)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 8)
     railties (6.1.6.1)
       actionpack (= 6.1.6.1)
       activesupport (= 6.1.6.1)
@@ -350,7 +379,7 @@ GEM
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    selenium-webdriver (4.4.0)
+    selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -365,6 +394,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sixarm_ruby_unaccent (1.2.0)
+    smart_properties (1.17.0)
     spring (4.0.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -378,6 +408,8 @@ GEM
     standard (1.16.0)
       rubocop (= 1.35.0)
       rubocop-performance (= 1.14.3)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     test-prof (1.0.10)
     thor (1.2.1)
     timeout (0.3.0)
@@ -388,8 +420,9 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
-    view_component (2.60.0)
+    view_component (2.74.1)
       activesupport (>= 5.0.0, < 8.0)
+      concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -398,7 +431,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.0.0)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
@@ -412,7 +445,6 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -452,6 +484,7 @@ DEPENDENCIES
   hotwire-livereload (~> 1.1)
   htmlbeautifier
   httparty
+  i18n-tasks (~> 1.0.12)
   image_processing (~> 1.12)
   iso
   jsbundling-rails
@@ -482,7 +515,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  zeitwerk (~> 2.3)
+  zeitwerk!
 
 BUNDLED WITH
    2.3.5

data/app/components/avo/panel_component.html.erb

@@ -25,10 +25,8 @@
   <% end %>
   <% if body? %>
     <div class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:gap-4 w-full">
-      <div class="flex-1 overflow-auto <% if sidebar? %> w-2/3 <% end %>">
-        <div class="relative <%= white_panel_classes %> <%= @body_classes %>">
-          <%= body %>
-        </div>
+      <div class="relative flex-1 overflow-auto <%= white_panel_classes %> <%= @body_classes %> <% if sidebar? %> w-2/3 <% end %>">
+        <%= body %>
       </div>
       <% if sidebar? %>
         <div class="w-full sm:w-1/3 flex-shrink-0 h-full <%= white_panel_classes %>">

data/app/components/avo/panel_component.rb

@@ -5,6 +5,8 @@ class Avo::PanelComponent < ViewComponent::Base
   attr_reader :name
   attr_reader :classes
 
+  delegate :white_panel_classes, to: :helpers
+
   renders_one :tools
   renders_one :body
   renders_one :sidebar
@@ -26,10 +28,6 @@ class Avo::PanelComponent < ViewComponent::Base
 
   private
 
-  def white_panel_classes
-    "bg-white rounded shadow"
-  end
-
   def data_attributes
     @data.merge({"panel-index": @index})
   end

data/app/components/avo/tab_switcher_component.html.erb

@@ -20,7 +20,7 @@
     </div>
   </div>
 <% else %>
-  <div class="flex flex-wrap gap-2 bg-white p-2" data-target="tab-switcher" data-style="pills">
+  <div class="flex flex-wrap gap-2 p-2 <%= white_panel_classes %>" data-target="tab-switcher" data-style="pills">
     <% visible_items.each do |tab| %>
       <%= a_link tab_path(tab),
       color: selected?(tab) ? :primary : :gray,

data/app/components/avo/tab_switcher_component.rb

@@ -11,6 +11,8 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   attr_reader :view
   attr_reader :style
 
+  delegate :white_panel_classes, to: :helpers
+
   def initialize(resource:, group:, current_tab:, active_tab_name:, view:, style:)
     @active_tab_name = active_tab_name
     @resource = resource

data/app/controllers/avo/associations_controller.rb

@@ -5,6 +5,7 @@ module Avo
     before_action :set_model, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :set_related_authorization
     before_action :set_reflection_field
     before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
     before_action :set_related_model, only: [:show, :order]
@@ -152,5 +153,18 @@ module Avo
     def authorize_detach_action
       authorize_if_defined "detach_#{@field.id}?"
     end
+
+    private
+
+    def set_related_authorization
+      @authorization = if related_resource
+        t = related_resource.authorization(user: _current_user)
+        puts ["1->", t, related_resource].inspect
+        t
+      else
+        puts ["2->"].inspect
+        Services::AuthorizationService.new _current_user
+      end
+    end
   end
 end

data/app/helpers/avo/application_helper.rb

@@ -89,6 +89,10 @@ module Avo
       classes
     end
 
+    def white_panel_classes
+      "bg-white rounded shadow-md"
+    end
+
     def get_model_class(model)
       if model.instance_of?(Class)
         model

data/avo.gemspec

@@ -34,13 +34,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", ">= 6.0"
   spec.add_dependency "pagy"
-  spec.add_dependency "zeitwerk"
+  # spec.add_dependency "zeitwerk", git: "https://github.com/fxn/zeitwerk"
   spec.add_dependency "countries"
   spec.add_dependency "pundit"
   spec.add_dependency "httparty"
   spec.add_dependency "active_link_to"
   spec.add_dependency "image_processing"
-  spec.add_dependency "view_component", "2.60"
+  spec.add_dependency "view_component"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"

data/config/i18n-tasks.yml

@@ -0,0 +1,159 @@
+# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks
+
+# The "main" locale.
+base_locale: en
+## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
+locales: [en, fr, nb, nn, pt-BR, ro, tr]
+## Reporting locale, default: en. Available: en, ru.
+# internal_locale: en
+
+# Read and write translations.
+data:
+  ## Translations are read from the file system. Supported format: YAML, JSON.
+  ## Provide a custom adapter:
+  # adapter: I18n::Tasks::Data::FileSystem
+
+  # Locale files or `File.find` patterns where translations are read from:
+  read:
+    ## Default:
+    # - config/locales/%{locale}.yml
+    ## More files:
+    - lib/generators/avo/templates/locales/**/*.%{locale}.yml
+
+  # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
+  # `i18n-tasks normalize -p` will force move the keys according to these rules
+  write:
+    ## For example, write devise and simple form keys to their respective files:
+    # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
+    ## Catch-all default:
+    # - config/locales/%{locale}.yml
+
+  # External locale data (e.g. gems).
+  # This data is not considered unused and is never written to.
+  external:
+    ## Example (replace %#= with %=):
+    # - "<%#= %x[bundle info vagrant --path].chomp %>/templates/locales/%{locale}.yml"
+
+  ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
+  # router: conservative_router
+
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+
+  ## Pretty-print JSON:
+  # json:
+  #   write:
+  #     indent: '  '
+  #     space: ' '
+  #     object_nl: "\n"
+  #     array_nl: "\n"
+
+# Find translate calls
+search:
+  ## Paths or `File.find` patterns to search in:
+  # paths:
+  #  - app/
+
+  ## Root directories for relative keys resolution.
+  # relative_roots:
+  #   - app/controllers
+  #   - app/helpers
+  #   - app/mailers
+  #   - app/presenters
+  #   - app/views
+
+  ## Directories where method names which should not be part of a relative key resolution.
+  # By default, if a relative translation is used inside a method, the name of the method will be considered part of the resolved key.
+  # Directories listed here will not consider the name of the method part of the resolved key
+  #
+  # relative_exclude_method_name_paths:
+  #  -
+
+  ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
+  ##   *.jpg *.jpeg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
+  ##   *.yml *.json *.zip *.tar.gz *.swf *.flv *.mp3 *.wav *.flac *.webm *.mp4 *.ogg *.opus *.webp *.map *.xlsx
+  exclude:
+    - app/assets/images
+    - app/assets/fonts
+    - app/assets/videos
+    - app/assets/builds
+
+  ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
+  ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
+  # only: ["*.rb", "*.html.slim"]
+
+  ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.
+  # strict: true
+
+  ## Allows adding ast_matchers for finding translations using the AST-scanners
+  ## The available matchers are:
+  ## - RailsModelMatcher
+  ##     Matches ActiveRecord translations like
+  ##     User.human_attribute_name(:email) and User.model_name.human
+  ##
+  ## To implement your own, please see `I18n::Tasks::Scanners::AstMatchers::BaseMatcher`.
+  <%# I18n::Tasks.add_ast_matcher('I18n::Tasks::Scanners::AstMatchers::RailsModelMatcher') %>
+
+  ## Multiple scanners can be used. Their results are merged.
+  ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.
+  ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
+
+## Translation Services
+# translation:
+#   # Google Translate
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
+#   google_translate_api_key: "AbC-dEf5"
+#   # DeepL Pro Translate
+#   # Get an API key and subscription at https://www.deepl.com/pro to use DeepL Pro
+#   deepl_api_key: "48E92789-57A3-466A-9959-1A1A1A1A1A1A"
+#   # deepl_host: "https://api.deepl.com"
+#   # deepl_version: "v2"
+
+## Do not consider these keys missing:
+ignore_missing:
+  - 'avo.field_translations.file'
+  - 'avo.field_translations.people'
+  - 'avo.number_of_items'
+  - 'avo.resource_translations.user'
+  - 'avo.x_items_more'
+
+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+# - '{devise,simple_form}.*'
+
+## Consider these keys used:
+# ignore_unused:
+# - 'activerecord.attributes.*'
+# - '{devise,kaminari,will_paginate}.*'
+# - 'simple_form.{yes,no}'
+# - 'simple_form.{placeholders,hints,labels}.*'
+# - 'simple_form.{error_notification,required}.:'
+
+## Exclude these keys from the `i18n-tasks eq-base' report:
+# ignore_eq_base:
+#   all:
+#     - common.ok
+#   fr,es:
+#     - common.brand
+
+## Exclude these keys from the `i18n-tasks check-consistent-interpolations` report:
+# ignore_inconsistent_interpolations:
+# - 'activerecord.attributes.*'
+
+## Ignore these keys completely:
+# ignore:
+#  - kaminari.*
+
+## Sometimes, it isn't possible for i18n-tasks to match the key correctly,
+## e.g. in case of a relative key defined in a helper method.
+## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:
+#
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       only: %w(*.html.haml *.html.slim),
+#       patterns: [['= title\b', '.page_title']] %>
+#
+# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
+#
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/config/routes.rb

@@ -33,7 +33,7 @@ Avo::Engine.routes.draw do
 
     # Generate resource routes as below:
     # resources :posts
-    Avo::DynamicRouter.routes(self)
+    Avo::DynamicRouter.routes
 
     # Associations
     get "/:resource_name/:id/:related_name/new", to: "associations#new", as: "associations_new"

data/lib/avo/app.rb

@@ -17,6 +17,12 @@ module Avo
     class_attribute :error_messages
 
     class << self
+      def eager_load_resources
+        Rails.autoloaders.each do |loader|
+          loader.eager_load_dir(Rails.root.join("app", "avo", "resources").to_s)
+        end
+      end
+
       def boot
         init_fields
 

data/lib/avo/dynamic_router.rb

@@ -1,21 +1,25 @@
 module Avo
-  module DynamicRouter
-    def self.routes(router)
-      Rails.application.eager_load! unless Rails.env.production?
+  class DynamicRouter
+    def self.routes
+      Avo::Engine.routes.draw do
+        scope "resources", as: "resources" do
+          Avo::App.eager_load_resources
 
-      BaseResource.descendants
-        .select do |resource|
-          resource != :BaseResource
-        end
-        .select do |resource|
-          resource.is_a? Class
-        end
-        # .select do |resource|
-        #   resource.model_class.present?
-        # end
-        .map do |resource|
-          router.resources resource.new.route_key
+          BaseResource.descendants
+            .select do |resource|
+              resource != :BaseResource
+            end
+            .select do |resource|
+              resource.is_a? Class
+            end
+            # .select do |resource|
+            #   resource.model_class.present?
+            # end
+            .map do |resource|
+              resources resource.new.route_key
+            end
         end
+      end
     end
   end
 end

data/lib/avo/engine.rb

@@ -17,6 +17,15 @@ module Avo
       ::Avo::App.boot
     end
 
+    # initializer "eager load resources" do |app|
+    #   # puts ["app.root->", app.root.join('app', 'avo', 'resources')].inspect
+    #   app.config.to_prepare do
+    #     puts ["app.config.to_prepare->", app.root.join('app', 'avo', 'resources')].inspect
+    #     Rails.autoloaders.main.eager_load_dir(app.root.join('app', 'avo', 'resources'))
+    #     puts [".to_prepare BaseResource.descendants->", BaseResource.descendants].inspect
+    #   end
+    # end
+
     initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],

data/lib/avo/services/authorization_service.rb

@@ -49,10 +49,15 @@ module Avo
           return model if skip_authorization || user.nil?
 
           begin
-            if policy_class
-              policy_class::Scope.new(user, model).resolve
+            # Try and figure out the scope from a given policy or auto-detected one
+            scope_from_policy_class = scope_for_policy_class(policy_class)
+
+            # If we discover one use it.
+            # Else fallback to pundit.
+            if scope_from_policy_class.present?
+              scope_from_policy_class.new(user, model).resolve
             else
-              Pundit.policy_scope! user, model
+              Pundit.policy_scope!(user, model)
             end
           rescue Pundit::NotDefinedError => e
             return model unless Avo.configuration.raise_error_on_missing_policy
@@ -88,6 +93,15 @@ module Avo
             raise error
           end
         end
+
+        # Fetches the scope for a given policy
+        def scope_for_policy_class(policy_class = nil)
+          return if policy_class.blank?
+
+          if policy_class.present? && defined?(policy_class::Scope)
+            policy_class::Scope
+          end
+        end
       end
 
       def initialize(user = nil, record = nil, policy_class: nil)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.17.0" unless const_defined?(:VERSION)
+  VERSION = "2.17.1.pre.1.zeitwerk.eager.load.dir" unless const_defined?(:VERSION)
 end