rack-cors 0.2.0 → 0.2.2

data/README.rdoc

@@ -13,6 +13,10 @@ http://www.w3.org/TR/access-control/#simple-cross-origin-request-and-actual-r
 Install the gem:
 
   gem install rack-cors
+  
+In your Gemfile:
+
+  gem 'rack-cors', :require => 'rack/cors'
 
 
 == Configuration

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/rack/cors.rb

@@ -43,7 +43,7 @@ module Rack
     protected
       def debug(env, message = nil, &block)
         logger = @logger || env['rack.logger'] || begin
-          @logger = ::Logger.new(STDOUT).tap {|logger| logger.level = ::Logger::Severity::DEBUG}
+          @logger = ::Logger.new(STDOUT).tap {|logger| logger.level = ::Logger::Severity::INFO}
         end
         logger.debug(message, &block)
       end
@@ -129,7 +129,7 @@ module Rack
 
         def process_preflight(env)
           return nil if invalid_method_request?(env) || invalid_headers_request?(env)
-          to_preflight_headers(env)
+          {'Content-Type' => 'text/plain'}.merge(to_preflight_headers(env))
         end
 
         def to_headers(env)
@@ -165,7 +165,10 @@ module Rack
 
           def allow_headers?(request_headers)
             return false if headers.nil?
-            headers == :any || !request_headers.detect{|h| !headers.include?(h.downcase)}
+            headers == :any || begin
+              request_headers = request_headers.split(/,\s*/) if request_headers.kind_of?(String)
+              request_headers.all?{|h| headers.include?(h.downcase)}
+            end
           end
 
           def ensure_enum(v)

data/rack-cors.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-cors}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Calvin Yu"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-08-26}
   s.email = %q{csyu77@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"

data/test/cors_test.rb

@@ -51,11 +51,27 @@ class CorsTest < Test::Unit::TestCase
       assert_preflight_success
     end
 
+    should 'allow multiple headers match' do
+      # Webkit style
+      preflight_request('http://localhost:3000', '/two_headers', :headers => 'X-Requested-With, X-Domain-Token')
+      assert_preflight_success
+
+      # Gecko style
+      preflight_request('http://localhost:3000', '/two_headers', :headers => 'x-requested-with,x-domain-token')
+      assert_preflight_success
+    end
+
     should '* origin should allow any origin' do
       preflight_request('http://locohost:3000', '/public')
       assert_preflight_success
       assert_equal '*', last_response.headers['Access-Control-Allow-Origin']
     end
+
+    should 'return a Content-Type' do
+      preflight_request('http://localhost:3000', '/')
+      assert_preflight_success
+      assert_not_nil last_response.headers['Content-Type']
+    end
   end
 
   protected
@@ -65,7 +81,7 @@ class CorsTest < Test::Unit::TestCase
         header 'Access-Control-Request-Method', opts[:method] ? opts[:method].to_s.upcase : 'GET'
       end
       if opts[:headers]
-        header 'Access-Control-Request-Headers', [opts[:headers]].flatten.join(', ')
+        header 'Access-Control-Request-Headers', opts[:headers]
       end
       options path
     end

data/test/test.ru

@@ -7,6 +7,7 @@ use Rack::Cors do |cfg|
     allow.resource '/get-only', :methods => :get
     allow.resource '/', :headers => :any
     allow.resource '/single_header', :headers => 'x-domain-token'
+    allow.resource '/two_headers', :headers => %w{x-domain-token x-requested-with}
     # allow.resource '/file/at/*',
     #     :methods => [:get, :post, :put, :delete],
     #     :headers => :any,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-cors
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Calvin Yu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: []