webfontloader 1.0.25 → 1.0.26

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.0.26 (February 8, 2012)
+* Updated the included version of the Closure JS compiler jar to 1741, to handle newer annotation styles.
+* Added a missing param annotation for the new FontWatcher.watch argument.
+* Added param annotations for Google's custom FontWatchRunner implementation.
+* Updated the Google Web Fonts API parser to accept family names with a plus sign.
+
 v1.0.25 (February 7, 2012)
 * Updated the user agent parser to recognize Chrome for Android properly as a Chrome browser.
 

data/Rakefile

@@ -106,7 +106,6 @@ file "target/webfont.js" => SourceJs + ["target"] do |t|
     ["-jar", JsCompilerJar],
     ["--compilation_level", "ADVANCED_OPTIMIZATIONS"],
     ["--js_output_file", t.name],
-    ["--output_wrapper_marker", %("#{output_marker}")],
     ["--output_wrapper", %("#{output_wrapper}")],
     ["--warning_level", "VERBOSE"],
     ["--summary_detail_level", "3"]

data/lib/webfontloader.rb

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

data/src/core/fontwatcher.js

@@ -31,6 +31,11 @@ webfont.FontWatcher.DEFAULT_VARIATION = 'n4';
  *     of each family to watch. Described with FVD.
  * @param {Object.<string, string>} fontTestStrings The font test strings for
  *     each family.
+ * @param {function(new:webfont.FontWatchRunner, function(string, string),
+ *     function(string, string), webfont.DomHelper,
+ *     Object.<string, function(Object): number>,
+ *     function(function(), number=), function(): number, string, string,
+ *     string=)} fontWatchRunnerCtor The font watch runner constructor.
  * @param {boolean} last True if this is the last set of families to watch.
  */
 webfont.FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions,

data/src/google/fontapiparser.js

@@ -37,7 +37,7 @@ webfont.FontApiParser.prototype.parse = function() {
 
   for (var i = 0; i < length; i++) {
     var elements = this.fontFamilies_[i].split(":");
-    var fontFamily = elements[0];
+    var fontFamily = elements[0].replace(/\+/g, " ");
     var variations = ['n4'];
 
     if (elements.length >= 2) {

data/src/google/lastresortwebkitfontwatchrunner.js

@@ -1,5 +1,15 @@
 /**
  * @constructor
+ * @param {function(string, string)} activeCallback
+ * @param {function(string, string)} inactiveCallback
+ * @param {webfont.DomHelper} domHelper
+ * @param {Object.<string, function(Object): number>} fontSizer
+ * @param {function(function(), number=)} asyncCall
+ * @param {function(): number} getTime
+ * @param {string} fontFamily
+ * @param {string} fontDescription
+ * @param {string=} opt_fontTestString
+ * @extends webfont.FontWatchRunner
  */
 webfont.LastResortWebKitFontWatchRunner = function(activeCallback,
     inactiveCallback, domHelper, fontSizer, asyncCall, getTime, fontFamily,

data/src-test/google/fontapiparsertest.js

@@ -207,3 +207,34 @@ FontApiParserTest.prototype.testHanumanIsForwardCompatible = function() {
   assertEquals(webfont.FontApiParser.INT_FONTS['khmer'],
       hanumanTestStrings);
 };
+
+FontApiParserTest.prototype.testPlusReplacedWithSpace = function() {
+  var fontFamilies = [ 'Erica+One', 'Droid+Serif::latin',
+      'Yanone+Kaffeesatz:400,700:latin'];
+  var fontApiParser = new webfont.FontApiParser(fontFamilies);
+
+  fontApiParser.parse();
+  var parsedFontFamilies = fontApiParser.getFontFamilies();
+
+  assertEquals(3, parsedFontFamilies.length);
+  assertEquals('Erica One', parsedFontFamilies[0]);
+  assertEquals('Droid Serif', parsedFontFamilies[1]);
+  assertEquals('Yanone Kaffeesatz', parsedFontFamilies[2]);
+  var variations = fontApiParser.getVariations();
+
+  var ericaOne = variations['Erica One'];
+  assertNotNull(ericaOne);
+  assertEquals(1, ericaOne.length);
+  assertEquals('n4', ericaOne[0]);
+
+  var droidSerif = variations['Droid Serif'];
+  assertNotNull(droidSerif);
+  assertEquals(1, droidSerif.length);
+  assertEquals('n4', droidSerif[0]);
+
+  var yanoneKaffeesatz = variations['Yanone Kaffeesatz'];
+  assertNotNull(yanoneKaffeesatz);
+  assertEquals(2, yanoneKaffeesatz.length);
+  assertEquals('n4', yanoneKaffeesatz[0]);
+  assertEquals('n7', yanoneKaffeesatz[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.25'
-  s.date              = '2012-02-07'
+  s.version           = '1.0.26'
+  s.date              = '2012-02-15'
 
   ## 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: 37
+  hash: 35
   prerelease: 
   segments: 
   - 1
   - 0
-  - 25
-  version: 1.0.25
+  - 26
+  version: 1.0.26
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 -08:00
+date: 2012-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency