bigcartel-theme-fonts 1.8.2 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58b062226017f9cf542de6c90d1cdb4a2f6ffc780948745c497d7b0384ef4a1
-  data.tar.gz: a1f4600d2e543286f9a4312216387b183b0534734cc66bef62155a3a0f0ab2fc
+  metadata.gz: c48e78ae6db729c7d3cde9cd655ca1317228c217cb65622e6066f494721b4961
+  data.tar.gz: f911517485f8c7d563b783cdf6d4d63a94db975ddc974cb850d9bbf8c430f415
 SHA512:
-  metadata.gz: 1cc9c664c5678b0005512f22cfcf23f142bf158838adf52042535da9468a7a6a1d7c98d8841a034e5ed5b48b9acf9d132df2beb69aa38dfb10a03a10fbdcd3cf
-  data.tar.gz: 15cccfc9483a7391b06cc7fee064fdbc9f0e452ef02b933f71562c7f31ce560eadca6f1c38a9b9b58047a87c51f3cfe0b4e8388f260372e18eb747bef5564b8b
+  metadata.gz: 79433d7dd5e8681831dbae7d24325445546da51ca44a081a56b73f54c18999bf12f0bffda936352e8fae75c1ae909acbc11a1f66ec4a3beeabf330603048178e
+  data.tar.gz: 802ae46ad25f847daf85a5023cc797325941c919c8c0270a8d887a8967ce2c7da0b131d489e1f83dd25e448c6efe516628642af30d3f7eada04470be99a2e1e0

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.8.2'
+  spec.version       = '1.8.4'
   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

@@ -81,7 +81,10 @@ class ThemeFont < Struct.new(:name, :family, :weights, :collection)
       return {} if font.nil? || font.collection != 'google'
 
       {
-        "primary_text_font" => "https://fonts.googleapis.com/css?family=#{font.name.gsub(' ', '+')}"
+        "primary_text_font" => {
+          "name" => font.name,
+          "url" => "https://fonts.googleapis.com/css?family=#{font.name.gsub(' ', '+')}"
+        }
       }
     end
 

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

@@ -87,7 +87,7 @@ google:
 
   atma:
     name: Atma
-    family: 'Atma, sans-serif'
+    family: '"Atma", system-ui'
 
   bevan:
     name: Bevan
@@ -109,7 +109,7 @@ google:
 
   chewy:
     name: Chewy
-    family: '"Chewy", cursive'
+    family: '"Chewy", system-ui'
 
   chivo:
     name: Chivo
@@ -118,7 +118,7 @@ google:
 
   coiny:
     name: Coiny
-    family: '"Coiny", cursive'
+    family: '"Coiny", system-ui'
 
   concert_one:
     name: Concert One
@@ -135,11 +135,11 @@ google:
 
   cutive_mono:
     name: Cutive Mono
-    family: '"Cutive Mono", serif'
+    family: '"Cutive Mono", monospace'
 
   dekko:
     name: Dekko
-    family: 'Dekko, sans-serif'
+    family: '"Dekko", cursive'
 
   delius:
     name: Delius
@@ -195,7 +195,7 @@ google:
 
   gorditas:
     name: Gorditas
-    family: '"Gorditas", sans-serif'
+    family: '"Gorditas", serif'
     weights: "400,700"
 
   goudy_bookletter_1911:
@@ -209,7 +209,7 @@ google:
 
   honk:
     name: Honk
-    family: 'Honk, sans-serif'
+    family: '"Honk", system-ui'
 
   inconsolata:
     name: Inconsolata
@@ -226,6 +226,11 @@ google:
     family: '"Inter", sans-serif'
     weights: "400,500,700"
 
+  kalnia_glaze:
+    name: Kalnia Glaze
+    family: '"Kalnia Glaze", serif'
+    weights: "100,200,300,400,500,600,700"
+
   karla:
     name: Karla
     family: '"Karla", sans-serif'
@@ -233,7 +238,7 @@ google:
 
   langar:
     name: Langar
-    family: '"Langar", cursive'
+    family: '"Langar", system-ui'
 
   lato:
     name: Lato
@@ -242,7 +247,7 @@ google:
 
   lekton:
     name: Lekton
-    family: '"Lekton", sans-serif'
+    family: '"Lekton", monospace'
     weights: "400,700"
 
   lexend_exa:
@@ -298,6 +303,10 @@ google:
     family: '"Open Sans", sans-serif'
     weights: "300,400,500,700"
 
+  over_the_rainbow:
+    name: Over the Rainbow
+    family: '"Over the Rainbow", cursive'
+
   overlock:
     name: Overlock
     family: '"Overlock", cursive'
@@ -329,8 +338,8 @@ google:
     weights: "300,400,500,700"
 
   parkinsans:
-    name: ParkinSans
-    family: '"ParkinSans", sans-serif'
+    name: Parkinsans
+    family: '"Parkinsans", sans-serif'
     weights: "300,400,500,700"
 
   permanent_marker:
@@ -348,8 +357,8 @@ google:
     weights: "400,700"
 
   playwrite_hrvatska_lijeva:
-    name: Playwrite Hrvatska Lijeva
-    family: '"Playwrite Hrvatska Lijeva", cursive'
+    name: Playwrite HR Lijeva
+    family: '"Playwrite HR Lijeva", cursive'
     weights: "100,200,300,400"
 
   poppins:
@@ -410,6 +419,10 @@ google:
     family: '"Rokkitt", serif'
     weights: "300,400,500,700"
 
+  rubik_dirt:
+    name: Rubik Dirt
+    family: '"Rubik Dirt", system-ui'
+
   signika:
     name: Signika
     family: '"Signika", sans-serif'
@@ -457,7 +470,7 @@ google:
   
   vampiro_one:
     name: Vampiro One
-    family: '"Vampiro One", cursive'
+    family: '"Vampiro One", system-ui'
 
   varela_round:
     name: Varela Round
@@ -470,4 +483,4 @@ google:
 
   yuji_mai:
     name: Yuji Mai
-    family: '"Yuji Mai", cursive'
+    family: '"Yuji Mai", serif'

data/spec/theme_font_spec.rb

@@ -161,7 +161,10 @@ describe ThemeFont 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"
+          "primary_text_font" => {
+            "name" => "One Font",
+            "url" => "https://fonts.googleapis.com/css?family=One+Font"
+          }
         }
       end
 
@@ -170,7 +173,10 @@ describe ThemeFont 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"
+            "primary_text_font" => {
+              "name" => "Three",
+              "url" => "https://fonts.googleapis.com/css?family=Three"
+            }
           }
         end
 
@@ -178,15 +184,21 @@ describe ThemeFont 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"
+            "primary_text_font" => {
+              "name" => "One Font",
+              "url" => "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" } }
+          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"
+            "primary_text_font" => {
+              "name" => "Three",
+              "url" => "https://fonts.googleapis.com/css?family=Three"
+            }
           }
         end
 
@@ -199,7 +211,10 @@ describe ThemeFont do
           } }
           result = ThemeFont.google_font_url_for_theme_json(account_theme)
           result.should == {
-            "primary_text_font" => "https://fonts.googleapis.com/css?family=One+Font"
+            "primary_text_font" => {
+              "name" => "One Font",
+              "url" => "https://fonts.googleapis.com/css?family=One+Font"
+            }
           }
         end
       end
@@ -224,7 +239,10 @@ describe ThemeFont 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"
+          "primary_text_font" => {
+            "name" => "Three",
+            "url" => "https://fonts.googleapis.com/css?family=Three"
+          }
         }
       end
 
@@ -235,7 +253,10 @@ describe ThemeFont do
         } }
         result = ThemeFont.google_font_url_for_theme_json(account_theme)
         result.should == {
-          "primary_text_font" => "https://fonts.googleapis.com/css?family=Three"
+          "primary_text_font" => {
+            "name" => "Three",
+            "url" => "https://fonts.googleapis.com/css?family=Three"
+          }
         }
       end
     end
@@ -247,7 +268,10 @@ describe ThemeFont 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"
+          "primary_text_font" => {
+            "name" => "One Font",
+            "url" => "https://fonts.googleapis.com/css?family=One+Font"
+          }
         }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigcartel-theme-fonts
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.4
 platform: ruby
 authors:
 - Big Cartel