fontico 0.1.1 → 1.2.0

data/lib/fontico/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fontico
-  VERSION = "0.1.1"
+  VERSION = "1.2.0"
 end

data/lib/fontico.rb

@@ -23,6 +23,8 @@ module Fontico
     autoload :Sprite,     "fontico/emitters/sprite"
     autoload :Font,       "fontico/emitters/font"
     autoload :Stylesheet, "fontico/emitters/stylesheet"
+    autoload :Header,     "fontico/emitters/header"
+    autoload :GfxFont,    "fontico/emitters/gfx_font"
   end
 
   class << self
@@ -34,9 +36,53 @@ module Fontico
     def root          = @root ||= Dir.pwd
     def output_dir    = @output_dir ||= "app/assets/builds"
     def manifest_path = @manifest_path ||= File.join(root, "icons.yml")
-    def manifest      = @manifest ||= Manifest.load(manifest_path)
+    # Same shape as I18n.load_path: engines first, the app last, later wins
+    # a name. Unset, it is just the app's icons.yml (non-Rails, tests).
+    def load_path     = @load_path || [manifest_path].select { File.file?(_1) }
+
+    def load_path=(paths)
+      @load_path = paths.nil? ? nil : Array(paths)
+      reset!
+    end
+
+    def manifest      = @manifest ||= Manifest.load(*load_path)
     def sprite_file   = File.join(root, output_dir, "icons.svg")
 
+    # Rendered markup for bare icon() calls, minus the sprite path. Keyed by
+    # name and bounded by the manifest, so it cannot grow with traffic.
+    def icon_cache = @icon_cache ||= {}
+
+    # Inline mode embeds the sprite in every response, and it used to be
+    # re-read off disk on every call: 13us and a fresh 10KB string per
+    # request, more than a whole page of icon() calls costs. Held instead,
+    # behind a stat, which is cheap next to the read and means a rebuild from
+    # anywhere — the dev watcher, or `rake fontico:build` in another terminal
+    # — is picked up without waiting for a reset!.
+    def sprite_markup
+      stamp = File.stat(sprite_file).then { [_1.mtime, _1.size] }
+      return @sprite_markup if @sprite_stamp == stamp
+
+      @sprite_stamp = stamp
+      @sprite_markup = File.read(sprite_file).freeze
+    end
+
+    # Rails engines that ship config/icons.yml (or icons.yml at the gem
+    # root), then the app's file. The app is last on purpose.
+    def discover(app)
+      files = []
+      app.railties.each do |rt|
+        next unless rt.is_a?(Rails::Engine)
+        next if rt.is_a?(Rails::Application)
+
+        root = rt.root
+        found = %w[config/icons.yml icons.yml].map { root.join(_1) }.find { File.file?(_1.to_s) }
+        files << found.to_s if found
+      end
+      # manifest_path goes in even when absent: the dev watcher has to notice
+      # an icons.yml created after boot. Manifest.load skips what isn't there.
+      (files.select { File.file?(_1) } << manifest_path).uniq
+    end
+
     # Inline mode embeds <symbol> definitions in the layout instead of
     # referencing an external file — required when assets are served from a
     # CDN, where cross-origin <use href> silently renders nothing.
@@ -85,13 +131,18 @@ module Fontico
     # a reference in Ruby source never goes stale.
     def codepoint(name)
       cp = lockfile.codepoint_for(name.to_s)
-      raise Error, "no icon named #{name.inspect}; run rake fontico:build" if cp.nil?
+      raise Error, "no icon named #{name.inspect} in icons.lock" if cp.nil?
 
       cp
     end
 
     def glyph(name) = [codepoint(name)].pack("U")
-    def reset!        = (@manifest = @build_error = @missing_icons = nil)
+    # Drops everything derived from a build. The dev watcher calls this after
+    # every rebuild, which is what keeps the caches above honest.
+    def reset!
+      @manifest = @build_error = @missing_icons = nil
+      @icon_cache = @sprite_markup = @sprite_stamp = nil
+    end
 
     def configure = yield(self)
   end

data/lib/tasks/fontico.rake

@@ -4,43 +4,52 @@
 # is noise, and the message reads fine without it.
 def fontico_red(text) = $stdout.tty? ? "\e[31m#{text}\e[0m" : text
 
-namespace :fontico do
-  desc "Build icon artifacts from icons.yml"
-  task :build do
-    require "fontico"
-    report = Fontico.build
+def fontico_print_report(report)
+  puts "fontico: #{report.written.size} artifact(s)"
+  report.written.each { puts "  #{_1}" }
+  puts "  fetched #{report.fetched.size}, cached #{report.cached.size}"
 
-    puts "fontico: #{report.written.size} artifact(s)"
-    report.written.each { puts "  #{_1}" }
-    puts "  fetched #{report.fetched.size}, cached #{report.cached.size}"
+  # Loud, but not fatal: one bad name should not stop the other 199 icons
+  # from building. The artifacts simply come out without it.
+  if report.missing&.any?
+    puts
+    puts fontico_red("fontico: #{report.missing.size} icon(s) could not be resolved and were left out:")
+    report.missing.each { |name, reason| puts fontico_red("  #{name}: #{reason}") }
+    puts fontico_red("  fix the entry in icons.yml, then run rake fontico:build again")
+    puts
+  end
 
-    # Loud, but not fatal: one bad name should not stop the other 199 icons
-    # from building. The artifacts simply come out without it.
-    if report.missing&.any?
-      puts
-      puts fontico_red("fontico: #{report.missing.size} icon(s) could not be resolved and were left out:")
-      report.missing.each { |name, reason| puts fontico_red("  #{name}: #{reason}") }
-      puts fontico_red("  fix the entry in icons.yml, then run rake fontico:build again")
-      puts
-    end
+  report.skipped.each do |target, names|
+    puts "  #{target}: skipped #{names.size} multicolor icon(s): #{names.join(", ")}" if names.any?
+  end
+  puts "  pending target(s): #{report.pending.join(", ")}" if report.pending.any?
 
-    report.skipped.each do |target, names|
-      puts "  #{target}: skipped #{names.size} multicolor icon(s): #{names.join(", ")}" if names.any?
-    end
-    puts "  pending target(s): #{report.pending.join(", ")}" if report.pending.any?
+  if report.warnings.any?
+    puts "\nfontico: #{report.warnings.size} icon(s) need fixing at the source:"
+    report.warnings.each { |name, list| puts "  #{name}: #{list.join("; ")}" }
+    puts "  see docs/icon-authoring.html"
+  end
+end
 
-    if report.warnings.any?
-      puts "\nfontico: #{report.warnings.size} icon(s) need fixing at the source:"
-      report.warnings.each { |name, list| puts "  #{name}: #{list.join("; ")}" }
-      puts "  see docs/icon-authoring.html"
-    end
+def fontico_rails_load_path!
+  return unless defined?(Rails) && Rails.respond_to?(:application) && Rails.application
+
+  Fontico.load_path = Fontico.discover(Rails.application)
+end
+
+namespace :fontico do
+  desc "Build icon artifacts from icons.yml"
+  task :build do
+    require "fontico"
+    fontico_rails_load_path!
+    fontico_print_report(Fontico.build)
   end
 
-  desc "Re-fetch every icon, ignoring icons.lock"
+  desc "Re-fetch every icon from its provider. Codepoints stay pinned."
   task :update do
     require "fontico"
-    File.delete(File.join(Fontico.root, "icons.lock")) if File.exist?(File.join(Fontico.root, "icons.lock"))
-    Rake::Task["fontico:build"].invoke
+    fontico_rails_load_path!
+    fontico_print_report(Fontico.build(force: true))
   end
 end
 
@@ -58,10 +67,13 @@ if Rake::Task.task_defined?("assets:clobber")
 end
 
 namespace :fontico do
+  # Only what lands in output_dir. A target given an explicit path in the
+  # manifest is pointing somewhere the app owns — a firmware include/ that is
+  # very likely committed — and deleting that is not precompile's business.
   desc "Remove generated icon artifacts (icons.lock is kept: it is source)"
   task :clobber do
     require "fontico"
-    %w[icons.svg icons.css icons.ttf].each do |name|
+    %w[icons.svg icons.css icons.ttf icons.h icons_font.h].each do |name|
       path = File.join(Fontico.root, Fontico.output_dir, name)
       File.delete(path) if File.exist?(path)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontico
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - nofxx
@@ -86,6 +86,8 @@ files:
 - lib/fontico.rb
 - lib/fontico/builder.rb
 - lib/fontico/emitters/font.rb
+- lib/fontico/emitters/gfx_font.rb
+- lib/fontico/emitters/header.rb
 - lib/fontico/emitters/sprite.rb
 - lib/fontico/emitters/stylesheet.rb
 - lib/fontico/helper.rb
@@ -95,6 +97,7 @@ files:
 - lib/fontico/node/build_font.mjs
 - lib/fontico/node/extract_glyphs.mjs
 - lib/fontico/node/package.json
+- lib/fontico/node/rasterize.mjs
 - lib/fontico/node_runner.rb
 - lib/fontico/outliner.rb
 - lib/fontico/prawn.rb
@@ -126,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Name icons by intent. Source them from anywhere. Ship one artifact.
 test_files: []