.

floere · Oct 5, 2012 · 3bede45 · 3bede45
1 parent 843dec1
commit 3bede45
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 32 deletions.
diff --git a/memory_test/Gemfile.lock b/memory_test/Gemfile.lock
diff --git a/memory_test/run.rb b/memory_test/run.rb
@@ -3,7 +3,7 @@
 
 # For Pickies that don't have that baked into.
 #
-MultiJson.use :yajl if defined? MultiJson
+# MultiJson.use :yajl if defined? MultiJson
 
 Picky::Indexes.load
 

diff --git a/server/lib/multi_json.rb b/server/lib/multi_json.rb
@@ -0,0 +1,6 @@
+# By default, Picky uses Yajl.
+#
+# It has proven to be the fastest, most
+# memory conservative adapter of them all.
+#
+MultiJson.use :yajl if defined? ::Yajl
diff --git a/server/lib/picky.rb b/server/lib/picky.rb
@@ -30,7 +30,7 @@ module Picky
 
   # Modify/configure the external libraries.
   #
-  require_relative 'multi_json'
+  # require_relative 'multi_json'
 
   # Require the constants.
   #