webfontloader 1.4.7 → 1.4.8

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.4.8 (June 24, 2013)
+* Add support for the Chromium based Opera browser
+* Change the debug task to do a Closure Compiler debug build
+* Fix a global variable leak in the compiled output
+* Add support for the PhantomJS user agent string
+
 v1.4.7 (June 6, 2013)
 * Fix backwards compatibility with version strings for Chrome
 * Restore specs that test against version strings for backwards compatibility with the old UserAgent API.

data/README.md

@@ -24,7 +24,7 @@ Web Font Loader gives you added control when using linked fonts via `@font-face`
 
 To use the Web Font Loader library, just include it in your page and tell it which fonts to load. For example, you could load fonts from [Google Fonts](http://www.google.com/fonts/) using the Web Font Loader hosted on [Google Hosted Libraries](https://developers.google.com/speed/libraries/) using the following code.
 
-    <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.2/webfont.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
     <script>
       WebFont.load({
         google: {
@@ -33,7 +33,7 @@ To use the Web Font Loader library, just include it in your page and tell it whi
       });
     </script>
 
-Alternatively, you can link to the latest `1.x` version of the Web Font Loader by using `//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js` as the `script` source. Note that the version in this url is less specific. It will always load the latest `1.x` version, but it also has a shorter cache time to ensure that your page gets updates in a timely manner. For performance reasons, we recommend using an explicit version number (such as `1.4.2`) in urls when using the Web Font Loader in production. You can manually update the Web Font Loader version number in the url when you want to adopt a new version.
+Alternatively, you can link to the latest `1.x` version of the Web Font Loader by using `//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js` as the `script` source. Note that the version in this url is less specific. It will always load the latest `1.x` version, but it also has a shorter cache time to ensure that your page gets updates in a timely manner. For performance reasons, we recommend using an explicit version number (such as `1.4.7`) in urls when using the Web Font Loader in production. You can manually update the Web Font Loader version number in the url when you want to adopt a new version.
 
 It is also possible to use the Web Font Loader asynchronously. For example, to load [Typekit](http://www.typekit.com) fonts asynchronously, you could use the following code.
 
@@ -45,7 +45,7 @@ It is also possible to use the Web Font Loader asynchronously. For example, to l
       (function() {
         var wf = document.createElement('script');
         wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
-            '://ajax.googleapis.com/ajax/libs/webfont/1.4.2/webfont.js';
+            '://ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js';
         wf.type = 'text/javascript';
         wf.async = 'true';
         var s = document.getElementsByTagName('script')[0];

data/Rakefile

@@ -95,7 +95,8 @@ file "target/webfont.js" => SourceJs + ["target"] do |t|
     "--generate_exports",
     ["--output_wrapper", %("#{output_wrapper}")],
     ["--warning_level", "VERBOSE"],
-    ["--summary_detail_level", "3"]
+    ["--summary_detail_level", "3"],
+    "--define goog.DEBUG=false"
   ]
 
   # Extra args to add warnings.
@@ -115,12 +116,34 @@ desc "Creates debug version into target/webfont.js"
 task :debug => "target/webfont_debug.js"
 
 file "target/webfont_debug.js" => SourceJs + ["target"] do |t|
-  File.open(t.name, "w") { |f|
-    @modules.all_source_files.each { |src|
-      f.puts File.read(src)
-      f.puts ""
-    }
-  }
+
+  output_marker = "%output%"
+  output_wrapper = @modules.js_output_wrapper(output_marker)
+
+  args = [
+    ["-jar", JsCompilerJar],
+    ["--compilation_level", "ADVANCED_OPTIMIZATIONS"],
+    ["--js_output_file", t.name],
+    "--generate_exports",
+    ["--output_wrapper", %("#{output_wrapper}")],
+    ["--warning_level", "VERBOSE"],
+    ["--summary_detail_level", "3"],
+    "--debug=true",
+    "--formatting=PRETTY_PRINT",
+    "--formatting=PRINT_INPUT_DELIMITER"
+  ]
+
+  # Extra args to add warnings.
+  args.concat([
+    ["--warning_level", "VERBOSE"],
+    ["--summary_detail_level", "1"]
+  ])
+
+  source = @modules.all_source_files
+  args.concat source.map { |f| ["--js", f] }
+
+  output = `java #{args.flatten.join(' ')} 2>&1`
+  $?.success? ? (puts output) : (fail output)
 end
 
 #

data/lib/webfontloader.rb

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

data/spec/core/useragentparser_spec.js

@@ -1222,6 +1222,27 @@ describe('UserAgentParser', function () {
           }
         });
       });
+
+      it('should detect Opera Next (15)', function () {
+        expect(parse('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.20 Safari/537.36  OPR/15.0.1147.18 (Edition Next)'))
+        .toMatchUserAgent({
+          name: 'Opera',
+          parsedVersion: new Version(15, 0, 1147, 18),
+          version: '15.0.1147.18',
+          platform: 'Macintosh',
+          parsedPlatformVersion: new Version(10, 8, 3),
+          platformVersion: '10_8_3',
+          engine: 'AppleWebKit',
+          parsedEngineVersion: new Version(537, 36),
+          engineVersion: '537.36',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: true
+          }
+        });
+      });
     });
 
     describe('WebKit fallback bug', function () {
@@ -1429,5 +1450,28 @@ describe('UserAgentParser', function () {
         });
       });
     });
+
+    describe('PhantomJS', function () {
+      it('should detect PhantomJS as having web font support', function () {
+        expect(parse('Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.0 (development) Safari/534.34'))
+        .toMatchUserAgent({
+          name: 'PhantomJS',
+          parsedVersion: new Version(1, 9, 0),
+          version: '1.9.0',
+          platform: 'Macintosh',
+          parsedPlatformVersion: new Version(),
+          platformVersion: 'Unknown',
+          engine: 'AppleWebKit',
+          parsedEngineVersion: new Version(534, 34),
+          engineVersion: '534.34',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
+          }
+        });
+      });
+    });
   });
 });

data/spec/index.html

@@ -13,7 +13,10 @@
     <link rel="stylesheet" href="fonts/sourcesansc.css">
     <link rel="stylesheet" href="fonts/sourcesanscbold.css">
  </head>
-  <body>
+ <body>
+    <script>
+      CLOSURE_NO_DEPS = true;
+    </script>
     <script src="../tools/jasmine/jasmine.js"></script>
     <script src="../tools/jasmine/jasmine-html.js"></script>
     <script src="../tools/jasmine-phantomjs/terminal-reporter.js"></script>

data/src/core/useragentparser.js

@@ -60,8 +60,10 @@ goog.scope(function () {
   UserAgentParser.prototype.parse = function() {
     if (this.isIe_()) {
       return this.parseIeUserAgentString_();
+    } else if (this.isOldOpera_()) {
+      return this.parseOldOperaUserAgentString_();
     } else if (this.isOpera_()) {
-      return this.parseOperaUserAgentString_();
+      return this.parseWebKitUserAgentString_();
     } else if (this.isWebKit_()) {
       return this.parseWebKitUserAgentString_();
     } else if (this.isGecko_()) {
@@ -175,14 +177,21 @@ goog.scope(function () {
   /**
    * @private
    */
-  UserAgentParser.prototype.isOpera_ = function() {
+  UserAgentParser.prototype.isOldOpera_ = function() {
     return this.userAgent_.indexOf("Opera") != -1;
   };
 
   /**
    * @private
    */
-  UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
+  UserAgentParser.prototype.isOpera_ = function () {
+    return /OPR\/[\d.]+/.test(this.userAgent_);
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.parseOldOperaUserAgentString_ = function() {
     var engineName = UserAgentParser.UNKNOWN,
         engineVersionString = this.getMatchingGroup_(this.userAgent_, /Presto\/([\d\w\.]+)/, 1),
         engineVersion = Version.parse(engineVersionString),
@@ -295,7 +304,9 @@ goog.scope(function () {
         browserVersionString = UserAgentParser.UNKNOWN,
         supportWebFont = false;
 
-    if (this.userAgent_.indexOf("Chrome") != -1 ||
+    if (/OPR\/[\d.]+/.test(this.userAgent_)) {
+      browserName = "Opera";
+    } else if (this.userAgent_.indexOf("Chrome") != -1 ||
         this.userAgent_.indexOf("CrMo") != -1 ||
         this.userAgent_.indexOf("CriOS") != -1) {
       browserName = "Chrome";
@@ -303,6 +314,8 @@ goog.scope(function () {
       browserName = "Silk";
     } else if (platform == "BlackBerry" || platform == "Android") {
       browserName = UserAgentParser.BUILTIN_BROWSER;
+    } else if (this.userAgent_.indexOf("PhantomJS") != -1) {
+      browserName = "PhantomJS";
     } else if (this.userAgent_.indexOf("Safari") != -1) {
       browserName = "Safari";
     } else if (this.userAgent_.indexOf("AdobeAIR") != -1) {
@@ -319,6 +332,10 @@ goog.scope(function () {
       browserVersionString = this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.\w]+)/, 1);
     } else if (browserName == "AdobeAIR") {
       browserVersionString = this.getMatchingGroup_(this.userAgent_, /AdobeAIR\/([\d\.]+)/, 1);
+    } else if (browserName == "Opera") {
+      browserVersionString = this.getMatchingGroup_(this.userAgent_, /OPR\/([\d.]+)/, 1);
+    } else if (browserName == "PhantomJS") {
+      browserVersionString = this.getMatchingGroup_(this.userAgent_, /PhantomJS\/([\d.]+)/, 1);
     }
     browserVersion = Version.parse(browserVersionString);
 

data/tools/compiler/base.js

@@ -375,7 +375,7 @@ goog.global.CLOSURE_BASE_PATH;
  * the deps are written.
  * @type {boolean|undefined}
  */
-goog.global.CLOSURE_NO_DEPS = true;
+goog.global.CLOSURE_NO_DEPS;
 
 
 /**

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.7'
-  s.date              = '2013-06-06'
+  s.version           = '1.4.8'
+  s.date              = '2013-06-24'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 4
-  - 7
-  version: 1.4.7
+  - 8
+  version: 1.4.8
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-06 00:00:00 Z
+date: 2013-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake