rack-cors 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/rack/cors.rb

@@ -120,7 +120,7 @@ module Rack
         def initialize(public_resource, path, opts={})
           self.path        = path
           self.methods     = ensure_enum(opts[:methods]) || [:get]
-          self.credentials = opts[:credentials] || true
+          self.credentials = opts[:credentials].nil? ? true : opts[:credentials]
           self.max_age     = opts[:max_age] || 1728000
           self.pattern     = compile(path)
           @public_resource = public_resource
@@ -146,7 +146,7 @@ module Rack
 
         def to_headers(env)
           x_origin = env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']
-          h = { 'Access-Control-Allow-Origin' => public_resource? ? '*' : env['HTTP_ORIGIN'],
+          h = { 'Access-Control-Allow-Origin' => credentials ? env['HTTP_ORIGIN'] : public_resource? ? '*' : env['HTTP_ORIGIN'],
             'Access-Control-Allow-Methods'    => methods.collect{|m| m.to_s.upcase}.join(', '),
             'Access-Control-Expose-Headers'   => expose.nil? ? '' : expose.join(', '),
             'Access-Control-Max-Age'          => max_age.to_s }

data/rack-cors.gemspec

@@ -1,51 +1,47 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rack-cors}
-  s.version = "0.2.4"
+  s.name = "rack-cors"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Calvin Yu"]
-  s.date = %q{2011-06-04}
-  s.description = %q{Middleware that will make Rack-based apps CORS compatible.  Read more here: http://blog.sourcebender.com/2010/06/09/introducin-rack-cors.html.  Fork the project here: http://github.com/cyu/rack-cors}
-  s.email = %q{csyu77@gmail.com}
+  s.date = "2012-04-26"
+  s.description = "Middleware that will make Rack-based apps CORS compatible.  Read more here: http://blog.sourcebender.com/2010/06/09/introducin-rack-cors.html.  Fork the project here: http://github.com/cyu/rack-cors"
+  s.email = "csyu77@gmail.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rack/cors.rb",
-     "rack-cors.gemspec",
-     "test/cors_test.rb",
-     "test/dsl_test.rb",
-     "test/test.ru"
-  ]
-  s.homepage = %q{http://github.com/cyu/rack-cors}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Middleware for enabling Cross-Origin Resource Sharing in Rack apps}
-  s.test_files = [
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rack/cors.rb",
+    "rack-cors.gemspec",
     "test/cors_test.rb",
-     "test/dsl_test.rb"
+    "test/dsl_test.rb",
+    "test/test.ru"
   ]
+  s.homepage = "http://github.com/cyu/rack-cors"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Middleware for enabling Cross-Origin Resource Sharing in Rack apps"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack-cors>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
     else
+      s.add_dependency(%q<rack-cors>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rack-cors>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
   end
 end

data/test/cors_test.rb

@@ -87,6 +87,12 @@ class CorsTest < Test::Unit::TestCase
     should '* origin should allow any origin' do
       preflight_request('http://locohost:3000', '/public')
       assert_cors_success
+      assert_equal 'http://locohost:3000', last_response.headers['Access-Control-Allow-Origin']
+    end
+
+    should '* origin should allow any origin, and set * if no credentials required' do
+      preflight_request('http://locohost:3000', '/public_without_credentials')
+      assert_cors_success
       assert_equal '*', last_response.headers['Access-Control-Allow-Origin']
     end
 
@@ -127,4 +133,4 @@ class CorsTest < Test::Unit::TestCase
     def assert_cors_failure
       assert_nil last_response.headers['Access-Control-Allow-Origin'], 'no expecting Access-Control-Allow-Origin header'
     end
-end
+end

data/test/test.ru

@@ -19,9 +19,10 @@ use Rack::Cors do
   allow do
     origins '*'
     resource '/public'
+    resource '/public_without_credentials', :credentials => false
   end
 end
 
 map '/' do
   run Proc.new { |env| [200, {'Content-Type' => 'text/html'}, ['success']] }
-end
+end

metadata

@@ -1,47 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-cors
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+version: !ruby/object:Gem::Version
+  version: 0.2.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Calvin Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-04 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
+date: 2012-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack-cors
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: "Middleware that will make Rack-based apps CORS compatible.  Read more here: http://blog.sourcebender.com/2010/06/09/introducin-rack-cors.html.  Fork the project here: http://github.com/cyu/rack-cors"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Middleware that will make Rack-based apps CORS compatible.  Read more
+  here: http://blog.sourcebender.com/2010/06/09/introducin-rack-cors.html.  Fork the
+  project here: http://github.com/cyu/rack-cors'
 email: csyu77@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
-- .gitignore
+files:
 - README.rdoc
 - Rakefile
 - VERSION
@@ -50,40 +60,28 @@ files:
 - test/cors_test.rb
 - test/dsl_test.rb
 - test/test.ru
-has_rdoc: true
 homepage: http://github.com/cyu/rack-cors
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Middleware for enabling Cross-Origin Resource Sharing in Rack apps
-test_files: 
-- test/cors_test.rb
-- test/dsl_test.rb
+test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-pkg
-Gemfile.lock