kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

choose a better default json_encoder if available

Browse source
This commit is contained in:
Konstantin Haase 2011-05-09 08:47:59 +02:00
parent 923e8080af
commit 9f3aeeeb99
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sinatra-contrib/lib/sinatra/json.rb
View file

@ -64,7 +64,13 @@ module Sinatra
end
end
Base.set :json_encoder, Sinatra::JSON
Base.set :json_encoder do
return Yajl::Encoder if defined? Yajl::Encoder
return JSON if defined? JSON
return :to_json if {}.respond_to? :to_json and [].respond_to? :to_json
Sinatra::JSON
end
Base.set :json_content_type, :json
helpers JSON
end

1
sinatra-contrib/spec/json_spec.rb
View file

@ -111,4 +111,5 @@ describe Sinatra::JSON do
describe('JSON') { it_should_behave_like "a json encoder", "json", "::JSON" }
describe('OkJson') { it_should_behave_like "a json encoder", nil, "OkJson" }
describe('to_json') { it_should_behave_like "a json encoder", "json", ":to_json" }
describe('without') { it_should_behave_like "a json encoder", nil, "Sinatra::JSON" }
end