From aefc1cd8bbcce11a38ede5da5204f53e18d920c2 Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Tue, 25 Mar 2014 18:02:24 +0000 Subject: [PATCH 1/2] dup and use a private call method To allow this gem to be used in threaded web servers. --- lib/font_assets/middleware.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/font_assets/middleware.rb b/lib/font_assets/middleware.rb index 32dc028..7905d6e 100644 --- a/lib/font_assets/middleware.rb +++ b/lib/font_assets/middleware.rb @@ -21,6 +21,12 @@ def access_control_headers end def call(env) + dup.__call(env) + end + + private + + def __call(env) @ssl_request = Rack::Request.new(env).scheme == "https" # intercept the "preflight" request if env["REQUEST_METHOD"] == "OPTIONS" @@ -32,9 +38,6 @@ def call(env) end end - - private - def origin if !wildcard_origin? and allow_ssl? and ssl_request? uri = URI(@origin) From 61d73f7085106c6b2881802d09994c73178f060e Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Tue, 25 Mar 2014 18:14:26 +0000 Subject: [PATCH 2/2] ooops, that shouldn't have been private! --- lib/font_assets/middleware.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/font_assets/middleware.rb b/lib/font_assets/middleware.rb index 7905d6e..16139ca 100644 --- a/lib/font_assets/middleware.rb +++ b/lib/font_assets/middleware.rb @@ -24,8 +24,6 @@ def call(env) dup.__call(env) end - private - def __call(env) @ssl_request = Rack::Request.new(env).scheme == "https" # intercept the "preflight" request @@ -37,6 +35,8 @@ def __call(env) [code, headers, body] end end + + private def origin if !wildcard_origin? and allow_ssl? and ssl_request?