active_material 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93275c327756af4eafee3c5542609ec05715b93c493640a1f9762a2222afcf10
-  data.tar.gz: 2ad339e7948a534d497c2c41fec43aca0aca8abfc04f51e1c710b25121d77ef8
+  metadata.gz: 0befeef9159040b47e03da4f2d258451c580a0d9ab33b2e0c10e249e8a7ac556
+  data.tar.gz: 550bc54c62434b4c81b1156a7d402283f22e497051b4d47a660ae5631be40790
 SHA512:
-  metadata.gz: 9824e96641f906684578de15c16fbda84188897cf22e40a260cf12f4fdb632c277e3647a6f253030f3fbf5be2fe7da4ae81d78bfbb9fa07ae5cfc35b7175d95b
-  data.tar.gz: 7e745b586892691b733a7a001fd495e0724a84bf8eb31d5e4456d97829a4603a02002c1540c90fcd1a443de5d56bab763767f424ed7f42dbca251bfa9702760d
+  metadata.gz: d0d4ed26ce6857b0837e759b8113e3a6f598a80b6880b79669d9303fdf3f8d320366f2618048ebead4452c0c27cf09490c704c3a0d7fa89edce07c93bcf3a2d6
+  data.tar.gz: 9174bfa663d0b9ae7718de7558883adc9ff8df4c82dc7195e1fa0ee7c1b5fa5dfd3e95e42c25cf872d2a75092ac4f9594614b856b067798291c3ef9d46b999e3

data/lib/active_material/font_loader.rb

@@ -3,10 +3,24 @@ module ActiveMaterial
     def build_active_admin_head
       within super do
         uri = URI.parse(ActiveMaterial::Rails::Engine.config.active_material.font_url)
-        link(rel: "preconnect", href: uri.origin)
-        link(rel: "preconnect", href: uri.origin, crossorigin: true)
+        origin = extract_origin(uri)
+
+        link(rel: "preconnect", href: origin)
+        link(rel: "preconnect", href: origin, crossorigin: true)
         link(rel: "stylesheet", href: uri.to_s)
       end
     end
+
+    private
+
+    def extract_origin(uri)
+      origin = "#{uri.scheme}://#{uri.host}"
+      origin += ":#{uri.port}" if uri.port && !default_port?(uri)
+      origin
+    end
+
+    def default_port?(uri)
+      (uri.scheme == 'http' && uri.port == 80) || (uri.scheme == 'https' && uri.port == 443)
+    end
   end
 end

data/lib/active_material/version.rb

@@ -1,3 +1,3 @@
 module ActiveMaterial
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_material
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Derek Kniffin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler