codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #776 from jroes/use-oj

Browse source 
Use oj for json encoding
This commit is contained in:
Sam 2013-04-28 00:42:10 -07:00
commit a6d2c9db03
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/export/json_encoder.rb
View file

@ -2,9 +2,6 @@ module Export
class SchemaArgumentsError < RuntimeError; end
# TODO: Use yajl-ruby for performance.
# https://github.com/brianmario/yajl-ruby
class JsonEncoder
def initialize
@ -58,7 +55,8 @@ module Export
def finish
@schema_data[:schema][:table_count] = @table_data.keys.count
json_output_stream.write( @schema_data.merge(@table_data).to_json )
json_output_stream.write( Oj.dump(@schema_data.merge(@table_data),
:mode => :compat) )
json_output_stream.close
@filenames = [File.join( tmp_directory, 'tables.json' )]
@ -72,4 +70,4 @@ module Export
FileUtils.rm_rf(tmp_directory) if Dir[tmp_directory].present?
end
end
end
end