bigcartel-theme-fonts 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda02a423d5ecebee3afd0f6ed53186cb01e1e8322073844ae90749f5ece7d73
-  data.tar.gz: c903ea89b42f88293a8d31f1f951fa4694586b63da3b44de22bd7c09235ef18f
+  metadata.gz: d58b062226017f9cf542de6c90d1cdb4a2f6ffc780948745c497d7b0384ef4a1
+  data.tar.gz: a1f4600d2e543286f9a4312216387b183b0534734cc66bef62155a3a0f0ab2fc
 SHA512:
-  metadata.gz: fdce3702961befcddfab26283c15993d791ac1a2f35c39ff5eec44f2909b01544b2f5022c1c2c45e14fb9e02a1ce39275696b7f562bdcdab3c17c293ac608869
-  data.tar.gz: 4f32a6003308f29b986e63d43fcc03cf1522176c730a2a6d98ac52714295485bf05c1fb05ceda4dde40c725f8f064f113553c28c21b22cd9032fa47ba38b4a7e
+  metadata.gz: 1cc9c664c5678b0005512f22cfcf23f142bf158838adf52042535da9468a7a6a1d7c98d8841a034e5ed5b48b9acf9d132df2beb69aa38dfb10a03a10fbdcd3cf
+  data.tar.gz: 15cccfc9483a7391b06cc7fee064fdbc9f0e452ef02b933f71562c7f31ce560eadca6f1c38a9b9b58047a87c51f3cfe0b4e8388f260372e18eb747bef5564b8b

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.0'
+  spec.version       = '1.8.2'
   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,31 +66,23 @@ 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?
+    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
 
-      base_url = opts[:include_protocol] ? "https://fonts.googleapis.com/css?family=" : "//fonts.googleapis.com/css?family="
+      font = find_by_name(font_setting)
+      return {} if font.nil? || font.collection != 'google'
 
-      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
+      {
+        "primary_text_font" => "https://fonts.googleapis.com/css?family=#{font.name.gsub(' ', '+')}"
+      }
     end
 
     private

data/spec/theme_font_spec.rb

@@ -144,8 +144,9 @@ describe ThemeFont do
     end
   end
 
-  describe ".google_font_url_for_theme_array" do
-    let(:fonts) {{ :header_font => {}, :body_font => {}, :paragraph_font => {} }}
+  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 {[
@@ -155,70 +156,99 @@ describe ThemeFont do
       ]}
     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"
-        ]
+    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
 
-      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"]
+      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 array when no Google fonts" do
-        settings = { :body_font => 'Two' }
-        result = ThemeFont.google_font_url_for_theme_array(fonts, settings)
-        result.should == []
+      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 "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"]
+      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 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"
-        ]
+    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
-    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"
-        ]
+      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 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"
-        ]
+    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

metadata

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