webfontloader 1.2.0 → 1.2.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.2.0'
-  s.date              = '2013-01-30'
+  s.version           = '1.2.1'
+  s.date              = '2013-02-26'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -56,9 +56,10 @@ DESC
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('rack', ["~>1.2.1"])
-  s.add_development_dependency('sinatra', ["~>1.0"])
-  s.add_development_dependency('vegas', ["~>0.1.6"])
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rack', ["~>1.5.1"])
+  s.add_development_dependency('sinatra', ["~>1.3.4"])
+  s.add_development_dependency('vegas', ["~>0.1.11"])
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -107,25 +108,40 @@ DESC
     lib/webfontloader/demo/public/typekit.html
     lib/webfontloader/demo/server.rb
     lib/webfontloader/modules.rb
-    src-test/ascender/ascender_script_test.js
-    src-test/core/cssclassnametest.js
-    src-test/core/cssfontfamilynametest.js
-    src-test/core/domhelpertest.js
-    src-test/core/eventdispatchertest.js
-    src-test/core/fontmoduleloadertest.js
-    src-test/core/fonttest.js
-    src-test/core/fontvariationdescriptiontest.js
-    src-test/core/fontwatchertest.js
-    src-test/core/fontwatchrunnertest.js
-    src-test/core/useragenttest.js
-    src-test/custom/customcsstest.js
-    src-test/fontdeck/fontdeck_script_test.js
-    src-test/google/fontapiparsertest.js
-    src-test/google/fontapiurlbuildertest.js
-    src-test/google/googlefontapitest.js
-    src-test/google/lastresortwebkitfontwatchrunnertest.js
-    src-test/monotype/monotype_script_test.js
-    src-test/typekit/typekit_script_test.js
+    spec/ascender/ascenderscript_spec.js
+    spec/core/cssclassname_spec.js
+    spec/core/cssfontfamilyname_spec.js
+    spec/core/domhelper_spec.js
+    spec/core/eventdispatcher_spec.js
+    spec/core/font_spec.js
+    spec/core/fontmoduleloader_spec.js
+    spec/core/fontruler_spec.js
+    spec/core/fontvariationdescription_spec.js
+    spec/core/fontwatcher_spec.js
+    spec/core/fontwatchrunner_spec.js
+    spec/core/size_spec.js
+    spec/core/useragentparser_spec.js
+    spec/custom/customcss_spec.js
+    spec/fontdeck/fontdeckscript_spec.js
+    spec/fonts/LICENSE.txt
+    spec/fonts/nullfont.css
+    spec/fonts/nullfont1.css
+    spec/fonts/nullfont2.css
+    spec/fonts/nullfont3.css
+    spec/fonts/sourcesans.eot
+    spec/fonts/sourcesans.otf
+    spec/fonts/sourcesans.svg
+    spec/fonts/sourcesans.ttf
+    spec/fonts/sourcesans.woff
+    spec/fonts/sourcesansa.css
+    spec/fonts/sourcesansb.css
+    spec/google/fontapiparser_spec.js
+    spec/google/fontapiurlbuilder_spec.js
+    spec/google/googlefontapi_spec.js
+    spec/google/lastresortwebkitfontwatchrunner_spec.js
+    spec/index.html
+    spec/monotype/monotypescript_spec.js
+    spec/typekit/typekitscript_spec.js
     src/ascender/ascender_script.js
     src/async_load.js
     src/closure.js
@@ -155,7 +171,12 @@ DESC
     src/monotype/monotype_script.js
     src/typekit/typekit_script.js
     tools/compiler/compiler.jar
-    tools/jstestdriver/JsTestDriver-1.2.1.jar
+    tools/jasmine-phantomjs/jasmine-phantomjs.js
+    tools/jasmine-phantomjs/terminal-reporter.js
+    tools/jasmine/MIT.LICENSE
+    tools/jasmine/jasmine-html.js
+    tools/jasmine/jasmine.css
+    tools/jasmine/jasmine.js
     webfontloader.gemspec
   ]
   # = MANIFEST =

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,55 +16,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-30 00:00:00 Z
+date: 2013-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  name: rake
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 1
         segments: 
         - 1
-        - 2
+        - 5
         - 1
-        version: 1.2.1
+        version: 1.5.1
+  requirement: *id002
+  name: rack
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 19
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 3
+        - 4
+        version: 1.3.4
+  requirement: *id003
+  name: sinatra
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: vegas
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 13
         segments: 
         - 0
         - 1
-        - 6
-        version: 0.1.6
+        - 11
+        version: 0.1.11
+  requirement: *id004
+  name: vegas
   type: :development
-  version_requirements: *id003
 description: |
   WebFont Loader gives you added control when using linked fonts via
   `@font-face`. It provides a common interface to loading fonts regardless of
@@ -124,25 +139,40 @@ files:
 - lib/webfontloader/demo/public/typekit.html
 - lib/webfontloader/demo/server.rb
 - lib/webfontloader/modules.rb
-- src-test/ascender/ascender_script_test.js
-- src-test/core/cssclassnametest.js
-- src-test/core/cssfontfamilynametest.js
-- src-test/core/domhelpertest.js
-- src-test/core/eventdispatchertest.js
-- src-test/core/fontmoduleloadertest.js
-- src-test/core/fonttest.js
-- src-test/core/fontvariationdescriptiontest.js
-- src-test/core/fontwatchertest.js
-- src-test/core/fontwatchrunnertest.js
-- src-test/core/useragenttest.js
-- src-test/custom/customcsstest.js
-- src-test/fontdeck/fontdeck_script_test.js
-- src-test/google/fontapiparsertest.js
-- src-test/google/fontapiurlbuildertest.js
-- src-test/google/googlefontapitest.js
-- src-test/google/lastresortwebkitfontwatchrunnertest.js
-- src-test/monotype/monotype_script_test.js
-- src-test/typekit/typekit_script_test.js
+- spec/ascender/ascenderscript_spec.js
+- spec/core/cssclassname_spec.js
+- spec/core/cssfontfamilyname_spec.js
+- spec/core/domhelper_spec.js
+- spec/core/eventdispatcher_spec.js
+- spec/core/font_spec.js
+- spec/core/fontmoduleloader_spec.js
+- spec/core/fontruler_spec.js
+- spec/core/fontvariationdescription_spec.js
+- spec/core/fontwatcher_spec.js
+- spec/core/fontwatchrunner_spec.js
+- spec/core/size_spec.js
+- spec/core/useragentparser_spec.js
+- spec/custom/customcss_spec.js
+- spec/fontdeck/fontdeckscript_spec.js
+- spec/fonts/LICENSE.txt
+- spec/fonts/nullfont.css
+- spec/fonts/nullfont1.css
+- spec/fonts/nullfont2.css
+- spec/fonts/nullfont3.css
+- spec/fonts/sourcesans.eot
+- spec/fonts/sourcesans.otf
+- spec/fonts/sourcesans.svg
+- spec/fonts/sourcesans.ttf
+- spec/fonts/sourcesans.woff
+- spec/fonts/sourcesansa.css
+- spec/fonts/sourcesansb.css
+- spec/google/fontapiparser_spec.js
+- spec/google/fontapiurlbuilder_spec.js
+- spec/google/googlefontapi_spec.js
+- spec/google/lastresortwebkitfontwatchrunner_spec.js
+- spec/index.html
+- spec/monotype/monotypescript_spec.js
+- spec/typekit/typekitscript_spec.js
 - src/ascender/ascender_script.js
 - src/async_load.js
 - src/closure.js
@@ -172,7 +202,12 @@ files:
 - src/monotype/monotype_script.js
 - src/typekit/typekit_script.js
 - tools/compiler/compiler.jar
-- tools/jstestdriver/JsTestDriver-1.2.1.jar
+- tools/jasmine-phantomjs/jasmine-phantomjs.js
+- tools/jasmine-phantomjs/terminal-reporter.js
+- tools/jasmine/MIT.LICENSE
+- tools/jasmine/jasmine-html.js
+- tools/jasmine/jasmine.css
+- tools/jasmine/jasmine.js
 - webfontloader.gemspec
 homepage: http://github.com/typekit/webfontloader
 licenses: []

data/src-test/ascender/ascender_script_test.js

@@ -1,51 +0,0 @@
-var AscenderScriptTest = TestCase('AscenderScriptTest');
-
-AscenderScriptTest.prototype.testLoadAndFamilyVariations = function(){
-
-  var insert, css, element;
-  var key = 'ec2de397-11ae-4c10-937f-bf94283a70c1';
-  var onReadyTriggered = false;
-
-  var fakeDomHelper = {
-      insertInto: function(tag, el) {
-        insert = tag;
-        element = el;
-      },
-      createCssLink: function(cssLink) {
-        css = cssLink;
-        return '<link href="' + css + '" type="text/css" />';
-      },
-      getProtocol: function() {
-        return 'http:';
-      }
-  };
-
-  var configuration = {
-    key:key,
-    families: ['AndyBold','Arial:bold,regular']
-  };
-
-  var fakeOnReady = function(){
-    onReadyTriggered = true;
-  };
-
-  var as = new webfont.AscenderScript(fakeDomHelper, configuration);
-
-  assertFalse(onReadyTriggered);
-  as.load(fakeOnReady);
-
-  assertEquals('http://webfonts.fontslive.com/css/' + key + '.css', css);
-  assertEquals('<link href="http://webfonts.fontslive.com/css/' + key + '.css" type="text/css" />', element);
-  assertEquals('head', insert);
-  assertTrue(onReadyTriggered);
-
-  assertEquals(['n4'], as.parseVariations('regular'));
-  assertEquals(['n7'], as.parseVariations('bold'));
-  assertEquals(['i4'], as.parseVariations('italic'));
-  assertEquals(['i7'], as.parseVariations('bolditalic'));
-  assertEquals(['n4'], as.parseVariations('regular,'));
-  assertEquals(['n4','n7'], as.parseVariations('regular,bold'));
-  assertEquals(['n4','n7'], as.parseVariations('regular,,bold'));
-  assertEquals(['n4','n7'], as.parseVariations('n4,n7'));
-
-};

data/src-test/core/cssclassnametest.js

@@ -1,42 +0,0 @@
-var CssClassNameTest = TestCase('CssClassName');
-
-CssClassNameTest.prototype.setUp = function() {
-  this.sanitizer_ = new webfont.CssClassName();
-};
-
-CssClassNameTest.prototype.testSanitizeSpacesInName = function() {
-  var result = this.sanitizer_.sanitize(' My Family ');
-
-  assertEquals('myfamily', result);
-};
-
-CssClassNameTest.prototype.testSanitizeNumbersInName = function() {
-  var result = this.sanitizer_.sanitize('99 My Family 99');
-
-  assertEquals('99myfamily99', result);
-};
-
-CssClassNameTest.prototype.testSanitizeOtherChars = function() {
-  var result = this.sanitizer_.sanitize('_My+Family!-');
-
-  assertEquals('myfamily', result);
-};
-
-CssClassNameTest.prototype.testBuildManyParts = function() {
-  var result = this.sanitizer_.build('pre_', 'My Family', '_post');
-
-  assertEquals('pre-myfamily-post', result);
-};
-
-CssClassNameTest.prototype.testBuildSomeParts = function() {
-  var result = this.sanitizer_.build('pre!', 'My Family');
-
-  assertEquals('pre-myfamily', result);
-};
-
-CssClassNameTest.prototype.testBuildOtherJoinChar = function() {
-  this.sanitizer_ = new webfont.CssClassName('_');
-  var result = this.sanitizer_.build('pre', 'My Family');
-
-  assertEquals('pre_myfamily', result);
-};

data/src-test/core/cssfontfamilynametest.js

@@ -1,54 +0,0 @@
-var CssFontFamilyNameTest = TestCase('CssFontFamilyName');
-
-CssFontFamilyNameTest.prototype.setUp = function() {
-  this.sanitizer_ = new webfont.CssFontFamilyName();
-};
-
-CssFontFamilyNameTest.prototype.testSpaceNameWithoutQuotes = function() {
-  var result = this.sanitizer_.quote('My Family');
-
-  assertEquals("'My Family'", result);
-};
-
-CssFontFamilyNameTest.prototype.testSpaceNameWithDoubleQuotes = function() {
-  var result = this.sanitizer_.quote('"My Family"');
-
-  assertEquals("'My Family'", result);
-};
-
-CssFontFamilyNameTest.prototype.testSpaceNameWithSingleQuotes = function() {
-  var result = this.sanitizer_.quote('\'My Family\'');
-
-  assertEquals("'My Family'", result);
-};
-
-CssFontFamilyNameTest.prototype.testSpaceNameWithCommasAndQuotes = function() {
-  var result = this.sanitizer_.quote('\'family 1\',\'family 2\'');
-
-  assertEquals("'family 1','family 2'", result);
-};
-
-CssFontFamilyNameTest.prototype.testSpaceNameWithCommaSpaceAndQuotes = function() {
-  var result = this.sanitizer_.quote('\'family 1\', \'family 2\'');
-
-  assertEquals("'family 1','family 2'", result);
-};
-
-CssFontFamilyNameTest.prototype.testNoSpaceNameWithoutQuotes = function() {
-  var result = this.sanitizer_.quote('MyFamily');
-
-  assertEquals('MyFamily', result);
-};
-
-CssFontFamilyNameTest.prototype.testNoSpaceNameWithQuotes = function() {
-  var result = this.sanitizer_.quote('"MyFamily"');
-
-  assertEquals('MyFamily', result);
-};
-
-CssFontFamilyNameTest.prototype.testNoSpaceNameWithCommasAndQuotes = function() {
-  var result = this.sanitizer_.quote('\'family-1\', \'family-2\'');
-
-  assertEquals('family-1,family-2', result);
-};
-

data/src-test/core/domhelpertest.js

@@ -1,151 +0,0 @@
-var DomHelperTest = TestCase('DomHelperTest');
-
-DomHelperTest.prototype.setUp = function() {
-  this.domHelper_ = new webfont.DomHelper(window);
-};
-
-DomHelperTest.prototype.testCreateElementNoAttr = function() {
-  var span = this.domHelper_.createElement('span');
-
-  assertNotNull(span);
-};
-
-DomHelperTest.prototype.testCreateElementEmptyAttrInnerHtml = function() {
-  var span = this.domHelper_.createElement('span', {}, 'moo');
-
-  assertNotNull(span);
-  assertEquals('moo', span.innerHTML);
-};
-
-DomHelperTest.prototype.testCreateElementWithAttrInnerHtml = function() {
-  var span = this.domHelper_.createElement('span', { style: 'font-size: 42px',
-      id: 'mySpan' }, 'hello');
-
-  assertNotNull(span);
-  assertEquals('mySpan', span.id);
-  assertEquals('42px', span.style.fontSize);
-  assertEquals('hello', span.innerHTML);
-};
-
-DomHelperTest.prototype.testCreateElementWithPrototypeAugments = function(){
-
-  Object.prototype.extrastuff = function(){ return 'I am a troublemaker.'; }
-
-  var span = this.domHelper_.createElement('span', { id : "augmented" });
-  var spanPar = this.domHelper_.createElement('div', { id : "augmentedpar" });
-  spanPar.appendChild(span);
-
-
-  assertNotNull(span);
-  assertSame(false,!!span.getAttribute('extrastuff'));
-  assertSame(-1,spanPar.innerHTML.indexOf('extrastuff'))
-
-
-  delete Object.prototype.extrastuff;
-  span = spanPar = undefined;
-}
-
-DomHelperTest.prototype.testCreateCssLink = function() {
-  var cssLink = this.domHelper_.createCssLink('http://moo/somecss.css');
-
-  assertEquals('stylesheet', cssLink.rel);
-  assertEquals('http://moo/somecss.css', cssLink.href);
-};
-
-DomHelperTest.prototype.testCreateScriptSrc = function() {
-  var cssLink = this.domHelper_.createScriptSrc('http://moo/somescript.js');
-
-  assertEquals('http://moo/somescript.js', cssLink.src);
-};
-
-DomHelperTest.prototype.testAppendAndRemoveClassNames = function() {
-  var div = this.domHelper_.createElement('div');
-
-  this.domHelper_.appendClassName(div, 'moo');
-  assertEquals('moo', div.className);
-  this.domHelper_.appendClassName(div, 'meuh');
-  assertEquals('moo meuh', div.className);
-  this.domHelper_.removeClassName(div, 'moo');
-  assertEquals('meuh', div.className);
-
-  this.domHelper_.removeClassName(div, 'meuh');
-  this.domHelper_.appendClassName(div, 'spaces and	tabs');
-
-  this.domHelper_.removeClassName(div, 'and');
-  assertEquals('spaces tabs', div.className);
-  this.domHelper_.removeClassName(div, 'spaces');
-  this.domHelper_.removeClassName(div, 'tabs');
-  assertEquals('', div.className);
-
-};
-
-DomHelperTest.prototype.testHasClassName = function() {
-  var div = this.domHelper_.createElement('div');
-
-  this.domHelper_.appendClassName(div, 'moo');
-  this.domHelper_.appendClassName(div, 'moo-meuh');
-
-  assertTrue(this.domHelper_.hasClassName(div, 'moo'));
-  assertTrue(this.domHelper_.hasClassName(div, 'moo-meuh'));
-  assertFalse(this.domHelper_.hasClassName(div, 'meuh'));
-  assertFalse(this.domHelper_.hasClassName(div, 'missingClassName'));
-};
-
-DomHelperTest.prototype.testSetStyle = function() {
-  var e = this.domHelper_.createElement('span')
-  this.domHelper_.setStyle(e, 'left:3px;top:1px;');
-  assertEquals('3px', e.style.left)
-  assertEquals('1px', e.style.top);
-};
-
-DomHelperTest.prototype.testHasSupportForStyle = function() {
-  assertUndefined(this.domHelper_.supportForStyle_);
-  assertBoolean(this.domHelper_.hasSupportForStyle_());
-  this.domHelper_.supportForStyle_ = false;
-  assertFalse(this.domHelper_.hasSupportForStyle_());
-  this.domHelper_.supportForStyle_ = true;
-  assertTrue(this.domHelper_.hasSupportForStyle_());
-};
-
-DomHelperTest.prototype.testGetWindows = function() {
-  var fakeMainWindow = 'main window';
-  var fakeLoadWindow = 'load window';
-  var domHelper = new webfont.DomHelper(fakeMainWindow, fakeLoadWindow);
-  assertEquals('main window', domHelper.getMainWindow());
-  assertEquals('load window', domHelper.getLoadWindow());
-};
-
-DomHelperTest.prototype.testGetProtocol = function() {
-  var fakeWindow = {
-    location: {
-      protocol: 'https:'
-    }
-  };
-  var domHelper = new webfont.DomHelper(fakeWindow);
-  assertEquals('https:', domHelper.getProtocol());
-};
-
-DomHelperTest.prototype.testGetProtocolHttpDefault = function() {
-  var fakeWindow = {
-    location: {
-      protocol: 'file:'
-    }
-  };
-  var domHelper = new webfont.DomHelper(fakeWindow);
-  assertEquals('http:', domHelper.getProtocol());
-};
-
-DomHelperTest.prototype.testGetProtocolIframeFallback = function() {
-  var fakeMainWindow = {
-    location: {
-      protocol: 'https:'
-    }
-  };
-  var fakeLoadWindow = {
-    location: {
-      protocol: 'about:'
-    }
-  };
-  var domHelper = new webfont.DomHelper(fakeMainWindow, fakeLoadWindow);
-  assertEquals('https:', domHelper.getProtocol());
-};