bigcartel-theme-fonts 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43edfee9943ab660cd6a9769b3b135c6a41b1c8ff4ec5c0388bd7309023f2c7
-  data.tar.gz: f03554bfad9c4b75cfa4c23c42b8bb51773b9903c472fdad0bb2f5ea4c8e60c1
+  metadata.gz: e9c62987d04b87cd2bc97b94d0b67b3788e8651cc35b8867fd6b2b765e8c7c8a
+  data.tar.gz: 920a5db7b7da48287c1911206228a01e61006e3cac164d01b5de19d7caeaa48e
 SHA512:
-  metadata.gz: 1a59d9bcd61be1f1c6058342d731802a295ecb2009389b12386947c435bd5cfce7a0fb122297276b404626239d638613cf888d60a0ad59afc770daa58d9d07d0
-  data.tar.gz: 35cfdd4ed6e703688a614c13d383b985894d05a6ebad61cce267539298af3c1c442a2bd673d8401b28c1b53c1a50f67f797b353d81fdcc89bbc81d407132fa02
+  metadata.gz: 1e3f4dd696bf60146c3a0564ef3b3db5b09d15d942e694d370c384988313607e6b42aa7eef43d490cd8dec497e33a4a5cf4df454216c8b55dba6f87b92afe1a5
+  data.tar.gz: a3d3318ce640fac9ac81b4822f64c8138e1da74c363b9d637fb2e5174920abdfa777cc460d2df9408f75dfc8fdeb190966d7a287da2e6919dec78b05cf63a6de

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.2.0'
+  spec.version       = '1.3.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

@@ -1,12 +1,12 @@
 require 'yaml'
 
-class ThemeFont < Struct.new(:name, :family, :collection)
+class ThemeFont < Struct.new(:name, :family, :weights, :collection)
   class << self
     def all
       @@all ||= Array.new.tap { |fonts|
         source.each_pair { |collection, collection_fonts|
           collection_fonts.values.each { |font|
-            fonts << ThemeFont.new(font['name'], font['family'], collection)
+            fonts << ThemeFont.new(font['name'], font['family'], font['weights'], collection)
           }
         }
       }.sort_by { |font| font.name }
@@ -30,22 +30,39 @@ class ThemeFont < Struct.new(:name, :family, :collection)
       end
     end
 
-    def google_font_names
-      @@google_font_names ||= all.select { |font|
+    def google_fonts
+      @@google_fonts ||= all.select { |font|
         font.collection == 'google'
-      }.map(&:name)
+      }
+    end
+
+    def google_font_names
+      google_fonts.map(&:name)
     end
 
     def google_font_url_for_fonts(fonts)
+      fonts = fonts.map do |font|
+        if font.kind_of? ThemeFont
+          font.weights ? "#{font.name}:#{font.weights}" : font.name
+        else
+          font
+        end
+      end
+
       "//fonts.googleapis.com/css?family=#{ fonts.uniq.map { |font| font.gsub(' ', '+') }.join('|') }"
     end
 
     def google_font_url_for_all_fonts
-      google_font_url_for_fonts(google_font_names)
+      google_font_url_for_fonts(google_fonts)
     end
 
     def google_font_url_for_theme(fonts, settings)
-      google_fonts = fonts.keys.map { |key| settings[key] }.select { |font_name| google_font_names.include? font_name }.sort
+      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 }
+
       google_fonts.empty? ? nil : google_font_url_for_fonts(google_fonts)
     end
 

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

@@ -60,10 +60,12 @@ google:
   amaranth:
     name: Amaranth
     family: '"Amaranth", serif'
+    weights: "400,700"
 
   arvo:
     name: Arvo
     family: '"Arvo", serif'
+    weights: "400,700"
 
   asap:
     name: Asap
@@ -84,6 +86,7 @@ google:
   chivo:
     name: Chivo
     family: '"Chivo", sans-serif'
+    weights: "400,700"
     
   cutive:
     name: Cutive
@@ -100,10 +103,12 @@ google:
   dosis:
     name: Dosis
     family: '"Dosis", sans-serif'
+    weights: "400,700"
 
   enriqueta:
     name: Enriqueta
     family: '"Enriqueta", serif'
+    weights: "400,700"
     
   fauna_one:
     name: Fauna One
@@ -116,10 +121,12 @@ google:
   gentium_book_basic:
     name: Gentium Book Basic
     family: '"Gentium Book Basic", serif'
+    weights: "400,700"
 
   glegoo:
     name: Glegoo
     family: '"Glegoo", serif'
+    weights: "400,700"
     
   goudy_bookletter_1911:
     name: Goudy Bookletter 1911
@@ -128,38 +135,47 @@ google:
   inconsolata:
     name: Inconsolata
     family: '"Inconsolata", sans-serif'
+    weights: "400,700"
 
   karla:
     name: Karla
     family: '"Karla", sans-serif'
+    weights: "400,700"
 
   lato:
     name: Lato
     family: '"Lato", sans-serif'
+    weights: "400,700"
 
   lekton:
     name: Lekton
     family: '"Lekton", sans-serif'
-    
+    weights: "400,700"
+
   libre_baskerville:
     name: Libre Baskerville
     family: '"Libre Baskerville", serif'
+    weights: 400,700
 
   lobster_two:
     name: Lobster Two
     family: '"Lobster Two", cursive'
+    weights: "400,700"
 
   merriweather:
     name: Merriweather
     family: '"Merriweather", serif'
+    weights: "400,700"
 
   montserrat:
     name: Montserrat
     family: '"Montserrat", sans-serif'
+    weights: "400,500,700"
 
   muli:
     name: Muli
     family: '"Muli", sans-serif'
+    weights: "400,700,900"
 
   nixie_one:
     name: Nixie One
@@ -168,46 +184,57 @@ google:
   open_sans:
     name: Open Sans
     family: '"Open Sans", sans-serif'
+    weights: "400,700"
 
   overlock:
     name: Overlock
     family: '"Overlock", cursive'
+    weights: "400,700"
 
   noticia_text:
     name: Noticia Text
     family: '"Noticia Text", serif'
+    weights: "400,700"
 
   playfair_display:
     name: Playfair Display
     family: '"Playfair Display", serif'
+    weights: "400,700"
 
   pt_serif:
     name: PT Serif
     family: '"PT Serif", serif'
+    weights: "400,700"
 
   raleway:
     name: Raleway
     family: '"Raleway", sans-serif'
+    weights: "400,700"
     
   roboto:
     name: Roboto
     family: '"Roboto", sans-serif'
+    weights: "400,700"
 
   rokkitt:
     name: Rokkitt
     family: '"Rokkitt", serif'
+    weights: "400,700"
 
   signika:
     name: Signika
     family: '"Signika", sans-serif'
+    weights: "400,700"
 
   source_sans_pro:
     name: Source Sans Pro
     family: '"Source Sans Pro", sans-serif'
+    weights: "400,700"
 
   titillium_web:
     name: Titillium Web
     family: '"Titillium Web", sans-serif'
+    weights: "400,700"
 
   vampiro_one:
     name: Vampiro One
@@ -220,3 +247,4 @@ google:
   work_sans:
     name: Work Sans
     family: '"Work Sans", sans-serif'
+    weights: "400,600,700"

data/spec/theme_font_spec.rb

@@ -6,7 +6,7 @@ describe ThemeFont do
     ThemeFont.send(:remove_class_variable, :@@source) rescue nil
     ThemeFont.send(:remove_class_variable, :@@all) rescue nil
     ThemeFont.send(:remove_class_variable, :@@options) rescue nil
-    ThemeFont.send(:remove_class_variable, :@@google_font_names) rescue nil
+    ThemeFont.send(:remove_class_variable, :@@google_fonts) rescue nil
   end
 
   describe ".all" do
@@ -60,9 +60,9 @@ describe ThemeFont do
   describe ".google_font_names" do
     before(:each) do
       stub(ThemeFont).all {[
-        ThemeFont.new('One Font', 'One Family', 'google'),
-        ThemeFont.new('Two', 'Two Family', 'default'),
-        ThemeFont.new('Three', 'Three Family', 'google')
+        ThemeFont.new('One Font', 'One Family', nil, 'google'),
+        ThemeFont.new('Two', 'Two Family', nil, 'default'),
+        ThemeFont.new('Three', 'Three Families', nil, 'google')
       ]}
     end
 
@@ -83,19 +83,32 @@ describe ThemeFont do
     it "should only use unique font names" do
       ThemeFont.google_font_url_for_fonts(['Yeah', 'Buddy', 'Yeah']).should == "//fonts.googleapis.com/css?family=Yeah|Buddy"
     end
+
+    context "when the fonts are an array of ThemeFonts" do
+      let(:fonts) do
+        [
+          ThemeFont.new('One Font', 'One Family', '400,500', 'google'),
+          ThemeFont.new('Two Font', 'Two Families', '500,700,800', 'google')
+        ]
+      end
+
+      it "includes font weights in the URL" do
+        ThemeFont.google_font_url_for_fonts(fonts).should == "//fonts.googleapis.com/css?family=One+Font:400,500|Two+Font:500,700,800"
+      end
+    end
   end
 
   describe ".google_font_url_for_all_fonts" do
     before(:each) do
       stub(ThemeFont).all {[
-        ThemeFont.new('One Font', 'One Family', 'google'),
-        ThemeFont.new('Two', 'Two Family', 'default'),
-        ThemeFont.new('Three', 'Three Family', 'google')
+        ThemeFont.new('One Font', 'One Family', nil, 'google'),
+        ThemeFont.new('Two', 'Two Family', nil, 'default'),
+        ThemeFont.new('Three', 'Three Family', '400,600', 'google')
       ]}
     end
 
     it "should return a URL for all Google fonts" do
-      ThemeFont.google_font_url_for_all_fonts.should == "//fonts.googleapis.com/css?family=One+Font|Three"
+      ThemeFont.google_font_url_for_all_fonts.should == "//fonts.googleapis.com/css?family=One+Font|Three:400,600"
     end
   end
 
@@ -104,20 +117,25 @@ describe ThemeFont do
 
     before(:each) do
       stub(ThemeFont).all {[
-        ThemeFont.new('One Font', 'One Family', 'google'),
-        ThemeFont.new('Two', 'Two Family', 'default'),
-        ThemeFont.new('Three', 'Three Family', 'google')
+        ThemeFont.new('One Font', 'One Family', '400,700', 'google'),
+        ThemeFont.new('Two', 'Two Family', nil, 'default'),
+        ThemeFont.new('Three', 'Three Family', nil, 'google')
       ]}
     end
 
     it "should return a URL if a theme has multiple" do
       settings = { :header_font => 'One Font', :body_font => 'Two', :paragraph_font => 'Three' }
-      ThemeFont.google_font_url_for_theme(fonts, settings).should == "//fonts.googleapis.com/css?family=One+Font|Three"
+      ThemeFont.google_font_url_for_theme(fonts, settings).should == "//fonts.googleapis.com/css?family=One+Font:400,700|Three"
     end
 
     it "should return single font name if a theme has one" do
       settings = { :header_font => 'One Font', :body_font => 'Two' }
-      ThemeFont.google_font_url_for_theme(fonts, settings).should == "//fonts.googleapis.com/css?family=One+Font"
+      ThemeFont.google_font_url_for_theme(fonts, settings).should == "//fonts.googleapis.com/css?family=One+Font:400,700"
+    end
+
+    it "should dedup" do
+      settings = { :header_font => 'One Font', :body_font => 'One Font' }
+      ThemeFont.google_font_url_for_theme(fonts, settings).should == "//fonts.googleapis.com/css?family=One+Font:400,700"
     end
 
     it "should return nil if a theme has none" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigcartel-theme-fonts
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler