Skip to content

Commit

Permalink
simplified json include
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Anderson committed May 24, 2008
1 parent 939ecaa commit dc6c927
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
16 changes: 9 additions & 7 deletions lib/couch_rest.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions spec/spec.opts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
--colour
--format
progress
--loadby
mtime
--reverse

0 comments on commit dc6c927

Please sign in to comment.