Skip to content

Commit

Permalink
Replace Yajl with Oj
Browse files Browse the repository at this point in the history
after some benchmarking
  • Loading branch information
magnetised committed Mar 20, 2015
1 parent 2936ab1 commit 0122a71
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions lib/spontaneous/data_mapper/content_model/serialization.rb
Expand Up @@ -38,7 +38,7 @@ def _deserialize_column(column)
end

def _deserialize_value(value)
Yajl::Parser.new(:symbolize_keys => true).parse(value || "null")
Spontaneous::parse_json(value || "null")
end

def _serialize_column(column, value)
Expand All @@ -47,7 +47,7 @@ def _serialize_column(column, value)
end

def _serialize_value(value)
Yajl::Encoder.new.encode(value)
Spontaneous::encode_json(value)
end
end
end
Expand Down
5 changes: 3 additions & 2 deletions lib/spontaneous/json.rb
@@ -1,6 +1,7 @@
# encoding: UTF-8

require 'yajl'
# require 'yajl'
require 'oj'

Oj.default_options = { mode: :compat } if defined?(Oj)

Expand All @@ -23,7 +24,7 @@ def encode(object)
if defined?(::Yajl)
module YajlParser
def parser
Yajl::Parser.new(:symbolize_keys => true)
Yajl::Parser.new(symbolize_keys: true)
end
def encoder
Yajl::Encoder.new
Expand Down
2 changes: 1 addition & 1 deletion spontaneous.gemspec
Expand Up @@ -48,7 +48,7 @@ Gem::Specification.new do |s|
s.add_dependency('thor', ['~> 0.16'])
s.add_dependency('uglifier', ['~> 1.3'])
s.add_dependency('xapian-fu', ['~> 1.5'])
s.add_dependency('yajl-ruby', ['~> 1.1'])
s.add_dependency('oj', ['~> 2.11'])

s.add_development_dependency('minitest', ['~> 4.7.0'])
s.add_development_dependency('minitest-colorize', ['~> 0.0.5'])
Expand Down

0 comments on commit 0122a71

Please sign in to comment.