avo 0.5.0.beta3 → 0.5.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01263a88047ada56ed5010750210945dd7b6c60493b6db08f5c6c0eb8588363
-  data.tar.gz: 1231108c022e42dbfcc73568ee428f16f37c8ee7fcfffec0199d907c080604b4
+  metadata.gz: 4f7f5a6a457f61e77abd2ac617061c042ead0eab1177a7d98b1ea3d3202db916
+  data.tar.gz: 0a999ae8588fea1973f91a601a00dda8c9eb6d3b4d05e34b55b39799d48659a3
 SHA512:
-  metadata.gz: 6c10735c0053dd06808dcce9b03be9b8c2025e020c05a3ae004a71e9ca6f2abcf793bf90dc84790b1097739fb9026980542078a2467036cfe605c771af834cfb
-  data.tar.gz: d7d111eb914b662998c288ee9aa399a52b27dabb57be7c1c316924b6ad8f7d31ff0e27491865c761f8d777e3cdfc15c8e9b48a910d69bf10eec8df57a4439f73
+  metadata.gz: e64e3c0d8a17c6fab1b79d58fd6eb33e6d92cfc1c71a3aacf81892225a69451901c322d4770956e42bda36ada3de82f78a8cb5ee1e80a0996b1c9f86cda14143
+  data.tar.gz: db227187abcd8fd276d9e34152b725eb7b7ab2c4312bc305f3d2a09a56a79da654b0d80f31e55b67b2871ae29375c34094b0570b41a0147520e2c8398092c7c2

data/Gemfile

@@ -15,7 +15,7 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 5.x'
+gem 'webpacker', '6.0.0.beta.5'
 
 # SVGs
 gem 'inline_svg'
@@ -73,12 +73,11 @@ gem 'debase'
 #
 
 group :development do
-  gem 'rubocop'
+  gem 'standard'
 
   # Release helper
   gem 'bump', require: false
   gem 'gem-release', require: false
-  gem 'faker', require: false
 
   # gem 'rack-mini-profiler'
   # gem 'memory_profiler'
@@ -89,6 +88,10 @@ group :development do
   # gem 'pry-rails'
 end
 
+group :development, :test do
+  gem 'faker', require: false
+end
+
 group :test do
   gem 'rspec-rails', '~> 4.0.0'
   gem 'rails-controller-testing'
@@ -97,7 +100,6 @@ group :test do
   gem 'selenium-webdriver'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
-  # gem 'faker'
   gem 'fuubar'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura'
@@ -116,10 +118,10 @@ gem 'httparty'
 
 gem 'iso'
 
-gem 'i18n-js'
-
 gem 'hotwire-rails'
 
 gem 'active_link_to'
 
 gem 'view_component', require: 'view_component/engine'
+
+gem 'addressable'

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta3)
+    avo (0.5.0.beta8)
       active_link_to
+      addressable
       countries
       hotwire-rails
       httparty
-      i18n-js
       image_processing
       inline_svg
       pagy
@@ -79,7 +79,7 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     bcrypt (3.1.16)
     bindex (0.8.1)
     bootsnap (1.4.8)
@@ -144,8 +144,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.8.0)
-      i18n (>= 0.6.6)
     i18n_data (0.10.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -172,7 +170,9 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
@@ -180,13 +180,13 @@ GEM
     msgpack (1.3.3)
     multi_xml (0.6.0)
     nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (3.10.0)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     public_suffix (4.0.6)
@@ -257,17 +257,20 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (0.92.0)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
     ruby-progressbar (1.10.1)
@@ -288,7 +291,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    semantic_range (2.3.1)
+    semantic_range (3.0.0)
     simplecov (0.19.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -306,6 +309,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    standard (1.0.4)
+      rubocop (= 1.11.0)
+      rubocop-performance (= 1.10.1)
     stimulus-rails (0.2.3)
       rails (>= 6.0.0)
     test-prof (0.12.2)
@@ -316,9 +322,9 @@ GEM
       rails (>= 6.0.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     unicode_utils (1.4.0)
-    view_component (2.24.0)
+    view_component (2.28.0)
       activesupport (>= 5.0.0, < 7.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -335,7 +341,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (5.2.1)
+    webpacker (6.0.0.beta.5)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -352,6 +358,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_link_to
+  addressable
   avo!
   bootsnap (>= 1.4.2)
   bump
@@ -368,7 +375,6 @@ DEPENDENCIES
   gem-release
   hotwire-rails
   httparty
-  i18n-js
   image_processing (~> 1.2)
   inline_svg
   iso
@@ -381,7 +387,6 @@ DEPENDENCIES
   rails (~> 6.0.2, >= 6.0.2.2)
   rails-controller-testing
   rspec-rails (~> 4.0.0)
-  rubocop
   ruby-debug-ide
   sass-rails (>= 6)
   selenium-webdriver
@@ -389,13 +394,14 @@ DEPENDENCIES
   simplecov-cobertura
   spring
   spring-commands-rspec
+  standard
   test-prof
   tzinfo-data
   view_component
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  webpacker (~> 5.x)
+  webpacker (= 6.0.0.beta.5)
   zeitwerk (~> 2.3)
 
 BUNDLED WITH

data/app/components/avo/common/badge_viewer_component.html.erb

@@ -17,7 +17,7 @@
     end
   end
 
-  classes = 'whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold text-black block text-center truncate '
+  classes = 'whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold block text-center truncate '
 
   classes += "#{backgrounds[background]} text-white" if backgrounds[background].present?
 %>

data/app/components/avo/common/gravatar_viewer_component.html.erb

@@ -6,7 +6,7 @@
   options[:default] = @default if @default.present?
   options[:size] = @size if @size.present?
   query = options.map { |key, value| "#{key}=#{value}" }.join('&')
-  url = URI::HTTP.build(host: "www.gravatar.com", path: "/avatar/#{@md5}", query: query)
+  url = URI::HTTPS.build(host: "www.gravatar.com", path: "/avatar/#{@md5}", query: query)
   classes = @rounded ? 'min-w-10 rounded-full' : 'min-w-10'
 %>
-<%= link_to_if @link_to_resource.present?, image_tag(url.to_s, class: classes), @link %>
+<%= link_to_if @link_to_resource.present?, image_tag(url.to_s, class: classes), @link, title: @title %>

data/app/components/avo/common/gravatar_viewer_component.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 class Avo::Common::GravatarViewerComponent < ViewComponent::Base
-  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_resource: false)
+  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_resource: false, title: nil)
     @md5 = md5
     @link = link
     @default = default
     @size = size
     @rounded = rounded
     @link_to_resource = link_to_resource
+    @title = title
   end
 end

data/app/components/avo/edit/fields/trix_field_component.html.erb

@@ -1,6 +1,6 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
   <% trix_id = "trix_#{@resource.name.underscore}_#{@field.id}" %>
-  <trix-editor input="<%= trix_id %>"></trix-editor>
+  <trix-editor input="<%= trix_id %>" value="<%= @field.id %>" placeholder="<%= @field.placeholder %>"></trix-editor>
   <%= @form.text_area @field.id,
     id: trix_id,
     class: helpers.input_classes('w-full hidden', has_error: (@resource.model.present? and @resource.model.errors.include?(@field.id))),

data/app/components/avo/index/field_wrapper_component.html.erb

@@ -1,4 +1,4 @@
-<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>">
+<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>

data/app/components/avo/index/fields/belongs_to_field_component.html.erb

@@ -1,7 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <% if @field.value.present? %>
-    <%= link_to @field.label, helpers.resource_path(@field.value) %>
-  <% else %>
-    –
-  <% end %>
+  <%= link_to @field.label, helpers.resource_path(@field.value) %>
 <% end %>

data/app/components/avo/index/fields/boolean_group_field_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, dash_if_blank: false do %>
   <%= render Avo::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/index/fields/gravatar_field_component.html.erb

@@ -5,7 +5,8 @@
     size: @field.size,
     rounded: @field.rounded,
     link_to_resource: @field.link_to_resource,
-    link: helpers.resource_path(@resource.model)
+    link: helpers.resource_path(@resource.model),
+    title: t('avo.view_item', { item: @resource.name}).humanize
   )
   %>
 <% end %>

data/app/components/avo/index/fields/has_one_field_component.html.erb

@@ -1,7 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <% if @field.value.present? %>
-    <%= link_to @field.label, helpers.resource_path(@field.value) %>
-  <% else %>
-    –
-  <% end %>
+  <%= link_to @field.label, helpers.resource_path(@field.value) %>
 <% end %>

data/app/components/avo/index/fields/id_field_component.html.erb

@@ -6,5 +6,5 @@
       path = helpers.resource_path(@resource.model)
     end
   %>
-  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, path %>
+  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, path, title: t('avo.view_item', { item: @resource.name}).humanize %>
 <% end %>

data/app/components/avo/index/grid_item_component.html.erb

@@ -4,19 +4,19 @@
   <div class="relative w-full pb-3/4 rounded-t-xl overflow-hidden">
     <%== item_selector_input floating: true, size: :lg %>
 
-    <% if preview.respond_to? :to_image %>
-        <%= link_to_if preview.link_to_resource, image_tag(preview.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
-    <% elsif preview.type == 'file_field' %>
-      <% if preview.value.attached? && preview.value.representable? %>
-        <%= link_to_if preview.link_to_resource, image_tag(preview.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+    <% if cover.respond_to? :to_image %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+    <% elsif cover.type == 'file' %>
+      <% if cover.value.attached? && cover.value.representable? %>
+        <%= link_to_if cover.link_to_resource, image_tag(cover.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <div class="absolute bg-gray-100 w-full h-full">
           <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
         </div>
       <% end %>
     <% else %>
-      <% if preview.value.present? %>
-        <%= link_to_if preview.link_to_resource, image_tag(preview.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+      <% if cover.value.present? %>
+        <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <div class="absolute bg-gray-100 w-full h-full">
           <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
@@ -27,7 +27,7 @@
   <div class="grid grid-cols-1 place-content-between p-4 h-full">
     <div class="mb-4">
       <div class="grid font-semibold leading-tight text-lg mb-2">
-        <%= link_to_if preview.link_to_resource, title.value, helpers.resource_path(@resource.model) if title.present? %>
+        <%= link_to_if title.link_to_resource, title.value, helpers.resource_path(@resource.model) if title.present? %>
       </div>
       <div class="text-sm break-words">
         <%= body.value if body.present? %>

data/app/components/avo/index/grid_item_component.rb

@@ -3,29 +3,23 @@
 class Avo::Index::GridItemComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
-  def initialize(resource: resource, reflection: reflection, parent_model: nil)
+  def initialize(resource: nil, reflection: nil, parent_model: nil)
     @resource = resource
     @reflection = reflection
-    @grid_fields = resource.get_fields(view_type: :grid)
+    @grid_fields = resource.get_grid_fields
     @parent_model = parent_model
   end
 
   private
-    def preview
-      @grid_fields.detect do |field|
-        field.grid_position == :preview
-      end
+    def cover
+      @grid_fields.cover_field
     end
 
     def title
-      @grid_fields.detect do |field|
-        field.grid_position == :title
-      end
+      @grid_fields.title_field
     end
 
     def body
-      @grid_fields.detect do |field|
-        field.grid_position == :body
-      end
+      @grid_fields.body_field
     end
 end

data/app/components/avo/index/resource_controls_component.html.erb

@@ -23,7 +23,9 @@
   <% end %>
 
   <% if can_detach? %>
-    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {'data-turbo-frame': params[:turbo_frame]} do |form| %>
+    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {
+        'data-turbo-frame': params[:turbo_frame]
+      } do |form| %>
       <%= form.button helpers.svg('trash-sm', class: 'text-gray-400 h-6 hover:text-gray-600'),
         title: t('avo.detach_item', { item: @resource.model.model_name.name.downcase }).capitalize,
         type: :submit,
@@ -34,12 +36,16 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:via_resource_class] %>
+      <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%#= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:via_resource_class] %>
     <% end %>
   <% end %>
 
   <% if can_delete? %>
-    <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: {'data-turbo-frame': params[:turbo_frame]} do |form| %>
+    <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: {
+        'data-turbo-frame': params[:turbo_frame]
+      } do |form| %>
       <%= form.button helpers.svg('trash', class: 'text-gray-400 h-6 hover:text-gray-600'),
         title: t('avo.delete_item', { item: @resource.model.model_name.name.downcase }).capitalize,
         type: :submit,
@@ -50,7 +56,9 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= form.hidden_field :referrer, value: request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:via_resource_class] %>
+      <%= form.hidden_field :view_type, value: params[:view_type], id: "turbo_view_type_#{@resource.model.id}" if params[:view_type] %>
+      <%= form.hidden_field :turbo_frame, value: params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= form.hidden_field :referrer, value: request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
     <% end %>
   <% end %>
 </div>

data/app/components/avo/index/resource_grid_component.html.erb

@@ -1,7 +1,7 @@
 <% if @resources.present?%>
   <div class="w-full grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 2xl:grid-cols-6 gap-6">
     <% @resources.each_with_index do |resource, index| %>
-      <% cache_if Avo.configuration.cache_resources_on_index_view, [resource.model, resource.file_hash] do %>
+      <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model) do %>
         <%= render(Avo::Index::GridItemComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model)) %>
       <% end %>
     <% end %>