update to new Couch, vendor finish

lib/couch_rest.rb

@@ -1,13 +1,7 @@
-require File.dirname(__FILE__) + '/../deps/rest-client/lib/rest_client'
+require File.dirname(__FILE__) + '/../vendor/rest-client/lib/rest_client'
 require "rubygems"
 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'
 

spec/couch_rest_spec.rb

@@ -22,7 +22,8 @@ describe CouchRest do
     it "should be up to date" do
       v = @cr.info["version"]
       vi = v.split(/a/).pop.to_i
-      vi.should be_between(658733, 660751)
+      vi.should be >= 661484 # versions older than this will likely fail many specs
+      vi.should be <= 661484 # versions newer than this haven't been tried
     end
   end
 

spec/database_spec.rb

@@ -53,7 +53,8 @@ describe CouchRest::Database do
     end
     it "should return the result of the temporary function" do
       rs = @db.temp_view(:map => "function(doc){emit(doc.beverage, doc.count)}", :reduce =>  "function(beverage,counts){return sum(counts)}")
-      rs['result'].should == 9
+      # rs.should == 'x'
+      rs['rows'][0]['value'].should == 9
     end
   end