From dc6c9276e5786f1ec9c689e7a6616ddf1535274c Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Sat, 24 May 2008 12:28:42 -0700 Subject: [PATCH] simplified json include --- lib/couch_rest.rb | 16 +++++++++------- spec/spec.opts | 6 ++++++ 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 spec/spec.opts diff --git a/lib/couch_rest.rb b/lib/couch_rest.rb index ec0a988..5450225 100644 --- a/lib/couch_rest.rb +++ b/lib/couch_rest.rb @@ -1,12 +1,14 @@ require File.dirname(__FILE__) + '/../deps/rest-client/lib/rest_client' require "rubygems" -gem "json" -begin - require "json/ext" -rescue LoadError - $stderr.puts "C version of json (fjson) could not be loaded, using pure ruby one" - require "json/pure" -end +require 'json' +# gem "json" +# begin +# require "json/ext" +# rescue LoadError +# $stderr.puts "C version of json (fjson) could not be loaded, using pure ruby one" +# require "json/pure" +# end + require File.dirname(__FILE__) + '/database' class CouchRest diff --git a/spec/spec.opts b/spec/spec.opts new file mode 100644 index 0000000..d4254ee --- /dev/null +++ b/spec/spec.opts @@ -0,0 +1,6 @@ +--colour +--format +progress +--loadby +mtime +--reverse \ No newline at end of file