diff --git a/memory_test/Gemfile.lock b/memory_test/Gemfile.lock deleted file mode 100644 index 1d96f31f..00000000 --- a/memory_test/Gemfile.lock +++ /dev/null @@ -1,30 +0,0 @@ -GEM - specs: - activesupport (3.2.8) - i18n (~> 0.6) - multi_json (~> 1.0) - cod (0.5.0) - i18n (0.6.1) - multi_json (1.3.6) - picky (4.6.6) - activesupport (>= 3.0) - multi_json - procrastinate (~> 0.4) - rack_fast_escape - text - procrastinate (0.4.1) - cod (~> 0.4) - state_machine (~> 0.9.4) - rack_fast_escape (2009.06.24) - url_escape - state_machine (0.9.4) - text (1.2.1) - url_escape (2009.06.24) - yajl-ruby (1.1.0) - -PLATFORMS - ruby - -DEPENDENCIES - picky (= 4.6.6) - yajl-ruby diff --git a/memory_test/run.rb b/memory_test/run.rb index a6930e38..aa2d3576 100644 --- 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 new file mode 100644 index 00000000..4d1f145f --- /dev/null +++ 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 \ No newline at end of file diff --git a/server/lib/picky.rb b/server/lib/picky.rb index 2b9b86b4..66b85a7c 100644 --- 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. #