avo 2.13.3.pre.3 → 2.13.3.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e872452c4bd0412af9b42203d98aaa4f4d98c3ac1e64bac3f83829cc74512a1
-  data.tar.gz: b6599c9c3e7115f555757525eec57b4ea8295f72acc5b5c5b5762d49b5b40ac4
+  metadata.gz: 595d05c5a12fe197d118cbaf142d64f445224afe450334f09f6e7a3e041f6c0f
+  data.tar.gz: a5101fe7f1c44fc5d8ccef230dbe44f73228e81e327893547b7d7004b0cc0e4a
 SHA512:
-  metadata.gz: 0645c82e51a7771452b702108d9fa022e74a8445d70d44d45bdb9bed5f95112efe86ecfb376e5c7c015c4bcafe87db89ab61bade18abf96ffb070c8c05cdad0c
-  data.tar.gz: 283be87c9d1c2c5977f61b04436ca947353c49845b372d25fd07cefa7adb4ec2d199e3f1f3a180ed438c241eb802f7d77c430df86b289c99b03b77c98da4d3cc
+  metadata.gz: ee55e57a363c34808c4f3b3fdd03bb34ebf262aff29739cf5114572ba4d22cd3b19dbfc9825eb80d25e701f8b11791205e77677dd5d2efba5988bc01dc623c6c
+  data.tar.gz: c3faf170cfeeb42af70b66858d12c5af938292649eefd2288661e272970704b9cf5edbef4a3bb9418ae862976e9119d7d05b175266810760746ec289282c5620

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.13.3.pre.3)
+    avo (2.13.3.pre.4)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -256,6 +256,8 @@ GEM
     nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.7-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport

data/app/helpers/avo/application_helper.rb

@@ -64,43 +64,15 @@ module Avo
       classes
     end
 
-    # Just use inline_svg gem.
+    # Use inline_svg gem but with our own finder implementation.
     def svg(file_name, **args)
+      return if file_name.blank?
+
       file_name = "#{file_name}.svg" unless file_name.end_with? ".svg"
 
-      inline_svg_tag file_name, **args
-      # return if file_name.nil?
-
-      # file_name = "#{file_name}.svg" unless file_name.end_with? ".svg"
-
-      # final_path = nil
-      # [Rails.root, Avo::Engine.root].each do |root|
-      #   [["app", "assets", "svgs", file_name], [file_name]].each do |file_path|
-      #     path = root.join(*file_path).to_s
-      #     puts ["path->", path].inspect
-      #     if File.exist? path
-      #       # final_path = file_path.join('/')
-      #       final_path = path
-      #       break
-      #     end
-      #   end
-      # end
-      # puts ["final_path->", final_path].inspect
-
-      # # paths = [
-      # #   Rails.root.join("app", "assets", "svgs", file_name).to_s,
-      # #   Rails.root.join(file_name).to_s,
-      # #   Avo::Engine.root.join("app", "assets", "svgs", file_name).to_s,
-      # #   Avo::Engine.root.join(file_name).to_s,
-      # # ]
-
-      # # path = paths.find do |path|
-      # #   File.exist? path
-      # # end
-
-      # return if final_path.nil?
-
-      # inline_svg_tag final_path, **args
+      with_asset_finder(::Avo::SvgFinder) do
+        inline_svg file_name, **args
+      end
     end
 
     def input_classes(extra_classes = "", has_error: false)
@@ -130,5 +102,17 @@ module Avo
     rescue
       Avo.configuration.root_path
     end
+
+    private
+
+    # Taken from the original library
+    # https://github.com/jamesmartin/inline_svg/blob/main/lib/inline_svg/action_view/helpers.rb#L76
+    def with_asset_finder(asset_finder)
+      Thread.current[:inline_svg_asset_finder] = asset_finder
+      output = yield
+      Thread.current[:inline_svg_asset_finder] = nil
+
+      output
+    end
   end
 end

data/app/views/layouts/avo/application.html.erb

@@ -33,7 +33,6 @@
             <div class="content p-4 lg:p-6 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
               <%= render partial: "avo/partials/custom_tools_alert" %>
               <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
-              <!-- <%= ::Rails.application.assets_manifest.inspect %> -->
                 <%= yield %>
                 <%= render partial: "avo/partials/footer" %>
               </div>

data/lib/avo/engine.rb

@@ -53,9 +53,6 @@ module Avo
       # app.config.logger = ::Logger.new(STDOUT)
     end
 
-    # Add the outline heroicons to the path
-    config.assets.paths << Avo::Engine.root.join("app", "assets", "svgs", "heroicons", "outline")
-
     config.app_middleware.use(
       Rack::Static,
       urls: ["/avo-assets"],

data/lib/avo/svg_finder.rb

@@ -0,0 +1,41 @@
+class Avo::SvgFinder
+  def self.find_asset(filename)
+    new(filename)
+  end
+
+  def initialize(filename)
+    @filename = filename
+  end
+
+  # Use the default static finder logic. If that doesn't find anything, search according to our pattern:
+  def pathname
+    found_asset = if ::Rails.application.config.assets.compile
+      asset = ::Rails.application.assets[@filename]
+      Pathname.new(asset.filename) if asset.present?
+    else
+      manifest = ::Rails.application.assets_manifest
+      asset_path = manifest.assets[@filename]
+      unless asset_path.nil?
+        ::Rails.root.join(manifest.directory, asset_path)
+      end
+    end
+
+    # Use the found asset
+    return found_asset if found_asset.present?
+
+    paths = [
+      Rails.root.join("app", "assets", "svgs", @filename).to_s,
+      Rails.root.join(@filename).to_s,
+      Avo::Engine.root.join("app", "assets", "svgs", @filename).to_s,
+      Avo::Engine.root.join("app", "assets", "svgs", "heroicons", "outline", @filename).to_s,
+      Avo::Engine.root.join(@filename).to_s,
+    ]
+
+    path = paths.find do |path|
+      File.exist? path
+    end
+
+    path
+  end
+end
+

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.13.3.pre.3" unless const_defined?(:VERSION)
+  VERSION = "2.13.3.pre.4" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.13.3.pre.3
+  version: 2.13.3.pre.4
 platform: ruby
 authors:
 - Adrian Marin
@@ -1297,6 +1297,7 @@ files:
 - lib/avo/resources/controls/link_to.rb
 - lib/avo/services/authorization_service.rb
 - lib/avo/services/uri_service.rb
+- lib/avo/svg_finder.rb
 - lib/avo/tab.rb
 - lib/avo/tab_builder.rb
 - lib/avo/tab_group.rb