bigcartel-theme-fonts 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c24d66f05033aa4200161c1f0c2e1f76b2e2d7ffc05ebf2c7362d0402c83d731
-  data.tar.gz: c2c5567bbd85fa600d66c62d561984d9bd16cd7c60132f6684620d63112c99b3
+  metadata.gz: 2baed7db194a686348bf4ef821d7a0f139e4f4d7b2c400d7bb2afc1d3719c3b2
+  data.tar.gz: 2d406ddecc9e86a422261d71fc4bed68722872e65e7a6b55602904335ef2f626
 SHA512:
-  metadata.gz: 4a321d1697c53a3dba38e686faa7dff2f7425ca78f604153e209dcfccaf2cfabd551dd7866bf99ed5b7f8f02e5dfb1260afd9fca1b3ca379ebe719a62b978792
-  data.tar.gz: 8ecd906210fdae6fd8ea4d7a239cc520d27630a9785b7631a2a124b2110bd9d41915a3a3e94f45c9b9c4aa539427e70cebb7b00ec7d70453c42fae96d03a2118
+  metadata.gz: d376e3f0da72ed79e202c0fdb3a79fe90acd8acb5fb87179768c15845470e95b2535b51509266bbfbe3f0d6558804a9a1a409e0081648e35d84d71f032b11d45
+  data.tar.gz: 1f9ab812bdedc4a77b3a5a591088b2e97687fad43ffd4707d111c88317879e88cf6f803183578a117600a3ded7d62580c22f6c2c405bde06f9ec8c32f12c3936

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.1'
+  spec.version       = '1.8.3'
   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

@@ -69,19 +69,22 @@ class ThemeFont < Struct.new(:name, :family, :weights, :collection)
     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"]
+        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"]
+        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(' ', '+')}"
+        "primary_text_font" => {
+          "name" => font.name,
+          "url" => "https://fonts.googleapis.com/css?family=#{font.name.gsub(' ', '+')}"
+        }
       }
     end
 

data/spec/theme_font_spec.rb

@@ -158,60 +158,75 @@ describe ThemeFont do
 
     context "with default theme" do
       it "uses primary_font when present" do
-        stub(account_theme).settings { { "primary_font" => "One Font" } }
+        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
 
       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" } }
+          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
 
         it "falls back to font when primary_font and text_font are absent" do
-          stub(account_theme).settings { { "font" => "One Font" } }
+          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
 
         it "prefers primary_font over other settings" do
           stub(account_theme).settings { {
-            "primary_font" => "One Font",
-            "text_font" => "Three",
-            "font" => "Three",
-            "serif_font" => "Three"
+            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"
+            "primary_text_font" => {
+              "name" => "One Font",
+              "url" => "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" } }
+        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" } }
+        stub(account_theme).settings { { primary_font: "Unknown" } }
         result = ThemeFont.google_font_url_for_theme_json(account_theme)
         result.should == {}
       end
@@ -221,21 +236,27 @@ describe ThemeFont do
       let(:theme) { double("Theme", name: "cosmos") }
 
       it "uses secondary_font setting" do
-        stub(account_theme).settings { { "secondary_font" => "Three" } }
+        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
 
       it "ignores primary_font when secondary_font is present" do
         stub(account_theme).settings { {
-          "secondary_font" => "Three",
-          "primary_font" => "One Font"
+          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"
+          "primary_text_font" => {
+            "name" => "Three",
+            "url" => "https://fonts.googleapis.com/css?family=Three"
+          }
         }
       end
     end
@@ -244,10 +265,13 @@ describe ThemeFont do
       let(:theme) { double("Theme", name: "lunch break") }
 
       it "uses secondary_font setting" do
-        stub(account_theme).settings { { "secondary_font" => "One Font" } }
+        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.1
+  version: 1.8.3
 platform: ruby
 authors:
 - Big Cartel