JSON library loading tweaks

Rakefile

@@ -25,7 +25,7 @@ begin
     gemspec.files = %w( LICENSE README.md Rakefile THANKS.md history.txt couchrest.gemspec) + Dir["{examples,lib,spec,utils}/**/*"] - Dir["spec/tmp"]
     gemspec.has_rdoc = true
     gemspec.add_dependency("rest-client", ">= 1.5.1")
-    gemspec.add_dependency("json", "<= 1.4.2")
+    gemspec.add_dependency("json", "= 1.2.4") # json 1.4.3 has stack overflow issues!
 #    gemspec.add_dependency("couchrest_extended_document", ">= 1.0.0")
     gemspec.version = CouchRest::VERSION
     gemspec.date = "2010-07-01"
@@ -65,4 +65,4 @@ module Rake
 end
 
 Rake.remove_task("github:release")
-Rake.remove_task("release")
+Rake.remove_task("release")

lib/couchrest.rb

@@ -13,10 +13,15 @@
 #    limitations under the License.
 
 require 'rubygems'
-gem 'json', "<= 1.4.2"
-require 'json'
 gem 'rest-client', ">= 1.5.1"
-require 'rest_client'
+begin
+  unless Kernel.const_defined?("JSON")
+    gem 'json', '1.2.4'
+    require 'json'
+  end
+rescue LoadError
+  raise "No compatible json library found, install json gem"
+end
 
 # Not sure why this is required, so removed until a reason is found!
 $:.unshift File.dirname(__FILE__) unless
@@ -134,4 +139,4 @@ def self.inherited(subclass)
     raise "ExtendedDocument is no longer included in CouchRest base driver, see couchrest_extended_document gem"
   end
 
-end
+end