fontist 0.3.0 → 0.4.0

data/lib/fontist/installer.rb

@@ -20,28 +20,23 @@ module Fontist
 
     attr_reader :font_name, :confirmation, :options
 
-    def downloaders
-      {
-        msvista: Fontist::Formulas::MsVista,
-        source_front: Fontist::Formulas::SourceFont,
-      }
-    end
-
     def find_system_font
       Fontist::SystemFont.find(font_name)
     end
 
-    def download_font
-      if !font_sources.empty?
-        downloader = downloaders[font_sources.first]
-        downloader.fetch_font(font_name, confirmation: confirmation)
-      end
+    def font_formulas
+      Fontist::FormulaFinder.find(font_name)
     end
 
-    def font_sources
-      @font_sources ||= Fontist::Source.formulas.to_h.select do |key, value|
-        !value.fonts.grep(/#{font_name}/i).empty?
-      end.keys
+    def download_font
+      if font_formulas
+        font_formulas.map do |formula|
+          formula[:installer].fetch_font(
+            font_name,
+            confirmation: confirmation,
+          )
+        end.flatten
+      end
     end
   end
 end

data/lib/fontist/system_font.rb

@@ -13,6 +13,8 @@ module Fontist
 
     def find
       paths = font_paths.grep(/#{font}/i)
+      paths = lookup_using_font_name || []  if paths.empty?
+
       paths.empty? ? nil : paths
     end
 
@@ -35,6 +37,11 @@ module Fontist
       ).flatten.uniq)
     end
 
+    def lookup_using_font_name
+      font_names = map_name_to_valid_font_names
+      font_paths.grep(/#{font_names.join("|")}/i) if font_names
+    end
+
     def fontist_fonts_path
       @fontist_fonts_path ||= Fontist.fonts_path
     end
@@ -61,5 +68,9 @@ module Fontist
       )
     end
 
+    def map_name_to_valid_font_names
+      fonts =  FormulaFinder.find_fonts(font)
+      fonts.map { |font| font.styles.map(&:font) }.flatten if fonts
+    end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/spec/fontist/finder_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Fontist::Finder do
 
     context "with downloadable ms vista font" do
       it "returns missing font error" do
-        name = "CALIBRI.TTF"
+        name = "Calibri"
         allow(Fontist::SystemFont).to receive(:find).and_return(nil)
 
         expect {

data/spec/fontist/formula_finder_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+RSpec.describe Fontist::FormulaFinder do
+  describe ".find" do
+    context "by font name" do
+      it "returns the font formulas" do
+        name = "Calibri"
+        formulas = Fontist::FormulaFinder.find(name)
+
+        expect(formulas.count).to eq(1)
+        expect(formulas.first[:key]).to eq("msvista")
+        expect(formulas.first[:installer]).to eq(Fontist::Formulas::MsVista)
+      end
+    end
+
+    context "by exact font" do
+      it "returns the font formulas" do
+        name = "CAMBRIAI.TTF"
+        formulas = Fontist::FormulaFinder.find(name)
+
+        expect(formulas.count).to eq(1)
+        expect(formulas.first[:key]).to eq("msvista")
+        expect(formulas.first[:installer]).to eq(Fontist::Formulas::MsVista)
+      end
+    end
+
+    context "for invalid font" do
+      it "returns nil to the caller" do
+        name = "Calibri Made Up Name"
+        formulas = Fontist::FormulaFinder.find(name)
+
+        expect(formulas).to be_nil
+      end
+    end
+  end
+
+  describe ".find_fonts" do
+    it "returns the exact font font names" do
+      name = "Calibri"
+      font = Fontist::FormulaFinder.find_fonts(name).first
+
+      expect(font.styles.map(&:font)).to include("CALIBRI.TTF")
+      expect(font.styles.map(&:font)).to include("CALIBRIB.TTF")
+      expect(font.styles.map(&:font)).to include("CALIBRII.TTF")
+    end
+
+    it "returns nil if invalid name provided" do
+      name = "Calibri Invlaid"
+      fonts = Fontist::FormulaFinder.find_fonts(name)
+
+      expect(fonts).to be_nil
+    end
+  end
+end

data/spec/fontist/formulas/courier_font_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+RSpec.describe Fontist::Formulas::CourierFont do
+  describe ".fetch_font" do
+    context "with valid licence", skip_in_windows: true do
+      it "downloads and returns the fonts" do
+        name = "Courier"
+        stub_fontist_path_to_assets
+        fonts = Fontist::Formulas::CourierFont.fetch_font(
+          name, confirmation: "yes", force_download: true
+        )
+
+        expect(fonts.count).to eq(4)
+        expect(fonts.first).to include("fonts/cour.ttf")
+        expect(Fontist::Finder.find(name)).not_to be_empty
+      end
+    end
+
+    context "with invalid licence agreement" do
+      it "raise an licensing error" do
+        font_name = "cour"
+        stub_fontist_path_to_assets
+
+        expect {
+          Fontist::Formulas::CourierFont.fetch_font(font_name, confirmation: "no")
+        }.to raise_error(Fontist::Errors::LicensingError)
+      end
+    end
+  end
+end

data/spec/fontist/formulas/ms_system_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+RSpec.describe Fontist::Formulas::MsSystem do
+  describe ".fetch_font" do
+    context "with valid licence", skip_in_windows: false do
+      it "downloads and returns font paths", file_download: true do
+        name = "Times"
+        stub_fontist_path_to_assets
+
+        fonts = Fontist::Formulas::MsSystem.fetch_font(
+          name, confirmation: "yes"
+        )
+
+        expect(fonts).not_to be_empty
+        expect(fonts.first).to include(name)
+        expect(Fontist::Finder.find(name)).not_to be_empty
+      end
+    end
+
+    context "with invalid licence agreement" do
+      it "raise an licensing error" do
+        font_name = "Times"
+        stub_fontist_path_to_assets
+
+        expect {
+          Fontist::Formulas::MsSystem.fetch_font(font_name, confirmation: "no")
+        }.to raise_error(Fontist::Errors::LicensingError)
+      end
+    end
+  end
+end

data/spec/fontist/formulas/ms_vista_spec.rb

@@ -2,11 +2,11 @@ require "spec_helper"
 
 RSpec.describe Fontist::Formulas::MsVista do
   describe ".fetch_font" do
-    context "with valid licence", file_download: true do
-      it "downloads and returns font paths" do
+    context "with valid licence" do
+      it "downloads and returns font paths", file_download: true do
         name = "CANDARAI.TTF"
         fonts = Fontist::Formulas::MsVista.fetch_font(
-          name, confirmation: "yes", force_download: true
+          name, confirmation: "yes"
         )
 
         expect(fonts.count).to eq(1)

data/spec/fontist/installer_spec.rb

@@ -3,8 +3,8 @@ require "spec_helper"
 RSpec.describe Fontist::Installer do
   describe ".download" do
     context "with already downloaded fonts", skip_in_windows: true do
-      it "returns the font path" do
-        name = "CALIBRI.TTF"
+      it "returns the font path", file_download: true do
+        name = "Arial"
         Fontist::Formulas::MsVista.fetch_font(name, confirmation: "yes")
 
         allow(Fontist::Formulas::MsVista).to receive(:fetch_font).and_return(nil)
@@ -16,7 +16,7 @@ RSpec.describe Fontist::Installer do
 
     context "with missing but downloadable fonts" do
       it "downloads and install the fonts", skip_in_windows: true do
-        name = "CALIBRI.TTF"
+        name = "Arial"
         confirmation = "yes"
         allow(Fontist::SystemFont).to receive(:find).and_return(nil)
 
@@ -26,7 +26,7 @@ RSpec.describe Fontist::Installer do
       end
 
       it "do not download if user didn't agree" do
-        name = "CALIBRI.TTF"
+        name = "Calibri"
         allow(Fontist::SystemFont).to receive(:find).and_return(nil)
 
         expect {

data/spec/fontist/source_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Fontist::Source do
 
       expect(formulas.msvista.license).not_to be_nil
       expect(formulas.msvista.file_size).to eq("62914560")
-      expect(formulas.msvista.fonts).to include("CALIBRI.TTF")
+      expect(formulas.msvista.fonts.map(&:name)).to include("Calibri")
     end
   end
 end

data/spec/fontist/system_font_spec.rb

@@ -12,6 +12,17 @@ RSpec.describe Fontist::SystemFont do
       end
     end
 
+    context "with valid font name" do
+      it "returns the complete font path", file_download: true do
+        name = "Courier"
+        stub_fontist_path_to_assets
+        Fontist::Formulas::CourierFont.fetch_font(name, confirmation: "yes")
+
+        courier = Fontist::SystemFont.find(name, sources: [font_sources])
+        expect(courier.first).to include("cour.ttf")
+      end
+    end
+
     context "with invalid font" do
       it "returns nill to the caller" do
         name = "invalid-font.ttf"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -132,14 +132,21 @@ files:
 - bin/setup
 - fontist.gemspec
 - lib/fontist.rb
+- lib/fontist/data/formulas/courier.yml
+- lib/fontist/data/formulas/ms_system.yml
 - lib/fontist/data/formulas/ms_vista.yml
 - lib/fontist/data/formulas/source_font.yml
 - lib/fontist/data/source.yml
 - lib/fontist/downloader.rb
 - lib/fontist/errors.rb
 - lib/fontist/finder.rb
+- lib/fontist/formula_finder.rb
 - lib/fontist/formulas.rb
 - lib/fontist/formulas/base.rb
+- lib/fontist/formulas/courier_font.rb
+- lib/fontist/formulas/helpers/exe_extractor.rb
+- lib/fontist/formulas/helpers/zip_extractor.rb
+- lib/fontist/formulas/ms_system.rb
 - lib/fontist/formulas/ms_vista.rb
 - lib/fontist/formulas/source_font.rb
 - lib/fontist/installer.rb
@@ -149,6 +156,9 @@ files:
 - spec/fixtures/fonts/DejaVuSerif.ttf
 - spec/fontist/downloader_spec.rb
 - spec/fontist/finder_spec.rb
+- spec/fontist/formula_finder_spec.rb
+- spec/fontist/formulas/courier_font_spec.rb
+- spec/fontist/formulas/ms_system_spec.rb
 - spec/fontist/formulas/ms_vista_spec.rb
 - spec/fontist/formulas/source_font_spec.rb
 - spec/fontist/installer_spec.rb