bigcartel-theme-fonts 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9611be8ee6e83ed90a7624435cb7e8446b75c6a0d1f411ff404a0ff6cf8f81cf
-  data.tar.gz: 39be88c91805a6862da48a8ad1057433753d8eefcc8dc74ee87216fb0bb2f2ae
+  metadata.gz: eda02a423d5ecebee3afd0f6ed53186cb01e1e8322073844ae90749f5ece7d73
+  data.tar.gz: c903ea89b42f88293a8d31f1f951fa4694586b63da3b44de22bd7c09235ef18f
 SHA512:
-  metadata.gz: f0f7586ace0c21cbdb1ebf36aa56ac4345428646de93ace3412756ea69343bea5735ad204be347a6390bfe3d583f2d201a55bac8a9591bc3f0a6a690f2aae0fd
-  data.tar.gz: 66726e854e1fa8dbd557c5d4bbd9bbb48ce2d805e50fc9e204c6ef677ef4d9e8b4056cb95f3a4908bc45f629d2886fcbd0ab11bdbdc5860155062e9b32b28eeb
+  metadata.gz: fdce3702961befcddfab26283c15993d791ac1a2f35c39ff5eec44f2909b01544b2f5022c1c2c45e14fb9e02a1ce39275696b7f562bdcdab3c17c293ac608869
+  data.tar.gz: 4f32a6003308f29b986e63d43fcc03cf1522176c730a2a6d98ac52714295485bf05c1fb05ceda4dde40c725f8f064f113553c28c21b22cd9032fa47ba38b4a7e

data/bigcartel-theme-fonts.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'bigcartel-theme-fonts'
-  spec.version       = '1.6.1'
+  spec.version       = '1.8.0'
   spec.authors       = ['Big Cartel']
   spec.email         = ['dev@bigcartel.com']
   spec.description   = %q{A simple class for working with Big Cartel's supported theme fonts.}

data/lib/bigcartel/theme/fonts/theme_font.rb

@@ -66,6 +66,33 @@ class ThemeFont < Struct.new(:name, :family, :weights, :collection)
       google_fonts.empty? ? nil : google_font_url_for_fonts(google_fonts)
     end
 
+    def google_font_url_for_theme_array(fonts, settings, options = {})
+      defaults = {
+        include_protocol: false,
+        include_weights: true
+      }
+      opts = defaults.merge(options)
+
+      google_fonts = fonts.keys.map { |key| settings[key] }.compact
+        .map { |font_name| find_by_name(font_name) }
+        .compact
+        .select { |font| font.collection == 'google' }
+        .sort_by { |font| font.name }
+
+      return [] if google_fonts.empty?
+
+      base_url = opts[:include_protocol] ? "https://fonts.googleapis.com/css?family=" : "//fonts.googleapis.com/css?family="
+
+      google_fonts.map do |font|
+        font_string = if opts[:include_weights] && font.weights
+                        "#{font.name}:#{font.weights}"
+                      else
+                        font.name
+                      end
+        "#{base_url}#{font_string.gsub(' ', '+')}&display=swap"
+      end
+    end
+
     private
 
     def source

data/lib/bigcartel/theme/fonts/theme_fonts.yml

@@ -57,6 +57,10 @@ google:
     name: Abril Fatface
     family: '"Abril Fatface", cursive'
 
+  alumni_sans_pinstripe:
+    name: Alumni Sans Pinstripe
+    family: '"Alumni Sans Pinstripe", sans-serif'
+
   amaranth:
     name: Amaranth
     family: '"Amaranth", serif'
@@ -76,6 +80,15 @@ google:
     name: Asap
     family: '"Asap", sans-serif'
 
+  atkinson_hyperlegible_next:
+    name: Atkinson Hyperlegible Next
+    family: '"Atkinson Hyperlegible Next", sans-serif'
+    weights: "200,300,400,500,600,700,800"
+
+  atma:
+    name: Atma
+    family: 'Atma, sans-serif'
+
   bevan:
     name: Bevan
     family: '"Bevan", cursive'
@@ -103,6 +116,10 @@ google:
     family: '"Chivo", sans-serif'
     weights: "400,700"
 
+  coiny:
+    name: Coiny
+    family: '"Coiny", cursive'
+
   concert_one:
     name: Concert One
     family: '"Concert One", cursive'
@@ -120,6 +137,10 @@ google:
     name: Cutive Mono
     family: '"Cutive Mono", serif'
 
+  dekko:
+    name: Dekko
+    family: 'Dekko, sans-serif'
+
   delius:
     name: Delius
     family: '"Delius", cursive'
@@ -134,6 +155,11 @@ google:
     family: '"Dosis", sans-serif'
     weights: "400,700"
 
+  doto:
+    name: Doto
+    family: 'Doto, monospace'
+    weights: "300,400,500,700"
+
   enriqueta:
     name: Enriqueta
     family: '"Enriqueta", serif'
@@ -167,6 +193,11 @@ google:
     family: '"Glegoo", serif'
     weights: "400,700"
 
+  gorditas:
+    name: Gorditas
+    family: '"Gorditas", sans-serif'
+    weights: "400,700"
+
   goudy_bookletter_1911:
     name: Goudy Bookletter 1911
     family: '"Goudy Bookletter 1911", serif'
@@ -176,6 +207,10 @@ google:
     family: '"Hahmlet", serif'
     weights: "400,700"
 
+  honk:
+    name: Honk
+    family: 'Honk, sans-serif'
+
   inconsolata:
     name: Inconsolata
     family: '"Inconsolata", sans-serif'
@@ -194,12 +229,16 @@ google:
   karla:
     name: Karla
     family: '"Karla", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
+
+  langar:
+    name: Langar
+    family: '"Langar", cursive'
 
   lato:
     name: Lato
     family: '"Lato", sans-serif'
-    weights: "400,700"
+    weights: "300,400,700"
 
   lekton:
     name: Lekton
@@ -224,7 +263,7 @@ google:
   lora:
     name: Lora
     family: '"Lora", serif'
-    weights: "400,700"
+    weights: "400,500,700"
 
   marcellus:
     name: Marcellus
@@ -233,12 +272,12 @@ google:
   merriweather:
     name: Merriweather
     family: '"Merriweather", serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   montserrat:
     name: Montserrat
     family: '"Montserrat", sans-serif'
-    weights: "400,500,700"
+    weights: "300,400,500,700"
 
   muli:
     name: Muli
@@ -257,7 +296,7 @@ google:
   open_sans:
     name: Open Sans
     family: '"Open Sans", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   overlock:
     name: Overlock
@@ -277,27 +316,46 @@ google:
   noto_sans:
     name: Noto Sans
     family: '"Noto Sans", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   noto_serif:
     name: Noto Serif
     family: '"Noto Serif", serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   nunito_sans:
     name: Nunito Sans
     family: '"Nunito Sans", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
+
+  parkinsans:
+    name: ParkinSans
+    family: '"ParkinSans", sans-serif'
+    weights: "300,400,500,700"
+
+  permanent_marker:
+    name: Permanent Marker
+    family: '"Permanent Marker", cursive'
 
   playfair_display:
     name: Playfair Display
     family: '"Playfair Display", serif'
+    weights: "400,500,700"
+
+  playfair_display_sc:
+    name: Playfair Display SC
+    family: '"Playfair Display SC", serif'
     weights: "400,700"
 
+  playwrite_hrvatska_lijeva:
+    name: Playwrite Hrvatska Lijeva
+    family: '"Playwrite Hrvatska Lijeva", cursive'
+    weights: "100,200,300,400"
+
   poppins:
     name: Poppins
     family: '"Poppins", sans-serif'
-    weights: "400,600"
+    weights: "300,400,600"
 
   prata:
     name: Prata
@@ -325,53 +383,78 @@ google:
   quicksand:
     name: Quicksand
     family: '"Quicksand", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   raleway:
     name: Raleway
     family: '"Raleway", sans-serif'
     weights: "400,700"
 
+  radio_canada:
+    name: Radio Canada
+    family: '"Radio Canada", sans-serif'
+    weights: "300,400,500,600,700"
+
+  reddit_sans:
+    name: Reddit Sans
+    family: '"Reddit Sans", sans-serif'
+    weights: "200,300,400,500,600,700,800"
+
   roboto:
     name: Roboto
     family: '"Roboto", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   rokkitt:
     name: Rokkitt
     family: '"Rokkitt", serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   signika:
     name: Signika
     family: '"Signika", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
+
+  source_code_pro:
+    name: Source Code Pro
+    family: '"Source Code Pro", monospace'
+    weights: "300,400,500,700"
 
   source_sans_pro:
     name: Source Sans Pro
     family: '"Source Sans Pro", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   sora:
     name: Sora
     family: '"Sora", sans-serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
+
+  sour_gummy:
+    name: Sour Gummy
+    family: '"Sour Gummy", sans-serif'
+    weights: "200,300,400,500,700"
 
   spectral:
     name: Spectral
     family: '"Spectral", serif'
-    weights: "400,700"
+    weights: "300,400,500,700"
 
   syne:
     name: Syne
     family: '"Syne", sans-serif'
-    weights: "400,700"
+    weights: "400,500,600,700"
 
   titillium_web:
     name: Titillium Web
     family: '"Titillium Web", sans-serif'
-    weights: "400,700"
+    weights: "400,600,700"
 
+  ubuntu:
+    name: Ubuntu
+    family: '"Ubuntu", sans-serif'
+    weights: "300,400,500,700"
+  
   vampiro_one:
     name: Vampiro One
     family: '"Vampiro One", cursive'
@@ -383,4 +466,8 @@ google:
   work_sans:
     name: Work Sans
     family: '"Work Sans", sans-serif'
-    weights: "400,600,700"
+    weights: "400,500,600,700"
+
+  yuji_mai:
+    name: Yuji Mai
+    family: '"Yuji Mai", cursive'

data/spec/theme_font_spec.rb

@@ -143,4 +143,83 @@ describe ThemeFont do
       ThemeFont.google_font_url_for_theme(fonts, settings).should be_nil
     end
   end
+
+  describe ".google_font_url_for_theme_array" do
+    let(:fonts) {{ :header_font => {}, :body_font => {}, :paragraph_font => {} }}
+
+    before(:each) do
+      stub(ThemeFont).all {[
+        ThemeFont.new('One Font', 'One Family', '400,700', 'google'),
+        ThemeFont.new('Two', 'Two Family', nil, 'default'),
+        ThemeFont.new('Three', 'Three Family', '300,600', 'google')
+      ]}
+    end
+
+    context "with default options" do
+      it "returns an array of URLs with weights and no protocol" do
+        settings = { :header_font => 'One Font', :body_font => 'Two', :paragraph_font => 'Three' }
+        result = ThemeFont.google_font_url_for_theme_array(fonts, settings)
+        result.should == [
+          "//fonts.googleapis.com/css?family=One+Font:400,700&display=swap",
+          "//fonts.googleapis.com/css?family=Three:300,600&display=swap"
+        ]
+      end
+
+      it "returns a single URL in array when only one Google font" do
+        settings = { :header_font => 'One Font', :body_font => 'Two' }
+        result = ThemeFont.google_font_url_for_theme_array(fonts, settings)
+        result.should == ["//fonts.googleapis.com/css?family=One+Font:400,700&display=swap"]
+      end
+
+      it "returns empty array when no Google fonts" do
+        settings = { :body_font => 'Two' }
+        result = ThemeFont.google_font_url_for_theme_array(fonts, settings)
+        result.should == []
+      end
+
+      it "deduplicates identical fonts" do
+        settings = { :header_font => 'One Font', :body_font => 'One Font' }
+        result = ThemeFont.google_font_url_for_theme_array(fonts, settings)
+        result.should == ["//fonts.googleapis.com/css?family=One+Font:400,700&display=swap"]
+      end
+    end
+
+    context "with include_protocol: true" do
+      it "returns URLs with https protocol" do
+        settings = { :header_font => 'One Font', :paragraph_font => 'Three' }
+        result = ThemeFont.google_font_url_for_theme_array(fonts, settings, include_protocol: true)
+        result.should == [
+          "https://fonts.googleapis.com/css?family=One+Font:400,700&display=swap",
+          "https://fonts.googleapis.com/css?family=Three:300,600&display=swap"
+        ]
+      end
+    end
+
+    context "with include_weights: false" do
+      it "returns URLs without weights" do
+        settings = { :header_font => 'One Font', :paragraph_font => 'Three' }
+        result = ThemeFont.google_font_url_for_theme_array(fonts, settings, include_weights: false)
+        result.should == [
+          "//fonts.googleapis.com/css?family=One+Font&display=swap",
+          "//fonts.googleapis.com/css?family=Three&display=swap"
+        ]
+      end
+    end
+
+    context "with both options customized" do
+      it "returns URLs with protocol and no weights" do
+        settings = { :header_font => 'One Font', :paragraph_font => 'Three' }
+        result = ThemeFont.google_font_url_for_theme_array(
+          fonts,
+          settings,
+          include_protocol: true,
+          include_weights: false
+        )
+        result.should == [
+          "https://fonts.googleapis.com/css?family=One+Font&display=swap",
+          "https://fonts.googleapis.com/css?family=Three&display=swap"
+        ]
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigcartel-theme-fonts
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler