webfontloader 1.0.24 → 1.0.25

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.0.25 (February 7, 2012)
+* Updated the user agent parser to recognize Chrome for Android properly as a Chrome browser.
+
 v1.0.24 (January 9, 2012)
 * Updated the standard test string from "BESs" to "BESbswy" for more width variability.
 * Improved Google's custom FontWatchRunner implementation for Webkit to work around an issue where the browser reports the 400 weight's width when it is already loaded.

data/lib/webfontloader.rb

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

data/src-test/core/useragenttest.js

@@ -165,6 +165,22 @@ UserAgentTest.prototype.testBrowserIsAndroid = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsAndroidChromeMobile = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+    "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; Nexus S Build/IML74K) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.75 Mobile Safari/535.7",
+    this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("Chrome", userAgent.getName());
+  assertEquals("16.0.912.75", userAgent.getVersion());
+  assertEquals("Android", userAgent.getPlatform());
+  assertEquals("4.0.3", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("535.7", 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",

data/src/core/useragentparser.js

@@ -195,7 +195,7 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
   }
   var name = webfont.UserAgentParser.UNKNOWN;
 
-  if (this.userAgent_.indexOf("Chrome") != -1) {
+  if (this.userAgent_.indexOf("Chrome") != -1 || this.userAgent_.indexOf("CrMo") != -1) {
     name = "Chrome";
   } else if (this.userAgent_.indexOf("Safari") != -1) {
     name = "Safari";
@@ -209,7 +209,7 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
         /Version\/([\d\.\w]+)/, 1);
   } else if (name == "Chrome") {
     version = this.getMatchingGroup_(this.userAgent_,
-        /Chrome\/([\d\.]+)/, 1);
+        /(Chrome|CrMo)\/([\d\.]+)/, 2);
   } else if (name == "AdobeAIR") {
     version = this.getMatchingGroup_(this.userAgent_,
         /AdobeAIR\/([\d\.]+)/, 1);

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.24'
-  s.date              = '2012-01-09'
+  s.version           = '1.0.25'
+  s.date              = '2012-02-07'
 
   ## 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: 39
+  hash: 37
   prerelease: 
   segments: 
   - 1
   - 0
-  - 24
-  version: 1.0.24
+  - 25
+  version: 1.0.25
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 -08:00
+date: 2012-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency