fontist 3.0.0 → 3.0.2

data/lib/fontist/font_installer.rb

@@ -90,6 +90,8 @@ module Fontist
                          Resources::GoogleResource
                        elsif @formula.source == "apple_cdn"
                          Resources::AppleCDNResource
+                       elsif @formula.source == "windows_fod"
+                         Resources::WindowsFodResource
                        else
                          Resources::ArchiveResource
                        end
@@ -98,16 +100,14 @@ module Fontist
     end
 
     def resource_options
-      @resource_options ||= begin
-        if @formula.resources.size == 1 || !@formula.v5?
-          @formula.resources.first
-        elsif @format_spec&.has_constraints?
-          matcher = FormatMatcher.new(@format_spec)
-          matcher.select_preferred_resource(@formula.resources)
-        else
-          find_desktop_resource || @formula.resources.first
-        end
-      end
+      @resource_options ||= if @formula.resources.size == 1 || !@formula.v5?
+                              @formula.resources.first
+                            elsif @format_spec&.has_constraints?
+                              matcher = FormatMatcher.new(@format_spec)
+                              matcher.select_preferred_resource(@formula.resources)
+                            else
+                              find_desktop_resource || @formula.resources.first
+                            end
     end
 
     def find_desktop_resource
@@ -135,7 +135,9 @@ module Fontist
         file_names = styles.map { |s| s.source_font || s.font }
 
         if @formula.v5? && resource_options&.source == "google" && file_names.any?
-          resource_basenames = Array(resource_options.files).map { |f| File.basename(f) }
+          resource_basenames = Array(resource_options.files).map do |f|
+            File.basename(f)
+          end
           unless file_names.any? { |f| resource_basenames.include?(f) }
             return resource_basenames
           end
@@ -169,7 +171,7 @@ module Fontist
       @subdirectories ||= begin
         extracts = [@formula.extract].flatten.compact
         # options is a collection, so we need to flatten it too
-        options = extracts.flat_map { |e| e.options }.compact
+        options = extracts.flat_map(&:options).compact
         options.filter_map(&:fonts_sub_dir)
       end
     end
@@ -296,12 +298,12 @@ module Fontist
     def temp_path_for(source_path, format)
       base = File.basename(source_path, ".*")
       dir = @format_spec&.transcode_path || Dir.mktmpdir
-      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+      FileUtils.mkdir_p(dir)
       File.join(dir, "#{base}.#{format}")
     end
 
     def cleanup_temp_file(path)
-      File.delete(path) if File.exist?(path)
+      FileUtils.rm_f(path)
     rescue StandardError
       # Ignore cleanup errors
     end

data/lib/fontist/format_matcher.rb

@@ -116,7 +116,9 @@ module Fontist
       end
 
       # Check if Fontisan can convert from any available format
-      convertible = available_formats.find { |f| self.class.can_convert?(f, requested) }
+      convertible = available_formats.find do |f|
+        self.class.can_convert?(f, requested)
+      end
       if convertible
         return {
           strategy: :convert,
@@ -163,7 +165,7 @@ module Fontist
     def find_variable_resource(resources)
       return nil unless @spec.prefer_variable
 
-      resources.find { |r| r.variable_font? }
+      resources.find(&:variable_font?)
     end
 
     def axes_match?(available_axes)

data/lib/fontist/format_spec.rb

@@ -47,7 +47,7 @@ module Fontist
       return nil if value.nil?
       return value if value.is_a?(Array)
 
-      value.to_s.split(",").map(&:strip).compact
+      value.to_s.split(",").filter_map(&:strip)
     end
 
     # Check if any format constraints are specified

data/lib/fontist/formula.rb

@@ -45,12 +45,14 @@ module Fontist
       "MacosImportSource",
       "GoogleImportSource",
       "SilImportSource",
+      "WindowsImportSource",
     ]
     attribute :font_version, :string
 
     key_value do
       # Only serialize schema_version if it's v5 (5), not for v4 formulas
-      map "schema_version", to: :schema_version, render_nil: false, render_default: false
+      map "schema_version", to: :schema_version, render_nil: false,
+                            render_default: false
       map "name", to: :name
       map "description", to: :description
       map "homepage", to: :homepage
@@ -67,6 +69,7 @@ module Fontist
         files: :files,
         format: :format,
         variable_axes: :variable_axes,
+        capability_name: :capability_name,
       }
       map "digest", to: :digest
       map "instructions", to: :instructions
@@ -85,6 +88,7 @@ module Fontist
           "macos" => "Fontist::MacosImportSource",
           "google" => "Fontist::GoogleImportSource",
           "sil" => "Fontist::SilImportSource",
+          "windows" => "Fontist::WindowsImportSource",
         },
       }
       map "font_version", to: :font_version
@@ -96,9 +100,9 @@ module Fontist
       end
 
       def all
-        formulas = Dir[Fontist.formulas_path.join("**/*.yml").to_s].map do |path|
+        formulas = Dir[Fontist.formulas_path.join("**/*.yml").to_s].filter_map do |path|
           Formula.from_file(path)
-        end.compact
+        end
 
         FormulaCollection.new(formulas)
       end
@@ -232,10 +236,18 @@ module Fontist
       import_source.is_a?(SilImportSource)
     end
 
+    def windows_import?
+      import_source.is_a?(WindowsImportSource)
+    end
+
     def manual_formula?
       import_source.nil?
     end
 
+    def windows_fod?
+      source == "windows_fod" && platforms&.any? { |p| p == "windows" || p.start_with?("windows-") }
+    end
+
     def compatible_with_current_platform?
       return true unless macos_import?
 

data/lib/fontist/formula_picker.rb

@@ -48,14 +48,14 @@ module Fontist
     def filter_by_format_spec(formulas)
       matcher = FormatMatcher.new(@format_spec)
 
-      formulas.map do |formula|
+      formulas.filter_map do |formula|
         next formula unless formula.v5?
 
         matching = matcher.filter_resources(formula.resources)
         if matching.any?
           formula.dup.tap { |f| f.resources = matching }
         end
-      end.compact
+      end
     end
 
     def ensure_fontist_version(formulas)
@@ -99,7 +99,9 @@ module Fontist
     end
 
     def raise_format_not_available_error(formulas)
-      available = formulas.flat_map { |f| Array(f.resources).map(&:format) }.compact.uniq
+      available = formulas.flat_map do |f|
+        Array(f.resources).map(&:format)
+      end.compact.uniq
       raise Errors::FormatNotAvailableError.new(
         @font_name,
         @format_spec.format || @format_spec.prefer_format,

data/lib/fontist/import/create_formula.rb

@@ -47,6 +47,11 @@ module Fontist
               version: @options[:import_source].version,
               release_date: @options[:import_source].release_date,
             )
+          when WindowsImportSource
+            builder.set_windows_import_source(
+              capability_name: @options[:import_source].capability_name,
+              min_windows_version: @options[:import_source].min_windows_version,
+            )
           end
         else
           # Legacy support for backward compatibility

data/lib/fontist/import/formula_builder.rb

@@ -85,6 +85,15 @@ family_id:)
         )
       end
 
+      # Convenience method to set Windows import source
+      def set_windows_import_source(capability_name:, min_windows_version: "10.0")
+        @import_source = WindowsImportSource.new(
+          type: "windows",
+          capability_name: capability_name,
+          min_windows_version: min_windows_version,
+        )
+      end
+
       private
 
       def formula_attributes
@@ -203,7 +212,7 @@ family_id:)
             result[k] = compacted unless compacted.nil?
           end
         when Array
-          value.map { |item| deep_compact(item) }.compact
+          value.filter_map { |item| deep_compact(item) }
         else
           value
         end

data/lib/fontist/import/google/data_sources/github.rb

@@ -69,7 +69,7 @@ module Fontist
 
             unless ofl_path.exist? || apache_path.exist? || ufl_path.exist?
               raise ArgumentError,
-                    "Source path does not contain expected font directories: "\
+                    "Source path does not contain expected font directories: " \
                     "#{@source_path}"
             end
           end
@@ -183,7 +183,7 @@ module Fontist
                   description: font_file.description,
                 }
               rescue StandardError => e
-                warn "Warning: Failed to parse font file #{filename}: "\
+                warn "Warning: Failed to parse font file #{filename}: " \
                      "#{e.message}"
               end
             end
@@ -199,11 +199,11 @@ module Fontist
             return [] unless metadata.fonts
 
             fonts_array = metadata.fonts.is_a?(Array) ? metadata.fonts : [metadata.fonts]
-            fonts_array.map do |font|
+            fonts_array.filter_map do |font|
               weight = font.respond_to?(:weight) ? font.weight : font["weight"]
               style = font.respond_to?(:style) ? font.style : font["style"]
               variant_name(weight, style)
-            end.compact.uniq
+            end.uniq
           end
 
           # Generate variant name from weight and style

data/lib/fontist/import/google/font_database.rb

@@ -136,7 +136,7 @@ github_data: nil, version: 4, source_path: nil)
 
         # Get all unique categories
         def categories
-          all_fonts.map(&:category).compact.uniq.sort
+          all_fonts.filter_map(&:category).uniq.sort
         end
 
         # Get fonts available in TTF format
@@ -190,7 +190,7 @@ github_data: nil, version: 4, source_path: nil)
 
         # Generate formulas for all fonts
         def to_formulas
-          all_fonts.map { |f| to_formula(f.family) }.compact
+          all_fonts.filter_map { |f| to_formula(f.family) }
         end
 
         # Save formulas to disk
@@ -198,12 +198,12 @@ github_data: nil, version: 4, source_path: nil)
           families = family_name ? [font_by_name(family_name)] : all_fonts
           families = families.compact
 
-          families.map do |family|
+          families.filter_map do |family|
             formula = to_formula(family.family)
             next unless formula
 
             save_formula(formula, family.family, output_dir)
-          end.compact
+          end
         end
 
         # Find filename for a variant
@@ -322,8 +322,8 @@ github_data: nil, version: 4, source_path: nil)
         def index_github_data
           return {} if @github_data_raw.empty?
 
-          @github_data_raw.each_with_object({}) do |family, hash|
-            hash[family.family] = family
+          @github_data_raw.to_h do |family|
+            [family.family, family]
           end
         end
 
@@ -367,8 +367,8 @@ github_data: nil, version: 4, source_path: nil)
 
         # Index fonts by family name
         def index_by_family(fonts)
-          fonts.each_with_object({}) do |font, hash|
-            hash[font.family] = font
+          fonts.to_h do |font|
+            [font.family, font]
           end
         end
 

data/lib/fontist/import/google/formula_builders/formula_builder_v4.rb

@@ -2,7 +2,7 @@
 
 require_relative "base_formula_builder"
 require_relative "../../../utils/downloader"
-require_relative "../../font_metadata_extractor"  # lib/fontist/import/font_metadata_extractor.rb
+require_relative "../../font_metadata_extractor" # lib/fontist/import/font_metadata_extractor.rb
 
 module Fontist
   module Import

data/lib/fontist/import/google/formula_builders/formula_builder_v5.rb

@@ -111,8 +111,11 @@ module Fontist
           end
 
           def detect_actual_format(urls, declared_format)
-            extensions = urls.map { |url| url.split("/").last[/\.(\w+)$/, 1]&.downcase }.compact.uniq
-            if extensions.size == 1 && %w[ttf otf woff woff2].include?(extensions.first)
+            extensions = urls.filter_map do |url|
+              url.split("/").last[/\.(\w+)$/, 1]&.downcase
+            end.uniq
+            if extensions.size == 1 && %w[ttf otf woff
+                                          woff2].include?(extensions.first)
               extensions.first
             else
               declared_format
@@ -174,7 +177,10 @@ module Fontist
             # For variable fonts, ALL styles should be marked as variable
             if family.variable_font?
               style["variable_font"] = true
-              style["variable_axes"] = family.axes.map(&:tag) if family.axes&.any?
+              if family.axes&.any?
+                style["variable_axes"] =
+                  family.axes.map(&:tag)
+              end
             else
               style["variable_font"] = false
             end

data/lib/fontist/import/google/metadata_adapter.rb

@@ -77,7 +77,7 @@ module Fontist
           font_fields = message.find_fields("fonts")
           return nil if font_fields.empty?
 
-          font_fields.map do |field|
+          font_fields.filter_map do |field|
             next unless field.message_field?
 
             # field.value is a Hash for message fields in unibuf
@@ -94,7 +94,7 @@ module Fontist
               "full_name" => field_value(font_msg, "full_name"),
               "copyright" => field_value(font_msg, "copyright"),
             }.compact
-          end.compact
+          end
         end
 
         # Extract axes array
@@ -102,7 +102,7 @@ module Fontist
           axis_fields = message.find_fields("axes")
           return nil if axis_fields.empty?
 
-          axis_fields.map do |field|
+          axis_fields.filter_map do |field|
             next unless field.message_field?
 
             axis_hash = field.value
@@ -115,7 +115,7 @@ module Fontist
               "max_value" => field_float(axis_msg, "max_value"),
               "default_value" => field_float(axis_msg, "default_value"),
             }.compact
-          end.compact
+          end
         end
 
         # Extract source information
@@ -142,7 +142,7 @@ module Fontist
           file_fields = source_msg.find_fields("files")
           return nil if file_fields.empty?
 
-          file_fields.map do |field|
+          file_fields.filter_map do |field|
             next unless field.message_field?
 
             file_hash = field.value
@@ -153,7 +153,7 @@ module Fontist
               "source_file" => field_value(file_msg, "source_file"),
               "dest_file" => field_value(file_msg, "dest_file"),
             }.compact
-          end.compact
+          end
         end
 
         # Extract registry default overrides as hash

data/lib/fontist/import/google/models/font_family.rb

@@ -43,7 +43,7 @@ module Fontist
               files_value = attributes.delete(:files)
               attributes[:files_data] = files_value
             end
-            super(**attributes)
+            super
           end
 
           # Get files as a Hash

data/lib/fontist/import/import_display.rb

@@ -113,7 +113,7 @@ module Fontist
       # @param title [String] Section title (deprecated - use header instead)
       def self.section(title)
         Fontist.ui.say("")
-        Fontist.ui.say("── #{title} " + "─" * (76 - title.length))
+        Fontist.ui.say("── #{title} " + ("─" * (76 - title.length)))
         Fontist.ui.say("")
       end
 
@@ -247,7 +247,7 @@ module Fontist
           return unless results[:errors]&.any?
 
           Fontist.ui.say("  #{Paint['⚠',
-                                    :yellow]} Note: #{results[:failed]} font#{results[:failed] > 1 ? 's' : ''} failed during import.")
+                                    :yellow]} Note: #{results[:failed]} font#{'s' if results[:failed] > 1} failed during import.")
           Fontist.ui.say("")
         end
 
@@ -266,10 +266,10 @@ module Fontist
           return if total.zero?
 
           if results[:successful] > (total * 0.5)
-            Fontist.ui.say(Paint["  🎉 Great success! #{results[:successful]} formula#{results[:successful] > 1 ? 's' : ''} created!",
+            Fontist.ui.say(Paint["  🎉 Great success! #{results[:successful]} formula#{'s' if results[:successful] > 1} created!",
                                  :green, :bright])
           elsif results[:successful].positive?
-            Fontist.ui.say(Paint["  👍 Keep going! #{results[:successful]} formula#{results[:successful] > 1 ? 's' : ''} created.",
+            Fontist.ui.say(Paint["  👍 Keep going! #{results[:successful]} formula#{'s' if results[:successful] > 1} created.",
                                  :yellow, :bright])
           end
 
@@ -277,7 +277,7 @@ module Fontist
         end
 
         def calculate_total(results)
-          results[:total] || (results[:successful] || 0) + (results[:failed] || 0) + (results[:skipped] || 0)
+          results[:total] || ((results[:successful] || 0) + (results[:failed] || 0) + (results[:skipped] || 0))
         end
       end
     end

data/lib/fontist/import/macos_importer.rb

@@ -111,7 +111,7 @@ force: false, verbose: false, import_cache: nil, schema_version: 4)
         Fontist.ui.say("#{Paint[progress,
                                 :white]} #{Paint["#{percentage}%",
                                                  :yellow]} | #{Paint[family_name, :cyan,
-                                                                     :bright]} #{Paint["(#{fonts_count} font#{fonts_count > 1 ? 's' : ''})", :black,
+                                                                     :bright]} #{Paint["(#{fonts_count} font#{'s' if fonts_count > 1})", :black,
                                                                                        :bright]}")
 
         start_time = Time.now

data/lib/fontist/import/upgrade_formulas.rb

@@ -438,9 +438,7 @@ module Fontist
 
           entry_path = File.join(extract_dir, entry.full_name)
           FileUtils.mkdir_p(File.dirname(entry_path))
-          File.open(entry_path, "wb") do |f|
-            f.write(entry.read)
-          end
+          File.binwrite(entry_path, entry.read)
         end
       end
 

data/lib/fontist/import/v4_to_v5_migrator.rb

@@ -93,7 +93,8 @@ module Fontist
       private
 
       def load_yaml_without_aliases(path)
-        data = YAML.safe_load(File.read(path), aliases: true, permitted_classes: [Date])
+        data = YAML.safe_load(File.read(path), aliases: true,
+                                               permitted_classes: [Date])
         JSON.parse(JSON.generate(data))
       end