jsonatra 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0d8d44af79ab5cf6dee75d62af27c876641e24f
-  data.tar.gz: 0968b006ea9a44217ed38cff192626f862c73999
+  metadata.gz: b70ca65553dfbc643e303901211b596bd20fde62
+  data.tar.gz: 2ab473350a070324ea3cf5d910504f1e6a9d46bd
 SHA512:
-  metadata.gz: 055915bb1afe2f636053cb156a6dea217ed6271e8400c3c7394b15c9fd47b72e76fad56eb10bcae9c86f60fbd9e177e6f9cd4213bdf10690e4d892c18806e35e
-  data.tar.gz: 290faa9e84a16a0356bc6e00bc966ae02ed922607c8d20309c61a5bb7bdef0421f4a3c8b700d078b12e777fa6b5658da8d632769d306d5b11a48f436039eb753
+  metadata.gz: 155a4953fce08b0e2fa2258c35bc8b1b0645af5dae81b4ddff2b64e43d01d77737f447f5420b31bb35ba1a8151231bd470e9de824ad40aa4d1eeb6ab4e023ac2
+  data.tar.gz: 56252f3bc023931b56796287934597611d80032744e93fe79d743c1344fdc4f65d5fb1685edede05324cc2173f8c9e4186bfd5bd982c9f491ab2705999cded68

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - jruby-19mode
-  - rbx-19mode
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby

data/lib/jsonatra/version.rb

@@ -1,3 +1,3 @@
 module Jsonatra
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/jsonatra.rb

@@ -52,15 +52,6 @@ module Jsonatra
 
     before do
 
-      # default to Content-Type to JSON, or javascript if request is JSONP
-      #
-      content_type :json
-      unless params[:callback].nil? or params[:callback] == ''
-        halt param_error(:callback, :invalid, 'invalid callback') if params[:callback].index('"')
-        response.jsonp_callback = params[:callback]
-        content_type :js
-      end
-
       # grok access control headers
       #
       achs = begin
@@ -79,6 +70,15 @@ module Jsonatra
       #
       achs.each {|k,v| headers[k] = v}
 
+      # default to Content-Type to JSON, or javascript if request is JSONP
+      #
+      content_type :json
+      unless params[:callback].nil? or params[:callback] == ''
+        halt param_error(:callback, :invalid, 'invalid callback') if params[:callback].index('"')
+        response.jsonp_callback = params[:callback]
+        content_type :js
+      end
+
     end
 
     after do

data/test/jsonatra_spec.rb

@@ -108,6 +108,19 @@ describe Jsonatra::Base do
       end
     end
 
+    it 'responds with CORS headers even when content-type is mismatched' do
+      params = {foo: 'bar'}.to_json
+      [:get, :post].each do |meth|
+        __send__ meth, '/', params, { 'Content-Type' => 'application/x-www-form-urlencoded' }
+        last_response.headers.keys.must_include 'Access-Control-Allow-Origin'
+        last_response.headers['Access-Control-Allow-Origin'].must_equal '*'
+        last_response.headers.keys.must_include 'Access-Control-Allow-Headers'
+        last_response.headers['Access-Control-Allow-Headers'].must_equal 'Accept, Authorization, Content-Type, Origin'
+        last_response.headers.keys.must_include 'Access-Control-Allow-Methods'
+        last_response.headers['Access-Control-Allow-Methods'].must_equal 'GET, POST'
+      end
+    end
+
   end
 
   describe 'access_control_headers' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonatra
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra