webfontloader 1.0.20 → 1.0.21

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.0.21 (June 17, 2011)
+* Added a protocol detect for the Typekit module so JS is loaded securely on
+secure pages. Thanks to bee525 for the pull request.
+
 v1.0.20 (March 30, 2011)
 * Changed CSS style for hidden span so it's not affected by inline or floated elements at the end of the body
 

data/lib/webfontloader.rb

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

data/src/typekit/typekit_script.js

@@ -13,7 +13,8 @@ webfont.TypekitScript.NAME = 'typekit';
 webfont.TypekitScript.HOOK = '__webfonttypekitmodule__';
 
 webfont.TypekitScript.prototype.getScriptSrc = function(kitId) {
-  var api = this.configuration_['api'] || 'http://use.typekit.com';
+  var protocol = 'https:' == window.location.protocol ? 'https:' : 'http:';
+  var api = this.configuration_['api'] || protocol + '//use.typekit.com';
   return api + '/' + kitId + '.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.0.20'
-  s.date              = '2011-03-30'
+  s.version           = '1.0.21'
+  s.date              = '2011-06-17'
 
   ## 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: 63
-  prerelease: false
+  hash: 61
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 20
-  version: 1.0.20
+  - 21
+  version: 1.0.21
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -07:00
+date: 2011-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +32,11 @@ dependencies:
         - 2
         - 1
         version: 1.2.1
-  type: :development
+  name: rack
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +47,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :development
+  name: sinatra
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: vegas
-  prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,7 +63,8 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
-  type: :development
+  name: vegas
+  prerelease: false
   version_requirements: *id003
 description: |
   WebFont Loader gives you added control when using linked fonts via
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: WebFont Loader gives you added control when using linked fonts via @font-face.