hyde-fonts 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bb291228573bdea080627224050976ac18797c064ae8e4b3136cc032979d367
-  data.tar.gz: eb6a3549cf8d1cc2dfcc460b34119f3d3b50ccada3ebbd1decf9f88a0fbf80fc
+  metadata.gz: 8b45842207d4fcca2f9294fc3926a10580fedf790fac681c216413da032d1677
+  data.tar.gz: 5786190067cbe6e726ac0317d9f06c02067c6e146fe67148e617e702830cb4f9
 SHA512:
-  metadata.gz: f261bb3935f1187a39005c490c19519cc0fe9be749bdc321b29988f051ae2aa698d6bbfa037ef5977bb93105e774d559610ac11ad769c06930f4c9d5d6f6e605
-  data.tar.gz: 0252b08511ba996024bb1b28d39138a6bf59a9a89922db06502fcae46ca2db91b5b1470e8bdf525a1421f97da690083f041c7237170d59e5a14baafbb77c293b
+  metadata.gz: 4c64109472b307adba55409231768623fa5ab9afffcb2d313b7de597ae54ac2275a1141886b3f8f361f7726d6335cb7cc344566d20093646c959df7b56ba3966
+  data.tar.gz: f44fd48352c0aaa10cc48940eae50f9bbf3ae3c93cd368e8966ab0609d810506a6db1b53e0e207fcc6194c816c8755adbd944dfa69009ad536dacc661a1cba76

data/lib/hyde-fonts.rb

@@ -0,0 +1,7 @@
+module Hyde
+  class Fonts
+    VERSION = "0.3.3"
+  end
+end
+
+require_relative "hyde_fonts/hyde_fonts"

data/lib/hyde_fonts/font_data.rb

@@ -13,12 +13,11 @@ module Hyde
     end
 
     def parse_faces
-
-      for face in @data['faces'] do
+      for face in @data["faces"] do
         faces.push(Hyde::FontFace.new(face))
       end
 
-      return faces
+      faces
     end
   end
 end

data/lib/hyde_fonts/font_face.rb

@@ -4,9 +4,9 @@ module Hyde
     attr_accessor :css
 
     def initialize(face)
-      @name = face['name']
-      @provider = face['provider']
-      @weights = face['weights']
+      @name = face["name"]
+      @provider = face["provider"]
+      @weights = face["weights"]
       @variants = parse_variants
       @css = []
     end
@@ -20,19 +20,19 @@ module Hyde
     def to_s
       variants = sort_variants.map { |variant| variant.to_s }
 
-      @name + ':ital,wght@' + variants.join(';')
+      @name + ":ital,wght@" + variants.join(";")
     end
 
-  private
+    private
 
     def parse_variants
       variants = []
 
       for variant in @weights
-        variants.push(Hyde::FontVariant.new(weight: variant['value'], italic: variant['italic']))
+        variants.push(Hyde::FontVariant.new(weight: variant["value"], italic: variant["italic"]))
       end
 
-      return variants
+      variants
     end
   end
 end

data/lib/hyde_fonts/font_ruleset.rb

@@ -18,11 +18,11 @@ module Hyde
       @uri = URI(uri)
       @format = format
 
-      @filename = [@family, @style, @weight, @char_set + '.' + @format].join('_')
+      @filename = [@family, @style, @weight, @char_set + "." + @format].join("_")
     end
 
     def local_ruleset(path)
-      @ruleset.gsub(/(?<=url\().*(?=\)\s)/, '/' + File.join(path, @filename))
+      @ruleset.gsub(/(?<=url\().*(?=\)\s)/, "/" + File.join(path, @filename))
     end
   end
 end

data/lib/hyde_fonts/font_variant.rb

@@ -12,7 +12,7 @@ module Hyde
     end
 
     def to_s
-      @italic.to_s + ',' + @weight.to_s
+      @italic.to_s + "," + @weight.to_s
     end
   end
 end

data/lib/hyde_fonts/generated_css_file.rb

@@ -8,12 +8,12 @@ module Hyde
 
     def initialize(site, dir, name)
       @site = site
-      @dir  = dir
+      @dir = dir
       @name = name
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
       @type = @collection&.label&.to_sym
-      @generator = 'hyde_fonts'
+      @generator = "hyde_fonts"
     end
 
     def write(dest)
@@ -23,7 +23,7 @@ module Hyde
       FileUtils.mkdir_p(File.dirname(dest_path))
       FileUtils.rm(dest_path) if File.exist?(dest_path)
 
-      File.open(dest_path, 'w') do |output_file|
+      File.open(dest_path, "w") do |output_file|
         output_file << file_contents
       end
 

data/lib/hyde_fonts/generated_font_file.rb

@@ -8,13 +8,13 @@ module Hyde
 
     def initialize(site, dir, name)
       @site = site
-      @dir  = dir
+      @dir = dir
       @name = name
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
       @type = @collection&.label&.to_sym
-      @generator = 'hyde_fonts'
-      @dest_path = ''
+      @generator = "hyde_fonts"
+      @dest_path = ""
     end
 
     def write(dest)
@@ -24,7 +24,7 @@ module Hyde
       FileUtils.mkdir_p(File.dirname(dest_path))
       FileUtils.rm(dest_path) if File.exist?(dest_path)
 
-      File.open(dest_path, 'w') do |output_file|
+      File.open(dest_path, "w") do |output_file|
         output_file << file_contents
       end
 

data/lib/hyde_fonts/hyde_fonts.rb

@@ -1,11 +1,11 @@
-require 'jekyll'
-require_relative 'font_data.rb'
-require_relative 'font_face.rb'
-require_relative 'font_ruleset.rb'
-require_relative 'font_variant.rb'
-require_relative 'generated_css_file.rb'
-require_relative 'generated_font_file.rb'
-require_relative 'provider_google.rb'
+require "jekyll"
+require_relative "font_data"
+require_relative "font_face"
+require_relative "font_ruleset"
+require_relative "font_variant"
+require_relative "generated_css_file"
+require_relative "generated_font_file"
+require_relative "provider_google"
 
 module Jekyll
   class HydeFontsTag < Liquid::Tag
@@ -13,66 +13,67 @@ module Jekyll
       super
 
       @tag_name = tag_name
-      style, indent = text.strip.split(' ')
+      style, indent = text.strip.split(" ")
+      return if style.nil?
       @style = style.strip
       @indent = indent.to_i || 0
       @tokens = tokens
     end
 
     def render(context)
-      return unless context.registers[:site].config['hyde_fonts']['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)
       }
 
-      if @style == 'inline'
+      if @style == "inline"
         file.file_contents
-      elsif @style == 'link'
+      elsif @style == "link"
         "<link href='" + file.relative_path + "' rel='stylesheet'>"
-      elsif @style == 'decap-config'
-          [
-            "- label: Hyde-Fonts",
-            "  name: fonts",
-            "  file: \"src/_data/fonts.yml\"",
-            "  fields:",
-            "    - label: Fonts",
-            "      name: fonts",
-            "      widget: object",
-            "      fields:",
-            "        - label: Faces",
-            "          name: faces",
-            "          widget: list",
-            "          collapsed: false",
-            "          create: true",
-            "          fields:",
-            "            - label: Name",
-            "              name: name",
-            "              widget: string",
-            "            - label: Weights",
-            "              name: weights",
-            "              widget: list",
-            "              collapsed: false",
-            "              fields:",
-            "                - label: Weight",
-            "                  name: value",
-            "                  widget: string",
-            "                - label: Italic",
-            "                  name: italic",
-            "                  widget: boolean",
-          ]
-            .map { |x| x.prepend(' ' * 6) }
-            .join("\n")
-            .prepend("# Hyde Fonts ---\n")
+      elsif @style == "decap-config"
+        [
+          "- label: Hyde-Fonts",
+          "  name: fonts",
+          "  file: \"src/_data/fonts.yml\"",
+          "  fields:",
+          "    - label: Fonts",
+          "      name: fonts",
+          "      widget: object",
+          "      fields:",
+          "        - label: Faces",
+          "          name: faces",
+          "          widget: list",
+          "          collapsed: false",
+          "          create: true",
+          "          fields:",
+          "            - label: Name",
+          "              name: name",
+          "              widget: string",
+          "            - label: Weights",
+          "              name: weights",
+          "              widget: list",
+          "              collapsed: false",
+          "              fields:",
+          "                - label: Weight",
+          "                  name: value",
+          "                  widget: string",
+          "                - label: Italic",
+          "                  name: italic",
+          "                  widget: boolean"
+        ]
+          .map { |x| x.prepend(" " * 6) }
+          .join("\n")
+          .prepend("# Hyde Fonts ---\n")
       end
     end
   end
 
-  Liquid::Template.register_tag('hyde_fonts', Jekyll::HydeFontsTag)
+  Liquid::Template.register_tag("hyde_fonts", Jekyll::HydeFontsTag)
 
   class HydeFontsGenerator < Generator
     def generate(site)
-      Hyde::Fonts.new(site).generate()
+      Hyde::Fonts.new(site).generate
     end
   end
 end
@@ -80,9 +81,9 @@ end
 module Hyde
   class Fonts
     @@config = {
-      "data_source_name" => 'fonts',
-      "file_output_path" => 'assets/fonts',
-      "css_output_name" => 'fonts.css',
+      "data_source_name" => "fonts",
+      "file_output_path" => "assets/fonts",
+      "css_output_name" => "fonts.css",
       "css_minify" => true,
       "enable" => true,
       "fetch_fonts" => true,
@@ -91,35 +92,35 @@ module Hyde
 
     def initialize(site)
       @site = site
-      @config = site.config.dig('hyde_fonts')
+      @config = site.config.dig("hyde_fonts")
 
-      if (@config.nil?)
+      if @config.nil?
         @config = @@config
-        site.config['hyde_fonts'] = @config
+        site.config["hyde_fonts"] = @config
       end
 
-      if config('keep_files') == true
-        @site.config['keep_files'].push(config('file_output_path'))
+      if config("keep_files") == true
+        @site.config["keep_files"].push(config("file_output_path"))
       end
 
-      if site.config.dig('hyde_fonts').nil?
-        @site.config['hyde_fonts'] = @config
+      if site.config.dig("hyde_fonts").nil?
+        @site.config["hyde_fonts"] = @config
       end
     end
 
     def generate
-      return unless config('enable') == true
+      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}")
+        Jekyll.logger.info("Fonts:", "Preparing #{face.name}")
 
         case face.provider
-        when 'google'
+        when "google"
           Hyde::FontProviderGoogle.new(@site, @config).fetch(face)
-        when 'local'
+        when "local"
           # TODO handle local fonts
           # Hyde::FontProviderLocal.new(@site, @config).fetch(face)
         end
@@ -127,26 +128,26 @@ module Hyde
 
       css = font_data.faces.map { |face| face.css }
       # generate static file containing face css rulesets
-      css_file = Hyde::GeneratedCssFile.new(@site, config('file_output_path'), config('css_output_name'))
+      css_file = Hyde::GeneratedCssFile.new(@site, config("file_output_path"), config("css_output_name"))
       css_file.file_contents = minify(css.join("\n"))
 
       @site.static_files << css_file
     end
 
-  private
+    private
 
-    def config(*keys)
-      @config.dig(*keys)
+    def config(*)
+      @config.dig(*)
     end
 
     def data
-      @site.data.dig(config('data_source_name'), 'fonts')
+      @site.data.dig(config("data_source_name"), "fonts")
     end
 
     def minify(css)
-      return css if config('css_minify') == false
+      return css if config("css_minify") == false
 
-      converter_config = { 'sass' => { 'style' => 'compressed' } }
+      converter_config = {"sass" => {"style" => "compressed"}}
 
       Jekyll::Converters::Scss.new(converter_config).convert(css)
     end

data/lib/hyde_fonts/provider_google.rb

@@ -1,5 +1,5 @@
-require 'uri'
-require 'net/http'
+require "uri"
+require "net/http"
 
 module Hyde
   class FontProviderGoogle
@@ -13,10 +13,10 @@ module Hyde
 
       begin
         uri_payload = Net::HTTP.get(face_uri, {
-          "User-Agent": 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0'
+          "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0"
         })
       rescue
-        Jekyll.logger.warn('Fonts Warning:', 'Unable to reach Google Fonts service.')
+        Jekyll.logger.warn("Fonts Warning:", "Unable to reach Google Fonts service.")
         return
       end
 
@@ -30,14 +30,14 @@ module Hyde
       end
     end
 
-  private
+    private
 
     def face_uri
-      google_uri_base = 'https://fonts.googleapis.com/css2'
-      params = [['display', 'swap']]
-      params.push(['family', @face.to_s])
+      google_uri_base = "https://fonts.googleapis.com/css2"
+      params = [["display", "swap"]]
+      params.push(["family", @face.to_s])
 
-      uri = google_uri_base + '?' + params.map { |param| param.join('=') }.join('&')
+      uri = google_uri_base + "?" + params.map { |param| param.join("=") }.join("&")
 
       URI(uri)
     end
@@ -50,21 +50,21 @@ module Hyde
 
     def fetch_font_from_ruleset(ruleset)
       filename = ruleset.filename
-      file = Hyde::GeneratedFontFile.new(@site, @config['file_output_path'], filename)
+      file = Hyde::GeneratedFontFile.new(@site, @config["file_output_path"], filename)
 
-      destination_fname = file.destination('./')
+      destination_fname = file.destination("./")
 
-      if @config['keep_files'] == true
-        Jekyll.logger.debug('Fonts:', "file #{filename} already exists.")
+      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.")
+      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}")
+      Jekyll.logger.debug("Fonts:", "downloading #{@face.name} from #{@face.provider}")
       font_uri_payload = Net::HTTP.get(ruleset.uri)
       file.file_contents = font_uri_payload
 
@@ -72,7 +72,7 @@ module Hyde
     end
 
     def rewrite_ruleset_to_local(ruleset)
-      ruleset.local_ruleset(@config['file_output_path'])
+      ruleset.local_ruleset(@config["file_output_path"])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyde-fonts
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Gregory Daynes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -37,7 +37,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hyde_fonts.rb
+- lib/hyde-fonts.rb
 - lib/hyde_fonts/font_data.rb
 - lib/hyde_fonts/font_face.rb
 - lib/hyde_fonts/font_ruleset.rb
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Plugin for jekyll to manage google fonts

data/lib/hyde_fonts.rb

@@ -1,8 +0,0 @@
-module Hyde
-  class Fonts
-    VERSION = "0.3.1"
-  end
-end
-
-require_relative './hyde_fonts/hyde_fonts.rb'
-