webfontloader 1.4.2 → 1.4.3

data/src/core/version.js

@@ -0,0 +1,180 @@
+goog.provide('webfont.Version');
+
+/**
+ * Represents a version as used in user agent strings. Note
+ * that this does not represent any sort of reliable versioning
+ * scheme (like Semantic Versioning) but merely a best effort
+ * at parsing a large amount of wildly different version strings.
+ *
+ * @constructor
+ * @param {?number=} opt_major
+ * @param {?number=} opt_minor
+ * @param {?number=} opt_patch
+ * @param {?(number|string)=} opt_build
+ */
+webfont.Version = function(opt_major, opt_minor, opt_patch, opt_build) {
+  /**
+   * @type {?number}
+   */
+  this.major = goog.isDefAndNotNull(opt_major) ? opt_major : null;
+
+  /**
+   * @type {?number}
+   */
+  this.minor = goog.isDefAndNotNull(opt_minor) ? opt_minor : null;
+
+  /**
+   * @type {?number}
+   */
+  this.patch = goog.isDefAndNotNull(opt_patch) ? opt_patch : null;
+
+  /**
+   * @type {?(number|string)}
+   */
+  this.build = goog.isDefAndNotNull(opt_build) ? opt_build : null;
+}
+
+goog.scope(function () {
+  var Version = webfont.Version;
+
+  Version.TOKENIZER = new RegExp(
+    "^" +
+    "([0-9]+)" +            // major
+    "(?:" +
+      "[\\._-]([0-9]+)" +   // minor
+    ")?" +
+    "(?:" +
+      "[\\._-]([0-9]+)" +  // patch
+    ")?" +
+    "(?:" +
+      "[\\._+-]?(.*)" +    // build
+    ")?$"
+  );
+
+  /**
+   * Returns true if the version is valid. A
+   * version is considered valid if it has at
+   * least a major version number.
+   *
+   * @return {boolean}
+   */
+  Version.prototype.isValid = function () {
+    return !goog.isNull(this.major);
+  };
+
+  /**
+   * Compares two versions. Returns -1 if this
+   * is smaller than version. Returns 1 if this
+   * is greater than version. Returns 0 if this
+   * equals version.
+   *
+   * Build strings or numbers are ignored when
+   * comparing versions.
+   *
+   * @param {webfont.Version} version
+   * @return {number}
+   */
+  Version.prototype.compare = function (version) {
+    if (this.major > version.major ||
+        ((this.major === version.major && this.minor > version.minor) ||
+          (this.major === version.major && this.minor === version.minor && this.patch > version.patch))) {
+      return 1;
+    } else if (this.major < version.major ||
+               ((this.major === version.major && this.minor < version.minor) ||
+                (this.major === version.major && this.minor === version.minor && this.patch < version.patch))) {
+      return -1;
+    }
+    return 0;
+  };
+
+  /**
+   * @param {webfont.Version} version
+   * @return {boolean}
+   */
+  Version.prototype.gt = function (version) {
+    return this.compare(version) === 1;
+  };
+
+  /**
+   * @param {webfont.Version} version
+   * @return {boolean}
+   */
+  Version.prototype.lt = function (version) {
+    return this.compare(version) === -1;
+  };
+
+  /**
+   * @param {webfont.Version} version
+   * @return {boolean}
+   */
+  Version.prototype.ge = function (version) {
+    return this.compare(version) === 0 || this.compare(version) === 1;
+  };
+
+  /**
+   * @param {webfont.Version} version
+   * @return {boolean}
+   */
+  Version.prototype.le = function (version) {
+    return this.compare(version) === 0 || this.compare(version) === -1;
+  };
+
+  /**
+   * @param {webfont.Version} version
+   * @return {boolean}
+   */
+  Version.prototype.eq = function (version) {
+    return this.compare(version) === 0;
+  };
+
+  /**
+   * @param {webfont.Version} version
+   * @return {boolean}
+   */
+  Version.prototype.ne = function (version) {
+    return this.compare(version) !== 0;
+  };
+
+  /**
+   * @return {string}
+   */
+  Version.prototype.toString = function () {
+    return [this.major, this.minor || '', this.patch || '', this.build || ''].join('');
+  };
+
+  /**
+   * @param {string} str
+   * @return {!webfont.Version}
+   */
+  Version.parse = function (str) {
+    var match = Version.TOKENIZER.exec(str),
+        major = null,
+        minor = null,
+        patch = null,
+        build = null;
+
+    if (match) {
+      if (!goog.isNull(match[1]) && !!match[1]) {
+        major = parseInt(match[1], 10);
+      }
+
+      if (!goog.isNull(match[2]) && !!match[2]) {
+        minor = parseInt(match[2], 10);
+      }
+
+      if (!goog.isNull(match[3]) && !!match[3]) {
+        patch = parseInt(match[3], 10);
+      }
+
+      if (!goog.isNull(match[4]) && !!match[4]) {
+        if (/^[0-9]+$/.test(match[4])) {
+          build = parseInt(match[4], 10);
+        } else {
+          build = match[4];
+        }
+      }
+    }
+
+    return new Version(major, minor, patch, build);
+  };
+});

data/src/modules.yml

@@ -2,6 +2,7 @@ core:
   - ../tools/compiler/base.js
   - core/domhelper.js
   - core/browserinfo.js
+  - core/version.js
   - core/useragent.js
   - core/useragentparser.js
   - core/cssclassname.js

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.2'
-  s.date              = '2013-04-11'
+  s.version           = '1.4.3'
+  s.date              = '2013-05-16'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -119,6 +119,7 @@ DESC
     spec/core/fontwatchrunner_spec.js
     spec/core/size_spec.js
     spec/core/useragentparser_spec.js
+    spec/core/version_spec.js
     spec/core/webfont_spec.js
     spec/custom/customcss_spec.js
     spec/deps.js
@@ -161,6 +162,7 @@ DESC
     src/core/namespace.js
     src/core/useragent.js
     src/core/useragentparser.js
+    src/core/version.js
     src/core/webfont.js
     src/custom/customcss.js
     src/fontdeck/fontdeck_script.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-11 00:00:00 Z
+date: 2013-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -150,6 +150,7 @@ files:
 - spec/core/fontwatchrunner_spec.js
 - spec/core/size_spec.js
 - spec/core/useragentparser_spec.js
+- spec/core/version_spec.js
 - spec/core/webfont_spec.js
 - spec/custom/customcss_spec.js
 - spec/deps.js
@@ -192,6 +193,7 @@ files:
 - src/core/namespace.js
 - src/core/useragent.js
 - src/core/useragentparser.js
+- src/core/version.js
 - src/core/webfont.js
 - src/custom/customcss.js
 - src/fontdeck/fontdeck_script.js