hyde-fonts 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31045070623a642018068adb44e36a21243c4d9f17110a6be1bafbdaedc326d
-  data.tar.gz: 5ebeb9ec48f423b3d8377ac6d3f0581d8625032cc74c719932a8236b618e0b00
+  metadata.gz: 3bb291228573bdea080627224050976ac18797c064ae8e4b3136cc032979d367
+  data.tar.gz: eb6a3549cf8d1cc2dfcc460b34119f3d3b50ccada3ebbd1decf9f88a0fbf80fc
 SHA512:
-  metadata.gz: 03ce902268a72a2677e3868e56fdd119516120b38caf395b5c590a9736aaa317a1e5ba7e12b06817960250fdea62d7b1385fc99f97fc87510d35c7840ea78720
-  data.tar.gz: d8577b7771ace316cb986735f95b0a4365ca3edb1118c3e95068ce5cbc6af5f5faa81734033de0307781226a172672eb98ebde09ff3181243f9ce8e2e3e25e05
+  metadata.gz: f261bb3935f1187a39005c490c19519cc0fe9be749bdc321b29988f051ae2aa698d6bbfa037ef5977bb93105e774d559610ac11ad769c06930f4c9d5d6f6e605
+  data.tar.gz: 0252b08511ba996024bb1b28d39138a6bf59a9a89922db06502fcae46ca2db91b5b1470e8bdf525a1421f97da690083f041c7237170d59e5a14baafbb77c293b

data/lib/hyde_fonts/font_face.rb

@@ -1,6 +1,6 @@
 module Hyde
   class FontFace
-    attr_reader :provider
+    attr_reader :provider, :name
     attr_accessor :css
 
     def initialize(face)

data/lib/hyde_fonts/hyde_fonts.rb

@@ -20,8 +20,7 @@ module Jekyll
     end
 
     def render(context)
-      config = context.registers[:site].config['hyde_fonts']
-      return unless config['enable'] == true
+      return unless context.registers[:site].config['hyde_fonts']['enable'] == true
 
       file = context.registers[:site].static_files.find { |file|
         file.is_a?(Hyde::GeneratedCssFile)
@@ -81,18 +80,23 @@ end
 module Hyde
   class Fonts
     @@config = {
-      "data_path" => 'fonts',
+      "data_source_name" => 'fonts',
       "file_output_path" => 'assets/fonts',
       "css_output_name" => 'fonts.css',
       "css_minify" => true,
       "enable" => true,
       "fetch_fonts" => true,
-      "keep_files" => false
+      "keep_files" => true
     }
 
     def initialize(site)
       @site = site
-      @config = site.config.dig('hyde_fonts') || @@config
+      @config = site.config.dig('hyde_fonts')
+
+      if (@config.nil?)
+        @config = @@config
+        site.config['hyde_fonts'] = @config
+      end
 
       if config('keep_files') == true
         @site.config['keep_files'].push(config('file_output_path'))
@@ -104,11 +108,14 @@ module Hyde
     end
 
     def generate
+      return unless config('enable') == true
       # get faces from jekyll data file
       font_data = Hyde::FontData.new(data)
 
       # handle font providers
       for face in font_data.faces
+        Jekyll.logger.info('Fonts:', "Preparing #{face.name}")
+
         case face.provider
         when 'google'
           Hyde::FontProviderGoogle.new(@site, @config).fetch(face)
@@ -133,7 +140,7 @@ module Hyde
     end
 
     def data
-      @site.data.dig(config('data_path'), 'fonts')
+      @site.data.dig(config('data_source_name'), 'fonts')
     end
 
     def minify(css)

data/lib/hyde_fonts/provider_google.rb

@@ -55,9 +55,16 @@ module Hyde
       destination_fname = file.destination('./')
 
       if @config['keep_files'] == true
+        Jekyll.logger.debug('Fonts:', "file #{filename} already exists.")
         return if File.exist?(destination_fname)
       end
 
+      if @config['fetch_fonts'] == false
+        Jekyll.logger.warn('Fonts:', "fetch disabled, no local version of #{filename} found.")
+        return
+      end
+
+      Jekyll.logger.debug('Fonts:', "downloading #{@face.name} from #{@face.provider}")
       font_uri_payload = Net::HTTP.get(ruleset.uri)
       file.file_contents = font_uri_payload
 

data/lib/hyde_fonts.rb

@@ -1,6 +1,6 @@
 module Hyde
   class Fonts
-    VERSION = "0.2.2"
+    VERSION = "0.3.1"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyde-fonts
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Gregory Daynes