fontist 1.8.11 → 1.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44eeffc78fd8188b4084f8771b17fd8b007c52cc6aec24b1ec50a5468e03d7a6
-  data.tar.gz: c039bba16e70d0a5def84fa3d63e24812e18b91751f4ee32a0bd1d5a789762d5
+  metadata.gz: d1ece96735fa8114f5ce56d56217b20208e8c5dced1c8d0b4092094ebac4ec17
+  data.tar.gz: 30e6189789d580d5c6bd56aa12d02c91057a05a286ec513469c4897d193a2542
 SHA512:
-  metadata.gz: 51da44eb3fcb027b45a283d860a54fd8f3da7dcdc34bf341f6e6e87b80b69dd0fe200060d32f63efbde9f53589aa50155418f277be131b062b07462de1b3f19c
-  data.tar.gz: 6faf5f88267c1173e271cc662e3b177862bb35462916e19a85232c0fbec54260a709781b470fe513e25697be2173a73097e5760e9b312629c4443316a4f95d04
+  metadata.gz: 20044f9435f70398c851eca878a846dad762c065ace4de9efcd6b1c05a3b5c6e9ab1f6bef4aefdf6231db020f3d5cb4454c5a2e4cf4c1f151f19288890449b11
+  data.tar.gz: d93ca29eedc83eeb4fb60b574ae254b277eb210e2e1e8fbcad68ad6a15d86f3f2fe981f549444fdfb13f559221cd2bc03b73f0a00a89496f7a22482c6493afa3

data/.rubocop.yml

@@ -9,14 +9,14 @@ AllCops:
 Rails:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
     - 'lib/fontist/formulas/**/*.rb'
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Exclude:
     - 'lib/fontist/formulas/**/*.rb'
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Exclude:
     - 'lib/fontist/formulas/**/*.rb'

data/README.md

@@ -1,7 +1,7 @@
 # Fontist
 
 [![Build Status](https://github.com/fontist/fontist/actions/workflows/rspec.yml/badge.svg)](https://github.com/fontist/fontist/actions/workflows/rspec.yml)
-[![Gem Version](https://img.shields.io/gem/v/fontist.svg)](https://rubygems.org/gems/fontist")
+[![Gem Version](https://img.shields.io/gem/v/fontist.svg)](https://rubygems.org/gems/fontist)
 [![Pull Requests](https://img.shields.io/github/issues-pr-raw/fontist/fontist.svg)](https://github.com/fontist/fontist/pulls)
 
 A simple library to find and download fonts for Windows, Linux and Mac.

data/lib/fontist/formula_paths.rb

@@ -14,6 +14,7 @@ module Fontist
         paths = search_font_paths(s["font"])
         paths.map do |path|
           { full_name: s["full_name"],
+            type: s["type"],
             path: path }
         end
       end

data/lib/fontist/manifest/install.rb

@@ -14,7 +14,7 @@ module Fontist
 
       def file_paths(font, style)
         paths = find_font_with_name(font, style)
-        return paths unless paths["paths"].empty?
+        return paths unless paths.nil?
 
         install_font(font)
 

data/lib/fontist/manifest/locations.rb

@@ -42,26 +42,40 @@ module Fontist
       end
 
       def style_paths_map(font, names)
-        paths = style_paths(font, names)
-        names.zip(paths).to_h
+        styles = style_paths(font, names)
+        group_paths(styles)
       end
 
       def style_paths(font, names)
-        names.map do |style|
-          file_paths(font, style)
+        names.flat_map do |style|
+          file_paths(font, style) || empty_paths(style)
         end
       end
 
+      def group_paths(styles)
+        styles.group_by { |s| s[:type] }
+          .transform_values { |group| style(group) }
+      end
+
+      def style(styles)
+        { "full_name" => styles.first[:full_name],
+          "paths" => styles.map { |x| x[:path] } }.compact
+      end
+
       def file_paths(font, style)
         find_font_with_name(font, style).tap do |x|
-          if x["paths"].empty?
+          if x.nil?
             raise Errors::MissingFontError.new(font, style)
           end
         end
       end
 
       def find_font_with_name(font, style)
-        Fontist::SystemFont.find_with_name(font, style).map { |k, v| [k.to_s, v] }.to_h
+        Fontist::SystemFont.find_styles(font, style)
+      end
+
+      def empty_paths(style)
+        [{ "full_name" => nil, "type" => style, "path" => nil }]
       end
     end
   end

data/lib/fontist/system_font.rb

@@ -40,8 +40,8 @@ module Fontist
       new(font: font, sources: sources).find
     end
 
-    def self.find_with_name(font, style)
-      new(font: font, style: style).find_with_name
+    def self.find_styles(font, style)
+      new(font: font, style: style).find_styles
     end
 
     def find
@@ -51,22 +51,14 @@ module Fontist
       styles.map { |x| x[:path] }
     end
 
-    def find_with_name
-      styles = find_styles
-      return { full_name: nil, paths: [] } unless styles
-
-      { full_name: styles.first[:full_name],
-        paths: styles.map { |x| x[:path] } }
+    def find_styles
+      find_by_index || find_by_formulas
     end
 
     private
 
     attr_reader :font, :style, :user_sources
 
-    def find_styles
-      find_by_index || find_by_formulas
-    end
-
     def find_by_index
       SystemIndex.new(all_paths).find(font, style)
     end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.11".freeze
+  VERSION = "1.8.12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.11
+  version: 1.8.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down