webfontloader 1.4.11 → 1.4.12

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.4.12 (August 21, 2013)
+* Cleared up initialization code and made all modules optional and configurable at compile time
+
 v1.4.11 (August 8, 2013)
 * Remove Ascender module (according to Monotype the service has now been shutdown completely.)
 * Switch Monotype module to use fast.fonts.net instead of fast.fonts.com

data/CONTRIBUTING.md

@@ -9,7 +9,7 @@ You'll need a few rubygems to run the tests, demo server, and other rake tasks,
     $ gem install bundler
     $ bundle install
 
-To run the tests in a headless WebKit you will also need to have [PhantomJS](http://www.phantomjs.org) installed. You can install PhantomJS by downloading a binary of using HomeBrew.
+To run the tests in a headless WebKit you will also need to have [PhantomJS](http://www.phantomjs.org) installed. You can install PhantomJS by downloading a binary or using HomeBrew.
 
     $ brew install phantomjs
 
@@ -19,6 +19,12 @@ To build a JS file from source, just run rake:
 
     $ rake
 
+If you want to build a JS file with only specific modules you can specify them on the command line:
+
+    $ rake compile['custom google typekit']
+
+This will compile a JS file with only the `custom`, `google` and `typekit` modules. The available modules are: `custom`, `google`, `typekit`, `ascender`, `monotype`, `fontdeck`. By default all modules are included.
+
 ## Demos
 
 A full suite of demo pages is included in this source. Here you can find some

data/README.md

@@ -205,11 +205,11 @@ The Fonts.com module has an optional `version` option which acts as a cache-bust
 
 ### Google
 
-Using [Google's Font API](https://code.google.com/apis/webfonts/docs/getting_started.html), name the font families you'd like to load.
+Using [Google's Font API](https://code.google.com/apis/webfonts/docs/getting_started.html), name the font families you'd like to load. You can use the same [syntax](https://developers.google.com/fonts/docs/getting_started#Syntax) as in the Font API to specify styles:
 
     WebFontConfig = {
       google: {
-        families: ['Droid Sans', 'Droid Serif']
+        families: ['Droid Sans', 'Droid Serif:bold']
       }
     };
 

data/Rakefile

@@ -81,9 +81,12 @@ directory "target"
 directory "tmp"
 
 desc "Compile the JavaScript into target/webfont.js"
-task :compile => "target/webfont.js"
+task :compile, [:modules] => "target/webfont.js"
 
-file "target/webfont.js" => SourceJs + ["target"] do |t|
+file "target/webfont.js", [:modules] => SourceJs + ["target"] do |t, args|
+  args.with_defaults(:modules => 'custom google typekit monotype fontdeck')
+
+  modules = args[:modules].split ' '
 
   output_marker = "%output%"
   output_wrapper = @modules.js_output_wrapper(output_marker)
@@ -99,6 +102,8 @@ file "target/webfont.js" => SourceJs + ["target"] do |t|
     "--define goog.DEBUG=false"
   ]
 
+  args.concat modules.map { |m| "--define INCLUDE_" + m.upcase + "_MODULE" }
+
   # Extra args to add warnings.
   args.concat([
     ["--warning_level", "VERBOSE"],
@@ -113,9 +118,12 @@ file "target/webfont.js" => SourceJs + ["target"] do |t|
 end
 
 desc "Creates debug version into target/webfont.js"
-task :debug => "target/webfont_debug.js"
+task :debug, [:modules] => "target/webfont_debug.js"
+
+file "target/webfont_debug.js", [:modules] => SourceJs + ["target"] do |t|
+  args.with_defaults(:modules => 'custom google typekit monotype fontdeck')
 
-file "target/webfont_debug.js" => SourceJs + ["target"] do |t|
+  modules = args[:modules].split ' '
 
   output_marker = "%output%"
   output_wrapper = @modules.js_output_wrapper(output_marker)
@@ -133,6 +141,8 @@ file "target/webfont_debug.js" => SourceJs + ["target"] do |t|
     "--formatting=PRINT_INPUT_DELIMITER"
   ]
 
+  args.concat modules.map { |m| "--define INCLUDE_" + m.upcase + "_MODULE" }
+
   # Extra args to add warnings.
   args.concat([
     ["--warning_level", "VERBOSE"],
@@ -149,6 +159,10 @@ end
 #
 # Run
 #
+desc "BrowserStack tests"
+task :bstest do |t|
+  exec "browserstack-test -u $BROWSERSTACK_USERNAME -p $BROWSERSTACK_PASSWORD -k $BROWSERSTACK_KEY -b browsers.json http://localhost:9999/spec/index.html"
+end
 
 desc "Test everything"
 task :default => [:clean, :gzipbytes, :test]

data/browsers.json

@@ -0,0 +1,122 @@
+[
+  {
+    "os_version": "XP",
+    "os": "Windows",
+    "browser_version": "11.1",
+    "browser": "opera"
+  },
+  {
+    "os_version": "XP",
+    "os": "Windows",
+    "browser_version": "3.6",
+    "browser": "firefox"
+  },
+  {
+    "os_version": "XP",
+    "os": "Windows",
+    "browser_version": "20.0",
+    "browser": "firefox"
+  },
+  {
+    "os_version": "XP",
+    "os": "Windows",
+    "browser_version": "6.0",
+    "browser": "ie"
+  },
+  {
+    "os_version": "XP",
+    "os": "Windows",
+    "browser_version": "7.0",
+    "browser": "ie"
+  },
+  {
+    "os_version": "XP",
+    "os": "Windows",
+    "browser_version": "8.0",
+    "browser": "ie"
+  },
+  {
+    "os_version": "8",
+    "os": "Windows",
+    "browser_version": "10.0 Desktop",
+    "browser": "ie"
+  },
+  {
+    "os_version": "7",
+    "os": "Windows",
+    "browser_version": "9.0",
+    "browser": "ie"
+  },
+  {
+    "os_version": "Mountain Lion",
+    "os": "OS X",
+    "browser_version": "6.0",
+    "browser": "safari"
+  },
+  {
+    "os_version": "Mountain Lion",
+    "os": "OS X",
+    "browser_version": "25.0",
+    "browser": "chrome"
+  },
+  {
+    "os_version": "Snow Leopard",
+    "os": "OS X",
+    "browser_version": "5.0",
+    "browser": "safari"
+  },
+  {
+    "os_version": "5.0",
+    "device": "iPad 2 (5.0)",
+    "os": "ios",
+    "browser": "Mobile Safari"
+  },
+  {
+    "os_version": "5.1",
+    "device": "iPad 3rd",
+    "os": "ios",
+    "browser": "Mobile Safari"
+  },
+  {
+    "os_version": "6.0",
+    "device": "iPhone 5",
+    "os": "ios",
+    "browser": "Mobile Safari"
+  },
+  {
+    "os_version": "4.3.2",
+    "device": "iPad 2",
+    "os": "ios",
+    "browser": "Mobile Safari"
+  },
+  {
+    "os_version": "2.3",
+    "device": "Samsung Galaxy S II",
+    "os": "android",
+    "browser": "Android Browser"
+  },
+  {
+    "os_version": "2.2",
+    "device": "Samsung Galaxy S",
+    "os": "android",
+    "browser": "Android Browser"
+  },
+  {
+    "os_version": "4.2",
+    "device": "LG Nexus 4",
+    "os": "android",
+    "browser": "Android Browser"
+  },
+  {
+    "os_version": "4.0",
+    "device": "Samsung Galaxy Nexus",
+    "os": "android",
+    "browser": "Android Browser"
+  },
+  {
+    "os_version": "4.1",
+    "device": "Samsung Galaxy S III",
+    "os": "android",
+    "browser": "Android Browser"
+  }
+]

data/lib/webfontloader/modules.rb

@@ -16,7 +16,7 @@ module WebFontLoader
 
     def all_source_files
       @all_source_files ||= begin
-        modules.map { |mod| config[mod] }.compact.flatten.map { |f| File.join(js_src, f) }.push File.join(js_src, "async_load.js")
+        modules.map { |mod| config[mod] }.compact.flatten.map { |f| File.join(js_src, f) }
       end
     end
 

data/lib/webfontloader.rb

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

data/spec/core/webfont_spec.js

@@ -1,5 +1,6 @@
 describe('WebFont', function () {
   var WebFont = webfont.WebFont,
+      Font = webfont.Font;
       UserAgent = webfont.UserAgent,
       FontWatchRunner = webfont.FontWatchRunner,
       BrowserInfo = webfont.BrowserInfo,
@@ -31,7 +32,7 @@ describe('WebFont', function () {
         testModule = null;
 
     beforeEach(function () {
-      font = new WebFont(window, fontModuleLoader, userAgent);
+      font = new WebFont(window);
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.conf = conf;
@@ -92,10 +93,15 @@ describe('WebFont', function () {
   describe('font load with context', function () {
     var font = null,
         testModule = null,
-        fakeMainWindow = {};
+        fakeMainWindow = {
+          navigator: {
+            userAgent: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-US) AppleWebKit/533.2 (KHTML, like Gecko) Chrome/5.0.342.9 Safari/533.2'
+          },
+          document: {}
+        };
 
     beforeEach(function () {
-      font = new WebFont(fakeMainWindow, fontModuleLoader, userAgent);
+      font = new WebFont(fakeMainWindow);
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.domHelper = domHelper;
@@ -135,7 +141,7 @@ describe('WebFont', function () {
     beforeEach(function () {
       font = new Font('Font1');
       jasmine.Clock.useMock();
-      webfont = new WebFont(window, fontModuleLoader, userAgent);
+      webfont = new WebFont(window);
       webfont.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.conf = conf;
@@ -202,7 +208,7 @@ describe('WebFont', function () {
         testModule = null;
 
     beforeEach(function () {
-      font = new WebFont(window, fontModuleLoader, userAgent);
+      font = new WebFont(window);
 
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {};
@@ -233,24 +239,15 @@ describe('WebFont', function () {
         testModule = null;
 
     beforeEach(function () {
-      font = new WebFont(window, fontModuleLoader, new UserAgent(
-        'Firefox',
-        new Version(3, 6),
-        '3.6',
-        'Gecko',
-        new Version(1, 9, 2),
-        '1.9.2',
-        'Macintosh',
-        new Version(10, 6),
-        '10.6',
-        undefined,
-        new BrowserInfo(false, false, false)
-      ));
+      font = new WebFont(window);
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.conf = conf;
           this.loadCalled = false;
         };
+        testModule.supportUserAgent = function (ua, support) {
+          support(false);
+        };
         testModule.load = function () {};
         return testModule;
       });
@@ -266,7 +263,6 @@ describe('WebFont', function () {
         inactive: inactive
       });
 
-      expect(testModule).toBeNull()
       expect(inactive).toHaveBeenCalled();
     });
   });

data/spec/deps.js

@@ -1,21 +1,20 @@
 // This file was autogenerated by calcdeps.js
-goog.addDependency("../../src/async_load.js", [], []);
 goog.addDependency("../../src/closure.js", [], []);
 goog.addDependency("../../src/core/browserinfo.js", ["webfont.BrowserInfo"], []);
 goog.addDependency("../../src/core/cssclassname.js", ["webfont.CssClassName"], []);
 goog.addDependency("../../src/core/domhelper.js", ["webfont.DomHelper"], []);
 goog.addDependency("../../src/core/eventdispatcher.js", ["webfont.EventDispatcher"], ["webfont.CssClassName"]);
 goog.addDependency("../../src/core/font.js", ["webfont.Font"], []);
-goog.addDependency("../../src/core/fontmoduleloader.js", ["webfont.FontModuleLoader","webfont.FontModule","webfont.FontModuleFactory"], []);
+goog.addDependency("../../src/core/fontmodule.js", ["webfont.FontModule"], []);
+goog.addDependency("../../src/core/fontmoduleloader.js", ["webfont.FontModuleLoader","webfont.FontModuleFactory"], []);
 goog.addDependency("../../src/core/fontruler.js", ["webfont.FontRuler"], []);
 goog.addDependency("../../src/core/fontwatcher.js", ["webfont.FontWatcher"], ["webfont.FontWatchRunner"]);
 goog.addDependency("../../src/core/fontwatchrunner.js", ["webfont.FontWatchRunner"], ["webfont.Font","webfont.FontRuler"]);
-goog.addDependency("../../src/core/initialize.js", ["webfont"], ["webfont.UserAgentParser","webfont.FontModuleLoader","webfont.WebFont"]);
-goog.addDependency("../../src/core/namespace.js", [], []);
+goog.addDependency("../../src/core/initialize.js", ["webfont"], ["webfont.WebFont","webfont.modules.Typekit","webfont.modules.Fontdeck","webfont.modules.Monotype","webfont.modules.Custom","webfont.modules.google.GoogleFontApi"]);
 goog.addDependency("../../src/core/useragent.js", ["webfont.UserAgent"], []);
 goog.addDependency("../../src/core/useragentparser.js", ["webfont.UserAgentParser"], ["webfont.BrowserInfo","webfont.UserAgent","webfont.Version"]);
 goog.addDependency("../../src/core/version.js", ["webfont.Version"], []);
-goog.addDependency("../../src/core/webfont.js", ["webfont.WebFont"], ["webfont.DomHelper","webfont.EventDispatcher","webfont.FontWatcher"]);
+goog.addDependency("../../src/core/webfont.js", ["webfont.WebFont"], ["webfont.DomHelper","webfont.EventDispatcher","webfont.FontWatcher","webfont.FontModuleLoader","webfont.UserAgentParser"]);
 goog.addDependency("../../src/modules/custom.js", ["webfont.modules.Custom"], ["webfont.Font"]);
 goog.addDependency("../../src/modules/fontdeck.js", ["webfont.modules.Fontdeck"], ["webfont.Font"]);
 goog.addDependency("../../src/modules/google/fontapiparser.js", ["webfont.modules.google.FontApiParser"], ["webfont.Font"]);

data/spec/index.html

@@ -20,6 +20,7 @@
     <script src="../tools/jasmine/jasmine.js"></script>
     <script src="../tools/jasmine/jasmine-html.js"></script>
     <script src="../tools/jasmine-phantomjs/terminal-reporter.js"></script>
+    <script src="../tools/jasmine-browserstack/jasmine-browserstack.js"></script>
     <script src="../tools/compiler/base.js"></script>
     <script src="../spec/deps.js"></script>
 
@@ -64,12 +65,14 @@
             terminalReporter = new jasmine.TerminalReporter({
               verbosity: 3,
               color: true
-            });
+            }),
+            browserStackReporter = new jasmine.BrowserStackReporter();
 
         if (/PhantomJS/.test(navigator.userAgent)) {
           env.addReporter(terminalReporter);
         }
         env.addReporter(htmlReporter);
+        env.addReporter(browserStackReporter);
         env.specFilter = function (spec) {
           return htmlReporter.specFilter(spec);
         };

data/spec/modules/google/googlefontapi_spec.js

@@ -1,8 +1,6 @@
 describe('modules.google.GoogleFontApi', function () {
   var GoogleFontApi = webfont.modules.google.GoogleFontApi,
       Font = webfont.Font,
-      UserAgent = webfont.UserAgent,
-      userAgent = null,
       link = '',
       insert = '',
       fakeDomHelper =  {
@@ -18,7 +16,6 @@ describe('modules.google.GoogleFontApi', function () {
   beforeEach(function () {
     insert = '';
     link = '';
-    userAgent = new UserAgent('Test', '1.0', true);
   });
 
   describe('call onReady with font family loading', function () {
@@ -26,7 +23,7 @@ describe('modules.google.GoogleFontApi', function () {
         fonts = null;
 
     beforeEach(function () {
-      googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, { families: ['Font1', 'Font2'] });
+      googleFontApi = new GoogleFontApi(fakeDomHelper, { families: ['Font1', 'Font2'] });
       googleFontApi.load(function (f) {
         fonts = f;
       });
@@ -48,7 +45,7 @@ describe('modules.google.GoogleFontApi', function () {
     var googleFontApi = null;
 
     beforeEach(function () {
-      googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, {
+      googleFontApi = new GoogleFontApi(fakeDomHelper, {
         api: 'http://moo',
         families: ['Font1', 'Font2']
       });
@@ -64,7 +61,7 @@ describe('modules.google.GoogleFontApi', function () {
     var googleFontApi = null;
 
     beforeEach(function () {
-      googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, { families: ['Font1 WithSpace', 'Font2 WithSpaceToo'] });
+      googleFontApi = new GoogleFontApi(fakeDomHelper, { families: ['Font1 WithSpace', 'Font2 WithSpaceToo'] });
       googleFontApi.load(function () {});
     });
 
@@ -77,7 +74,7 @@ describe('modules.google.GoogleFontApi', function () {
     var googleFontApi = null;
 
     beforeEach(function () {
-      googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, { families: ['Font1 WithSpace:bi', 'Font2 WithSpaceToo:b,r'] });
+      googleFontApi = new GoogleFontApi(fakeDomHelper, { families: ['Font1 WithSpace:bi', 'Font2 WithSpaceToo:b,r'] });
       googleFontApi.load(function () {});
     });
 

data/spec/modules/monotype_spec.js

@@ -45,7 +45,7 @@ describe('modules.Monotype', function () {
       new BrowserInfo(true, false, false)
     );
 
-    monotype = new Monotype(useragent, fakeDomHelper, configuration);
+    monotype = new Monotype(fakeDomHelper, configuration);
     monotype.supportUserAgent(useragent, support);
     monotype.load(load);
 

data/src/core/initialize.js

@@ -1,28 +1,93 @@
 goog.provide('webfont');
 
-goog.require('webfont.UserAgentParser');
-goog.require('webfont.FontModuleLoader');
 goog.require('webfont.WebFont');
 
+goog.require('webfont.modules.Typekit');
+goog.require('webfont.modules.Fontdeck');
+goog.require('webfont.modules.Monotype');
+goog.require('webfont.modules.Custom');
+goog.require('webfont.modules.google.GoogleFontApi');
+
 /**
  * @typedef {Object.<string, Array.<string>>}
  */
 webfont.FontTestStrings;
 
 /**
- * Name of the global object
- *
+ * @define {boolean}
+ */
+var INCLUDE_CUSTOM_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_FONTDECK_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_MONOTYPE_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_TYPEKIT_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_GOOGLE_MODULE = false;
+
+/**
  * @define {string}
  */
-var GLOBAL_NAME = 'WebFont';
+var WEBFONT = 'WebFont';
+
+/**
+ * @define {string}
+ */
+var WEBFONT_CONFIG = 'WebFontConfig';
+
+/**
+ * @type {webfont.WebFont}
+ */
+var webFontLoader = new webfont.WebFont(goog.global);
+
+if (INCLUDE_CUSTOM_MODULE) {
+  webFontLoader.addModule(webfont.modules.Custom.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Custom(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_FONTDECK_MODULE) {
+  webFontLoader.addModule(webfont.modules.Fontdeck.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Fontdeck(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_MONOTYPE_MODULE) {
+  webFontLoader.addModule(webfont.modules.Monotype.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Monotype(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_TYPEKIT_MODULE) {
+  webFontLoader.addModule(webfont.modules.Typekit.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Typekit(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_GOOGLE_MODULE) {
+  webFontLoader.addModule(webfont.modules.google.GoogleFontApi.NAME, function (configuration, domHelper) {
+    return new webfont.modules.google.GoogleFontApi(domHelper, configuration);
+  });
+}
 
-// Provide an instance of WebFont in the global namespace.
-var globalNamespaceObject = window[GLOBAL_NAME] = (function() {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  var fontModuleLoader = new webfont.FontModuleLoader();
-  return new webfont.WebFont(window, fontModuleLoader, userAgent);
-})();
+if (!goog.global[WEBFONT]) {
+  goog.global[WEBFONT] = {};
+  goog.global[WEBFONT]['load'] = goog.bind(webFontLoader.load, webFontLoader);
 
-// Export the public API.
-globalNamespaceObject['load'] = globalNamespaceObject.load;
+  if (goog.global[WEBFONT_CONFIG]) {
+    webFontLoader.load(goog.global[WEBFONT_CONFIG]);
+  }
+}

data/src/core/webfont.js

@@ -3,18 +3,19 @@ goog.provide('webfont.WebFont');
 goog.require('webfont.DomHelper');
 goog.require('webfont.EventDispatcher');
 goog.require('webfont.FontWatcher');
+goog.require('webfont.FontModuleLoader');
+goog.require('webfont.UserAgentParser');
 
 /**
  * @param {Window} mainWindow The main application window containing
  *   webfontloader.js.
- * @param {webfont.FontModuleLoader} fontModuleLoader A loader instance to use.
- * @param {webfont.UserAgent} userAgent The detected user agent to load for.
  * @constructor
  */
-webfont.WebFont = function(mainWindow, fontModuleLoader, userAgent) {
+webfont.WebFont = function(mainWindow) {
   this.mainWindow_ = mainWindow;
-  this.fontModuleLoader_ = fontModuleLoader;
-  this.userAgent_ = userAgent;
+  this.fontModuleLoader_ = new webfont.FontModuleLoader();
+  this.userAgentParser_ = new webfont.UserAgentParser(mainWindow.navigator.userAgent, mainWindow.document);
+  this.userAgent_ = this.userAgentParser_.parse();
   this.moduleLoading_ = 0;
   this.moduleFailedLoading_ = 0;
 };
@@ -43,11 +44,7 @@ goog.scope(function () {
     var eventDispatcher = new EventDispatcher(
         this.domHelper_, context.document.documentElement, configuration);
 
-    if (this.userAgent_.getBrowserInfo().hasWebFontSupport()) {
-      this.load_(eventDispatcher, configuration);
-    } else {
-      eventDispatcher.dispatchInactive();
-    }
+    this.load_(eventDispatcher, configuration);
   };
 
   /**

data/src/modules/custom.js

@@ -18,6 +18,10 @@ webfont.modules.Custom = function(domHelper, configuration) {
   this.configuration_ = configuration;
 };
 
+/**
+ * @const
+ * @type {string}
+ */
 webfont.modules.Custom.NAME = 'custom';
 
 goog.scope(function () {
@@ -56,7 +60,3 @@ goog.scope(function () {
     return support(userAgent.getBrowserInfo().hasWebFontSupport());
   };
 });
-
-globalNamespaceObject.addModule(webfont.modules.Custom.NAME, function(configuration, domHelper) {
-  return new webfont.modules.Custom(domHelper, configuration);
-});

data/src/modules/fontdeck.js

@@ -12,6 +12,10 @@ webfont.modules.Fontdeck = function(domHelper, configuration) {
   this.fonts_ = [];
 };
 
+/**
+ * @const
+ * @type {string}
+ */
 webfont.modules.Fontdeck.NAME = 'fontdeck';
 webfont.modules.Fontdeck.HOOK = '__webfontfontdeckmodule__';
 webfont.modules.Fontdeck.API = '//f.fontdeck.com/s/css/js/';
@@ -65,7 +69,3 @@ goog.scope(function () {
     onReady(this.fonts_);
   };
 });
-
-globalNamespaceObject.addModule(webfont.modules.Fontdeck.NAME, function(configuration, domHelper) {
-  return new webfont.modules.Fontdeck(domHelper, configuration);
-});

data/src/modules/google/googlefontapi.js

@@ -8,12 +8,19 @@ goog.require('webfont.FontWatchRunner');
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.modules.google.GoogleFontApi = function(userAgent, domHelper, configuration) {
-  this.userAgent_ = userAgent;
+webfont.modules.google.GoogleFontApi = function(domHelper, configuration) {
+  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
+
+  this.userAgent_ = userAgentParser.parse();
+
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
 };
 
+/**
+ * @const
+ * @type {string}
+ */
 webfont.modules.google.GoogleFontApi.NAME = 'google';
 
 goog.scope(function () {
@@ -58,9 +65,3 @@ goog.scope(function () {
     onReady(fontApiParser.getFonts(), fontApiParser.getFontTestStrings(), GoogleFontApi.METRICS_COMPATIBLE_FONTS);
   };
 });
-
-globalNamespaceObject.addModule(webfont.modules.google.GoogleFontApi.NAME, function(configuration, domHelper) {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  return new webfont.modules.google.GoogleFontApi(userAgent, domHelper, configuration);
-});

data/src/modules/monotype.js

@@ -14,8 +14,7 @@ projectId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'//this is your Fonts.com Web fo
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.modules.Monotype = function (userAgent, domHelper, configuration) {
-  this.userAgent_ = userAgent;
+webfont.modules.Monotype = function (domHelper, configuration) {
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
   this.fonts_ = [];
@@ -23,7 +22,9 @@ webfont.modules.Monotype = function (userAgent, domHelper, configuration) {
 
 /**
  * name of the module through which external API is supposed to call the MonotypeFontAPI.
+ *
  * @const
+ * @type {string}
  */
 webfont.modules.Monotype.NAME = 'monotype';
 
@@ -87,9 +88,3 @@ goog.scope(function () {
     onReady(this.fonts_);
   };
 });
-
-globalNamespaceObject.addModule(webfont.modules.Monotype.NAME, function (configuration, domHelper) {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  return new webfont.modules.Monotype(userAgent, domHelper, configuration);
-});

data/src/modules/typekit.js

@@ -12,7 +12,12 @@ webfont.modules.Typekit = function(domHelper, configuration) {
   this.fonts_ = [];
 };
 
+/**
+ * @const
+ * @type {string}
+ */
 webfont.modules.Typekit.NAME = 'typekit';
+
 webfont.modules.Typekit.HOOK = '__webfonttypekitmodule__';
 
 goog.scope(function () {
@@ -72,7 +77,3 @@ goog.scope(function () {
     onReady(this.fonts_);
   };
 });
-
-globalNamespaceObject.addModule(webfont.modules.Typekit.NAME, function(configuration, domHelper) {
-  return new webfont.modules.Typekit(domHelper, configuration);
-});

data/tools/jasmine-browserstack/jasmine-browserstack.js

@@ -0,0 +1,128 @@
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define(['jasmine'], factory);
+  } else {
+    factory(jasmine);
+  }
+}(this, function (jasmine) {
+  function stack(err) {
+    var str = err.stack || err.toString();
+
+    if (!~str.indexOf(err.message)) {
+      str = err.message + '\n' + str;
+    }
+
+    if ('[object Error]' == str) {
+      str = err.message;
+    }
+
+    if (!err.stack && err.sourceURL && err.line !== undefined) {
+      str += '\n(' + err.sourceURL + ':' + err.line + ')';
+    }
+    return str.replace(/^/gm, '  ');
+  }
+
+  function BrowserStackReporter() {
+    this.stats = {
+      suites: 0,
+      tests: 0,
+      passes: 0,
+      pending: 0,
+      failures: 0
+    };
+    this.tests = [];
+  }
+
+  BrowserStackReporter.prototype.reportRunnerStarting = function (runner) {
+    this.stats.start = new Date();
+  };
+
+  BrowserStackReporter.prototype.reportSpecStarting = function (spec) {
+    spec.startedAt = new Date().getTime();
+  };
+
+  BrowserStackReporter.prototype.reportSpecResults = function (spec) {
+    var currentTime = new Date().getTime();
+    spec.duration = currentTime - spec.startedAt;
+
+    var result = spec.results();
+
+    var test = {
+      status: null,
+      title: spec.getFullName().replace(/#/g, ''),
+      duration: currentTime - spec.startedAt
+    };
+
+    if (result.skipped) {
+      this.stats.pending += 1;
+      test.status = 'skipped';
+    } else if (result.failedCount === 0) {
+      this.stats.passes += 1;
+      test.status = 'passed';
+    } else {
+      var items = result.getItems(),
+          message = [];
+
+      for (var i = 0; i < items.length; i += 1) {
+        message.push(stack(items[i].trace));
+      }
+
+      test.err = message;
+      test.status = 'failed';
+      this.stats.failures += 1;
+    }
+
+    this.stats.tests += 1;
+    this.tests.push(test);
+  };
+
+  BrowserStackReporter.prototype.reportSuiteResults = function (suite) {
+  };
+
+  BrowserStackReporter.prototype.reportRunnerResults = function (runner) {
+    var suites = runner.suites();
+
+    this.stats.end = new Date();
+    this.stats.duration = this.stats.end - this.stats.end;
+
+    this.stats.suites = suites.length;
+
+    var result = '1..' + this.stats.tests + '\n';
+
+    for (var i = 0; i < this.tests.length; i += 1) {
+      var count = i + 1;
+
+      if (this.tests[i].status === 'pending') {
+        result += 'ok ' + count + ' ' + this.tests[i].title + ' # SKIP -\n';
+      } else if (this.tests[i].status === 'failed') {
+        result += 'not ok ' + count + ' ' + this.tests[i].title + '\n';
+        for (var j = 0; j < this.tests[i].err.length; j += 1) {
+          result += this.tests[i].err[j] + '\n';
+        }
+      } else {
+        result += 'ok ' + count + ' ' + this.tests[i].title + '\n';
+      }
+    }
+
+    result += '# tests ' + this.stats.tests + '\n';
+    result += '# pass ' + this.stats.passes + '\n';
+    result += '# fail ' + this.stats.failures + '\n';
+
+    if (/browser=/i.test(window.location.search)) {
+      var xhr = null;
+
+      if (window.XMLHttpRequest) {
+        xhr = new XMLHttpRequest();
+      } else {
+        xhr = new ActiveXObject('Microsoft.XMLHTTP');
+      }
+
+      xhr.open('POST', window.location.href);
+      xhr.setRequestHeader('Content-Type', 'text/plain');
+      xhr.send(result);
+    }
+  };
+
+  // Attach to the jasmine object like many other reporters do
+  jasmine.BrowserStackReporter = BrowserStackReporter;
+}));

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.4.11'
-  s.date              = '2013-08-08'
+  s.version           = '1.4.12'
+  s.date              = '2013-08-21'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -74,6 +74,7 @@ DESC
     README.md
     Rakefile
     bin/webfontloader-demos
+    browsers.json
     lib/webfontloader.rb
     lib/webfontloader/demo/public/basic.css
     lib/webfontloader/demo/public/blank.html
@@ -143,7 +144,6 @@ DESC
     spec/modules/google/googlefontapi_spec.js
     spec/modules/monotype_spec.js
     spec/modules/typekit_spec.js
-    src/async_load.js
     src/closure.js
     src/core/browserinfo.js
     src/core/cssclassname.js
@@ -170,6 +170,7 @@ DESC
     src/modules/typekit.js
     tools/compiler/base.js
     tools/compiler/compiler.jar
+    tools/jasmine-browserstack/jasmine-browserstack.js
     tools/jasmine-phantomjs/jasmine-phantomjs.js
     tools/jasmine-phantomjs/terminal-reporter.js
     tools/jasmine/MIT.LICENSE

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 4
-  - 11
-  version: 1.4.11
+  - 12
+  version: 1.4.12
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-08 00:00:00 Z
+date: 2013-08-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -102,6 +102,7 @@ files:
 - README.md
 - Rakefile
 - bin/webfontloader-demos
+- browsers.json
 - lib/webfontloader.rb
 - lib/webfontloader/demo/public/basic.css
 - lib/webfontloader/demo/public/blank.html
@@ -171,7 +172,6 @@ files:
 - spec/modules/google/googlefontapi_spec.js
 - spec/modules/monotype_spec.js
 - spec/modules/typekit_spec.js
-- src/async_load.js
 - src/closure.js
 - src/core/browserinfo.js
 - src/core/cssclassname.js
@@ -198,6 +198,7 @@ files:
 - src/modules/typekit.js
 - tools/compiler/base.js
 - tools/compiler/compiler.jar
+- tools/jasmine-browserstack/jasmine-browserstack.js
 - tools/jasmine-phantomjs/jasmine-phantomjs.js
 - tools/jasmine-phantomjs/terminal-reporter.js
 - tools/jasmine/MIT.LICENSE

data/src/async_load.js

@@ -1,3 +0,0 @@
-if (window['WebFontConfig']) {
-  globalNamespaceObject['load'](window['WebFontConfig']);
-}