fontist 1.5.0 → 1.7.2

data/lib/fontist/utils/dsl.rb

@@ -47,6 +47,10 @@ module Fontist
         instance.temp_resource.merge!(filename: name)
       end
 
+      def source_filename(name)
+        instance.temp_resource.merge!(source_filename: name)
+      end
+
       def provides_font(font, options = {})
         font_styles = instance.extract_font_styles(options)
         instance.font_list.push(name: font, styles: font_styles)

data/lib/fontist/utils/dsl/collection_font.rb

@@ -0,0 +1,36 @@
+module Fontist
+  module Utils
+    module Dsl
+      class CollectionFont
+        REQUIRED_ATTRIBUTES = %i[style].freeze
+
+        attr_reader :attributes
+
+        def initialize(attributes)
+          REQUIRED_ATTRIBUTES.each do |required_attribute|
+            unless attributes[required_attribute]
+              raise(Fontist::Errors::MissingAttributeError.new(
+                      "Missing attribute: #{required_attribute}"
+                    ))
+            end
+          end
+
+          self.attributes = attributes
+        end
+
+        def attributes=(attrs)
+          @attributes = { family_name: attrs[:family_name],
+                          type: attrs[:style],
+                          collection: attrs[:full_name],
+                          full_name: attrs[:full_name],
+                          post_script_name: attrs[:post_script_name],
+                          version: attrs[:version],
+                          description: attrs[:description],
+                          copyright: attrs[:copyright],
+                          font: attrs[:filename],
+                          source_font: attrs[:source_filename] }
+        end
+      end
+    end
+  end
+end

data/lib/fontist/utils/dsl/font.rb

@@ -29,7 +29,8 @@ module Fontist
                           version: attrs[:version],
                           description: attrs[:description],
                           copyright: attrs[:copyright],
-                          font: attrs[:filename] }
+                          font: attrs[:filename],
+                          source_font: attrs[:source_filename] }
         end
       end
     end

data/lib/fontist/utils/exe_extractor.rb

@@ -5,17 +5,19 @@ module Fontist
         download = @downloaded === true ? false : download
 
         exe_file = download_file(exe_file).path if download
+
+        Fontist.ui.say(%(Installing font "#{key}".))
         cab_file = decompressor.search(exe_file)
-        cabbed_fonts = grep_fonts(cab_file.files, font_ext) || []
+        cabbed_fonts = grep_fonts(cab_file.files) || []
         fonts_paths = extract_cabbed_fonts_to_assets(cabbed_fonts)
 
         block_given? ? yield(fonts_paths) : fonts_paths
       end
 
-      def exe_extract(source)
+      def exe_extract(source, subarchive: nil)
         cab_file = decompressor.search(download_file(source).path)
-        fonts_paths = build_cab_file_hash(cab_file.files)
-        block_given? ? yield(fonts_paths) : fonts_paths
+        subarchive_path = extract_subarchive(cab_file.files, subarchive)
+        block_given? ? yield(subarchive_path) : subarchive_path
       end
 
       private
@@ -27,10 +29,10 @@ module Fontist
         )
       end
 
-      def grep_fonts(file, font_ext)
+      def grep_fonts(file)
         Array.new.tap do |fonts|
           while file
-            fonts.push(file) if file.filename.match(font_ext)
+            fonts.push(file) if font_file?(file.filename)
             file = file.next
           end
         end
@@ -39,7 +41,8 @@ module Fontist
       def extract_cabbed_fonts_to_assets(cabbed_fonts)
         Array.new.tap do |fonts|
           cabbed_fonts.each do |font|
-            font_path = fonts_path.join(font.filename).to_s
+            target_filename = target_filename(font.filename)
+            font_path = fonts_path.join(target_filename).to_s
             decompressor.extract(font, font_path)
 
             fonts.push(font_path)
@@ -47,10 +50,11 @@ module Fontist
         end
       end
 
-      def build_cab_file_hash(file)
+      def extract_subarchive(file, subarchive = nil)
         while file
           filename = file.filename
-          if filename.include?("cab") || filename.include?("msi")
+
+          if subarchive_found?(filename, subarchive)
             file_path = File.join(Dir.mktmpdir, filename)
             decompressor.extract(file, file_path)
 
@@ -60,6 +64,12 @@ module Fontist
           file = file.next
         end
       end
+
+      def subarchive_found?(filename, subarchive)
+        return subarchive == filename if subarchive
+
+        filename.include?("cab") || filename.include?("msi")
+      end
     end
   end
 end

data/lib/fontist/utils/ui.rb

@@ -18,6 +18,10 @@ module Fontist
       def self.ask(message, options = {})
         new.ask(message, options)
       end
+
+      def self.print(message)
+        super
+      end
     end
   end
 end

data/lib/fontist/utils/zip_extractor.rb

@@ -4,40 +4,49 @@ require "pathname"
 module Fontist
   module Utils
     module ZipExtractor
-      # fonts_sub_dir is unused now, but formulas have this option
-      # rubocop:disable Lint/UnusedMethodArgument
-      def zip_extract(resource, download: true, fonts_sub_dir: "")
+      def zip_extract(resource, download: true, fonts_sub_dir: nil)
         zip_file = download_file(resource) if download
         zip_file ||= resource.urls.first
 
-        fonts_paths = unzip_fonts(zip_file)
+        Fontist.ui.say(%(Installing font "#{key}".))
+        fonts_paths = unzip_fonts(zip_file, fonts_sub_dir)
         block_given? ? yield(fonts_paths) : fonts_paths
       end
-      # rubocop:enable Lint/UnusedMethodArgument
 
       alias_method :unzip, :zip_extract
 
       private
 
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      def unzip_fonts(file)
+      def unzip_fonts(file, subdir)
         Zip.on_exists_proc = true
 
         Array.new.tap do |fonts|
           Zip::File.open(file) do |zip_file|
-            zip_file.glob("**/*.{ttf,ttc,otf}").each do |entry|
+            zip_file.each do |entry|
               if entry.name
-                filename = Pathname.new(entry.name).basename
-                font_path = fonts_path.join(filename.to_s)
-                fonts.push(font_path.to_s)
+                filename = Pathname.new(entry.name).basename.to_s
+                if font_directory?(entry.name, subdir) && font_file?(filename)
+                  target_filename = target_filename(filename)
+                  font_path = fonts_path.join(target_filename)
+                  fonts.push(font_path.to_s)
 
-                entry.extract(font_path)
+                  entry.extract(font_path)
+                end
               end
             end
           end
         end
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+      def font_directory?(path, subdir)
+        return true unless subdir
+
+        dirname = File.dirname(path)
+        normalized_pattern = subdir.chomp("/")
+        File.fnmatch?(normalized_pattern, dirname)
+      end
     end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.5.0".freeze
+  VERSION = "1.7.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ttfunk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +298,8 @@ files:
 - lib/fontist/import/extractors/seven_zip_extractor.rb
 - lib/fontist/import/extractors/zip_extractor.rb
 - lib/fontist/import/files/collection_file.rb
+- lib/fontist/import/files/file_requirement.rb
+- lib/fontist/import/files/font_detector.rb
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb
@@ -306,16 +322,17 @@ files:
 - lib/fontist/import/template_helper.rb
 - lib/fontist/import/text_helper.rb
 - lib/fontist/manifest.rb
-- lib/fontist/manifest/common.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
 - lib/fontist/registry.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
+- lib/fontist/system_index.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
 - lib/fontist/utils/downloader.rb
 - lib/fontist/utils/dsl.rb
+- lib/fontist/utils/dsl/collection_font.rb
 - lib/fontist/utils/dsl/font.rb
 - lib/fontist/utils/exe_extractor.rb
 - lib/fontist/utils/msi_extractor.rb

data/lib/fontist/manifest/common.rb

@@ -1,60 +0,0 @@
-module Fontist
-  module Manifest
-    class Common
-      def initialize(manifest)
-        @manifest = manifest
-      end
-
-      def self.call(manifest)
-        new(manifest).call
-      end
-
-      def call
-        font_names.zip(font_paths).to_h
-      end
-
-      private
-
-      def font_names
-        fonts.keys
-      end
-
-      def fonts
-        @fonts ||= begin
-          unless File.exist?(@manifest)
-            raise Fontist::Errors::ManifestCouldNotBeFoundError
-          end
-
-          fonts = YAML.load_file(@manifest)
-          unless fonts.is_a?(Hash)
-            raise Fontist::Errors::ManifestCouldNotBeReadError
-          end
-
-          fonts
-        end
-      end
-
-      def font_paths
-        fonts.map do |font, styles|
-          styles_to_ary = [styles].flatten
-          style_paths_map(font, styles_to_ary)
-        end
-      end
-
-      def style_paths_map(font, names)
-        paths = style_paths(font, names)
-        names.zip(paths).to_h
-      end
-
-      def style_paths(font, names)
-        names.map do |style|
-          file_paths(font, style)
-        end
-      end
-
-      def file_paths(_font, _style)
-        raise NotImplementedError.new("Implement #file_paths in child class")
-      end
-    end
-  end
-end