fontist 3.0.31 → 3.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9016d35c6100b87e2a7585f7193a8fbac76a1a32ab01e178a2d95bef017fa5
-  data.tar.gz: 6f02798721c34a5402bf413c9e1c003c3e968d1e01de44ae3562b726cf65bdb4
+  metadata.gz: 9138df3c46f325e2909f1312ffbe906d3b6bd6b70b695a751af1576f68cd8903
+  data.tar.gz: a496ef4bac70d7b1c414f17d07514bece411a7fc9e8dd1e4901e8fcc8e9d55b5
 SHA512:
-  metadata.gz: 7b2a062de85a9d66e0ec4e6e6d726c1d6716f8653c4ee96313eea8ba379941476064121d014851ce15bc6e7cf59ee4dcf3b77d68cd43fef7863238b9bbb55a68
-  data.tar.gz: 4d92357d6f58a7a1588bf4e6fb7793c94bbd8e47ecd1106cf9bbab87ef4321a4dd7fd172cbafab873f10c27c2563224fb7634fc0ad652baeda59e2ec433597b7
+  metadata.gz: 6a179916eb34c002c5635b8e7e6ee9ec6602e8aa1a7a6ab02174fdd6f25a5f183ed307f4db04911f62901a5f44d034850a4225827062503bf606587593918ec0
+  data.tar.gz: 23e184310fc3ab3da8b99fa9dc5c3f506f29962d837c36a46f09211873014eadc46379bea2f5788cfdbec7e5cdc80d610458266c9a33985c8fba217875d38d16

data/fontist.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fontisan", "~> 0.4", ">= 0.4.47"
   spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_dependency "git", "~> 6.0"
-  spec.add_dependency "lutaml-model", "~> 0.8.0"
+  spec.add_dependency "lutaml-model", "~> 0.8.162"
   spec.add_dependency "marcel", "~> 1.0"
-  spec.add_dependency "nokogiri", "~> 1.0"
+  spec.add_dependency "moxml", "~> 0.6"
   spec.add_dependency "octokit", "~> 10.0"
   spec.add_dependency "paint", "~> 2.3"
   spec.add_dependency "parallel", "~> 1.24"

data/lib/fontist/import/helpers/hash_helper.rb

@@ -3,8 +3,28 @@ module Fontist
     module Helpers
       module HashHelper
         class << self
+          # Converts a formula hash to string-keyed plain data. Values
+          # that are lutaml-model models join the document through their
+          # own to_hash serializer (the json gem used to call to_json on
+          # them implicitly during traversal; Yeptris::JSON does not).
           def stringify_keys(hash)
-            Fontist::JSON.parse(Fontist::JSON.dump(hash))
+            deep_stringify(hash)
+          end
+
+          private
+
+          def deep_stringify(value)
+            case value
+            when Hash then value.to_h { |k, v| [k.to_s, deep_stringify(v)] }
+            when Array then value.map { |v| deep_stringify(v) }
+            else deep_stringify_model(value)
+            end
+          end
+
+          def deep_stringify_model(value)
+            return value unless value.respond_to?(:to_hash)
+
+            deep_stringify(value.to_hash)
           end
         end
       end

data/lib/fontist/import/macos_importer.rb

@@ -1,5 +1,4 @@
 require "plist"
-require "nokogiri"
 require "paint"
 
 module Fontist

data/lib/fontist/import/sil_importer.rb

@@ -1,4 +1,4 @@
-require "nokogiri"
+require "moxml"
 require "paint"
 
 module Fontist
@@ -277,7 +277,7 @@ module Fontist
 
       def font_links
         html = URI.parse(ROOT).open("User-Agent" => Fontist::Utils::UserAgent.random_user_agent).read
-        document = Nokogiri::HTML.parse(html)
+        document = Moxml.new.parse(html)
         links = document.css(CARD_LINK_SELECTOR)
         links = document.css(LEGACY_LINK_SELECTOR) if links.empty?
         links
@@ -408,7 +408,7 @@ module Fontist
         response = uri.open("User-Agent" => Fontist::Utils::UserAgent.random_user_agent)
         current_url = response.base_uri
         html = response.read
-        document = Nokogiri::HTML.parse(html)
+        document = Moxml.new.parse(html)
 
         if @verbose
           # Debug: Show what selectors find using standardized method

data/lib/fontist/repo.rb

@@ -115,16 +115,19 @@ module Fontist
         end
       end
 
-      def update(name)
+      def update(name, rebuild: true)
         path = repo_path(name)
         unless Dir.exist?(path)
           raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
         end
 
         git = Git.open(path)
+        before = git.rev_parse("HEAD")
         git.pull("origin", git.current_branch)
+        changed = git.rev_parse("HEAD") != before
 
-        rebuild_index_if_needed
+        rebuild_index_if_needed if rebuild && changed
+        changed
       rescue StandardError => e
         # Catch all git-related errors
         if e.class.name.include?("Git") || e.message.match?(/git|pull|repository/i)

data/lib/fontist/update.rb

@@ -9,23 +9,35 @@ module Fontist
     end
 
     def call
-      update_main_repo
-      update_private_repos
+      main_changed = update_main_repo
+      private_changed = update_private_repos
     ensure
-      rebuild_index
+      # The index is a projection of the corpus: a pull that brought no
+      # changes leaves it valid, and a failed pull leaves the corpus
+      # untouched. Rebuilding costs a full pass over every formula, so
+      # it only runs when some repo actually moved — or when no index
+      # exists yet (a fresh clone never had one; lookups self-heal by
+      # rebuilding on demand, but an explicit update should leave one
+      # behind).
+      rebuild_index if main_changed || private_changed || index_missing?
     end
 
     private
 
+    def index_missing?
+      !File.exist?(Fontist.formula_filename_index_path)
+    end
+
     def update_main_repo
       dir = File.dirname(Fontist.formulas_repo_path)
       FileUtils.mkdir_p(dir)
 
       unless Dir.exist?(Fontist.formulas_repo_path)
-        return Git.clone(Fontist.formulas_repo_url,
-                         Fontist.formulas_repo_path,
-                         branch: @branch,
-                         depth: 1)
+        Git.clone(Fontist.formulas_repo_url,
+                  Fontist.formulas_repo_path,
+                  branch: @branch,
+                  depth: 1)
+        return true
       end
 
       git = if Dir.exist?(Fontist.formulas_repo_path.join(".git"))
@@ -36,21 +48,34 @@ module Fontist
               end
             end
 
-      return git.pull("origin", @branch) if git.current_branch == @branch
+      if git.current_branch != @branch
+        git.config_set("remote.origin.fetch",
+                       "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+        git.fetch
+        git.checkout(@branch)
+        git.pull("origin", @branch)
+        return true
+      end
 
-      git.config_set("remote.origin.fetch",
-                     "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
-      git.fetch
-      git.checkout(@branch)
+      # A freshly init-ed repo has no commits yet; nil before the first
+      # pull means "changed", since the pull then creates the corpus
+      before = head_sha(git)
       git.pull("origin", @branch)
+      head_sha(git) != before
     end
 
     def update_private_repos
-      Repo.list.each do |name|
-        Repo.update(name)
+      Repo.list.reduce(false) do |changed, name|
+        Repo.update(name, rebuild: false) || changed
       end
     end
 
+    def head_sha(git)
+      git.rev_parse("HEAD")
+    rescue Git::FailedError, Git::GitError
+      nil
+    end
+
     def rebuild_index
       Index.rebuild
     end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.31".freeze
+  VERSION = "3.0.33".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.31
+  version: 3.0.33
 platform: ruby
 authors:
 - Ribose Inc.
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.162
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.162
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -121,19 +121,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: moxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement