sinatra-cors 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f7b70ae703eb840d9b0b7fdb6dba3da07ee847
-  data.tar.gz: 71b050ddd584a746ad40cccb75308a02a2366264
+  metadata.gz: eec892821ef7e4305cc56e5e4861d15d367c4a7a
+  data.tar.gz: 382419f5dbe192cf489979dcf88304c63d1cf5a6
 SHA512:
-  metadata.gz: 8481507d524e29b50e08bb443303b35df5ae9a05586f4a47e48538acda6957ad136768a252d39c854d64e159d3b087343e7546e046e53144fe4797776c89aeaf
-  data.tar.gz: 1239d45d41eb109b7561bd067c822de2f33cebe4c7197eac4fe1aa71c62d2992136867caf95f745749865fa63b0a79e0136c614dcee967f3d998081c8a761630
+  metadata.gz: bd68aca87befc236ed071d832fa57c1af7ad662aa857d5b5a90c516022d878b311c77d5fd35ed31dcaec37d6705d36a05703859326961b94a984ef8ae7160908
+  data.tar.gz: 2047c36bce901140d5c65724715644492509e60b264b4947115547c85b32481575c3ca08e304cbab131158be73fb4bde11c9570f5437bd698a2783725abbe94a

data/lib/sinatra/cors.rb

@@ -16,8 +16,8 @@ module Sinatra
               return
             end
 
-            response.headers["Access-Control-Allow-Headers"] = request.env["HTTP_ACCESS_CONTROL_REQUEST_HEADERS"]
-            response.headers["Access-Control-Allow-Methods"] = request.env["HTTP_ACCESS_CONTROL_REQUEST_METHOD"]
+            response.headers["Access-Control-Allow-Headers"] = request_headers if request_headers
+            response.headers["Access-Control-Allow-Methods"] = request_method
             response.headers["Access-Control-Max-Age"] = settings.max_age if settings.max_age?
           else
             response.headers["Access-Control-Expose-Headers"] = settings.expose_headers if settings.expose_headers?
@@ -68,7 +68,15 @@ module Sinatra
           end
         end
 
-        matches
+        matches.uniq
+      end
+
+      def request_headers
+        request.env["HTTP_ACCESS_CONTROL_REQUEST_HEADERS"]
+      end
+
+      def request_method
+        request.env["HTTP_ACCESS_CONTROL_REQUEST_METHOD"]
       end
 
       private
@@ -88,7 +96,10 @@ to requests with these headers, you can add them to the `allow_headers` sinatra
       end
 
       def bad_origin_message
-        "This CORS request was rejected because the client is making the request from '#{request.env["HTTP_ORIGIN"]}', but the server only allows requests from '#{settings.allow_origin}'.  To allow the server to respond to requests from this origin, you can add it to the `allow_origin` sinatra setting."
+        "This CORS request was rejected because the client is making the request from \
+'#{request.env["HTTP_ORIGIN"]}', but the server only allows requests from '#{settings.allow_origin}'.  \
+To allow the server to respond to requests from this origin, you can add it to the `allow_origin` \
+sinatra setting."
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cors
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jason Desrosiers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies: []
 description: 'This Sinatra plugin supports the full CORS spec including automatic
   support for CORS preflight (OPTIONS) requests.  It uses CORS security best practices.  The
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: CORS support for Sinatra applications