webfontloader 1.0.28 → 1.0.29

data/CHANGELOG

@@ -1,3 +1,11 @@
+v1.0.29 (July 26, 2012)
+* Added test to ensure Firefox for Android is properly detected as "Firefox" by UserAgentParser.
+* Added test to ensure Opera Mobile for Android is properly detected as "Opera" by UserAgentParser.
+* Changed detection so that Chrome for iOS is detected as "Chrome" instead of "Safari".
+* Changed detection so that Opera Mini is correctly detected as "OperaMini" (without font support) instead of "Opera" (with font support).
+* Fixed a bug in Google Web Fonts module when requesting a font family with character sets and no variations.
+* Scaled back the number of fall back fonts used in the Google Web Fonts font watching code.
+
 v1.0.28 (June 4, 2012)
 * Added support for detecting the Chrome OS platform ("CrOS") in the UserAgentParser.
 

data/lib/webfontloader.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'webfontloader/modules'
 
 module WebFontLoader
-  VERSION = '1.0.28'
+  VERSION = '1.0.29'
 
   ProjectRoot = File.expand_path(File.dirname(__FILE__) + "/..")
 

data/src-test/core/useragenttest.js

@@ -197,6 +197,24 @@ UserAgentTest.prototype.testBrowserIsAndroidChromeMobile = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsAndroidFirefox = function() {
+  // This useragent has been slightly doctored with versions to ensure the right
+  // info is coming from the right places.
+  var userAgentParser = new webfont.UserAgentParser(
+    "Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/15.0 Firefox/14.0",
+    this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("Firefox", userAgent.getName());
+  assertEquals("14.0", userAgent.getVersion());
+  assertEquals("Android", userAgent.getPlatform());
+  assertEquals("Unknown", userAgent.getPlatformVersion());
+  assertEquals("Gecko", userAgent.getEngine());
+  assertEquals("13.0", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+}
+
 UserAgentTest.prototype.testBrowserIsFirefoxLettersVersion = function() {
   var userAgentParser = new webfont.UserAgentParser(
       "Mozilla/5.0 (X11; U; Linux i686; ru-RU; rv:1.9.2a1pre) Gecko/20090405 Ubuntu/9.04 (jaunty) Firefox/3.6a1pre",
@@ -293,6 +311,45 @@ UserAgentTest.prototype.testBrowserIsOperaBeforeVersion10 = function() {
   assertFalse(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsOperaMobileAndroid = function() {
+  // For the purposes of web font support, we consider Opera Mobile to be a
+  // version of full Opera on mobile devices, since the support for web fonts
+  // follows the same version numbers as the desktop versions.
+  var userAgentParser = new webfont.UserAgentParser(
+    "Opera/9.80 (Android 4.1.1; Linux; Opera Mobi/ADR-1207201819; U; en) Presto/2.10.254 Version/12.00",
+    this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("Opera", userAgent.getName());
+  assertEquals("12.00", userAgent.getVersion());
+  assertEquals("Android", userAgent.getPlatform());
+  assertEquals("4.1.1", userAgent.getPlatformVersion());
+  assertEquals("Presto", userAgent.getEngine());
+  assertEquals("2.10.254", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+};
+
+UserAgentTest.prototype.testBrowserIsOperaMiniAndroid = function() {
+  // For the purposes of web font support, we consider Opera Mini to be a
+  // different browser from the full Opera, since it doesn't support web fonts
+  // and follows two separate versioning systems. We use the Opera Mini version
+  // instead of the more generic Opera version.
+  var userAgentParser = new webfont.UserAgentParser(
+    "Opera/9.80 (Android; Opera Mini/7.0.29952/28.2144; U; en) Presto/2.8.119 Version/11.10",
+    this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("OperaMini", userAgent.getName());
+  assertEquals("7.0.29952", userAgent.getVersion());
+  assertEquals("Android", userAgent.getPlatform());
+  assertEquals("Unknown", userAgent.getPlatformVersion());
+  assertEquals("Presto", userAgent.getEngine());
+  assertEquals("2.8.119", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertFalse(userAgent.isSupportingWebFont());
+}
+
 UserAgentTest.prototype.testBrowserIsIEOnMac = function() {
   var userAgentParser = new webfont.UserAgentParser(
       "Mozilla/4.0 (compatible; MSIE 5.23; Mac_PowerPC)",
@@ -357,6 +414,22 @@ UserAgentTest.prototype.testBrowserIsIPadWithoutIPhone = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsIPadChrome = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (iPad; U; CPU OS 5_1_1 like Mac OS X; en-us) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("Chrome", userAgent.getName());
+  assertEquals("19.0.1084.60", userAgent.getVersion());
+  assertEquals("iPad", userAgent.getPlatform());
+  assertEquals("5_1_1", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("534.46.0", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+}
+
 UserAgentTest.prototype.testBrowserIsIPod = function() {
   var userAgentParser = new webfont.UserAgentParser(
       "Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Mobile/5H11a",
@@ -389,6 +462,22 @@ UserAgentTest.prototype.testBrowserIsIPodSafari = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsIPodChrome = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (iPod; U; CPU iPhone OS 5_1_1 like Mac OS X; en-us) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("Chrome", userAgent.getName());
+  assertEquals("19.0.1084.60", userAgent.getVersion());
+  assertEquals("iPod", userAgent.getPlatform());
+  assertEquals("5_1_1", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("534.46.0", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+}
+
 UserAgentTest.prototype.testBrowserIsSafariWithPlusVersion = function() {
   var userAgentParser = new webfont.UserAgentParser(
       "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; tr) AppleWebKit/528.4+ (KHTML, like Gecko) Version/4.0dp1 Safari/526.11.2",

data/src-test/google/fontapiurlbuildertest.js

@@ -37,3 +37,14 @@ FontApiUrlBuilderTest.prototype.testBuildProperUrlWithSubsets = function() {
 	       '?family=Font1:bold%7CFont2:italic%7CFont3' +
       '&subset=greek,cyrillic', fontApiUrlBuilder.build());
 };
+
+FontApiUrlBuilderTest.prototype.testBuildProperUrlWithSubsetsNoVariations =
+    function() {
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder();
+
+  fontApiUrlBuilder.setFontFamilies([ 'Font1:bold,italic:greek,cyrillic',
+      'Font2:italic', 'Font3::latin' ]);
+  assertEquals("http:" + webfont.FontApiUrlBuilder.DEFAULT_API_URL +
+	       '?family=Font1:bold,italic%7CFont2:italic%7CFont3' +
+      '&subset=greek,cyrillic,latin', fontApiUrlBuilder.build());
+};

data/src-test/google/lastresortwebkitfontwatchrunnertest.js

@@ -73,7 +73,7 @@ LastResortWebKitFontWatchRunnerTest.prototype.setUp = function() {
 LastResortWebKitFontWatchRunnerTest.prototype.testLastResortFontIgnored =
     function() {
   var originalSizeCount = 2;
-  var lastResortFontsCount = 11;
+  var lastResortFontsCount = 5;
   var firstSize = 2;
   var secondSize = 2;
   var thirdSize = 2;
@@ -119,7 +119,7 @@ LastResortWebKitFontWatchRunnerTest.prototype.testLastResortFontActiveWhenSizeMa
     = function() {
   this.timesToGetTimeBeforeTimeout_ = 3;
   var originalSizeCount = 2;
-  var lastResortFontsCount = 11;
+  var lastResortFontsCount = 5;
   var firstSize = 2;
 
   this.fontFamily_ = "Arimo";
@@ -157,7 +157,7 @@ LastResortWebKitFontWatchRunnerTest.prototype.testLastResortFontInactiveWhenSize
     = function() {
   this.timesToGetTimeBeforeTimeout_ = 3;
   var originalSizeCount = 2;
-  var lastResortFontsCount = 11;
+  var lastResortFontsCount = 5;
   var firstSize = 2;
   var secondSize = 2;
   var thirdSize = 2;

data/src/core/useragentparser.js

@@ -153,6 +153,21 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
       engineVersion = geckoVersion;
     }
   }
+
+  // Check for Opera Mini first, since it looks like normal Opera
+  if (this.userAgent_.indexOf("Opera Mini/") != -1) {
+    var version = this.getMatchingGroup_(this.userAgent_, /Opera Mini\/([\d\.]+)/, 1);
+
+    if (version == "") {
+      version = webfont.UserAgentParser.UNKNOWN;
+    }
+
+    return new webfont.UserAgent("OperaMini", version, engineName,
+        engineVersion, this.getPlatform_(), this.getPlatformVersion_(),
+        this.getDocumentMode_(this.doc_), false);
+  }
+
+  // Otherwise, find version information for normal Opera or Opera Mobile
   if (this.userAgent_.indexOf("Version/") != -1) {
     var version = this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.]+)/, 1);
 
@@ -195,7 +210,7 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
   }
   var name = webfont.UserAgentParser.UNKNOWN;
 
-  if (this.userAgent_.indexOf("Chrome") != -1 || this.userAgent_.indexOf("CrMo") != -1) {
+  if (this.userAgent_.indexOf("Chrome") != -1 || this.userAgent_.indexOf("CrMo") != -1 || this.userAgent_.indexOf("CriOS") != -1) {
     name = "Chrome";
   } else if (this.userAgent_.indexOf("Safari") != -1) {
     name = "Safari";
@@ -209,7 +224,7 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
         /Version\/([\d\.\w]+)/, 1);
   } else if (name == "Chrome") {
     version = this.getMatchingGroup_(this.userAgent_,
-        /(Chrome|CrMo)\/([\d\.]+)/, 2);
+        /(Chrome|CrMo|CriOS)\/([\d\.]+)/, 2);
   } else if (name == "AdobeAIR") {
     version = this.getMatchingGroup_(this.userAgent_,
         /AdobeAIR\/([\d\.]+)/, 1);

data/src/google/fontapiurlbuilder.js

@@ -8,7 +8,7 @@ webfont.FontApiUrlBuilder = function(apiUrl) {
     var protocol = 'https:' == window.location.protocol ? 'https:' : 'http:';
 
     this.apiUrl_ = protocol + webfont.FontApiUrlBuilder.DEFAULT_API_URL;
-  }  
+  }
   this.fontFamilies_ = [];
   this.subsets_ = [];
 };
@@ -32,7 +32,11 @@ webfont.FontApiUrlBuilder.prototype.parseFontFamilies_ =
     if (elements.length == 3) {
       this.subsets_.push(elements.pop());
     }
-    this.fontFamilies_.push(elements.join(':'));
+    var joinCharacter = '';
+    if (elements.length == 2 && elements[1] != ''){
+      joinCharacter = ':';
+    }
+    this.fontFamilies_.push(elements.join(joinCharacter));
   }
 };
 

data/src/google/lastresortwebkitfontwatchrunner.js

@@ -38,10 +38,7 @@ webfont.LastResortWebKitFontWatchRunner.METRICS_COMPATIBLE_FONTS = {
  */
 webfont.LastResortWebKitFontWatchRunner.prototype
     .setUpWebKitLastResortFontSizes_ = function() {
-  var lastResortFonts = ["Times New Roman",
-      "Lucida Sans Unicode", "Courier New", "Tahoma", "Arial",
-      "Microsoft Sans Serif", "Times", "Lucida Console", "Sans", "Serif",
-      "Monospace"];
+  var lastResortFonts = ['Times New Roman', 'Arial', 'Times', 'Sans', 'Serif'];
   var lastResortFontSizes = lastResortFonts.length;
   var webKitLastResortFontSizes = {};
   var element = this.createHiddenElementWithFont_(lastResortFonts[0], true);

data/webfontloader.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'webfontloader'
-  s.version           = '1.0.28'
-  s.date              = '2012-06-04'
+  s.version           = '1.0.29'
+  s.date              = '2012-07-26'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 1
   - 0
-  - 28
-  version: 1.0.28
+  - 29
+  version: 1.0.29
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false