font_assets 0.1.7 → 0.1.8

data/lib/font_assets/middleware.rb

@@ -36,7 +36,7 @@ module FontAssets
     private
 
     def origin
-      if allow_ssl? and ssl_request?
+      if !wildcard_origin? and allow_ssl? and ssl_request?
         uri = URI(@origin)
         uri.scheme = "https"
         uri.to_s
@@ -45,6 +45,10 @@ module FontAssets
       end
     end
 
+    def wildcard_origin?
+      @origin == '*'
+    end
+
     def ssl_request?
       @ssl_request
     end

data/lib/font_assets/version.rb

@@ -1,3 +1,3 @@
 module FontAssets
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/middleware_spec.rb

@@ -39,7 +39,39 @@ describe FontAssets::Middleware do
             its(['Content-Type']) { should == 'application/x-font-ttf' }
           end
         end
-        
+
+      end
+
+      context 'with an app that allows ssl from any origin' do
+        let(:app) { load_app '*', allow_ssl: true }
+
+        context 'and makes an 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 == '*' }
+            its(['Content-Type']) { should == 'application/x-font-ttf' }
+          end
+        end
+
+        context 'and makes an http request' do
+          let(:response) { request app, 'http://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 == '*' }
+            its(['Content-Type']) { should == 'application/x-font-ttf' }
+          end
+        end
       end
 
       context 'with an app with just the origin specified' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: font_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack