avo 1.25.0 → 1.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371a5db5091d8aad3fd0109c8640a06b10ee5cb61d9b16c5a98d25e566b54787
-  data.tar.gz: 8c15d927349aed0e15ccda76f656883e51ca8c3d33ba703c2646ff7a59695a1a
+  metadata.gz: fbaf39a3e7e7d5bd9ed2e5fc7f61cdacf70387c5f943c8ccc4405378c67dd6a7
+  data.tar.gz: 97359bfa2572ad00f84b3cf21582406eaa0bf3205a61ef503f02d4a15e234c39
 SHA512:
-  metadata.gz: ab631914363eb8bd77a5f1053d9c568d6e36f2cdd8c05a84845e4726e3d069394afc1be9778dcc3ad051a91839cb1ef050b12711e165cf8140014cb844096c8c
-  data.tar.gz: 8cbbe3db1bd3e0b77b548706eb696f0ee0bb455cdb2d5ccab6047e4747a0eeae9eff167456bd214ab392825b6c356d061be07c15c7732ef213bc4fa64753c3df
+  metadata.gz: 9aa49a22c165ca4ec0638603e1fdda8649ca612b99e847fa015e20edf81b64527d408e47e2af19d0cac3b8fb5389e5608423305334090918c2cb6ff382d37634
+  data.tar.gz: c79b94df66a4910bddd53d7fa2a3a4c2a904919e4781a30e82053b8ff65559b48eef0d778f561ac11c845f461bf544d205c193168d7b890365490518f419788b

data/Gemfile

@@ -39,7 +39,7 @@ gem "puma", "~> 5.6.2"
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use Active Storage variant
-gem "image_processing", "~> 1.12"
+gem "image_processing", "~> 1.2"
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.25.0)
+    avo (1.25.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -187,7 +187,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
-    image_processing (1.12.2)
+    image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-wait (0.2.1)
@@ -370,7 +370,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    view_component (2.49.1)
+    view_component (2.48.0)
       activesupport (>= 5.0.0, < 8.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -425,7 +425,7 @@ DEPENDENCIES
   hotwire-rails
   htmlbeautifier
   httparty
-  image_processing (~> 1.12)
+  image_processing (~> 1.2)
   iso
   jsbundling-rails
   launchy

data/app/helpers/avo/url_helpers.rb

@@ -12,8 +12,12 @@ module Avo
       rescue
       end
 
-      # This entry uses `route_key` instead of `model_key` because it's rails that needs `fish_index` to build the correct path
-      avo.send :"resources_#{resource.route_key}_path", **existing_params, **args
+      # Create the `route_key` from the model key so the namespaced models get the proper path (SomeModule::Post -> some_module_post).
+      # Add the `_index` suffix for the uncountable models so they get the correct path (`fish_index`)
+      route_key = resource.model_key
+      route_key << "_index" if resource.model_name.singular == resource.model_name.plural
+
+      avo.send :"resources_#{route_key}_path", **existing_params, **args
     end
 
     def resource_path(

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

@@ -19,7 +19,7 @@
 
   <% if main_app.respond_to?(destroy_user_session_path) %>
     <div class="hidden absolute inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
-      <%= button_to t('avo.sign_out'), main_app.send(:destroy_user_session_path), method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+      <%= button_to t('avo.sign_out'), main_app.send(destroy_user_session_path), method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
     </div>
   <% end %>
 </div>

data/lib/avo/base_resource.rb

@@ -406,11 +406,15 @@ module Avo
     # This is used as the model class ID
     # We use this instead of the route_key to maintain compatibility with uncountable models
     # With uncountable models route key appends an _index suffix (Fish->fish_index)
-    # Example: User->users, MediaItem->medie_items, Fish->fish
+    # Example: User->users, MediaItem->media_items, Fish->fish
     def model_key
       model_class.model_name.plural
     end
 
+    def model_name
+      model_class.model_name
+    end
+
     def singular_model_key
       model_class.model_name.singular
     end

data/lib/avo/fields/date_field.rb

@@ -19,7 +19,7 @@ module Avo
         return if value.blank?
 
         if @format.is_a?(Symbol)
-          value.to_s(@format)
+          value.to_formatted_s(@format)
         else
           value.strftime(@format)
         end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.25.0"
+  VERSION = "1.25.1"
 end

data/public/avo-assets/avo.js

@@ -17916,7 +17916,7 @@
         function isInteger(value) {
           return /^[0-9]+$/.test(value);
         }
-        URI3.version = "1.19.10";
+        URI3.version = "1.19.7";
         var p2 = URI3.prototype;
         var hasOwn = Object.prototype.hasOwnProperty;
         function escapeRegEx(string) {
@@ -18026,7 +18026,6 @@
           trim: /[`!()\[\]{};:'".,<>?«»“”„‘’]+$/,
           parens: /(\([^\)]*\)|\[[^\]]*\]|\{[^}]*\}|<[^>]*>)/g
         };
-        URI3.leading_whitespace_expression = /^[\x00-\x20\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]+/;
         URI3.defaultPorts = {
           http: "80",
           https: "443",
@@ -18224,7 +18223,6 @@
               preventInvalidHostname: URI3.preventInvalidHostname
             };
           }
-          string = string.replace(URI3.leading_whitespace_expression, "");
           pos = string.indexOf("#");
           if (pos > -1) {
             parts.fragment = string.substring(pos + 1) || null;
@@ -18235,7 +18233,7 @@
             parts.query = string.substring(pos + 1) || null;
             string = string.substring(0, pos);
           }
-          string = string.replace(/^(https?|ftp|wss?)?:+[/\\]*/i, "$1://");
+          string = string.replace(/^(https?|ftp|wss?)?:[/\\]*/, "$1://");
           if (string.substring(0, 2) === "//") {
             parts.protocol = null;
             string = string.substring(2);
@@ -88689,7 +88687,7 @@
 /*!
  * URI.js - Mutating URLs
  *
- * Version: 1.19.10
+ * Version: 1.19.7
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/
@@ -88702,7 +88700,7 @@
  * URI.js - Mutating URLs
  * IPv6 Support
  *
- * Version: 1.19.10
+ * Version: 1.19.7
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/
@@ -88715,7 +88713,7 @@
  * URI.js - Mutating URLs
  * Second Level Domain (SLD) Support
  *
- * Version: 1.19.10
+ * Version: 1.19.7
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/