active_material 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d199f290d9505ddc520ac11343fd3dd45a174608691f30c50f6d53da7f94f81
-  data.tar.gz: a217138c6d68dcd47787ef2f9053baac7bfa1960d829de626d66280025c3d19d
+  metadata.gz: 0befeef9159040b47e03da4f2d258451c580a0d9ab33b2e0c10e249e8a7ac556
+  data.tar.gz: 550bc54c62434b4c81b1156a7d402283f22e497051b4d47a660ae5631be40790
 SHA512:
-  metadata.gz: 1f68d12ea2b2a4672184b69ab562593e585fd521ba939c08a4c68622c84f9f56be7522fcb628345294d924e93634cd15306b1324572bf9fc05100ac27b75ee0f
-  data.tar.gz: e32ee1cb4376485d5fcec9878a507b841f74524e8b2938bf20f0d162218d396ee78b1d23d7b2fa1d84768922769d362f3e2740892eca6c9224d88c4a8d654313
+  metadata.gz: d0d4ed26ce6857b0837e759b8113e3a6f598a80b6880b79669d9303fdf3f8d320366f2618048ebead4452c0c27cf09490c704c3a0d7fa89edce07c93bcf3a2d6
+  data.tar.gz: 9174bfa663d0b9ae7718de7558883adc9ff8df4c82dc7195e1fa0ee7c1b5fa5dfd3e95e42c25cf872d2a75092ac4f9594614b856b067798291c3ef9d46b999e3

data/config/importmap.rb

@@ -0,0 +1,2 @@
+pin "active_material"
+pin "active_material/actions-toggle"

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.0"
+  VERSION = "2.1.2"
 end

data/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "active_material",
+  "version": "2.1.1",
+  "description": "ActiveAdmin skin based on Google's Material Design.",
+  "main": "src/javascripts/active_material.js",
+  "directories": {
+    "lib": "lib"
+  },
+  "scripts": {
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dkniffin/active_material.git"
+  },
+  "author": "Derek Kniffin",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/dkniffin/active_material/issues"
+  },
+  "homepage": "https://github.com/dkniffin/active_material#readme",
+  "dependencies": {},
+  "devDependencies": {}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_material
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  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
@@ -130,9 +130,11 @@ files:
 - app/assets/stylesheets/active_material/values/elevation.scss
 - app/assets/stylesheets/active_material/values/fonts.scss
 - app/assets/stylesheets/active_material/values/units.scss
+- config/importmap.rb
 - lib/active_material.rb
 - lib/active_material/font_loader.rb
 - lib/active_material/version.rb
+- package.json
 homepage: ''
 licenses:
 - MIT