webfontloader 1.1.1 → 1.1.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.1.2 (January 21, 2013)
+* Added parameter to Google module to do character based subsetting.
+* Made WebKit useragent check less strict about capitalization for LG L160 phones that apparently use 'AppleWebkit' instead of 'AppleWebKit' in their useragent strings.
+
 v1.1.1 (December 12, 2012)
 * Added the ability to recognize BlackBerry devices, which have web font support (WOFF) in platform version 10+
 * Added a new browser name "BuiltinBrowser" to recognize built-in browsers on mobile platforms which we previously called "Safari" (applies to Android's "Browser" app and BlackBerry's built-in browser)

data/lib/webfontloader.rb

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

data/src-test/core/useragenttest.js

@@ -717,3 +717,19 @@ UserAgentTest.prototype.testBrowserBBNotSupportWebfont = function() {
   assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
+
+UserAgentTest.prototype.testBrowserWebKitVSWebkit = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("BuiltinBrowser", userAgent.getName());
+  assertEquals("Unknown", userAgent.getVersion());
+  assertEquals("Android", userAgent.getPlatform());
+  assertEquals("4.0.3", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("534.30", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+};

data/src-test/google/fontapiurlbuildertest.js

@@ -48,3 +48,24 @@ FontApiUrlBuilderTest.prototype.testBuildProperUrlWithSubsetsNoVariations =
 	       '?family=Font1:bold,italic%7CFont2:italic%7CFont3' +
       '&subset=greek,cyrillic,latin', fontApiUrlBuilder.build());
 };
+
+
+FontApiUrlBuilderTest.prototype.testBuildProperUrlWithText = function() {
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(undefined, "http:", "lorem ipsum");
+
+  fontApiUrlBuilder.setFontFamilies([ 'Font1', 'Font2' ]);
+  assertEquals("http:" + webfont.FontApiUrlBuilder.DEFAULT_API_URL +
+         '?family=Font1%7CFont2' +
+      '&text=lorem%20ipsum', fontApiUrlBuilder.build());
+};
+
+
+FontApiUrlBuilderTest.prototype.testBuildProperUrlWithEmptyText = function() {
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(undefined, "http:", "");
+
+  fontApiUrlBuilder.setFontFamilies([ 'Font1:bold:greek,cyrillic',
+      'Font2:italic', 'Font3' ]);
+  assertEquals("http:" + webfont.FontApiUrlBuilder.DEFAULT_API_URL +
+         '?family=Font1:bold%7CFont2:italic%7CFont3' +
+      '&subset=greek,cyrillic', fontApiUrlBuilder.build());
+};

data/src/core/useragentparser.js

@@ -223,7 +223,7 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
  * @private
  */
 webfont.UserAgentParser.prototype.isWebKit_ = function() {
-  return this.userAgent_.indexOf("AppleWebKit") != -1;
+  return /AppleWeb(K|k)it/.test(this.userAgent_);
 };
 
 /**
@@ -233,7 +233,7 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
   var platform = this.getPlatform_();
   var platformVersion = this.getPlatformVersion_();
   var webKitVersion = this.getMatchingGroup_(this.userAgent_,
-      /AppleWebKit\/([\d\.\+]+)/, 1);
+      /AppleWeb(?:K|k)it\/([\d\.\+]+)/, 1);
 
   if (webKitVersion == "") {
     webKitVersion = webfont.UserAgentParser.UNKNOWN;

data/src/google/fontapiurlbuilder.js

@@ -1,7 +1,7 @@
 /**
  * @constructor
  */
-webfont.FontApiUrlBuilder = function(apiUrl, protocol) {
+webfont.FontApiUrlBuilder = function(apiUrl, protocol, text) {
   if (apiUrl) {
     this.apiUrl_ = apiUrl;
   } else {
@@ -9,6 +9,7 @@ webfont.FontApiUrlBuilder = function(apiUrl, protocol) {
   }
   this.fontFamilies_ = [];
   this.subsets_ = [];
+  this.text_ = text || '';
 };
 
 
@@ -63,5 +64,9 @@ webfont.FontApiUrlBuilder.prototype.build = function() {
     url += '&subset=' + this.subsets_.join(',');
   }
 
+  if (this.text_.length > 0) {
+    url += '&text=' + encodeURIComponent(this.text_);
+  }
+
   return url;
 };

data/src/google/googlefontapi.js

@@ -35,7 +35,7 @@ webfont.GoogleFontApi.prototype.load = function(onReady) {
 webfont.GoogleFontApi.prototype.insertLink_ = function(onReady) {
   var domHelper = this.domHelper_;
   var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(
-      this.configuration_['api'], domHelper.getProtocol());
+      this.configuration_['api'], domHelper.getProtocol(), this.configuration_['text']);
   var fontFamilies = this.configuration_['families'];
   fontApiUrlBuilder.setFontFamilies(fontFamilies);
 

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.1.1'
-  s.date              = '2012-12-12'
+  s.version           = '1.1.2'
+  s.date              = '2013-01-21'
 
   ## 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: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-12 00:00:00 Z
+date: 2013-01-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false