webfontloader 1.4.0 → 1.4.1

data/src/typekit/typekit_script.js

@@ -1,5 +1,7 @@
 goog.provide('webfont.TypekitScript');
 
+goog.require('webfont.Font');
+
 /**
  * @constructor
  * @implements {webfont.FontModule}
@@ -7,15 +9,15 @@ goog.provide('webfont.TypekitScript');
 webfont.TypekitScript = function(domHelper, configuration) {
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
-  this.fontFamilies_ = [];
-  this.fontVariations_ = {};
+  this.fonts_ = [];
 };
 
 webfont.TypekitScript.NAME = 'typekit';
 webfont.TypekitScript.HOOK = '__webfonttypekitmodule__';
 
 goog.scope(function () {
-  var TypekitScript = webfont.TypekitScript;
+  var TypekitScript = webfont.TypekitScript,
+      Font = webfont.Font;
 
   TypekitScript.prototype.getScriptSrc = function(kitId) {
     var protocol = this.domHelper_.getProtocol();
@@ -39,8 +41,17 @@ goog.scope(function () {
       // and what fonts will be provided.
       loadWindow[webfont.TypekitScript.HOOK][kitId] = function(callback) {
         var init = function(typekitSupports, fontFamilies, fontVariations) {
-          self.fontFamilies_ = fontFamilies;
-          self.fontVariations_ = fontVariations;
+          for (var i = 0; i < fontFamilies.length; i += 1) {
+            var variations = fontVariations[fontFamilies[i]];
+
+            if (variations) {
+              for(var j = 0; j < variations.length; j += 1) {
+                self.fonts_.push(new Font(fontFamilies[i], variations[j]));
+              }
+            } else {
+              self.fonts_.push(new Font(fontFamilies[i]));
+            }
+          }
           support(typekitSupports);
         };
         callback(userAgent, configuration, init);
@@ -49,14 +60,13 @@ goog.scope(function () {
       // Load the Typekit script.
       var script = this.domHelper_.createScriptSrc(this.getScriptSrc(kitId))
       this.domHelper_.insertInto('head', script);
-
     } else {
       support(true);
     }
   };
 
   TypekitScript.prototype.load = function(onReady) {
-    onReady(this.fontFamilies_, this.fontVariations_);
+    onReady(this.fonts_);
   };
 });
 

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.0'
-  s.date              = '2013-03-28'
+  s.version           = '1.4.1'
+  s.date              = '2013-04-08'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -110,17 +110,16 @@ DESC
     lib/webfontloader/modules.rb
     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/core/webfont_spec.js
     spec/custom/customcss_spec.js
     spec/deps.js
     spec/fontdeck/fontdeckscript_spec.js
@@ -136,6 +135,9 @@ DESC
     spec/fonts/sourcesans.woff
     spec/fonts/sourcesansa.css
     spec/fonts/sourcesansb.css
+    spec/fonts/sourcesansc.css
+    spec/fonts/sourcesanscbold.css
+    spec/fonts/sourcesanscbold.otf
     spec/google/fontapiparser_spec.js
     spec/google/fontapiurlbuilder_spec.js
     spec/google/googlefontapi_spec.js
@@ -148,19 +150,18 @@ DESC
     src/closure.js
     src/core/browserinfo.js
     src/core/cssclassname.js
-    src/core/cssfontfamilyname.js
     src/core/domhelper.js
     src/core/eventdispatcher.js
     src/core/font.js
     src/core/fontmoduleloader.js
     src/core/fontruler.js
-    src/core/fontvariationdescription.js
     src/core/fontwatcher.js
     src/core/fontwatchrunner.js
     src/core/initialize.js
     src/core/namespace.js
     src/core/useragent.js
     src/core/useragentparser.js
+    src/core/webfont.js
     src/custom/customcss.js
     src/fontdeck/fontdeck_script.js
     src/google/fontapiparser.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-28 00:00:00 Z
+date: 2013-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -141,17 +141,16 @@ files:
 - lib/webfontloader/modules.rb
 - 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/core/webfont_spec.js
 - spec/custom/customcss_spec.js
 - spec/deps.js
 - spec/fontdeck/fontdeckscript_spec.js
@@ -167,6 +166,9 @@ files:
 - spec/fonts/sourcesans.woff
 - spec/fonts/sourcesansa.css
 - spec/fonts/sourcesansb.css
+- spec/fonts/sourcesansc.css
+- spec/fonts/sourcesanscbold.css
+- spec/fonts/sourcesanscbold.otf
 - spec/google/fontapiparser_spec.js
 - spec/google/fontapiurlbuilder_spec.js
 - spec/google/googlefontapi_spec.js
@@ -179,19 +181,18 @@ files:
 - src/closure.js
 - src/core/browserinfo.js
 - src/core/cssclassname.js
-- src/core/cssfontfamilyname.js
 - src/core/domhelper.js
 - src/core/eventdispatcher.js
 - src/core/font.js
 - src/core/fontmoduleloader.js
 - src/core/fontruler.js
-- src/core/fontvariationdescription.js
 - src/core/fontwatcher.js
 - src/core/fontwatchrunner.js
 - src/core/initialize.js
 - src/core/namespace.js
 - src/core/useragent.js
 - src/core/useragentparser.js
+- src/core/webfont.js
 - src/custom/customcss.js
 - src/fontdeck/fontdeck_script.js
 - src/google/fontapiparser.js

data/spec/core/cssfontfamilyname_spec.js

@@ -1,38 +0,0 @@
-describe('CssFontFamilyName', function () {
-  var CssFontFamilyName = webfont.CssFontFamilyName,
-      sanitizer = new CssFontFamilyName();
-
-  describe('#quote', function () {
-    it('should quote names with spaces', function () {
-      expect(sanitizer.quote('My Family')).toEqual("'My Family'");
-    });
-
-    it('should quote names with spaces and double quotes', function () {
-      expect(sanitizer.quote('"My Family"')).toEqual("'My Family'");
-    });
-
-    it('should quote names with spaces and single quotes', function () {
-      expect(sanitizer.quote("'My Family'")).toEqual("'My Family'");
-    });
-
-    it('should quote multiple single quoted names separated with a comma', function () {
-      expect(sanitizer.quote("'family 1','family 2'")).toEqual("'family 1','family 2'");
-    });
-
-    it('should quote multiple single quoted names separated with a comma and space', function () {
-      expect(sanitizer.quote("'family 1', 'family 2'")).toEqual("'family 1','family 2'");
-    });
-
-    it('should not quote when there is no space', function () {
-      expect(sanitizer.quote('MyFamily')).toEqual('MyFamily');
-    });
-
-    it('should remove quotes when they are unnecesssary', function () {
-      expect(sanitizer.quote('"MyFamily"')).toEqual('MyFamily');
-    });
-
-    it('should not quote multiple names when there is no space', function () {
-      expect(sanitizer.quote("'family-1', 'family-2'")).toEqual('family-1,family-2');
-    });
-  });
-});

data/spec/core/fontvariationdescription_spec.js

@@ -1,67 +0,0 @@
-describe('FontVariationDescription', function () {
-  var FontVariationDescription = webfont.FontVariationDescription,
-      fvd = new FontVariationDescription();
-
-  describe('#compact', function () {
-    it('should default to n4 when there is no description', function () {
-      expect(fvd.compact('')).toEqual('n4');
-    });
-
-    it('should compact font style', function () {
-      expect(fvd.compact('font-style: normal;')).toEqual('n4');
-      expect(fvd.compact('font-style: italic;')).toEqual('i4');
-      expect(fvd.compact('font-style: oblique;')).toEqual('o4');
-    });
-
-    it('should return the default value when font-style is incorrect', function () {
-      expect(fvd.compact('font-style: other;')).toEqual('n4');
-    });
-
-    it('should compact font weight', function () {
-      expect(fvd.compact('font-weight: normal;')).toEqual('n4');
-      expect(fvd.compact('font-weight: bold;')).toEqual('n7');
-      for (var i = 1; i < 10; i += 1) {
-        expect(fvd.compact('font-weight: ' + (i * 100) + ';')).toEqual('n' + i);
-      }
-    });
-
-    it('should return the default value when font-weight is incorrect', function () {
-      expect(fvd.compact('font-weight: 140;')).toEqual('n4');
-      expect(fvd.compact('font-weight: other;')).toEqual('n4');
-    });
-
-    it('should compact multiple properties', function () {
-      expect(fvd.compact('font-weight: bold; font-style: italic;')).toEqual('i7');
-      expect(fvd.compact('; font-weight: bold; font-style: italic;')).toEqual('i7');
-      expect(fvd.compact('font-style:italic;font-weight:bold;')).toEqual('i7');
-      expect(fvd.compact('   font-style:   italic    ;\n\nfont-weight:   bold;  ')).toEqual('i7');
-    });
-
-    it('should return default values for incorrect individual properties', function () {
-      expect(fvd.compact('src: url(/font.otf)')).toEqual('n4');
-      expect(fvd.compact('font-weight: 900; src: url(/font.otf);')).toEqual('n9');
-      expect(fvd.compact('font-weight: 800; font-stretch:condensed;')).toEqual('n8');
-    });
-  });
-
-  describe('#expand', function () {
-    it('should expand font-style', function () {
-      expect(fvd.expand('n4')).toEqual('font-style:normal;font-weight:400;');
-      expect(fvd.expand('i4')).toEqual('font-style:italic;font-weight:400;');
-      expect(fvd.expand('o4')).toEqual('font-style:oblique;font-weight:400;');
-    });
-
-    it('should expand weights correctly', function () {
-      for (var i = 1; i < 10; i += 1) {
-        expect(fvd.expand('n' + i)).toEqual('font-style:normal;font-weight:' + (i * 100) + ';');
-      }
-    });
-
-    it('should not expand incorrect input', function () {
-      expect(fvd.expand('')).toBeNull();
-      expect(fvd.expand('n')).toBeNull();
-      expect(fvd.expand('1')).toBeNull();
-      expect(fvd.expand('n1x')).toBeNull();
-    });
-  });
-});

data/src/core/cssfontfamilyname.js

@@ -1,33 +0,0 @@
-goog.provide('webfont.CssFontFamilyName');
-
-/**
- * Handles quoting rules for a font family name in css.
- * @constructor
- */
-webfont.CssFontFamilyName = function() {
-  /** @type {string} */
-  this.quote_ = "'";
-};
-
-goog.scope(function () {
-  var CssFontFamilyName = webfont.CssFontFamilyName;
-
-  /**
-   * Quotes the name.
-   * @param {string} name The name to quote.
-   * @return {string} The quoted name.
-   */
-  CssFontFamilyName.prototype.quote = function(name) {
-    var quoted = [];
-    var split = name.split(/,\s*/);
-    for (var i = 0; i < split.length; i++) {
-      var part = split[i].replace(/['"]/g, '');
-      if (part.indexOf(' ') == -1) {
-        quoted.push(part);
-      } else {
-        quoted.push(this.quote_ + part + this.quote_);
-      }
-    }
-    return quoted.join(',');
-  };
-});

data/src/core/fontvariationdescription.js

@@ -1,140 +0,0 @@
-goog.provide('webfont.FontVariationDescription');
-
-/**
- * @constructor
- */
-webfont.FontVariationDescription = function() {
-  this.properties_ = webfont.FontVariationDescription.PROPERTIES;
-  this.values_ = webfont.FontVariationDescription.VALUES;
-};
-
-/**
- * @const
- */
-webfont.FontVariationDescription.PROPERTIES = [
-  'font-style',
-  'font-weight'
-];
-
-/**
- * @const
- */
-webfont.FontVariationDescription.VALUES = {
-  'font-style': [
-    ['n', 'normal'],
-    ['i', 'italic'],
-    ['o', 'oblique']
-  ],
-  'font-weight': [
-    ['1', '100'],
-    ['2', '200'],
-    ['3', '300'],
-    ['4', '400'],
-    ['5', '500'],
-    ['6', '600'],
-    ['7', '700'],
-    ['8', '800'],
-    ['9', '900'],
-    ['4', 'normal'],
-    ['7', 'bold']
-  ]
-};
-
-goog.scope(function () {
-  var FontVariationDescription = webfont.FontVariationDescription;
-
-  /**
-   * @private
-   * @constructor
-   */
-  FontVariationDescription.Item = function(index, property, values) {
-    this.index_ = index;
-    this.property_ = property;
-    this.values_ = values;
-  }
-
-  FontVariationDescription.Item.prototype.compact = function(output, value) {
-    for (var i = 0; i < this.values_.length; i++) {
-      if (value == this.values_[i][1]) {
-        output[this.index_] = this.values_[i][0];
-        return;
-      }
-    }
-  }
-
-  FontVariationDescription.Item.prototype.expand = function(output, value) {
-    for (var i = 0; i < this.values_.length; i++) {
-      if (value == this.values_[i][0]) {
-        output[this.index_] = this.property_ + ':' + this.values_[i][1];
-        return;
-      }
-    }
-  }
-
-  /**
-   * Compacts CSS declarations into an FVD.
-   * @param {string} input A string of CSS declarations such as
-   *    'font-weight:normal;font-style:italic'.
-   * @return {string} The equivalent FVD such as 'n4'.
-   */
-  FontVariationDescription.prototype.compact = function(input) {
-    var result = ['n', '4'];
-    var descriptors = input.split(';');
-
-    for (var i = 0, len = descriptors.length; i < len; i++) {
-      var pair = descriptors[i].replace(/\s+/g, '').split(':');
-      if (pair.length == 2) {
-        var property = pair[0];
-        var value = pair[1];
-        var item = this.getItem_(property);
-        if (item) {
-          item.compact(result, value);
-        }
-      }
-    }
-
-    return result.join('');
-  };
-
-  /**
-   * Expands a FVD string into equivalent CSS declarations.
-   * @param {string} fvd The FVD string, such as 'n4'.
-   * @return {?string} The equivalent CSS such as
-   *    'font-weight:normal;font-style:italic' or null if it cannot be parsed.
-   */
-  FontVariationDescription.prototype.expand = function(fvd) {
-    if (fvd.length != 2) {
-      return null;
-    }
-
-    var result = [null, null];
-
-    for (var i = 0, len = this.properties_.length; i < len; i++) {
-      var property = this.properties_[i];
-      var key = fvd.substr(i, 1);
-      var values = this.values_[property];
-      var item = new webfont.FontVariationDescription.Item(i, property, values);
-      item.expand(result, key);
-    }
-
-    if (result[0] && result[1]) {
-      return result.join(';') + ';';
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * @private
-   */
-  FontVariationDescription.prototype.getItem_ = function(property) {
-    for (var i = 0; i < this.properties_.length; i++) {
-      if (property == this.properties_[i]) {
-        var values = this.values_[property];
-        return new webfont.FontVariationDescription.Item(i, property, values);
-      }
-    }
-
-    return null;
-  };
-});