JSON generator binded to C

1.0
Fernando Blat 14 years ago
parent 6f55d5e271
commit 3ed05bacb7

@ -21,6 +21,7 @@ gem "aws-ses", "0.4.1", :require => "aws/ses"
gem "rubyzip", :require => "zip/zip"
gem "redis"
gem "resque"
gem "yajl-ruby", :require => "yajl"
group :development do
gem "capistrano"

@ -219,6 +219,7 @@ GEM
xml-simple (1.0.15)
xpath (0.1.3)
nokogiri (~> 1.3)
yajl-ruby (0.8.2)
PLATFORMS
ruby
@ -257,3 +258,4 @@ DEPENDENCIES
timecop
warden
webrat
yajl-ruby

@ -21,7 +21,7 @@ class Api::Json::QueriesController < Api::ApplicationController
respond_to do |format|
format.json do
@to_log = params[:sql]
render :json => current_user.run_query(params[:sql]).to_json, :callback => params[:callback]
render :json => Yajl::Encoder.encode(current_user.run_query(params[:sql])), :callback => params[:callback]
end
end
rescue CartoDB::ErrorRunningQuery => e

@ -8,7 +8,7 @@ class Api::Json::RecordsController < Api::ApplicationController
before_filter :load_table
def index
render :json => @table.records(params.slice(:page, :rows_per_page)).to_json,
render :json => Yajl::Encoder.encode(@table.records(params.slice(:page, :rows_per_page))),
:callback => params[:callback]
end

Loading…
Cancel
Save