From 9891d093223b32dea1fec593246600a6e4a27a0f Mon Sep 17 00:00:00 2001 From: ccocchi Date: Thu, 20 Sep 2012 18:45:46 +0200 Subject: [PATCH] Replace yajl by oj --- Gemfile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 62a2914..c9d2029 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" gemspec -gem 'yajl-ruby' +gem 'oj' gem 'libxml-ruby' group :test do diff --git a/README.md b/README.md index 417473c..bf38312 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ After the template is compiled into a hash, Rabl-rails will use a renderer to do ## Configuration -RablRails works out of the box, with default options and fastest engine available (yajl, libxml). But depending on your needs, you might want to change that or how your output looks like. You can set global configuration in your application: +RablRails works out of the box, with default options and fastest engine available (oj, libxml). But depending on your needs, you might want to change that or how your output looks like. You can set global configuration in your application: ```ruby # config/initializers/rabl_rails.rb @@ -91,7 +91,7 @@ RablRails works out of the box, with default options and fastest engine availabl # These are the default # config.cache_templates = true # config.include_json_root = true - # config.json_engine = :yajl + # config.json_engine = :oj # config.xml_engine = 'LibXML' end ```