Merge pull request #199 from jwhitcraft/woff2

Woff2 Support

Author: j15e

Gemfile

@@ -10,7 +10,7 @@ end
 group :test do
   gem 'contest'
   gem 'rake'
-  gem 'mocha'
+  gem 'mocha', '0.14.0'
 end
 
 gemspec

Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    rack (1.5.2)
+    rack (1.6.4)
     rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
@@ -69,7 +69,7 @@ DEPENDENCIES
   gem-release
   haml
   less
-  mocha
+  mocha (= 0.14.0)
   rake
   sass
   sinatra-assetpack!

lib/sinatra/assetpack.rb

@@ -10,7 +10,7 @@ def self.registered(app)
     # Returns a list of formats that can be served.
     # Anything not in this list will be rejected.
     def self.supported_formats
-      @supported_formats ||= %w(css js png jpg gif svg otf eot ttf woff htc ico)
+      @supported_formats ||= %w(css js png jpg gif svg otf eot ttf woff woff2 htc ico)
     end
 
     # Returns a map of what MIME format each Tilt type returns.

test/app/app/fonts/cantarell-regular-webfont.woff2

@@ -50,4 +50,9 @@ class AppTest < UnitTest
     get '/fonts/cantarell-regular-webfont.woff'
     assert last_response.content_type =~ %r[^application/font-woff]
   end
+  
+  test 'woff2' do
+    get '/fonts/cantarell-regular-webfont.woff2'
+    assert last_response.content_type =~ %r[^application/font-woff2]
+  end
 end