fontist 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dbc313275aceace35c9a4f5e39bf17af46e8d0c2d661f4270909c36d6dc855e
-  data.tar.gz: 8abacb5373f59f3e0df5fae5baeb2a81adfab4eb40a5ae55a12867c4da646d88
+  metadata.gz: ec6fb2284e060c8f43ac62c16a9777d25d20886ef2ff687eecdfb963980bb350
+  data.tar.gz: ddcba3ee0f0a7c75f23532d7809c7c40492583ba032b4ebbc204d0730f6af9a4
 SHA512:
-  metadata.gz: d5b234dcafb1ad011c508b1972b2b0ba79aa0222cdc5117d6c47250f2a8e4f3ec62f9404ac039ee8452b88aa050200201d1b3957e2ff70c7da1f54556b82a41a
-  data.tar.gz: 49dc8f923c050fc6d793fe5a24315e75728e5baa9c50cb97ca596641d4344d301bdab3bd96b0e6f7157b745daaa78e5755325e22d2dc97dd72aff6bf4ddae8d4
+  metadata.gz: 7bfc0b3cb5597ceca0474c95d47a26e993ccf91773b4a17b10f08c84ac2ec4dfed40d3a271b309c6b2f7c77cd14dca5978b88a274c7aba3ba3ee95b25afcea30
+  data.tar.gz: af007b2fda60f2f53bf2be5c107bf27ec423b9759f62c6827bdecc50ed62bf56a4f4f0969ec9d74f91631f92cad75c0564182424ef2b5754ead6c9335ae87ac1

data/lib/fontist.rb

@@ -8,8 +8,6 @@ require "fontist/errors"
 require "fontist/version"
 
 require "fontist/font"
-require "fontist/downloader"
-
 require "fontist/registry"
 require "fontist/formulas"
 require "fontist/formula"

data/lib/fontist/font_formula.rb

@@ -6,7 +6,7 @@ module Fontist
     include Fontist::Utils::ExeExtractor
 
     attr_accessor :license, :license_url, :license_required
-    attr_accessor :key, :homepage, :description, :temp_resource
+    attr_accessor :key, :homepage, :description, :options, :temp_resource
 
     def font_list
       @font_list ||= []
@@ -105,12 +105,19 @@ module Fontist
     end
 
     def download_file(source)
-      downloaded_file = Fontist::Downloader.download(
-        source[:urls].sample, sha: source[:sha256], file_size: source[:file_size]
+      downloaded_file = Fontist::Utils::Downloader.download(
+        source[:urls].sample,
+        sha: source[:sha256],
+        file_size: source[:file_size],
+        progress_bar: is_progress_bar_enabled
       )
 
       @downloaded = true
       downloaded_file
     end
+
+    def is_progress_bar_enabled
+      options.nil? ? false : options.fetch(:progress_bar, false)
+    end
   end
 end

data/lib/fontist/formulas/cleartype_fonts.rb

@@ -5,6 +5,7 @@ module Fontist
       desc "Microsoft ClearType Fonts"
       homepage "https://www.microsoft.com"
 
+      display_progress_bar(true)
       resource "PowerPointViewer.exe" do
         urls [
           "https://nchc.dl.sourceforge.net/project/mscorefonts2/cabs/PowerPointViewer.exe",

data/lib/fontist/system.yml

@@ -10,6 +10,7 @@ system:
   macosx:
     paths:
       - /System/Library/Fonts/**/**.{ttf,ttc}
+      - /Applications/Microsoft**/Contents/Resources/**/**.{ttf,ttc}
 
   unix:
     paths:

data/lib/fontist/system_font.rb

@@ -29,8 +29,8 @@ module Fontist
     end
 
     def lookup_using_font_name
-      font_names = map_name_to_valid_font_names
-      font_paths.grep(/#{font_names.join("|")}/i) if font_names
+      font_names = map_name_to_valid_font_names || []
+      font_paths.grep(/#{font_names.join("|")}/i) unless font_names.empty?
     end
 
     def fontist_fonts_path

data/lib/fontist/utils.rb

@@ -1,4 +1,5 @@
 require "fontist/utils/dsl"
+require "fontist/utils/downloader"
 require "fontist/utils/zip_extractor"
 require "fontist/utils/exe_extractor"
 

data/lib/fontist/utils/downloader.rb

@@ -0,0 +1,72 @@
+module Fontist
+  module Utils
+    class Downloader
+      def initialize(file, file_size: nil, sha: nil, progress_bar: nil)
+        @file = file
+        @progress_bar = progress_bar
+        @sha = [sha].flatten.compact
+        @file_size = (file_size || default_file_size).to_i
+      end
+
+      def download
+        file = download_file
+
+        if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
+          raise(Fontist::Errors::TemparedFileError.new(
+            "The downloaded file from #{@file} doesn't " \
+            "match with the expected sha256 checksum!"
+          ))
+        end
+
+        file
+      end
+
+      def self.download(file, options = {})
+        new(file, options).download
+      end
+
+      private
+
+      attr_reader :file, :sha, :file_size
+
+      def default_file_size
+        5 * byte_to_megabyte
+      end
+
+      def byte_to_megabyte
+        @byte_to_megabyte ||= 1024 * 1024
+      end
+
+      def download_path
+        options[:download_path] || Fontist.root_path.join("tmp")
+      end
+
+      def download_file
+        bar = ProgressBar.new(file_size / byte_to_megabyte)
+
+        Down.download(
+          @file,
+          progress_proc: -> (progress) {
+            bar.increment(progress / byte_to_megabyte) if @progress_bar === true
+          }
+        )
+
+      rescue Down::NotFound
+        raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
+      end
+    end
+
+    class ProgressBar
+      def initialize(total)
+        @counter = 1
+        @total  = total
+      end
+
+      def increment(progress)
+        complete = sprintf("%#.2f%%", ((@counter.to_f / @total.to_f) * 100))
+        print "\r\e[0KDownloads: #{@counter}MB/#{@total}MB (#{complete})"
+        @counter = progress
+      end
+    end
+  end
+end

data/lib/fontist/utils/dsl.rb

@@ -68,6 +68,10 @@ module Fontist
       def license_url(url)
         instance.license_url = url
       end
+
+      def display_progress_bar(value )
+        instance.options = (instance.options || {}).merge(progress_bar: value )
+      end
     end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/spec/fontist/system_font_spec.rb

@@ -24,6 +24,11 @@ RSpec.describe Fontist::SystemFont do
     end
 
     context "with invalid font" do
+      it "returns nil for partial-not match" do
+        name = "Deje"
+        expect(Fontist::SystemFont.find(name)).to be_nil
+      end
+
       it "returns nill to the caller" do
         name = "invalid-font.ttf"
         invalid_font = Fontist::SystemFont.find(name, sources: [font_sources])

data/spec/fontist/{downloader_spec.rb → utils/downloader_spec.rb}

@@ -1,9 +1,9 @@
 require "spec_helper"
 
-RSpec.describe Fontist::Downloader do
+RSpec.describe Fontist::Utils::Downloader do
   describe ".download" do
     it "return the valid downloaded file" do
-      tempfile = Fontist::Downloader.download(
+      tempfile = Fontist::Utils::Downloader.download(
         sample_file[:file],
         sha: sample_file[:sha],
         file_size: sample_file[:file_size],
@@ -15,7 +15,7 @@ RSpec.describe Fontist::Downloader do
 
     it "raises an error for tempared file" do
       expect{
-        Fontist::Downloader.download(
+        Fontist::Utils::Downloader.download(
           sample_file[:file],
           sha: sample_file[:sha] + "mm",
           file_size: sample_file[:file_size]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -131,7 +131,6 @@ files:
 - bin/setup
 - fontist.gemspec
 - lib/fontist.rb
-- lib/fontist/downloader.rb
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
 - lib/fontist/font_formula.rb
@@ -157,12 +156,12 @@ files:
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
 - lib/fontist/utils.rb
+- lib/fontist/utils/downloader.rb
 - lib/fontist/utils/dsl.rb
 - lib/fontist/utils/exe_extractor.rb
 - lib/fontist/utils/zip_extractor.rb
 - lib/fontist/version.rb
 - spec/fixtures/fonts/DejaVuSerif.ttf
-- spec/fontist/downloader_spec.rb
 - spec/fontist/font_formula_spec.rb
 - spec/fontist/font_spec.rb
 - spec/fontist/formula_spec.rb
@@ -184,6 +183,7 @@ files:
 - spec/fontist/formulas/webding_font_spec.rb
 - spec/fontist/registry_spec.rb
 - spec/fontist/system_font_spec.rb
+- spec/fontist/utils/downloader_spec.rb
 - spec/fontist_spec.rb
 - spec/spec_helper.rb
 - spec/support/fontist_helper.rb

data/lib/fontist/downloader.rb

@@ -1,70 +0,0 @@
-module Fontist
-  class Downloader
-    def initialize(file, file_size: nil, sha: nil, progress: nil)
-      @file = file
-      @progress = progress
-      @sha = [sha].flatten.compact
-      @file_size = (file_size || default_file_size).to_i
-    end
-
-    def download
-      file = download_file
-
-      if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
-        raise(Fontist::Errors::TemparedFileError.new(
-          "The downloaded file from #{@file} doesn't " \
-          "match with the expected sha256 checksum!"
-        ))
-      end
-
-      file
-    end
-
-    def self.download(file, options = {})
-      new(file, options).download
-    end
-
-    private
-
-    attr_reader :file, :sha, :file_size
-
-    def default_file_size
-      5 * byte_to_megabyte
-    end
-
-    def byte_to_megabyte
-      @byte_to_megabyte ||= 1024 * 1024
-    end
-
-    def download_path
-      options[:download_path] || Fontist.root_path.join("tmp")
-    end
-
-    def download_file
-      bar = ProgressBar.new(file_size / byte_to_megabyte)
-
-      Down.download(
-        @file,
-        progress_proc: -> (progress) {
-          bar.increment(progress / byte_to_megabyte) if @progress === true
-        }
-      )
-
-    rescue Down::NotFound
-      raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
-    end
-  end
-
-  class ProgressBar
-    def initialize(total)
-      @counter = 1
-      @total  = total
-    end
-
-    def increment(progress)
-      complete = sprintf("%#.2f%%", ((@counter.to_f / @total.to_f) * 100))
-      print "\r\e[0KDownloads: #{@counter}MB/#{@total}MB (#{complete})"
-      @counter = progress
-    end
-  end
-end