fontist 0.3.0 → 0.4.0

data/lib/fontist/data/source.yml

@@ -18,4 +18,6 @@ system:
 remote:
   formulas:
     - ./formulas/ms_vista.yml
+    - ./formulas/ms_system.yml
     - ./formulas/source_font.yml
+    - ./formulas/courier.yml

data/lib/fontist/downloader.rb

@@ -7,7 +7,7 @@ module Fontist
       @sha = sha
       @file = file
       @progress = progress
-      @file_size = file_size || default_file_size
+      @file_size = (file_size || default_file_size).to_i
     end
 
     def download

data/lib/fontist/finder.rb

@@ -21,13 +21,11 @@ module Fontist
     end
 
     def remote_source
-      Fontist::Source.formulas.to_h.select do |key, value|
-        !value.fonts.grep(/#{name}/i).empty?
-      end
+      Fontist::FormulaFinder.find(name)
     end
 
     def downloadable_font
-      unless remote_source.empty?
+      unless remote_source.nil?
         raise(
           Fontist::Errors::MissingFontError,
           "Fonts are missing, please run" \

data/lib/fontist/formula_finder.rb

@@ -0,0 +1,94 @@
+module Fontist
+  class FormulaFinder
+    def initialize(font_name)
+      @font_name = font_name
+    end
+
+    def self.find(font_name)
+      new(font_name).find
+    end
+
+    def self.find_fonts(name)
+      new(name).find_fonts
+    end
+
+    def find
+      formulas = find_formula
+      build_formulas_array(formulas)
+    end
+
+    def find_fonts
+      matched_fonts = find_formula.map do |key, _value|
+        formulas[key].fonts.select do |font|
+          font.name == font_name
+        end
+      end
+
+      matched_fonts.empty? ? nil : matched_fonts.flatten
+    end
+
+    private
+
+    attr_reader :font_name
+
+    def build_formulas_array(formulas)
+      unless formulas.empty?
+        Array.new.tap do |formula_array|
+          formulas.each do |key|
+            formula_array.push(
+              key: key.to_s,
+              installer: formula_installers[key]
+            )
+          end
+        end
+      end
+    end
+
+    def find_formula
+      find_by_font_name || find_by_font || []
+    end
+
+    def formulas
+      @formulas ||=  Fontist::Source.formulas.to_h
+    end
+
+    def formula_installers
+      {
+        msvista: Fontist::Formulas::MsVista,
+        ms_system: Fontist::Formulas::MsSystem,
+        courier: Fontist::Formulas::CourierFont,
+        source_front: Fontist::Formulas::SourceFont,
+      }
+    end
+
+    def find_by_font_name
+      formula_names = formulas.select do |key, value|
+        !value.fonts.map(&:name).grep(/#{font_name}/i).empty?
+      end.keys
+
+      formula_names.empty? ? nil : formula_names
+    end
+
+    # Note
+    #
+    # These interface recursively look into every single font styles,
+    # so ideally try to avoid using it when possible, and that's why
+    # we've added it as last option in formula finder.
+    #
+    def find_by_font
+      formula_names = formulas.select do |key, value|
+        match_in_font_styles?(value.fonts)
+      end.keys
+
+      formula_names.empty? ? nil : formula_names
+    end
+
+    def match_in_font_styles?(fonts)
+      styles = fonts.select do |font|
+        !font.styles.map(&:font).grep(/#{font_name}/i).empty?
+      end
+
+      styles.empty? ? false : true
+    end
+  end
+end

data/lib/fontist/formulas.rb

@@ -1,6 +1,8 @@
 require "fontist/formulas/base"
 require "fontist/formulas/ms_vista"
+require "fontist/formulas/ms_system"
 require "fontist/formulas/source_font"
+require "fontist/formulas/courier_font"
 
 module Fontist
   module Formulas

data/lib/fontist/formulas/base.rb

@@ -1,7 +1,12 @@
+require "fontist/downloader"
+require "fontist/formulas/helpers/exe_extractor"
+require "fontist/formulas/helpers/zip_extractor"
+
 module Fontist
   module Formulas
     class Base
       def initialize(font_name, confirmation:, **options)
+        @matched_fonts = []
         @font_name = font_name
         @confirmation = confirmation || "no"
         @force_download = options.fetch(:force_download, false)
@@ -14,12 +19,54 @@ module Fontist
         new(font_name, options.merge(confirmation: confirmation)).fetch
       end
 
+      def fetch
+        extract_fonts(map_names_to_fonts(font_name))
+
+        matched_fonts_uniq = matched_fonts.flatten.uniq
+        matched_fonts_uniq.empty? ? nil : matched_fonts_uniq
+      end
+
       private
 
-      attr_reader :font_name, :confirmation, :fonts_path, :force_download
+      attr_reader(
+        :font_name,
+        :fonts_path,
+        :confirmation,
+        :matched_fonts,
+        :force_download,
+      )
 
       def check_user_license_agreement
       end
+
+      def resources(name, &block)
+        source = formulas[name]
+        block_given? ? yield(source) : source
+      end
+
+      def formulas
+        @formulas ||= Fontist::Source.formulas
+      end
+
+      def match_fonts(fonts_dir, font_name)
+        font = fonts_dir.grep(/#{font_name}/i)
+        @matched_fonts.push(font) if font
+
+        font
+      end
+
+      def map_names_to_fonts(font_name)
+        fonts = FormulaFinder.find_fonts(font_name)
+        fonts = fonts.map { |font| font.styles.map(&:font) }.flatten if fonts
+
+        fonts || []
+      end
+
+      def download_file(source)
+        Fontist::Downloader.download(
+          source.urls.first, sha: source.sha, file_size: source.file_size,
+        )
+      end
     end
   end
 end

data/lib/fontist/formulas/courier_font.rb

@@ -0,0 +1,25 @@
+module Fontist
+  module Formulas
+    class CourierFont < Base
+      include Formulas::Helpers::ExeExtractor
+
+      private
+
+      def extract_fonts(font_names)
+        resources("courier") do |resource|
+          cab_extract(resource) do |fonts_dir|
+            font_names.each do |font_name|
+              match_fonts(fonts_dir, font_name)
+            end
+          end
+        end
+      end
+
+      def check_user_license_agreement
+        unless resources("courier").agreement === confirmation
+          raise(Fontist::Errors::LicensingError)
+        end
+      end
+    end
+  end
+end

data/lib/fontist/formulas/helpers/exe_extractor.rb

@@ -0,0 +1,45 @@
+module Fontist
+  module Formulas
+    module Helpers
+      module ExeExtractor
+        def cab_extract(exe_file, download: true,  font_ext: /.tt|.ttc/i)
+          exe_file = download_file(exe_file).path if download
+          cab_file = decompressor.search(exe_file)
+          cabbed_fonts = grep_fonts(cab_file.files, font_ext) || []
+          fonts_paths = extract_cabbed_fonts_to_assets(cabbed_fonts)
+
+          yield(fonts_paths) if block_given?
+        end
+
+        private
+
+        def decompressor
+          @decompressor ||= (
+            require "libmspack"
+            LibMsPack::CabDecompressor.new
+          )
+        end
+
+        def grep_fonts(file, font_ext)
+          Array.new.tap do |fonts|
+            while file
+              fonts.push(file) if file.filename.match(font_ext)
+              file = file.next
+            end
+          end
+        end
+
+        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
+              decompressor.extract(font, font_path)
+
+              fonts.push(font_path)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fontist/formulas/helpers/zip_extractor.rb

@@ -0,0 +1,36 @@
+module Fontist
+  module Formulas
+    module Helpers
+      module ZipExtractor
+        def zip_extract(resource, download: true, fonts_sub_dir: "/")
+          zip_file = download_file(resource) if download
+          zip_file ||= resource.urls.first
+
+          fonts_paths = unzip_fonts(zip_file, fonts_sub_dir)
+          block_given? ? yield(fonts_paths) : fonts_paths
+        end
+
+        private
+
+        def unzip_fonts(file, fonts_sub_dir = "/")
+          Zip.on_exists_proc = true
+
+          Array.new.tap do |fonts|
+            Zip::File.open(file) do |zip_file|
+              zip_file.glob("#{fonts_sub_dir}*.{ttf,ttc}").each do |entry|
+                filename = entry.name.gsub("#{fonts_sub_dir}", "")
+
+                if filename
+                  font_path = fonts_path.join(filename)
+                  fonts.push(font_path.to_s)
+
+                  entry.extract(font_path)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fontist/formulas/ms_system.rb

@@ -0,0 +1,29 @@
+module Fontist
+  module Formulas
+    class MsSystem < Base
+      include Formulas::Helpers::ExeExtractor
+
+      private
+
+      def data_node
+        @data_node ||= "ms_system"
+      end
+
+      def check_user_license_agreement
+        unless resources(data_node).agreement === confirmation
+          raise(Fontist::Errors::LicensingError)
+        end
+      end
+
+      def extract_fonts(font_names)
+        resources(data_node) do |resource|
+          cab_extract(resource) do |fonts_dir|
+            font_names.each do |font_name|
+              match_fonts(fonts_dir, font_name)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fontist/formulas/ms_vista.rb

@@ -1,69 +1,37 @@
-require "fontist/downloader"
-
 module Fontist
   module Formulas
     class MsVista < Base
-      def fetch
-        fonts = extract_ppviewer_fonts
-        paths = fonts.grep(/#{font_name}/i)
-        paths.empty? ? nil : paths
-      end
+      include Formulas::Helpers::ExeExtractor
 
       private
 
-      def check_user_license_agreement
-        unless source.agreement === confirmation
-          raise(Fontist::Errors::LicensingError)
-        end
+      def data_node
+        @data_node ||= "msvista"
       end
 
-      def decompressor
-        @decompressor ||= (
-          require "libmspack"
-          LibMsPack::CabDecompressor.new
-        )
-      end
-
-      def extract_ppviewer_fonts
-        Array.new.tap do |fonts|
-          cabbed_fonts.each do |font|
-            font_path = fonts_path.join(font.filename).to_s
-            decompressor.extract(font, font_path)
-
-            fonts.push(font_path)
-          end
-        end
-      end
-
-      def extract_ppviewer_cab_file
-        if !File.exists?(ppviewer_cab) || force_download
-          exe_file = decompressor.search(download_exe_file.path)
-          decompressor.extract(exe_file.files.next, ppviewer_cab)
+      def check_user_license_agreement
+        unless resources(data_node).agreement === confirmation
+          raise(Fontist::Errors::LicensingError)
         end
       end
 
-      def cabbed_fonts
-        extract_ppviewer_cab_file
-        grep_cabbed_fonts(decompressor.search(ppviewer_cab).files) || []
-      end
-
-      def grep_cabbed_fonts(file)
-        Array.new.tap do |fonts|
-          while file
-            fonts.push(file) if file.filename.match(/.tt|.TT/)
-            file = file.next
+      def extract_fonts(font_names)
+        resources(data_node) do |resource|
+          exe_extract(resource) do |cab_file|
+            cab_extract(cab_file, download: false) do |fonts_dir|
+              font_names.each do |font_name|
+                match_fonts(fonts_dir, font_name)
+              end
+            end
           end
         end
       end
 
-      def source
-        @source ||= Fontist::Source.formulas.msvista
-      end
+      def exe_extract(source)
+        cab_files = decompressor.search(download_file(source).path)
+        decompressor.extract(cab_files.files.next, ppviewer_cab)
 
-      def download_exe_file
-        Fontist::Downloader.download(
-          source.urls.first, file_size: source.file_size.to_i, sha: source.sha
-        )
+        yield(ppviewer_cab) if block_given?
       end
 
       def ppviewer_cab

data/lib/fontist/formulas/source_font.rb

@@ -3,46 +3,23 @@ require "zip"
 module Fontist
   module Formulas
     class SourceFont < Formulas::Base
-      def fetch
-        paths = extract_fonts.grep(/#{font_name}/i)
-        paths.empty? ? nil : paths
-      end
+      include Formulas::Helpers::ZipExtractor
 
       private
 
-      def source
-        @source ||= Fontist::Source.formulas.source_font
-      end
-
-      def extract_fonts
-        zip_file = download_file
-        unzip_fonts(zip_file)
+      def data_node
+        @data_node ||= "source_font"
       end
 
-      def unzip_fonts(file)
-        Zip.on_exists_proc = true
-
-        Array.new.tap do |fonts|
-          Zip::File.open(file) do |zip_file|
-            zip_file.glob("fonts/*.ttf").each do |entry|
-              filename = entry.name.gsub("fonts/", "")
-
-              if filename
-                font_path = fonts_path.join(filename)
-                fonts.push(font_path.to_s)
-
-                entry.extract(font_path)
-              end
+      def extract_fonts(font_names)
+        resources(data_node) do |resource|
+          zip_extract(resource, fonts_sub_dir: "fonts/") do |fonts_paths|
+            font_names.each do |font_name|
+              match_fonts(fonts_paths, font_name)
             end
           end
         end
       end
-
-      def download_file
-        Fontist::Downloader.download(
-          source.urls.first, file_size: source.file_size.to_i, sha: source.sha
-        )
-      end
     end
   end
 end