sinatra-cross_origin 0.2.0 → 0.3.1

data/README.markdown

@@ -2,8 +2,8 @@
 A simple Sinatra extension to enable Cross Domain Resource Sharing (CORS)
 To see more on cross domain resource sharing, see https://developer.mozilla.org/En/HTTP_access_control
 
-## Installation
-    sudo gem install sinatra-cross_origin
+## Installation with Bundler
+    `gem sinatra-cross_origin`
 
 ## Examples
 
@@ -31,6 +31,7 @@ You can set global options via the normal Sinatra set method:
     set :allow_methods, [:get, :post, :options]
     set :allow_credentials, true
     set :max_age, "1728000"
+    set :expose_headers, ['Content-Type']
 
 You can change configuration options on the fly within routes with:
     

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/lib/sinatra/cross_origin.rb

@@ -31,11 +31,18 @@ module Sinatra
 
         origin = settings.allow_origin == :any ? request.env['HTTP_ORIGIN'] : settings.allow_origin
         methods = settings.allow_methods.map{ |m| m.to_s.upcase! }.join(', ')
+        expose_headers = settings.expose_headers || %w(Cache-Control Content-Language Content-Type Expires Last-Modified Pragma)
 
-        headers 'Access-Control-Allow-Origin' => origin,
+        headers_list = {
+          'Access-Control-Allow-Origin' => origin,
           'Access-Control-Allow-Methods' => methods,
+          'Access-Control-Allow-Headers' => settings.allow_headers.map(&:to_s).join(', '),
           'Access-Control-Allow-Credentials' => settings.allow_credentials.to_s,
-          'Access-Control-Max-Age' => settings.max_age.to_s 
+          'Access-Control-Max-Age' => settings.max_age.to_s,
+          'Access-Control-Expose-Headers' => expose_headers.join(', ')
+        }
+
+        headers headers_list
       end
     end
 
@@ -47,9 +54,9 @@ module Sinatra
       app.set :allow_origin, :any
       app.set :allow_methods, [:post, :get, :options]
       app.set :allow_credentials, true
+      app.set :allow_headers, ["*", "Content-Type", "Accept", "AUTHORIZATION", "Cache-Control"]
       app.set :max_age, 1728000
 
-
       app.before do 
         cross_origin if settings.cross_origin
       end

data/sinatra-cross_origin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sinatra-cross_origin"
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brit Gardner"]
-  s.date = "2012-07-19"
+  s.date = "2013-12-30"
   s.description = "Cross Origin Resource Sharing helper for Sinatra"
   s.email = "brit@britg.com"
   s.extra_rdoc_files = [
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/britg/sinatra-cross_origin"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.25"
   s.summary = "Cross Origin Resource Sharing helper for Sinatra"
 
   if s.respond_to? :specification_version then

data/test/app/test_app.rb

@@ -31,6 +31,11 @@ class TestApp < Sinatra::Base
     "Allowing methods"
   end
 
+  get '/allow_headers' do
+    cross_origin :allow_headers => params[:allow_headers]
+    "Allowing headers"
+  end
+
   get '/dont_allow_credentials' do
     cross_origin :allow_credentials => false
     "Not allowing credentials"

data/test/test_all.rb

@@ -14,6 +14,7 @@ class HelloTest < Test::Unit::TestCase
     assert_equal 'POST, GET, OPTIONS', last_response.headers['Access-Control-Allow-Methods']
     assert_equal 'true', last_response.headers['Access-Control-Allow-Credentials']
     assert_equal "1728000", last_response.headers['Access-Control-Max-Age']
+    assert_equal false, last_response.headers.has_key?('Access-Control-Allow-Headers')
   end
 
   def test_it_says_hello
@@ -46,6 +47,12 @@ class HelloTest < Test::Unit::TestCase
     assert_equal 'GET, POST', last_response.headers['Access-Control-Allow-Methods']
   end
 
+  def test_allow_headers
+    get '/allow_headers', {:allow_headers=>['Content-Type', 'Origin', 'Accept']}, {'HTTP_ORIGIN' => 'http://localhost'}
+    assert last_response.ok?
+    assert_equal 'Content-Type, Origin, Accept', last_response.headers['Access-Control-Allow-Headers']
+  end
+
   def test_dont_allow_credentials
     get '/dont_allow_credentials', {}, {'HTTP_ORIGIN' => 'http://localhost'}
     assert last_response.ok?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cross_origin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies: []
 description: Cross Origin Resource Sharing helper for Sinatra
 email: brit@britg.com
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cross Origin Resource Sharing helper for Sinatra