fontawesome_subsetter 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f3b31b1f9c9b187bead63801821cf4361d70254b9419b871a493871a75fb2d0
-  data.tar.gz: 740a2f6547e6d10f3a8c5627f944a4869e263d856f11219a597a46a1e6367d8e
+  metadata.gz: fd9237f5e86d63481cb5cb18ab422008f36f5ae4f32f2116f24d1549e964b2a3
+  data.tar.gz: b55ca058bde22b4b7a454ae0fcb211dc2c6df33aa87d10de381ea09495c3608f
 SHA512:
-  metadata.gz: e8c84e173d49c219764c998fc2249df1b18f398944cfd6855f5eabb5d09bf2e31f0a116b847cf118e8044cd01b893467957c5abb23a4d5852c7c1fad1fb11a47
-  data.tar.gz: 923cb195f65901177ac1f1daf90b2c60a7fd6ae07fc54efdd4e75db193edd9c71cea8416cba1402fa7a94a93a186d3d8c8baeda8ef0d8540c65b783351b200d1
+  metadata.gz: 54c84abeeceb8dfdc1337358d4ff3c03022a578760e04dbea6746c5ac239bc92ac3fbd62b5a8074803c345e526caef01985a8d354cc721600605a1d8bd6a5f1c
+  data.tar.gz: 64b61927a5dae3874a74a9cdb2dfe6918e925d605c55612ec6577a950e757989010f792d2055821ed974ec00b8ee61c606c9b4587a433e39d3656adced3f8a88

data/README.md

@@ -1,6 +1,6 @@
 # FontAwesome Subsetter
 
-A Rails gem that tree-shakes FontAwesome — scans your views and helpers for `icon()` calls, subsets WOFF2 font files to include only used glyphs, and generates minimal CSS.
+A Rails gem that tree-shakes FontAwesome 7 — scans your views and helpers for `icon()` calls, subsets WOFF2 font files to include only used glyphs, and generates minimal CSS.
 
 ## Requirements
 
@@ -47,8 +47,6 @@ vendor/
       fa-thin-100.woff2
 ```
 
-> **Note:** In `vendor/fontawesome/scss/variables.scss`, change `$icons` and `$brand-icons` to empty maps with `!default` so the subsetter can inject only the used icons.
-
 ## Features
 
 ### 1. Icon Helper
@@ -67,7 +65,7 @@ Add to your `config/puma.rb`:
 
 ```ruby
 if ENV.fetch("RAILS_ENV", "development") == "development"
-  plugin :fontawesome
+  plugin :fontawesome_subsetter
 end
 ```
 

data/lib/fontawesome_subsetter/subsetter.rb

@@ -3,9 +3,51 @@ require "open3"
 require "fileutils"
 require "yaml"
 require "set"
+require "uri"
 
 module FontawesomeSubsetter
 
+  # Custom Sass importer that intercepts FontAwesome SCSS file loads.
+  # Strips the populated $icons and $brand-icons maps from variables.scss in memory,
+  # replacing them with empty !default maps so the subsetter can inject only used icons.
+  # This avoids requiring users to manually edit their vendor FontAwesome files.
+  class FontawesomeSassImporter
+
+    def initialize(scss_dir)
+      @scss_dir = File.expand_path(scss_dir.to_s)
+    end
+
+    def canonicalize(url, context)
+      if url.start_with?("file://")
+        path = URI.parse(url).path
+      elsif context.containing_url
+        base = File.dirname(URI.parse(context.containing_url.to_s).path)
+        path = File.expand_path(url, base)
+      else
+        return nil
+      end
+
+      candidates = [path, "#{path}.scss", File.join(File.dirname(path), "_#{File.basename(path)}.scss")]
+      match = candidates.find { |c| File.exist?(c) && c.start_with?(@scss_dir) }
+      return nil unless match
+
+      "file://#{match}"
+    end
+
+    def load(url)
+      path = URI.parse(url).path
+      content = File.read(path)
+
+      if File.basename(path, ".scss").delete_prefix("_") == "variables"
+        content = content.sub(/^\$icons\s*:\s*\(.*?^\)\s*;/m, "$icons: () !default;")
+        content = content.sub(/^\$brand-icons\s*:\s*\(.*?^\)\s*;/m, "$brand-icons: () !default;")
+      end
+
+      { contents: content, syntax: :scss }
+    end
+
+  end
+
   class Subsetter
 
     def initialize(root: nil)
@@ -116,8 +158,18 @@ module FontawesomeSubsetter
         default_scss_template(styles)
       end
 
-      # Compile the dynamic SCSS. `load_paths` tells Sass where to find the imported files.
-      compiled_css = Sass.compile_string(scss_string, style: :compressed, load_paths: [ @root ]).css
+      # Compile the dynamic SCSS with a custom importer that strips populated icon maps
+      # from variables.scss in memory, so users don't need to modify their vendor files.
+      scss_dir = @root.join("vendor", "fontawesome", "scss").to_s
+      fa_importer = FontawesomeSassImporter.new(scss_dir)
+
+      compiled_css = Sass.compile_string(
+        scss_string,
+        style: :compressed,
+        importer: fa_importer,
+        importers: [fa_importer],
+        url: "file://#{@root}/fontawesome_subsetter_input.scss"
+      ).css
 
       # Forcefully remove all comments, including "loud" /*! ... */ comments for licenses.
       compiled_css = compiled_css.gsub(/\/\*!.*?\*\//m, "")
@@ -184,7 +236,7 @@ module FontawesomeSubsetter
     def default_scss_template(styles)
       <<-SCSS
 
-        // NOTE: $icons and $brand-icons were changed in variables to just be empty arrays with !default.
+        // The custom importer strips populated $icons/$brand-icons maps from variables.scss in memory.
         @use "./vendor/fontawesome/scss/variables" with (
           $font-path: "webfonts",
           $icons: (#{ @styles.except("brands").values.reduce(Set.new) { | all_icons, style | all_icons.merge(style[:sass_icon_cache]) }.join(", ") }),

data/lib/fontawesome_subsetter/version.rb

@@ -1,5 +1,5 @@
 module FontawesomeSubsetter
 
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 
 end

data/lib/puma/plugin/{fontawesome.rb → fontawesome_subsetter.rb}

@@ -1,6 +1,6 @@
 require "puma/plugin"
 
-class Fontawesome
+class FontawesomeSubsetter
 end
 
 Puma::Plugin.create do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontawesome_subsetter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - 16554289+optimuspwnius@users.noreply.github.com
@@ -95,7 +95,7 @@ files:
 - lib/fontawesome_subsetter/icon_helper.rb
 - lib/fontawesome_subsetter/subsetter.rb
 - lib/fontawesome_subsetter/version.rb
-- lib/puma/plugin/fontawesome.rb
+- lib/puma/plugin/fontawesome_subsetter.rb
 - lib/tasks/fontawesome_subsetter.rake
 homepage: https://github.com/optimuspwnius/fontawesome-subsetter
 licenses: