avo 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b24b80baf28fe7848e431079b17b9384ad5f4369e65a4c81bce9f1af68776d1f
-  data.tar.gz: '08b79a4f7fe3c462937099421fc4d90c5b02ce54a6903eaa5cf5b525e56d9f8e'
+  metadata.gz: 9bcdaff03547e43800f1385ad2d3d328aa3017d453652e34b71e8b6ace66ed25
+  data.tar.gz: 811b6c854c53e4e04cfa91d4b0e8dc3881e8dc7f37578844f4f75db256d6be2d
 SHA512:
-  metadata.gz: 71eaebcef5037f4ad99a49c8da1231c40e9aee6279cffc7083ba9f4f16ef344ccfeac970bbbe5358dc576703cb1196180338c18b0b788c1c50ab5c22f09ddc8a
-  data.tar.gz: c5b562841cc86aa1063e393b59a5145018808dbdb524e8e5e5c0e38b99a32893f9349b2cd286c2cded8c237379b6f065bc1b42d669bc01799d58d7aeaeeeb4b3
+  metadata.gz: 550010a6c01e74234df0c8d379b56f3f7412ee654a8941e137eafc91ea6dac0b6c6430c597a6e2d4554fc5045501e6a5f026e856ec85a4e93379db5a895554f2
+  data.tar.gz: 284d0e648c29f6c4acbaccbccd24e915684e629278243f3bbed95f305a93b7b8ef9853c10ebddcd21af8cf9f00416c7a895bae466af7329aa6ff3d03a128d848

data/Gemfile

@@ -75,6 +75,7 @@ group :development do
   gem "rubocop"
   gem "ripper-tags"
   gem "rubocop-shopify", require: false
+  gem "rubycritic", require: false
 end
 
 group :test do
@@ -152,7 +153,7 @@ gem "activestorage"
 # Required by Avo
 gem "sprockets-rails"
 
-# Avo file filed requires this gem
+# Avo file field requires this gem
 # Use Active Storage variant
 gem "image_processing", "~> 1.12"
 
@@ -164,3 +165,8 @@ gem "prefixed_ids"
 gem "mapkick-rb", "~> 0.1.4"
 
 gem "pluggy", path: "./pluggy"
+
+# Avo money field
+# gem "avo-money_field", path: "./../avo-money_field"
+gem "money-rails", "~> 1.12"
+gem "avo-money_field"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.6.0)
+    avo (3.6.1)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -119,6 +119,8 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    avo-money_field (0.0.4)
+      money-rails (~> 1.12)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
     aws-partitions (1.888.0)
@@ -136,6 +138,10 @@ GEM
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     backport (1.2.0)
     base64 (0.2.0)
     bcrypt (3.1.20)
@@ -147,7 +153,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
@@ -165,6 +171,8 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     chartkick (5.0.5)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     countries (5.7.1)
@@ -183,6 +191,8 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -195,9 +205,34 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
     dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.3)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
     e2mmap (0.1.0)
     erb-formatter (0.7.1)
       syntax_tree (~> 6.0)
@@ -215,6 +250,15 @@ GEM
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
     ffi (1.16.3)
+    flay (2.13.2)
+      erubi (~> 1.10)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    flog (4.8.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.1, > 3.1.0)
+      sexp_processor (~> 4.8)
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     fuubar (2.5.1)
@@ -238,7 +282,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.13)
       activesupport (>= 4.0.2)
@@ -251,6 +295,7 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
+    ice_nine (0.11.2)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -258,7 +303,7 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.11.2)
+    irb (1.12.0)
       rdoc
       reline (>= 0.4.2)
     iso (0.4.0)
@@ -296,7 +341,16 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
+    monetize (1.13.0)
+      money (~> 6.12)
+    money (6.19.0)
+      i18n (>= 0.6.4, <= 2)
+    money-rails (1.15.0)
+      activesupport (>= 3.0)
+      monetize (~> 1.9)
+      money (~> 6.13)
+      railties (>= 3.0)
     msgpack (1.7.2)
     multi_xml (0.6.0)
     mutex_m (0.2.0)
@@ -310,10 +364,10 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (7.0.6)
@@ -321,6 +375,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
+    path_expander (1.1.1)
     pg (1.5.4)
     prefixed_ids (1.6.1)
       hashids (>= 1.0.0, < 2.0.0)
@@ -332,7 +387,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (3.0.9.1)
+    rack (3.0.10)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -377,7 +432,7 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     ransack (4.1.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
@@ -392,8 +447,13 @@ GEM
       redis-client (>= 0.17.0)
     redis-client (0.19.1)
       connection_pool
+    reek (6.3.0)
+      dry-schema (~> 1.13.0)
+      parser (~> 3.3.0)
+      rainbow (>= 2.0, < 4.0)
+      rexml (~> 3.1)
     regexp_parser (2.9.0)
-    reline (0.4.3)
+    reline (0.5.1)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -442,7 +502,22 @@ GEM
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.0)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
+    ruby_parser (3.21.0)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
+    rubycritic (4.9.0)
+      flay (~> 2.13)
+      flog (~> 4.7)
+      launchy (>= 2.5.2)
+      parser (>= 3.2.2.1)
+      rainbow (~> 3.1.1)
+      reek (~> 6.0, < 7.0)
+      rexml
+      ruby_parser (~> 3.20)
+      simplecov (>= 0.22.0)
+      tty-which (~> 0.5.0)
+      virtus (~> 2.0)
+    sexp_processor (4.17.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -501,9 +576,11 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     test-prof (1.3.1)
-    thor (1.3.0)
+    thor (1.3.1)
+    thread_safe (0.3.6)
     tilt (2.3.0)
     timeout (0.4.1)
+    tty-which (0.5.0)
     turbo-rails (2.0.1)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -518,6 +595,10 @@ GEM
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
+    virtus (2.0.0)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.1)
@@ -552,6 +633,7 @@ DEPENDENCIES
   annotate
   appraisal
   avo!
+  avo-money_field
   awesome_print
   aws-sdk-s3
   bootsnap (>= 1.4.2)
@@ -585,6 +667,7 @@ DEPENDENCIES
   listen (>= 3.5.1)
   mapkick-rb (~> 0.1.4)
   meta-tags
+  money-rails (~> 1.12)
   net-smtp
   pg (>= 0.18, < 2.0)
   pluggy!
@@ -599,6 +682,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rubocop
   rubocop-shopify
+  rubycritic
   simplecov
   simplecov-cobertura
   simplecov-lcov

data/app/assets/builds/avo.base.css

@@ -8222,6 +8222,10 @@ tag.tagify__tag{
   border-top-width:0px
 }
 
+.border-solid{
+  border-style:solid
+}
+
 .border-dashed{
   border-style:dashed
 }

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

@@ -1,31 +1,33 @@
 <%= content_tag :div, data: data_attributes, class: classes do %>
   <% if render_header? %>
-    <div data-target="panel-header" class="flex-1 flex flex-col xl:flex-row justify-between mb-4">
-      <div class="overflow-hidden flex flex-col">
-        <% if display_breadcrumbs? %>
-          <div class="breadcrumbs truncate mb-2">
-            <%= helpers.render_avo_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
-          </div>
-        <% end %>
-        <div class="text-2xl tracking-normal font-semibold text-gray-800 truncate items-center flex flex-1" data-target="title">
-          <span><%= @name %></span>
-          <% if @reloadable %>
-            <%= button_tag data: { controller: "panel-refresh", action: "click->panel-refresh#refresh" } do %>
-              <%= svg "heroicons/outline/arrow-path", class: "ml-2 text-2xl h-6 " %>
+    <div data-target="panel-header" class="mb-4">
+      <% if display_breadcrumbs? %>
+        <div class="breadcrumbs mb-2">
+          <%= helpers.render_avo_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
+        </div>
+      <% end %>
+      <div class="flex-1 flex flex-col xl:flex-row justify-between gap-1">
+        <div class="overflow-hidden flex flex-col">
+          <div class="text-2xl tracking-normal font-semibold text-gray-800 items-center flex flex-1" data-target="title">
+            <span><%= @name %></span>
+            <% if @reloadable %>
+              <%= button_tag data: { controller: "panel-refresh", action: "click->panel-refresh#refresh" } do %>
+                <%= svg "heroicons/outline/arrow-path", class: "ml-2 text-2xl h-6 " %>
+              <% end %>
             <% end %>
+          </div>
+          <% if description.present? %>
+            <div class="text-sm tracking-normal font-medium text-gray-600" data-target="description">
+              <%== description %>
+            </div>
           <% end %>
         </div>
-        <% if description.present? %>
-          <div class="text-sm tracking-normal font-medium text-gray-600" data-target="description">
-            <%== description %>
+        <% if tools.present? %>
+          <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end gap-2 mt-4 xl:mt-0" data-target="panel-tools">
+            <%= tools %>
           </div>
         <% end %>
       </div>
-      <% if tools.present? %>
-        <div class="flex-1 w-full flex flex-wrap flex-col sm:flex-row xl:justify-end sm:items-end gap-2 mt-4 xl:mt-0" data-target="panel-tools">
-          <%= tools %>
-        </div>
-      <% end %>
     </div>
   <% end %>
   <% if body? %>

data/lib/avo/concerns/has_items.rb

@@ -274,7 +274,7 @@ module Avo
               item.is_heading? ||
               item.is_a?(Avo::Fields::LocationField)
 
-            item.resource.record.respond_to?("#{item.id}=")
+            item.resource.record.respond_to?(:"#{item.id}=")
           end
           .select do |item|
             # Check if the user is authorized to view it.

data/lib/avo/fields/base_field.rb

@@ -267,10 +267,10 @@ module Avo
 
       # Used by Avo to fill the record with the default value on :new and :edit views
       def assign_value(record:, value:)
-        id = type == "belongs_to" ? foreign_key : database_id
+        id = (type == "belongs_to") ? foreign_key : database_id
 
         if record.send(id).nil?
-          record.send("#{id}=", value)
+          record.send(:"#{id}=", value)
         end
       end
 

data/lib/avo/fields/concerns/use_view_components.rb

@@ -29,7 +29,7 @@ module Avo
             view: view
           ).handle
 
-          component_class = custom_components.dig("#{view}_component".to_sym) || "#{view_component_namespace}::#{view.to_s.camelize}Component"
+          component_class = custom_components.dig(:"#{view}_component") || "#{view_component_namespace}::#{view.to_s.camelize}Component"
           component_class.to_s.constantize
         rescue
           unless Rails.env.test?

data/lib/avo/fields/field_manager.rb

@@ -44,12 +44,20 @@ module Avo
         end
       end
 
-      def load_field(method_name, klass)
+      def load_field(name, klass)
+        return if field_exists?(name)
+
         fields.push(
-          name: method_name.to_s,
+          name: name.to_s,
           class: klass
         )
       end
+
+      private
+
+      def field_exists?(name)
+        fields.pluck(:name).map(&:to_sym).include?(name.to_sym)
+      end
     end
   end
 end

data/lib/avo/fields/has_base_field.rb

@@ -83,7 +83,7 @@ module Avo
       def component_for_view(view = Avo::ViewInquirer.new("index"))
         view = Avo::ViewInquirer.new("show") if view.in? %w[new create update edit]
 
-        super view
+        super(view)
       end
 
       def authorized?

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.6.0" unless const_defined?(:VERSION)
+  VERSION = "3.6.1" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-09 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord