bigcartel-theme-fonts 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 853b879bcbe17a51fb9f9ad539d070b50a957c6c195553ba4c6195a5c182dcc0
-  data.tar.gz: 187c701969e84a18afdfa1ae14462d71394b94fb166fb75ed182fe12796ac2f3
+  metadata.gz: c24d66f05033aa4200161c1f0c2e1f76b2e2d7ffc05ebf2c7362d0402c83d731
+  data.tar.gz: c2c5567bbd85fa600d66c62d561984d9bd16cd7c60132f6684620d63112c99b3
 SHA512:
-  metadata.gz: aea2cfb82faebc86825199a6593d37b7d1d12c77997b2ea051387e21755c539edb877ac2387732f4f54a4143c1b24eaedc5edc8f4bf7aa5ba5a4e8426be97a44
-  data.tar.gz: db7b6989bfddaf5e968466b92796f58bc875ddf0fbff4180bb100d18b28b03c8f48407ef21aa90114a877c939b55fae2dd30b1519e7abf09a9ec7b0eaf084165
+  metadata.gz: 4a321d1697c53a3dba38e686faa7dff2f7425ca78f604153e209dcfccaf2cfabd551dd7866bf99ed5b7f8f02e5dfb1260afd9fca1b3ca379ebe719a62b978792
+  data.tar.gz: 8ecd906210fdae6fd8ea4d7a239cc520d27630a9785b7631a2a124b2110bd9d41915a3a3e94f45c9b9c4aa539427e70cebb7b00ec7d70453c42fae96d03a2118

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.7.0'
+  spec.version       = '1.8.1'
   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,25 @@ 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_json(account_theme)
+      # Cosmos and Lunch Break use the secondary font for the primary text font
+      font_setting = if ["cosmos", "lunch break"].include?(account_theme.theme.name.downcase)
+        account_theme.settings["secondary_font"]
+      else
+        account_theme.settings["primary_font"] ||
+        account_theme.settings["text_font"] ||
+        account_theme.settings["font"] ||
+        account_theme.settings["serif_font"]
+      end
+
+      font = find_by_name(font_setting)
+      return {} if font.nil? || font.collection != 'google'
+
+      {
+        "primary_text_font" => "https://fonts.googleapis.com/css?family=#{font.name.gsub(' ', '+')}"
+      }
+    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'
@@ -172,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'
@@ -181,6 +207,10 @@ google:
     family: '"Hahmlet", serif'
     weights: "400,700"
 
+  honk:
+    name: Honk
+    family: 'Honk, sans-serif'
+
   inconsolata:
     name: Inconsolata
     family: '"Inconsolata", sans-serif'
@@ -201,6 +231,10 @@ google:
     family: '"Karla", sans-serif'
     weights: "300,400,500,700"
 
+  langar:
+    name: Langar
+    family: '"Langar", cursive'
+
   lato:
     name: Lato
     family: '"Lato", sans-serif'
@@ -299,6 +333,10 @@ google:
     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'
@@ -352,6 +390,16 @@ google:
     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'

data/spec/theme_font_spec.rb

@@ -143,4 +143,113 @@ describe ThemeFont do
       ThemeFont.google_font_url_for_theme(fonts, settings).should be_nil
     end
   end
+
+  describe ".google_font_url_for_theme_json" do
+    let(:theme) { double("Theme", name: "default") }
+    let(:account_theme) { double("AccountTheme", theme: theme, settings: {}) }
+
+    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 theme" do
+      it "uses primary_font when present" do
+        stub(account_theme).settings { { "primary_font" => "One Font" } }
+        result = ThemeFont.google_font_url_for_theme_json(account_theme)
+        result.should == {
+          "primary_text_font" => "https://fonts.googleapis.com/css?family=One+Font"
+        }
+      end
+
+      context "font setting fallback stack" do
+        it "falls back to text_font when primary_font is absent" do
+          stub(account_theme).settings { { "text_font" => "Three" } }
+          result = ThemeFont.google_font_url_for_theme_json(account_theme)
+          result.should == {
+            "primary_text_font" => "https://fonts.googleapis.com/css?family=Three"
+          }
+        end
+
+        it "falls back to font when primary_font and text_font are absent" do
+          stub(account_theme).settings { { "font" => "One Font" } }
+          result = ThemeFont.google_font_url_for_theme_json(account_theme)
+          result.should == {
+            "primary_text_font" => "https://fonts.googleapis.com/css?family=One+Font"
+          }
+        end
+
+        it "falls back to serif_font when all others are absent" do
+          stub(account_theme).settings { { "serif_font" => "Three" } }
+          result = ThemeFont.google_font_url_for_theme_json(account_theme)
+          result.should == {
+            "primary_text_font" => "https://fonts.googleapis.com/css?family=Three"
+          }
+        end
+
+        it "prefers primary_font over other settings" do
+          stub(account_theme).settings { {
+            "primary_font" => "One Font",
+            "text_font" => "Three",
+            "font" => "Three",
+            "serif_font" => "Three"
+          } }
+          result = ThemeFont.google_font_url_for_theme_json(account_theme)
+          result.should == {
+            "primary_text_font" => "https://fonts.googleapis.com/css?family=One+Font"
+          }
+        end
+      end
+
+      it "returns empty hash for non-Google font" do
+        stub(account_theme).settings { { "primary_font" => "Two" } }
+        result = ThemeFont.google_font_url_for_theme_json(account_theme)
+        result.should == {}
+      end
+
+      it "returns empty hash for unknown font" do
+        stub(account_theme).settings { { "primary_font" => "Unknown" } }
+        result = ThemeFont.google_font_url_for_theme_json(account_theme)
+        result.should == {}
+      end
+    end
+
+    context "with Cosmos theme" do
+      let(:theme) { double("Theme", name: "cosmos") }
+
+      it "uses secondary_font setting" do
+        stub(account_theme).settings { { "secondary_font" => "Three" } }
+        result = ThemeFont.google_font_url_for_theme_json(account_theme)
+        result.should == {
+          "primary_text_font" => "https://fonts.googleapis.com/css?family=Three"
+        }
+      end
+
+      it "ignores primary_font when secondary_font is present" do
+        stub(account_theme).settings { {
+          "secondary_font" => "Three",
+          "primary_font" => "One Font"
+        } }
+        result = ThemeFont.google_font_url_for_theme_json(account_theme)
+        result.should == {
+          "primary_text_font" => "https://fonts.googleapis.com/css?family=Three"
+        }
+      end
+    end
+
+    context "with Lunch Break theme" do
+      let(:theme) { double("Theme", name: "lunch break") }
+
+      it "uses secondary_font setting" do
+        stub(account_theme).settings { { "secondary_font" => "One Font" } }
+        result = ThemeFont.google_font_url_for_theme_json(account_theme)
+        result.should == {
+          "primary_text_font" => "https://fonts.googleapis.com/css?family=One+Font"
+        }
+      end
+    end
+  end
 end

metadata

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