avo 0.5.0.beta12 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47c1f451d81d649f0caefd5c6517597c9d3029f645a19783092bf1ae4fa0e1b
-  data.tar.gz: 31be2cf78a17de4422fe4c2e8a83aa946b4f840bc8023cbfae20fe1358801636
+  metadata.gz: 9fdcf5553b07360ef48d362721aabb8ee87e9e1d4289e30a8f141851445ebde3
+  data.tar.gz: c3121bdfbbeeeca0f06d059824ed9d6405dfca16f71b443433e697dea7a8d5ff
 SHA512:
-  metadata.gz: 1e975d6483acc1ff9018e210c36b9f3dd261b46ad9bbb179cb71d57cd020c6e4f1967d6426420e5a3c5b0a2362ad0adeefbc0f7f6b3b7f54af588ee89d7af65c
-  data.tar.gz: 3ea9bdcdf90dc29a6eea0af11b9399c133989321af8a0ebcd19fb66e715f4236400ad3c4835b3b301369045e2b753374fd78f9ca375299c985d191b755511cbe
+  metadata.gz: 8bcd1bea917df6700908215c57766c1c071ce1398e75681cdaef9f751feefbe3941fba5539ff4d52bdacd964993dd2579d1d63920cf8a6dbee4f9ffeb28fbab8
+  data.tar.gz: 1d3ee22e3f143294bc477b7a8c0e0070f63f5846a707272bd14d71cbad5722c3f3c3e24b917b8564e3585ad684a1aed702ba687d88463d2908c351d1731cf99b

data/Gemfile

@@ -17,9 +17,6 @@ gemspec
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
 gem "webpacker", "6.0.0.beta.6"
 
-# SVGs
-gem "inline_svg"
-
 gem "countries"
 
 # Authorization
@@ -55,7 +52,7 @@ gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
 gem "dotenv-rails"
 # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
 gem "web-console", ">= 3.3.0"
-gem "listen", ">= 3.0.5", "< 3.2"
+gem "listen", ">= 3.3.0"
 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 gem "spring"
 
@@ -67,7 +64,6 @@ gem "devise"
 gem "database_cleaner"
 
 gem "ruby-debug-ide", require: false
-gem "debase"
 #
 # END Dependencies for dummy_app
 #

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta12)
+    avo (1.0.1)
       active_link_to
       addressable
       countries
       hotwire-rails
       httparty
       image_processing
-      inline_svg
       pagy
       pundit
       rails (>= 6.0)
@@ -104,9 +103,6 @@ GEM
     crack (0.4.4)
     crass (1.0.6)
     database_cleaner (1.8.5)
-    debase (0.2.4.1)
-      debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.11)
     devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -148,17 +144,13 @@ GEM
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    inline_svg (1.7.2)
-      activesupport (>= 3.0)
-      nokogiri (>= 1.6)
     iso (0.3.0)
       i18n
     jbuilder (2.10.1)
       activesupport (>= 5.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.5.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -276,7 +268,6 @@ GEM
     ruby-progressbar (1.10.1)
     ruby-vips (2.0.17)
       ffi (~> 1.9)
-    ruby_dep (1.5.0)
     rubyzip (2.3.0)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -366,7 +357,6 @@ DEPENDENCIES
   capybara (>= 2.15)
   countries
   database_cleaner
-  debase
   devise
   dotenv-rails
   factory_bot_rails
@@ -376,10 +366,9 @@ DEPENDENCIES
   hotwire-rails
   httparty
   image_processing (~> 1.2)
-  inline_svg
   iso
   jbuilder (~> 2.7)
-  listen (>= 3.0.5, < 3.2)
+  listen (>= 3.3.0)
   pagy
   pg (>= 0.18, < 2.0)
   puma (~> 4.3.5)
@@ -405,4 +394,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.5
+   2.2.15

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

@@ -19,7 +19,7 @@
       <% end %>
       <%= a_link "/avo/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
       }/active_storage_attachments/#{@id}/#{@file.id}", color: :red, variant: :outlined, size: :xs, class: 'text-center', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
-        <%= helpers.svg 'trash' %> <span class="hidden lg:block lg:flex-1"><%= t('avo.delete_file', { item: @file.filename }) %></span>
+        <%= helpers.svg 'trash' %> <span class="hidden lg:block lg:flex-1"><%= t 'avo.delete_file', item: @file.filename %></span>
       <% end %>
     </div>
   <% end %>

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

@@ -19,7 +19,7 @@
       <% end %>
       <%= a_link "/avo/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
       }/active_storage_attachments/#{@id}/#{@file.id}", color: :red, variant: :outlined, size: :md, class: '', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
-        <%= helpers.svg 'trash' %> <%= t('avo.delete_file', { item: @file.filename }) %>
+        <%= helpers.svg 'trash' %> <%= t 'avo.delete_file', item: @file.filename %>
       <% end %>
     </div>
   <% else %>

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

@@ -6,7 +6,7 @@
     rounded: @field.rounded,
     link_to_resource: @field.link_to_resource,
     link: helpers.resource_path(@resource.model),
-    title: t('avo.view_item', { item: @resource.name}).humanize
+    title: t('avo.view_item', item: @resource.name).humanize
   )
   %>
 <% 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, title: t('avo.view_item', { item: @resource.name}).humanize %>
+  <% 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/resource_controls_component.html.erb

@@ -2,7 +2,7 @@
   <% if can_view? %>
     <%= link_to helpers.svg('eye', class: 'text-gray-400 h-6 hover:text-gray-600'),
       show_path,
-      title: t('avo.view_item', { item: @resource.model.model_name.name.downcase }).capitalize,
+      title: t('avo.view_item',  item: @resource.model.model_name.name.downcase ).capitalize,
       data: {
         control: :show,
         'tippy': 'tooltip',
@@ -13,7 +13,7 @@
   <% if can_edit? %>
     <%= link_to helpers.svg('edit', class: 'text-gray-400 h-6 hover:text-gray-600'),
       edit_path,
-      title: t('avo.edit_item', { item: @resource.model.model_name.name.downcase }).capitalize,
+      title: t('avo.edit_item', item: @resource.model.model_name.name.downcase ).capitalize,
       data: {
         control: :edit,
         'resource-id': @resource.model.id,
@@ -27,10 +27,10 @@
         '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,
+        title: t('avo.detach_item', item: @resource.model.model_name.name.downcase).capitalize,
         type: :submit,
         data: {
-          confirm: t('avo.are_you_sure_detach_item', { item: @resource.model.model_name.name.downcase }),
+          confirm: t('avo.are_you_sure_detach_item', item: @resource.model.model_name.name.downcase),
           control: :detach,
           'resource-id': @resource.model.id,
           'tippy': 'tooltip',
@@ -47,10 +47,10 @@
         '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,
+        title: t('avo.delete_item',  item: @resource.model.model_name.name.downcase ).capitalize,
         type: :submit,
         data: {
-          confirm: t('avo.are_you_sure', { item: @resource.model.model_name.name.downcase }),
+          confirm: t('avo.are_you_sure',  item: @resource.model.model_name.name.downcase ),
           control: :destroy,
           'resource-id': @resource.model.id,
           'tippy': 'tooltip',

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

@@ -6,7 +6,7 @@
   <%= panel(title: @field.id.capitalize) do |c| %>
     <% c.with :tools do %>
       <%= a_link helpers.resource_attach_path(@resource.model.model_name.route_key, @resource.model.id, @field.id), color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
-        <%= svg 'view-grid-add' %> <%= t('avo.attach_item', { item: @field.id }).capitalize %>
+        <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: @field.id).capitalize %>
       <% end %>
     <% end %>
 

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

@@ -4,19 +4,19 @@
 
     <% if can_create? %>
       <%= a_link create_path do %>
-        <%= svg 'plus' %> <%= t('avo.create_new_item', { item: @resource.model_class.model_name.human.downcase }) %>
+        <%= svg 'plus' %> <%= t('avo.create_new_item', item: @resource.model_class.model_name.human.downcase ) %>
       <% end %>
     <% end %>
 
     <% if can_detach? %>
       <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@resource.singular_name}." } do %>
-        <%= svg 'trash' %> <%= t('avo.detach_item', { item: @resource.singular_name }).capitalize %>
+        <%= svg 'trash' %> <%= t('avo.detach_item', item: @resource.singular_name).capitalize %>
       <% end %>
     <% end %>
 
     <% if can_attach? %>
       <%= a_link attach_path, color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
-        <%= svg 'view-grid-add' %> <%= t('avo.attach_item', { item: @resource.singular_name }).capitalize %>
+        <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: @resource.singular_name).capitalize %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -10,7 +10,7 @@
 
           <% if @reflection.present? && @resource.model.present? %>
             <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@resource.singular_name}." } do %>
-              <%= svg 'trash' %> <%= t('avo.detach_item', { item: @resource.singular_name }).capitalize %>
+              <%= svg 'trash' %> <%= t('avo.detach_item', item: @resource.singular_name).capitalize %>
             <% end %>
           <% else %>
             <%= a_link back_path do %>
@@ -19,12 +19,12 @@
 
             <% if @resource.authorization.authorize_action(:destroy, raise_exception: false) %>
               <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: { 'data-turbo-frame': params[:turbo_frame] } do |form| %>
-                <%= a_button title: t('avo.delete_item', { item: @resource.model.model_name.name.downcase }).capitalize,
+                <%= a_button title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,
                   color: 'red',
                   variant: 'outlined',
                   type: :submit,
                   data: {
-                    confirm: t('avo.are_you_sure', { item: @resource.model.model_name.name.downcase }),
+                    confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
                     control: :destroy,
                     'resource-id': @resource.model.id,
                     'tippy': 'tooltip',

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

@@ -1,7 +1,7 @@
 <%
   classes = 'absolute inset-auto left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2'
   translation_tag = params[:related_name].present? ? 'avo.no_related_item_found' : 'avo.no_item_found'
-  label = t translation_tag, { item: resource_name }
+  label = t translation_tag, item: resource_name
 %>
 <div class="relative flex-1 py-12">
   <div class="relative block text-gray-300 h-64 w-full">

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

@@ -11,7 +11,7 @@
       translation_key = 'avo.table_view'
     end
 %>
-  <%= a_link params.permit!.merge(view_type: new_view_type), color: :blue, 'data-turbo-frame': turbo_frame, title: t('avo.switch_to_view', { view_type: new_view_type }), 'data-tippy': 'tooltip' do %>
-    <%= svg new_icon %> <%= t(translation_key, { item: @resource.model_class.model_name.human.downcase }) %>
+  <%= a_link params.permit!.merge(view_type: new_view_type), color: :blue, 'data-turbo-frame': turbo_frame, title: t('avo.switch_to_view', view_type: new_view_type), 'data-tippy': 'tooltip' do %>
+    <%= svg new_icon %> <%= t translation_key, item: @resource.model_class.model_name.human.downcase %>
   <% end %>
 <% end %>

data/app/views/avo/relations/new.html.erb

@@ -6,7 +6,7 @@
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
       <% c.with :heading do %>
-        <%= t('avo.choose_item', { item: params[:related_name].downcase }) %>
+        <%= t 'avo.choose_item', item: params[:related_name].downcase %>
       <% end %>
 
       <div class="flex-1 flex items-center justify-center px-8 text-lg mt-8 mb-12">

data/avo.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails", ">= 6.0"
   spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk"
-  spec.add_dependency "inline_svg"
   spec.add_dependency "webpacker"
   spec.add_dependency "countries"
   spec.add_dependency "pundit"

data/config/webpacker.yml

@@ -5,29 +5,50 @@ default: &default
   source_entry_path: entrypoints
   public_root_path: public
   cache_path: tmp/cache/webpacker
-  check_yarn_integrity: false
   # use a different sub-folder name
   public_output_path: avo-packs
   webpack_compile_output: true
-  extract_css: true
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  additional_paths_paths: []
+  additional_paths: []
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-# We override the development env. when packed.
-# Avo needs to be packed and compiled for when the dev uses it in his development env.
 development:
   <<: *default
-
-  # Production depends on precompilation of packs prior to booting for performance.
   compile: true
 
-  # Cache manifest.json for performance
-  cache_manifest: true
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3039
+    public: localhost:3039
+    # Inject browserside javascript that required by both HMR and Live(full) reload
+    inject_client: true
+    # Hot Module Replacement updates modules while the application is running without a full reload
+    hmr: true
+    # Inline should be set to true if using HMR; it inserts a script to take care of live reloading
+    inline: true
+    # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
+    overlay: true
+    # Should we use gzip compression?
+    compress: true
+    # Note that apps that do not check the host are vulnerable to DNS rebinding attacks
+    disable_host_check: true
+    # This option lets the browser open with your local IP
+    use_local_ip: false
+    # When enabled, nothing except the initial startup information will be written to the console.
+    # This also means that errors or warnings from webpack are not visible.
+    quiet: false
+    pretty: true
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: '**/node_modules/**'
+    env_prefix: "AVO_WEBPACKER_DEV_SERVER"
 
 test:
   <<: *default

data/config/webpacker_packed.yml

@@ -0,0 +1,79 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/packs
+  source_entry_path: entrypoints
+  public_root_path: public
+  cache_path: tmp/cache/webpacker
+  check_yarn_integrity: false
+  # use a different sub-folder name
+  public_output_path: avo-packs
+  webpack_compile_output: true
+  extract_css: true
+
+  # Additional paths webpack should lookup modules
+  # ['app/assets', 'engine/foo/app/assets']
+  additional_paths_paths: []
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+# We override the development env. when packed.
+# Avo needs to be packed and compiled for when the dev uses it in his development env.
+development:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: true
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+  # Even though Avo does not use the dev_server when packed we still need to add the info here.
+  # The packed version of Avo will pick up the parent's app information.
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3039
+    public: localhost:3039
+    # Inject browserside javascript that required by both HMR and Live(full) reload
+    inject_client: true
+    # Hot Module Replacement updates modules while the application is running without a full reload
+    hmr: true
+    # Inline should be set to true if using HMR; it inserts a script to take care of live reloading
+    inline: true
+    # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
+    overlay: true
+    # Should we use gzip compression?
+    compress: true
+    # Note that apps that do not check the host are vulnerable to DNS rebinding attacks
+    disable_host_check: true
+    # This option lets the browser open with your local IP
+    use_local_ip: false
+    # When enabled, nothing except the initial startup information will be written to the console.
+    # This also means that errors or warnings from webpack are not visible.
+    quiet: false
+    pretty: true
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: '**/node_modules/**'
+    env_prefix: "AVO_WEBPACKER_DEV_SERVER"
+
+test:
+  <<: *default
+  compile: true
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+  public_root_path: spec/dummy/public
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true

data/lib/avo/base_resource.rb

@@ -222,7 +222,7 @@ module Avo
       params.each do |key, value|
         field = fields_by_database_id[key]
 
-        next unless field
+        next unless field.present?
 
         model = field.fill_field model, key, value
       end
@@ -238,7 +238,7 @@ module Avo
       content_to_be_hashed = ""
 
       # resource file hash
-      resource_path = Rails.root.join("app", "avo", "resources", "#{self.class.name.underscore}_resource.rb").to_s
+      resource_path = Rails.root.join("app", "avo", "resources", "#{self.class.name.underscore}.rb").to_s
       if File.file? resource_path
         content_to_be_hashed += File.read(resource_path)
       end