webfontloader 1.0.27 → 1.0.28

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.0.28 (June 4, 2012)
+* Added support for detecting the Chrome OS platform ("CrOS") in the UserAgentParser.
+
 v1.0.27 (April 20, 2012)
 * Updated DomHelper to not require a UserAgent instance. Feature-detection is not used instead of UA detection for switching DOM methods.
 

data/lib/webfontloader.rb

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

data/src-test/core/useragenttest.js

@@ -84,6 +84,22 @@ UserAgentTest.prototype.testBrowserIsChrome = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsChromeOS = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (X11; CrOS i686 1660.57.0) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.46 Safari/535.19",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("Chrome", userAgent.getName());
+  assertEquals("18.0.1025.46", userAgent.getVersion());
+  assertEquals("CrOS", userAgent.getPlatform());
+  assertEquals("i686 1660.57.0", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("535.19", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+};
+
 UserAgentTest.prototype.testBrowserIsSafari = function() {
   var userAgentParser = new webfont.UserAgentParser(
       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10",

data/src/core/useragentparser.js

@@ -56,7 +56,7 @@ webfont.UserAgentParser.prototype.getPlatform_ = function() {
     return mobileOs;
   }
   var os = this.getMatchingGroup_(this.userAgent_,
-      /(Linux|Mac_PowerPC|Macintosh|Windows)/, 1);
+      /(Linux|Mac_PowerPC|Macintosh|Windows|CrOS)/, 1);
 
   if (os != "") {
     if (os == "Mac_PowerPC") {
@@ -71,10 +71,10 @@ webfont.UserAgentParser.prototype.getPlatform_ = function() {
  * @private
  */
 webfont.UserAgentParser.prototype.getPlatformVersion_ = function() {
-  var macVersion = this.getMatchingGroup_(this.userAgent_,
-      /(OS X|Windows NT|Android) ([^;)]+)/, 2);
-  if (macVersion) {
-    return macVersion;
+  var genericVersion = this.getMatchingGroup_(this.userAgent_,
+      /(OS X|Windows NT|Android|CrOS) ([^;)]+)/, 2);
+  if (genericVersion) {
+    return genericVersion;
   }
   var iVersion = this.getMatchingGroup_(this.userAgent_,
       /(iPhone )?OS ([\d_]+)/, 2);

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.27'
-  s.date              = '2012-04-20'
+  s.version           = '1.0.28'
+  s.date              = '2012-06-04'
 
   ## 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: 33
+  hash: 47
   prerelease: 
   segments: 
   - 1
   - 0
-  - 27
-  version: 1.0.27
+  - 28
+  version: 1.0.28
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-20 00:00:00 Z
+date: 2012-06-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false