webfontloader 1.3.1 → 1.3.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.3.2 (March 27, 2013)
+* Add support for the Amazon 1 and 2+ browsers.
+
 v1.3.1 (March 14, 2013)
 * Change code to use explicit dependencies
 * Fix unit tests in older browsers

data/lib/webfontloader.rb

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

data/spec/core/useragentparser_spec.js

@@ -705,6 +705,188 @@ describe('UserAgentParser', function () {
       });
     });
 
+    describe('Amazon Silk', function () {
+      it('should detect 2nd generation', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFOT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Mobile Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Android',
+          platformVersion: '4.0.3',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('should detect 2nd generation (Desktop mode)', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; en-us; KFOT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Linux',
+          platformVersion: 'Unknown',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        })
+      });
+
+      it('HD 7"', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFTT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Mobile Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Android',
+          platformVersion: '4.0.3',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('HD 7" (Desktop mode)', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; en-us; KFTT Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Linux',
+          platformVersion: 'Unknown',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('HD 8.9" Wi-Fi', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFJWI Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Mobile Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Android',
+          platformVersion: '4.0.3',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('HD 8.9" Wi-Fi (Desktop mode)', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; en-us; KFJWI Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Linux',
+          platformVersion: 'Unknown',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('HD 8.9" WAN', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; KFJWA Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Mobile Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Android',
+          platformVersion: '4.0.3',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('HD 8.9" WAN (Desktop mode)', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; en-us; KFJWA Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.6 Safari/535.19 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '2.6',
+          platform: 'Linux',
+          platformVersion: 'Unknown',
+          engine: 'AppleWebKit',
+          engineVersion: '535.19',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('1st generation', function () {
+        expect(parse('Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Silk/1.0.22.79_10013310) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '1.0.22.79_10013310',
+          platform: 'Android',
+          platformVersion: '2.3.4',
+          engine: 'AppleWebKit',
+          engineVersion: '533.1',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
+      it('1st generation (Desktop mode)', function () {
+        expect(parse('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.22.79_10013310) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=false'))
+        .toMatchUserAgent({
+          name: 'Silk',
+          version: '1.0.22.79_10013310',
+          platform: 'Macintosh',
+          platformVersion: '10_6_3',
+          engine: 'AppleWebKit',
+          engineVersion: '533.16',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
+          }
+        });
+      });
+    });
+
     describe('Opera', function () {
       it('should detect Opera', function () {
         expect(parse('Opera/9.80 (Linux i686; U; en) Presto/2.5.22 Version/10.51'))

data/src/core/useragentparser.js

@@ -251,13 +251,14 @@ goog.scope(function () {
     if (webKitVersionString == "") {
       webKitVersionString = UserAgentParser.UNKNOWN;
     }
-
     var webKitVersion = this.parseVersion_(webKitVersionString);
     var platformVersion = this.parseVersion_(platformVersionString);
     var name = UserAgentParser.UNKNOWN;
 
     if (this.userAgent_.indexOf("Chrome") != -1 || this.userAgent_.indexOf("CrMo") != -1 || this.userAgent_.indexOf("CriOS") != -1) {
       name = "Chrome";
+    } else if (/Silk\/\d/.test(this.userAgent_)) {
+      name = "Silk";
     } else if (platform == "BlackBerry" || platform == "Android") {
       name = UserAgentParser.BUILTIN_BROWSER;
     } else if (this.userAgent_.indexOf("Safari") != -1) {
@@ -269,6 +270,9 @@ goog.scope(function () {
 
     if (name == UserAgentParser.BUILTIN_BROWSER) {
       version = UserAgentParser.UNKNOWN;
+    } else if (/Silk\/\d/.test(this.userAgent_)) {
+      version = this.getMatchingGroup_(this.userAgent_,
+          /Silk\/([\d\._]+)/, 1);
     } else if (this.userAgent_.indexOf("Version/") != -1) {
       version = this.getMatchingGroup_(this.userAgent_,
           /Version\/([\d\.\w]+)/, 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.3.1'
-  s.date              = '2013-03-14'
+  s.version           = '1.3.2'
+  s.date              = '2013-03-27'
 
   ## 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: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-14 00:00:00 Z
+date: 2013-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake