Permalink
Browse files

Require yajl as development dependency

1.8.x platform doesn't have built-in JSON parser, so it should load
something for it before. See multi-json supported libraries.

Change-Id: I4328246652e05d7456f10b8aff9cbf1776628b09
Reviewed-on: http://review.couchbase.org/16709
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
  • Loading branch information...
avsej authored and ingenthr committed Jun 3, 2012
1 parent 4685833 commit 87a0cd711f04920f46e9aec6ca017590d69f0379
Showing with 3 additions and 3 deletions.
  1. +1 −1 couchbase.gemspec
  2. +2 −2 test/test_format.rb
View
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']
s.add_runtime_dependency 'yaji', '~> 0.3.2'
-# s.add_runtime_dependency 'yajl-ruby', '~> 1.1.0'
s.add_runtime_dependency 'multi_json', '~> 1.0'
s.add_development_dependency 'rake', '~> 0.8.7'
@@ -45,5 +44,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rdiscount'
s.add_development_dependency 'yard'
s.add_development_dependency 'mini_portile'
+ s.add_development_dependency 'yajl-ruby', '~> 1.1.0'
s.add_development_dependency RUBY_VERSION =~ /^1\.9/ ? 'debugger' : 'ruby-debug'
end
View
@@ -58,15 +58,15 @@ def test_it_raises_error_for_document_format_when_neither_to_json_nor_to_s_defin
class << orig_doc
def to_json
- JSON.dump(:name => name, :role => role)
+ MultiJson.dump(:name => name, :role => role)
end
end
connection.set(uniq_id, orig_doc) # OK
class << orig_doc
undef to_json
def to_s
- JSON.dump(:name => name, :role => role)
+ MultiJson.dump(:name => name, :role => role)
end
end
connection.set(uniq_id, orig_doc) # OK

0 comments on commit 87a0cd7

Please sign in to comment.