font_assets 0.1.3 → 0.1.4

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 *.swp
+bin/

data/lib/font_assets/middleware.rb

@@ -4,15 +4,16 @@ require 'font_assets/mime_types'
 module FontAssets
   class Middleware
 
-    def initialize(app, origin)
+    def initialize(app, origin, options={})
       @app = app
       @origin = origin
+      @options = options
       @mime_types = FontAssets::MimeTypes.new(Rack::Mime::MIME_TYPES)
     end
 
     def access_control_headers
       {
-        "Access-Control-Allow-Origin" => @origin,
+        "Access-Control-Allow-Origin" => origin,
         "Access-Control-Allow-Methods" => "GET",
         "Access-Control-Allow-Headers" => "x-requested-with",
         "Access-Control-Max-Age" => "3628800"
@@ -20,6 +21,7 @@ module FontAssets
     end
 
     def call(env)
+      @ssl_request = env['HTTPS'] == 'on' or env['rack.url_scheme'] == 'https'
       # intercept the "preflight" request
       if env["REQUEST_METHOD"] == "OPTIONS"
         return [200, access_control_headers, []]
@@ -33,6 +35,23 @@ module FontAssets
 
     private
 
+    def origin
+      if allow_ssl? and ssl_request?
+        uri = URI(@origin)
+        uri.scheme = "https"
+        uri.to_s
+      else
+        @origin
+      end
+    end
+
+    def ssl_request?
+      @ssl_request
+    end
+
+    def allow_ssl?
+      @options[:allow_ssl]
+    end
 
     def extension(path)
       "." + path.split("?").first.split(".").last

data/lib/font_assets/version.rb

@@ -1,3 +1,3 @@
 module FontAssets
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/middleware_spec.rb

@@ -9,17 +9,52 @@ describe FontAssets::Middleware do
 
   context 'for GET requests' do
     context 'to font assets' do
-      let(:app) { load_app 'http://test.origin' }
-      let(:response) { request app, '/test.ttf' }
+      context 'with an app that allows ssl' do
+        let(:app) { load_app 'http://test.origin', allow_ssl: true }
+
+        context 'and makes a https request' do
+          let(:response) { request app, 'https://test.origin/test.ttf' }
+
+          context 'the response headers' do
+            subject { response[1] }
+
+            its(["Access-Control-Allow-Headers"]) { should == "x-requested-with" }
+            its(["Access-Control-Max-Age"]) { should == "3628800" }
+            its(['Access-Control-Allow-Methods']) { should == 'GET' }
+            its(['Access-Control-Allow-Origin']) { should == 'https://test.origin' }
+            its(['Content-Type']) { should == 'application/x-font-ttf' }
+          end
+        end
+
+        context 'and makes a http request' do
+          let(:response) { request app, '/test.ttf' }
+
+          context 'the response headers' do
+            subject { response[1] }
+
+            its(["Access-Control-Allow-Headers"]) { should == "x-requested-with" }
+            its(["Access-Control-Max-Age"]) { should == "3628800" }
+            its(['Access-Control-Allow-Methods']) { should == 'GET' }
+            its(['Access-Control-Allow-Origin']) { should == 'http://test.origin' }
+            its(['Content-Type']) { should == 'application/x-font-ttf' }
+          end
+        end
+        
+      end
 
-      context 'the response headers' do
-        subject { response[1] }
+      context 'with an app with just the origin specified' do
+        let(:app) { load_app 'http://test.origin' }
+        let(:response) { request app, '/test.ttf' }
+
+        context 'the response headers' do
+          subject { response[1] }
 
-        its(["Access-Control-Allow-Headers"]) { should == "x-requested-with" }
-        its(["Access-Control-Max-Age"]) { should == "3628800" }
-        its(['Access-Control-Allow-Methods']) { should == 'GET' }
-        its(['Access-Control-Allow-Origin']) { should == 'http://test.origin' }
-        its(['Content-Type']) { should == 'application/x-font-ttf' }
+          its(["Access-Control-Allow-Headers"]) { should == "x-requested-with" }
+          its(["Access-Control-Max-Age"]) { should == "3628800" }
+          its(['Access-Control-Allow-Methods']) { should == 'GET' }
+          its(['Access-Control-Allow-Origin']) { should == 'http://test.origin' }
+          its(['Content-Type']) { should == 'application/x-font-ttf' }
+        end
       end
     end
 
@@ -66,8 +101,8 @@ describe FontAssets::Middleware do
   private
 
 
-  def load_app(origin = 'http://test.local')
-    FontAssets::Middleware.new(inner_app, origin)
+  def load_app(origin = 'http://test.local', options={})
+    FontAssets::Middleware.new(inner_app, origin, options)
   end
 
   def inner_app

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: font_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack