webfontloader 1.0.31 → 1.1.0

data/src-test/fontdeck/fontdeck_script_test.js

@@ -41,6 +41,10 @@ FontdeckScriptTest.prototype.testSupportAndLoadLifecycle = function() {
     ]
   };
   var insert = '';
+  var global = {
+    // No hostname to verify fallback behavior for empty iframe
+    location: {}
+  };
   var src = '';
   var fakeDomHelper = {
     insertInto: function(tag, e) {
@@ -48,19 +52,22 @@ FontdeckScriptTest.prototype.testSupportAndLoadLifecycle = function() {
     },
     createScriptSrc: function(srcLink) {
       src = srcLink;
-    }
-  };
-  var global = {
-    location: {
-      protocol: 'https:'
     },
-    document: {
-      location: {
-        hostname: 'test-host-name'
-      }
+    getLoadWindow: function() {
+      return global;
+    },
+    getMainWindow: function() {
+      return {
+        location: {
+          hostname: 'test-host-name'
+        }
+      };
+    },
+    getProtocol: function() {
+      return 'https:';
     }
   };
-  var fontdeck = new webfont.FontdeckScript(global, fakeDomHelper, configuration);
+  var fontdeck = new webfont.FontdeckScript(fakeDomHelper, configuration);
 
   // supportUserAgent
   var userAgent = 'user agent';
@@ -80,7 +87,7 @@ FontdeckScriptTest.prototype.testSupportAndLoadLifecycle = function() {
   assertEquals(fontdeck.fontFamilies_, [apiResponse.fonts[0].name, apiResponse.fonts[1].name]);
   assertEquals(fontdeck.fontVariations_[apiResponse.fonts[0].name], ['n4']);
   assertEquals(fontdeck.fontVariations_[apiResponse.fonts[1].name], ['i7']);
-  
+
   assertEquals(true, isSupport);
 };
 
@@ -90,17 +97,20 @@ FontdeckScriptTest.prototype.testNoProjectId = function() {
   };
   var insert = '';
   var src = '';
-  var fakeDomHelper = {};
-  var global = {};
-  var fontdeck = new webfont.FontdeckScript(global, fakeDomHelper, configuration);
+  var fakeDomHelper = {
+    getLoadWindow: function() {
+      return {};
+    }
+  };
+  var fontdeck = new webfont.FontdeckScript(fakeDomHelper, configuration);
 
   // supportUserAgent
   var userAgent = 'user agent';
   var isSupport = null;
 
   fontdeck.supportUserAgent(userAgent, function(support) { isSupport = support; });
-  
+
   assertEquals(fontdeck.fontFamilies_, []);
   assertEquals(fontdeck.fontVariations_, []);
   assertEquals(true, isSupport);
-}
+}

data/src-test/google/fontapiurlbuildertest.js

@@ -2,7 +2,7 @@ var FontApiUrlBuilderTest = TestCase('FontApiUrlBuilderTest');
 
 FontApiUrlBuilderTest.prototype.testThrowsExceptionIfNoFontFamilies =
     function() {
-  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder("http://moo");
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder("http://moo", "http:");
 
   try {
     fontApiUrlBuilder.build();
@@ -13,14 +13,14 @@ FontApiUrlBuilderTest.prototype.testThrowsExceptionIfNoFontFamilies =
 };
 
 FontApiUrlBuilderTest.prototype.testBuildProperUrl = function() {
-  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder("http://moo");
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder("http://moo", "http:");
 
   fontApiUrlBuilder.setFontFamilies([ 'Font1', 'Font2' ]);
   assertEquals('http://moo?family=Font1%7CFont2', fontApiUrlBuilder.build());
 };
 
 FontApiUrlBuilderTest.prototype.testBuildProperDefaultUrl = function() {
-  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder();
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(undefined, "http:");
 
   fontApiUrlBuilder.setFontFamilies([ 'Font1', 'Font2' ]);
   assertEquals("http:" + webfont.FontApiUrlBuilder.DEFAULT_API_URL +
@@ -29,7 +29,7 @@ FontApiUrlBuilderTest.prototype.testBuildProperDefaultUrl = function() {
 
 
 FontApiUrlBuilderTest.prototype.testBuildProperUrlWithSubsets = function() {
-  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder();
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(undefined, "http:");
 
   fontApiUrlBuilder.setFontFamilies([ 'Font1:bold:greek,cyrillic',
       'Font2:italic', 'Font3' ]);
@@ -40,7 +40,7 @@ FontApiUrlBuilderTest.prototype.testBuildProperUrlWithSubsets = function() {
 
 FontApiUrlBuilderTest.prototype.testBuildProperUrlWithSubsetsNoVariations =
     function() {
-  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder();
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(undefined, "http:");
 
   fontApiUrlBuilder.setFontFamilies([ 'Font1:bold,italic:greek,cyrillic',
       'Font2:italic', 'Font3::latin' ]);

data/src-test/google/googlefontapitest.js

@@ -9,6 +9,9 @@ GoogleFontApiTest.prototype.testCallOnReadyWithFontFamilyLoading = function() {
       },
       createCssLink: function(csslink) {
         link = csslink;
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
@@ -53,6 +56,9 @@ GoogleFontApiTest.prototype.testCallOnReadyWithFontFamilyLoadingApiUrlChanged =
       },
       createCssLink: function(csslink) {
         link = csslink;
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
@@ -95,6 +101,9 @@ GoogleFontApiTest.prototype.testSpacesReplacedByPlus = function() {
       },
       createCssLink: function(csslink) {
         link = csslink;
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
@@ -137,6 +146,9 @@ GoogleFontApiTest.prototype.testLoadWithVariations = function() {
       },
       createCssLink: function(csslink) {
         link = csslink;
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
   var userAgent = new webfont.UserAgent("Test", "1.0", true);

data/src-test/monotype/monotype_script_test.js

@@ -1,46 +1,7 @@
 var MonotypeScriptTest = TestCase('MonotypeScriptTest');
 
-MonotypeScriptTest.prototype.testIfProtocolMethodIsReturningProperly = function () {
-  var fakeDocument = {
-    location: { protocol: "https:" }
-  };
-  var global = {}; // should be window in actual situation.
-  var script = null;
-  var userAgent = new webfont.UserAgent("Test", "1.0", true);
-  var config = { projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7cc' };
-  var fakedom = [];
-  var fakeDomHelper = {
-    createScriptSrc: function (s) {
-      script = { src: s };
-      return script;
-    },
-    insertInto: function (tag, elem) {
-      fakedom[tag].push(elem);
-      global[webfont.MonotypeScript.HOOK + config.projectId] = function () {
-        return ["aachen bold", "kid print regualr"];
-      };
-      if (script.onload) {
-        script.onload();
-      }
-    }
-  };
-
-  var monotypeScript = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocument, config);
-  assertEquals("https:", monotypeScript.protocol());
-
-  fakeDocument = {
-    location: { protocol: "http:" }
-  };
-
-  monotypeScript = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocument, config);
-  assertEquals("http:", monotypeScript.protocol());
-};
-
 MonotypeScriptTest.prototype.testIfScriptTagIsAdded = function () {
   var fakedom = { 'head': [], 'body': [] };
-  var fakeDocument = {
-    location: { protocol: "http:" }
-  };
   var script = null;
   var global = {}; // should be window in actual situation.
   var families = null;
@@ -59,6 +20,12 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAdded = function () {
       if (script.onload) {
         script.onload();
       }
+    },
+    getLoadWindow: function () {
+      return global;
+    },
+    getProtocol: function () {
+      return "http:";
     }
   };
 
@@ -77,7 +44,7 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAdded = function () {
   }
   var isSupport = null;
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
-  var monotypeScript = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocument, config);
+  var monotypeScript = new webfont.MonotypeScript(userAgent, fakeDomHelper, config);
   monotypeScript.supportUserAgent(userAgent, function (support) { isSupport = support; });
   monotypeScript.load(function (fontFamilies) {
     families = fontFamilies;
@@ -93,12 +60,7 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAdded = function () {
 //If current page is browsed using https protocol, the added script should be requested with SSL.
 MonotypeScriptTest.prototype.testIfScriptTagHasCorrectSSL = function () {
   var fakedom = { 'head': [], 'body': [] };
-  var fakeDocument1 = {
-    location: { protocol: "https:" }
-  };
-  var fakeDocument2 = {
-    location: { protocol: "http:" }
-  };
+  var fakeProtocol = "https:";
   var script = null;
   var global = {}; // should be window in actual situation.
   var families = null;
@@ -117,6 +79,12 @@ MonotypeScriptTest.prototype.testIfScriptTagHasCorrectSSL = function () {
       if (script.onload) {
         script.onload();
       }
+    },
+    getLoadWindow: function () {
+      return global;
+    },
+    getProtocol: function () {
+      return fakeProtocol;
     }
   };
 
@@ -136,7 +104,7 @@ MonotypeScriptTest.prototype.testIfScriptTagHasCorrectSSL = function () {
   }
   var isSupport = null;
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
-  var monotypeScript = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocument1, config);
+  var monotypeScript = new webfont.MonotypeScript(userAgent, fakeDomHelper, config);
   monotypeScript.supportUserAgent(userAgent, function (support) { isSupport = support; });
   monotypeScript.load(function (fontFamilies) {
     families = fontFamilies;
@@ -150,7 +118,8 @@ MonotypeScriptTest.prototype.testIfScriptTagHasCorrectSSL = function () {
 
   //one page can have multiple projects, but not 2 projects with same projectId.
   config = { projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7c1', api: "http://fast.fonts.com/jsapidev" };
-  var monotypeScript2 = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocument2, config);
+  fakeProtocol = "http:";
+  var monotypeScript2 = new webfont.MonotypeScript(userAgent, fakeDomHelper, config);
   monotypeScript2.supportUserAgent(userAgent, function (support) { isSupport = support; });
   monotypeScript2.load(function (fontFamilies) {
     families = fontFamilies;
@@ -182,11 +151,11 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurl = function () {
       if (script.onload) {
         script.onload();
       }
-    }
-  };
-
-  var fakeDocHelper = {
-    protocol: function () {
+    },
+    getLoadWindow: function () {
+      return global;
+    },
+    getProtocol: function () {
       return "http:";
     }
   };
@@ -207,7 +176,7 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurl = function () {
 
   var isSupport = null;
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
-  var monotypeScript = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocHelper, config);
+  var monotypeScript = new webfont.MonotypeScript(userAgent, fakeDomHelper, config);
   monotypeScript.supportUserAgent(userAgent, function (support) { isSupport = support; });
 
   monotypeScript.load(function (fontFamilies) {
@@ -224,7 +193,6 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurl = function () {
 //If current page is browsed using https protocol, the added script should be requested with SSL.
 MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurlAndTheScriptUrlHasCorrectSSL = function () {
   var fakedom = { 'head': [], 'body': [] };
-  var fakeDocument = { location: { protocol: "https:"} };
   var global = {}; // should be window in actual situation.
   var script = null;
   var families = null;
@@ -243,6 +211,12 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurlAndTheScriptUrlH
       if (script.onload) {
         script.onload();
       }
+    },
+    getLoadWindow: function () {
+      return global;
+    },
+    getProtocol: function () {
+      return "https:";
     }
   };
 
@@ -262,7 +236,7 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurlAndTheScriptUrlH
 
   var isSupport = null;
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
-  var monotypeScript = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocument, config);
+  var monotypeScript = new webfont.MonotypeScript(userAgent, fakeDomHelper, config);
   monotypeScript.supportUserAgent(userAgent, function (support) { isSupport = support; });
 
   monotypeScript.load(function (fontFamilies) {
@@ -297,18 +271,18 @@ MonotypeScriptTest.prototype.testWithoutProjectId = function () {
       if (script.onload) {
         script.onload();
       }
-    }
-  };
-
-  var fakeDocHelper = {
-    protocol: function () {
+    },
+    getLoadWindow: function () {
+      return global;
+    },
+    getProtocol: function () {
       return "http:";
     }
   };
 
   var isSupport = null;
   var userAgent = new webfont.UserAgent("Test", "1.0", true);
-  var monotypeScript = new webfont.MonotypeScript(global, userAgent, fakeDomHelper, fakeDocHelper, config);
+  var monotypeScript = new webfont.MonotypeScript(userAgent, fakeDomHelper, config);
   monotypeScript.supportUserAgent(userAgent, function (support) { isSupport = support; });
 
   monotypeScript.load(function (fontFamilies) {

data/src-test/typekit/typekit_script_test.js

@@ -6,16 +6,22 @@ TypekitScriptTest.prototype.testSupportAndLoadLifecycle = function() {
   };
   var insert = '';
   var src = '';
+  var global = {};
   var fakeDomHelper = {
       insertInto: function(tag, e) {
         insert = tag;
       },
       createScriptSrc: function(srcLink) {
         src = srcLink;
+      },
+      getLoadWindow: function() {
+        return global;
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
-  var global = {};
-  var typeKit = new webfont.TypekitScript(global, fakeDomHelper, configuration);
+  var typeKit = new webfont.TypekitScript(fakeDomHelper, configuration);
 
   // supportUserAgent
   var userAgent = 'user agent';
@@ -65,16 +71,22 @@ TypekitScriptTest.prototype.testLoadWithVariations = function() {
   };
   var insert = '';
   var src = '';
+  var global = {};
   var fakeDomHelper = {
       insertInto: function(tag, e) {
         insert = tag;
       },
       createScriptSrc: function(srcLink) {
         src = srcLink;
+      },
+      getLoadWindow: function() {
+        return global;
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
-  var global = {};
-  var typeKit = new webfont.TypekitScript(global, fakeDomHelper, configuration);
+  var typeKit = new webfont.TypekitScript(fakeDomHelper, configuration);
 
   // supportUserAgent
   var userAgent = 'user agent';
@@ -129,9 +141,15 @@ TypekitScriptTest.prototype.testAlternateApi = function() {
       },
       createScriptSrc: function(srcLink) {
         src = srcLink;
+      },
+      getLoadWindow: function() {
+        return {};
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
-  var typeKit = new webfont.TypekitScript({}, fakeDomHelper, configuration);
+  var typeKit = new webfont.TypekitScript(fakeDomHelper, configuration);
   var userAgent = 'user agent';
   var isSupport = null;
 
@@ -152,9 +170,15 @@ TypekitScriptTest.prototype.testNoKitId = function() {
       },
       createScriptSrc: function(srcLink) {
         src = srcLink;
+      },
+      getLoadWindow: function() {
+        return {};
+      },
+      getProtocol: function() {
+        return 'http:';
       }
   };
-  var typeKit = new webfont.TypekitScript({}, fakeDomHelper, configuration);
+  var typeKit = new webfont.TypekitScript(fakeDomHelper, configuration);
   var userAgent = 'user agent';
   var isSupport = null;
 

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.31'
-  s.date              = '2012-09-11'
+  s.version           = '1.1.0'
+  s.date              = '2012-12-05'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -75,8 +75,11 @@ DESC
     docs/MODULES.md
     docs/TRANSITIONS.md
     lib/webfontloader.rb
+    lib/webfontloader/demo/public/ascender-iframe.html
     lib/webfontloader/demo/public/ascender.html
     lib/webfontloader/demo/public/basic.css
+    lib/webfontloader/demo/public/blank.html
+    lib/webfontloader/demo/public/custom-iframe.html
     lib/webfontloader/demo/public/custom.html
     lib/webfontloader/demo/public/event-css-active-multiple.html
     lib/webfontloader/demo/public/event-css-active.html
@@ -90,13 +93,16 @@ DESC
     lib/webfontloader/demo/public/fontdeck.html
     lib/webfontloader/demo/public/fontwatchrunner-default-fonts.html
     lib/webfontloader/demo/public/google-css.html
+    lib/webfontloader/demo/public/google-iframe.html
     lib/webfontloader/demo/public/google.html
     lib/webfontloader/demo/public/ie-fast-js.html
     lib/webfontloader/demo/public/ie-slow-js.html
     lib/webfontloader/demo/public/ie-slow-link.html
     lib/webfontloader/demo/public/index.html
     lib/webfontloader/demo/public/jquery.min.js
+    lib/webfontloader/demo/public/monotype-iframe.html
     lib/webfontloader/demo/public/monotype.html
+    lib/webfontloader/demo/public/typekit-iframe.html
     lib/webfontloader/demo/public/typekit-variations.html
     lib/webfontloader/demo/public/typekit.html
     lib/webfontloader/demo/server.rb