webfontloader 1.5.1 → 1.5.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.5.2 (January 3, 2014)
+* Add Copyright, License and Version to the compiled output file(s)
+* Fix small bug in Google Font module that rejected font variations with dashes
+
 v1.5.1 (October 15, 2013)
 * Dispatch wf-loading event synchronously instead of waiting for asynchronous modules
 * Update README explaining how to use custom fonts without a stylesheet

data/Rakefile

@@ -89,7 +89,7 @@ file "target/webfont.js", [:modules] => SourceJs + ["target"] do |t, args|
   modules = args[:modules].split ' '
 
   output_marker = "%output%"
-  output_wrapper = @modules.js_output_wrapper(output_marker)
+  output_wrapper = @modules.js_output_wrapper(output_marker, version)
 
   args = [
     ["-jar", JsCompilerJar],
@@ -120,13 +120,13 @@ end
 desc "Creates debug version into target/webfont.js"
 task :debug, [:modules] => "target/webfont_debug.js"
 
-file "target/webfont_debug.js", [:modules] => SourceJs + ["target"] do |t|
+file "target/webfont_debug.js", [:modules] => SourceJs + ["target"] do |t, args|
   args.with_defaults(:modules => 'custom google typekit monotype fontdeck')
 
   modules = args[:modules].split ' '
 
   output_marker = "%output%"
-  output_wrapper = @modules.js_output_wrapper(output_marker)
+  output_wrapper = @modules.js_output_wrapper(output_marker, version)
 
   args = [
     ["-jar", JsCompilerJar],

data/lib/webfontloader.rb

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

data/lib/webfontloader/modules.rb

@@ -27,8 +27,8 @@ module WebFontLoader
       end
     end
 
-    def js_output_wrapper(source)
-      File.read(File.join(js_src, "closure.js")).sub("{{source}}", source)
+    def js_output_wrapper(source, version)
+      File.read(File.join(js_src, "closure.js")).sub("{{source}}", source).sub("{{version}}", version)
     end
 
   protected

data/spec/modules/google/fontapiparser_spec.js

@@ -66,6 +66,22 @@ describe('modules.google.FontApiParser', function () {
     });
   });
 
+  describe('variations with dashes', function () {
+    var parser = null;
+
+    beforeEach(function () {
+      parser = new FontApiParser(['Nobile:semi-bold']);
+      parser.parse();
+    });
+
+    it('should parse the variation correctly', function () {
+      var fonts = parser.getFonts();
+
+      expect(fonts.length).toEqual(1);
+      expect(fonts[0]).toEqual(new Font('Nobile', 'n6'));
+    });
+  });
+
   describe('nonsense', function () {
     var parser = null;
 

data/src/closure.js

@@ -1,3 +1,2 @@
-;(function(window,document,undefined){
-{{source}}
-})(this,document);
+/* Web Font Loader v{{version}} - (c) Adobe Systems, Google. License: Apache 2.0 */
+;(function(window,document,undefined){{{source}}})(this,document);

data/src/modules/google/fontapiparser.js

@@ -103,7 +103,7 @@ goog.scope(function () {
   };
 
   FontApiParser.prototype.generateFontVariationDescription_ = function(variation) {
-    if (!variation.match(/^[\w]+$/)) {
+    if (!variation.match(/^[\w-]+$/)) {
       return '';
     }
     var normalizedVariation = variation.toLowerCase();

data/src/modules/google/fontapiurlbuilder.js

@@ -51,7 +51,7 @@ goog.scope(function () {
 
   FontApiUrlBuilder.prototype.build = function() {
     if (this.fontFamilies_.length == 0) {
-      throw new Error('No fonts to load !');
+      throw new Error('No fonts to load!');
     }
     if (this.apiUrl_.indexOf("kit=") != -1) {
       return this.apiUrl_;

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.5.1'
-  s.date              = '2013-10-15'
+  s.version           = '1.5.2'
+  s.date              = '2014-01-03'
 
   ## 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: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-15 00:00:00 Z
+date: 2014-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake