couchrest 2.0.0.rc3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b17f1a8431dbf297df05649b3e3ef50da87ec5
-  data.tar.gz: d6c33fc6dfd9651d3cafb18d75a91a363542026f
+  metadata.gz: 35f90529f40322cb4c79feff70763d46e7feb0b0
+  data.tar.gz: 9cb8ed603d0898f37d1ebafeb23fa00204eaea62
 SHA512:
-  metadata.gz: c690201c7ca0cde422405fc26e1399e18d0b98c435cfb6ca37e38fb2dd194351f06188930ebe805fd7201fb5f089dbde9df1fea1f12913c8ecf0be8f602ef4c9
-  data.tar.gz: 0d012252eb5d4a89302d2f069d76b855763aba3e65d6a17dbfe6f78b2d129ff381211ed96d08250ae6bef6edea8224983a03245db5bf06b0851af8a777bb5d35
+  metadata.gz: e927060a2d0c42fd94f761b7f4f161c6627738c92c51de6bf483b9ebbce3527ab165420eb54a3a1c0e9f447d8f1cfc3323b70a05e87a761bac387472bd8c3b3e
+  data.tar.gz: 431046aa57a718f9c2d9a1c966cf060b1123f49dff147ccd8a272b39ab1df5c59d8c038dc41c8d5f9cb6f84783c21e8c6abd380fbcca00b6999d5bee8754b460

data/.gitignore

@@ -5,3 +5,4 @@ pkg
 *.gem
 Gemfile.lock
 *.rvmrc
+.bundle

data/.travis.yml

@@ -3,9 +3,10 @@ rvm:
   - 2.2.0
   - 2.1.0
   - 2.0.0
-  - 1.9.3
   - jruby
   - rbx
 services: couchdb
 before_install:
   - gem install bundler
+env:
+  - JRUBY_OPTS=--2.0

data/Rakefile

@@ -1,7 +1,5 @@
-# encoding: utf-8
-require 'bundler'
-Bundler::GemHelper.install_tasks
 
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 desc 'Default: run unit tests.'
@@ -12,12 +10,3 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
   t.rspec_opts = ["-c", "-f progress"]
 end
-
-module Rake
-  def self.remove_task(task_name)
-    Rake.application.instance_variable_get('@tasks').delete(task_name.to_s)
-  end
-end
-
-Rake.remove_task("github:release")
-Rake.remove_task("release")

data/VERSION

@@ -1 +1 @@
-2.0.0.rc3
+2.0.0

data/couchrest.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber", "Sam Lown"]
   s.date = File.mtime('VERSION')
   s.description = %q{CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.}
-  s.email = %q{jchris@apache.org}
+  s.email = %q{me@samlown.com}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -21,18 +21,19 @@ Gem::Specification.new do |s|
     "README.md",
     "THANKS.md"
   ]
+
   s.homepage = %q{http://github.com/couchrest/couchrest}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Lean and RESTful interface to CouchDB.}
 
-  s.add_dependency("httpclient", ["~> 2.7"])
-  s.add_dependency("mime-types", [">= 1.15"])
-  s.add_dependency("multi_json", ["~> 1.7"])
-  s.add_development_dependency("json", [">= 1.7.0"])
-  s.add_development_dependency("rspec", "~> 2.14.1")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("webmock")
-  s.add_development_dependency("mime-types", "2.6.2") # Avoid Errors with 3.0 series
+  s.add_dependency "httpclient", ["~> 2.8"]
+  s.add_dependency "multi_json", ["~> 1.7"]
+  s.add_dependency "mime-types", [">= 1.15"]
+
+  s.add_development_dependency "bundler", "~> 1.3"
+  # s.add_development_dependency "json", ">= 2.0.1"
+  s.add_development_dependency "rspec", "~> 2.14.1"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "webmock"
 end

data/history.txt

@@ -1,4 +1,14 @@
-== 2.0.0.rc3
+== 2.0.0 - 2016-07-06
+
+* Minor changes
+  * Update the revisions when bulk saving (@ellneal)
+  * Pass connection options via Server, with improved connection caching (@samlown)
+  * Support for disabling persistent connections (@samlown)
+  * Escaping database names (@samlown)
+  * Upgrading to HTTPClient 2.8 series (@samlown)
+  * Removing Ruby < 2.0 support (@samlown)
+
+== 2.0.0.rc3 - 2016-01-08
 
 * Major Changes
   * At the risk of causing chaos, `Database#get` now returns nil for 404 (@samlown)

data/lib/couchrest/attributes.rb

@@ -12,10 +12,10 @@ module CouchRest
   module Attributes
     extend Forwardable
 
-    # Initialize a new CouchRest Document and prepare 
+    # Initialize a new CouchRest Document and prepare
     # a hidden attributes hash.
     #
-    # When inherting a Document, it is essential that the 
+    # When inherting a Document, it is essential that the
     # super method is called before you own changes to ensure
     # that the attributes hash has been initialized before
     # you attempt to use it.
@@ -34,9 +34,15 @@ module CouchRest
     def [](key)
       _attributes[key.to_s]
     end
-    def has_key?(key)
+    # key? is preferred over has_key?
+    def key?(key)
       _attributes.has_key?(key.to_s)
     end
+    # has_key? is deprecated for Hash, key? replaces it
+    # https://github.com/bbatsov/ruby-style-guide#hash-key
+    def has_key?(key)
+      key?(key)
+    end
     def delete(key)
       _attributes.delete(key.to_s)
     end

data/lib/couchrest/connection.rb

@@ -5,30 +5,30 @@ module CouchRest
   # Handle connections to the CouchDB server and provide a set of HTTP based methods to
   # perform requests.
   #
-  # All connection are persistent. A connection cannot be re-used to connect to other servers.
+  # All connections are persistent, unless configured otherwise. A connection cannot be re-used to connect to other servers.
   #
   # Six types of REST requests are supported: get, put, post, delete, copy and head.
   #
-  # Requests that do not have a payload, get, delete and copy, accept the URI and options parameters,
-  # where as put and post both expect a document as the second parameter.
+  # Requests that do not have a payload like GET, DELETE and COPY, accept the URI and options parameters.
+  # PUT and POST both expect a document as the second parameter.
   #
-  # The API will share the options between the Net::HTTP connection and JSON parser.
+  # The API will share the options between the HTTP connection and JSON parser.
   #
-  # The following options will be recognised as header options and automatically added
-  # to the header hash:
+  # When initializing a connection, the following options are available:
   #
-  #  * `:content_type`, type of content to be sent, especially useful when sending files as this will set the file type. The default is :json.
-  #  * `:accept`, the content type to accept in the response. This should pretty much always be `:json`.
-  #
-  # The following request options are supported:
-  #
-  #  * `:payload` override the document or data sent in the message body (only PUT or POST).
-  #  * `:headers` any additional headers (overrides :content_type and :accept)
+  #  * `:persistent` true by default, forces the HTTP connection to be persistent to ensure each request attempts to use the same TCP socket, especially important for SSL connections.
   #  * `:timeout` (or `:read_timeout`) and `:open_timeout` the time in miliseconds to wait for the request, see the [Net HTTP Persistent documentation](http://docs.seattlerb.org/net-http-persistent/Net/HTTP/Persistent.html#attribute-i-read_timeout) for more details.
   #  * `:verify_ssl` verify ssl certificates (or not)
   #  * `:ssl_client_cert`, `:ssl_client_key` parameters controlling ssl client certificate authentication
   #  * `:ssl_ca_file` load additional CA certificates from a file (or directory)
   #
+  # The following request options are supported:
+  #
+  #  * `:content_type`, type of content to be sent, especially useful when sending files as this will set the file type. The default is :json.
+  #  * `:accept`, the content type to accept in the response. This should pretty much always be `:json`.
+  #  * `:payload` override the document or data sent in the message body (only PUT or POST).
+  #  * `:headers` any additional headers (overrides :content_type and :accept if provided).
+  #
   # When :raw is true in PUT and POST requests, no attempt will be made to convert the document payload to JSON. This is
   # not normally necessary as IO and Tempfile objects will not be parsed anyway. The result of the request will
   # *always* be parsed.
@@ -54,12 +54,13 @@ module CouchRest
 
     SUCCESS_RESPONSE_CODES = [200, 201, 202, 204]
 
-    attr_reader :uri, :http, :last_response
+    attr_reader :uri, :last_response, :options
 
     def initialize(uri, options = {})
       raise "CouchRest::Connection.new requires URI::HTTP(S) parameter" unless uri.is_a?(URI::HTTP)
       @uri = clean_uri(uri)
-      prepare_http_connection(options)
+      @options = options.dup
+      @options[:persistent] = true if @options[:persistent].nil?
     end
 
     # Send a GET request.
@@ -96,6 +97,12 @@ module CouchRest
       execute('HEAD', path, options)
     end
 
+    # Special accessor that will either return the last used http
+    # connection or prepare a new one if none available.
+    def http
+      @http || prepare_http_connection
+    end
+
     protected
 
     # Duplicate and remove excess baggage from the provided URI
@@ -108,33 +115,42 @@ module CouchRest
     end
 
     # Take a look at the options povided and try to apply them to the HTTP conneciton.
-    # We try to maintain RestClient compatability as this is what we used before.
-    def prepare_http_connection(opts)
-      @http = HTTPClient.new(opts[:proxy] || self.class.proxy)
+    def prepare_http_connection
+      conn = @http
+      if conn.nil? || !options[:persistent]
+        conn = HTTPClient.new(options[:proxy] || self.class.proxy)
+        set_http_connection_options(conn, options)
+        @http = conn # Always set to last used connection
+      end
+      conn
+    end
 
+    # Prepare the http connection options for HTTPClient.
+    # We try to maintain RestClient compatability in option names as this is what we used before.
+    def set_http_connection_options(conn, opts)
       # Authentication
       unless uri.user.to_s.empty?
-        http.force_basic_auth = true
-        http.set_auth(uri.to_s, uri.user, uri.password)
+        conn.force_basic_auth = true
+        conn.set_auth(uri.to_s, uri.user, uri.password)
       end
 
       # SSL Certificate option mapping
       if opts.include?(:verify_ssl)
-        http.ssl_config.verify_mode = opts[:verify_ssl] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+        conn.ssl_config.verify_mode = opts[:verify_ssl] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
       end
-      http.ssl_config.client_cert = opts[:ssl_client_cert] if opts.include?(:ssl_client_cert)
-      http.ssl_config.client_key  = opts[:ssl_client_key]  if opts.include?(:ssl_client_key)
-      http.ssl_config.set_trust_ca(opts[:ssl_ca_file]) if opts.include?(:ssl_ca_file)
+      conn.ssl_config.client_cert = opts[:ssl_client_cert] if opts.include?(:ssl_client_cert)
+      conn.ssl_config.client_key  = opts[:ssl_client_key]  if opts.include?(:ssl_client_key)
+      conn.ssl_config.set_trust_ca(opts[:ssl_ca_file]) if opts.include?(:ssl_ca_file)
 
       # Timeout options
-      http.receive_timeout = opts[:timeout] if opts.include?(:timeout)
-      http.connect_timeout = opts[:open_timeout] if opts.include?(:open_timeout)
-      http.send_timeout    = opts[:read_timeout] if opts.include?(:read_timeout)
-
-      http
+      conn.receive_timeout = opts[:timeout] if opts.include?(:timeout)
+      conn.connect_timeout = opts[:open_timeout] if opts.include?(:open_timeout)
+      conn.send_timeout    = opts[:read_timeout] if opts.include?(:read_timeout)
     end
 
     def execute(method, path, options, payload = nil, &block)
+      conn = prepare_http_connection
+
       req = {
         :method => method,
         :uri    => uri + path
@@ -151,29 +167,29 @@ module CouchRest
         req[:body] = payload_from_doc(req, payload, options)
       end
 
-      send_and_parse_response(req, options, &block)
+      send_and_parse_response(conn, req, options, &block)
     end
 
-    def send_and_parse_response(req, options, &block)
+    def send_and_parse_response(conn, req, opts, &block)
       if block_given?
-        parser = CouchRest::StreamRowParser.new(options[:continuous] ? :feed : :array)
-        response = send_request(req) do |chunk|
+        parser = CouchRest::StreamRowParser.new(opts[:continuous] ? :feed : :array)
+        response = send_request(conn, req) do |chunk|
           parser.parse(chunk) do |doc|
-            block.call(parse_body(doc, options))
+            block.call(parse_body(doc, opts))
           end
         end
         handle_response_code(response)
-        parse_body(parser.header, options)
+        parse_body(parser.header, opts)
       else
-        response = send_request(req)
+        response = send_request(conn, req)
         handle_response_code(response)
-        parse_response(response, options)
+        parse_response(response, opts)
       end
     end
 
     # Send request, and leave a reference to the response for debugging purposes
-    def send_request(req, &block)
-      @last_response = http.request(req.delete(:method), req.delete(:uri), req, &block)
+    def send_request(conn, req, &block)
+      @last_response = conn.request(req.delete(:method), req.delete(:uri), req, &block)
     end
 
     def handle_response_code(response)

data/lib/couchrest/database.rb

@@ -26,7 +26,7 @@ module CouchRest
     def initialize(server, name)
       @name     = name
       @server   = server
-      @path     = "/#{name.gsub('/','%2F')}"
+      @path     = "/#{CGI.escape(name)}"
       @bulk_save_cache = []
       @bulk_save_cache_limit = 500  # must be smaller than the uuid count
     end
@@ -202,7 +202,10 @@ module CouchRest
       if opts[:all_or_nothing]
         request_body[:all_or_nothing] = true
       end
-      connection.post "#{path}/_bulk_docs", request_body
+      results = connection.post "#{path}/_bulk_docs", request_body
+      docs_by_id = Hash[docs.map { |doc| [doc['_id'], doc] }] unless docs.nil?
+      results.each { |r| docs_by_id[r['id']]['_rev'] = r['rev'] if r['ok'] } unless results.nil?
+      results
     end
     alias :bulk_delete :bulk_save
 

data/lib/couchrest/server.rb

@@ -12,15 +12,27 @@ module CouchRest
     # saving new documents. See also #next_uuid.
     attr_reader :uuids
 
-    def initialize(server = 'http://127.0.0.1:5984', uuid_batch_count = 1000)
+    # The connection options we should use to connect with
+    attr_reader :connection_options
+
+    def initialize(server = 'http://127.0.0.1:5984', opts = {})
       @uri = prepare_uri(server).freeze
-      @uuid_batch_count = uuid_batch_count
+      if opts.is_a?(Integer)
+        # Backwards compatibility
+        @uuid_batch_count = opts
+        @connection_options = {}
+      else
+        @uuid_batch_count = opts.delete(:uuid_batch_count)
+        @connection_options = opts
+      end
+      @uuid_batch_count ||= 1000
     end
 
     # Lazy load the connection for the current thread
     def connection
       conns = (Thread.current['couchrest.connections'] ||= {})
-      conns[uri.to_s] ||= Connection.new(uri)
+      key = "#{uri.to_s}##{connection_options.hash}"
+      conns[key] ||= Connection.new(uri, connection_options)
     end
 
     # Lists all databases on the server

data/spec/couchrest/connection_spec.rb

@@ -157,8 +157,11 @@ describe CouchRest::Connection do
     let :conn do
       CouchRest::Connection.new(uri)
     end
+    let :mock_uri do
+      URI "http://mock/db/test-doc"
+    end
     let :mock_conn do
-      CouchRest::Connection.new(URI "http://mock")
+      CouchRest::Connection.new(mock_uri)
     end
 
     describe :get do
@@ -169,6 +172,29 @@ describe CouchRest::Connection do
         expect(res['name']).to eql(doc['name'])
       end
 
+      context "persistency" do
+        before :each do
+          stub_request(:get, "http://mock/db/test-doc")
+            .to_return(:body => doc.to_json)
+        end
+
+        it "should have persistency enabled by default" do
+          conn = CouchRest::Connection.new(mock_uri)
+          expect(conn.options[:persistent]).to be_true
+          http1 = conn.http
+          conn.get(mock_uri.path)
+          expect(conn.http.object_id).to eql(http1.object_id)
+        end
+
+        it "should disable persistency" do
+          conn = CouchRest::Connection.new(mock_uri, :persistent => false)
+          expect(conn.options[:persistent]).to be_false
+          http1 = conn.http
+          conn.get(mock_uri.path)
+          expect(conn.http.object_id).to_not eql(http1.object_id)
+        end
+      end
+
       it "should raise exception if document missing" do
         uri = URI(DB.to_s + "/missingdoc")
         conn = CouchRest::Connection.new(uri)

data/spec/couchrest/database_spec.rb

@@ -11,12 +11,12 @@ describe CouchRest::Database do
   describe "#initialize" do
     describe "database name including slash" do
       it "should escape the name in the URI" do
-        db = @cr.database("foo/bar")
-        expect(db.name).to eq "foo/bar"
-        expect(db.root).to eq URI("#{COUCHHOST}/foo%2Fbar")
-        expect(db.uri).to eq URI("#{COUCHHOST}/foo%2Fbar")
-        expect(db.to_s).to eq "#{COUCHHOST}/foo%2Fbar"
-        expect(db.path).to  eq "/foo%2Fbar"
+        db = @cr.database("foo/bar some")
+        expect(db.name).to eq "foo/bar some"
+        expect(db.root).to eq URI("#{COUCHHOST}/foo%2Fbar+some")
+        expect(db.uri).to eq URI("#{COUCHHOST}/foo%2Fbar+some")
+        expect(db.to_s).to eq "#{COUCHHOST}/foo%2Fbar+some"
+        expect(db.path).to eq "/foo%2Fbar+some"
       end
     end
   end

data/spec/couchrest/document_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 class Video < CouchRest::Document; end
 
 describe CouchRest::Document do
-  
+
   before(:all) do
     @couch = CouchRest.new
     @db    = @couch.database!(TESTDB)
@@ -73,18 +73,26 @@ describe CouchRest::Document do
     end
   end
 
-  describe "#has_key?" do
+  describe "#key?" do
     before :each do
       @doc = CouchRest::Document.new
     end
     it "should confirm existance of key" do
       @doc[:test] = 'example'
-      expect(@doc.has_key?('test')).to be_true
-      expect(@doc.has_key?(:test)).to be_true
+      expect(@doc.key?('test')).to be_true
+      expect(@doc.key?(:test)).to be_true
     end
     it "should deny existance of key" do
-      expect(@doc.has_key?(:bardom)).to be_false
-      expect(@doc.has_key?('bardom')).to be_false
+      expect(@doc.key?(:bardom)).to be_false
+      expect(@doc.key?('bardom')).to be_false
+    end
+  end
+
+  describe "#has_key?" do
+    it 'calls #key?' do
+      @doc = CouchRest::Document.new
+      expect(@doc).to receive(:key?).with(:test)
+      @doc.has_key? :test
     end
   end
 
@@ -160,7 +168,7 @@ describe CouchRest::Document do
       expect(Video.new.database).to eql @db
       Video.use_database nil
     end
-    
+
     it "should be overwritten by instance" do
       db = @couch.database('test')
       article = Video.new
@@ -173,7 +181,7 @@ describe CouchRest::Document do
 
   describe  "new" do
     before(:each) do
-      @doc = CouchRest::Document.new("key" => [1,2,3], :more => "values")    
+      @doc = CouchRest::Document.new("key" => [1,2,3], :more => "values")
     end
     it "should create itself from a Hash" do
       expect(@doc["key"]).to eql [1,2,3]
@@ -187,22 +195,22 @@ describe CouchRest::Document do
       @doc.id = 1
       expect(@doc.id).to eql(1)
     end
-    
+
     it "should freak out when saving without a database" do
       expect(lambda{@doc.save}).to raise_error(ArgumentError)
     end
-    
+
   end
 
   # move to database spec
   describe  "saving using a database" do
     before(:all) do
-      @doc = CouchRest::Document.new("key" => [1,2,3], :more => "values")    
-      @db = reset_test_db!    
+      @doc = CouchRest::Document.new("key" => [1,2,3], :more => "values")
+      @db = reset_test_db!
       @resp = @db.save_doc(@doc)
     end
     it "should apply the database" do
-      expect(@doc.database).to eql @db    
+      expect(@doc.database).to eql @db
     end
     it "should get id and rev" do
       expect(@doc.id).to eql @resp["id"]
@@ -231,6 +239,25 @@ describe CouchRest::Document do
       doc.database.bulk_save
       expect(doc.database.get(doc["_id"])["val"]).to eql doc["val"]
     end
+
+    it "should update the revisions of the saved documents" do
+      doc = CouchRest::Document.new({"_id" => "bulkdoc1", "val" => 3})
+      doc.database = @db
+      doc.save(true)
+      doc.database.bulk_save
+      expect(doc.database.get(doc["_id"])["_rev"]).to eql doc["_rev"]
+    end
+
+    it "should not update the revisions of documents that aren't saved successfully" do
+      doc1 = CouchRest::Document.new({"_id" => "bulkdoc", "val" => 3})
+      doc2 = CouchRest::Document.new({"_id" => "bulkdoc2", "val" => 3})
+      doc1.database = @db
+      doc2.database = @db
+      doc1.save(true)
+      doc2.save(true)
+      @db.bulk_save
+      expect(doc1["_rev"]).to be_nil
+    end
   end
 
   describe "getting from a database" do
@@ -251,7 +278,7 @@ describe CouchRest::Document do
       @doc["more"] = "keys"
       @doc.save
       expect(@db.get(@resp['id'])["more"]).to eql "keys"
-      @doc["more"] = "these keys"    
+      @doc["more"] = "these keys"
       @doc.save
       expect(@db.get(@resp['id'])["more"]).to eql "these keys"
     end
@@ -270,7 +297,7 @@ describe CouchRest::Document do
       expect(@db.get @resp['id']).to be_nil
     end
     it "should error when there's no db" do
-      @doc = CouchRest::Document.new("key" => [1,2,3], :more => "values")    
+      @doc = CouchRest::Document.new("key" => [1,2,3], :more => "values")
       expect(lambda{@doc.destroy}).to raise_error(ArgumentError)
     end
   end

data/spec/couchrest/server_spec.rb

@@ -6,8 +6,12 @@ describe CouchRest::Server do
     CouchRest::Server.new(COUCHHOST)
   end
 
+  let :mock_url do
+    "http://mock"
+  end
+
   let :mock_server do
-    CouchRest::Server.new("http://mock")
+    CouchRest::Server.new(mock_url)
   end
 
   describe "#initialize" do
@@ -21,6 +25,24 @@ describe CouchRest::Server do
       server = CouchRest::Server.new(COUCHHOST + "/some/path?q=1#fragment")
       expect(server.uri.to_s).to eql(COUCHHOST)
     end
+
+    it "should set default uuid batch count" do
+      expect(server.uuid_batch_count).to eql(1000)
+    end
+
+    it "should set uuid batch count" do
+      server = CouchRest::Server.new(mock_url, 1234)
+      expect(server.uuid_batch_count).to eql(1234)
+      server = CouchRest::Server.new(mock_url, :uuid_batch_count => 1235)
+      expect(server.uuid_batch_count).to eql(1235)
+    end
+
+    it "should set connection options" do
+      server = CouchRest::Server.new(mock_url)
+      expect(server.connection_options).to be_empty
+      server = CouchRest::Server.new(mock_url, :persistent => false)
+      expect(server.connection_options[:persistent]).to be_false
+    end
   end
 
   describe :connection do
@@ -32,7 +54,32 @@ describe CouchRest::Server do
     it "should cache connection in current thread" do
       server.connection # instantiate
       conns = Thread.current['couchrest.connections']
-      expect(server.connection).to eql(conns[COUCHHOST])
+      expect(server.connection).to eql(conns[COUCHHOST + "##{{}.hash}"])
+    end
+
+    it "should cache connection in current thread with options" do
+      Thread.current['couchrest.connections'] = {}
+      srv = CouchRest::Server.new(mock_url, :persistent => false)
+      srv.connection # instantiate
+      conns = Thread.current['couchrest.connections']
+      expect(srv.connection.object_id).to eql(conns[conns.keys.last].object_id)
+      expect(conns.length).to eql(1)
+    end
+
+    it "should not cache connection in current thread with different options" do
+      conns = Thread.current['couchrest.connections'] = {}
+      srv = CouchRest::Server.new(mock_url, :persistent => true)
+      srv.connection # init
+      srv2 = CouchRest::Server.new(mock_url, :persistent => false)
+      srv2.connection # init
+      expect(conns.length).to eql(2)
+      expect(srv.connection.object_id).to_not eql(srv2.connection.object_id)
+    end
+
+    it "should pass configuration options to the connection" do
+      expect(mock_server.connection.options[:persistent]).to be_true
+      srv = CouchRest::Server.new(mock_url, :persistent => false)
+      expect(srv.connection.options[:persistent]).to be_false
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -20,56 +20,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,23 +112,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
 description: CouchRest provides a simple interface on top of CouchDB's RESTful HTTP
   API, as well as including some utility scripts for managing views and attachments.
-email: jchris@apache.org
+email: me@samlown.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -220,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Lean and RESTful interface to CouchDB.