couchdb 0.1.3 → 0.2.0

data/lib/couchdb.rb

@@ -2,11 +2,14 @@ require 'transport'
 
 module CouchDB
 
-  autoload :Server, File.join(File.dirname(__FILE__), "couchdb", "server")
+  autoload :Collection, File.join(File.dirname(__FILE__), "couchdb", "collection")
   autoload :Database, File.join(File.dirname(__FILE__), "couchdb", "database")
-  autoload :Document, File.join(File.dirname(__FILE__), "couchdb", "document")
   autoload :Design, File.join(File.dirname(__FILE__), "couchdb", "design")
-  autoload :Collection, File.join(File.dirname(__FILE__), "couchdb", "collection")
+  autoload :Document, File.join(File.dirname(__FILE__), "couchdb", "document")
   autoload :Row, File.join(File.dirname(__FILE__), "couchdb", "row")
+  autoload :Security, File.join(File.dirname(__FILE__), "couchdb", "security")
+  autoload :Server, File.join(File.dirname(__FILE__), "couchdb", "server")
+  autoload :User, File.join(File.dirname(__FILE__), "couchdb", "user")
+  autoload :UserDatabase, File.join(File.dirname(__FILE__), "couchdb", "user_database")
 
 end

data/lib/couchdb/collection.rb

@@ -66,18 +66,22 @@ module CouchDB
     def fetch_response
       @response = Transport::JSON.request(
         :get, url,
-        :parameters => request_parameters,
-        :expected_status_code => 200,
-        :encode_parameters => true
+        authentication_options.merge(
+          :parameters => request_parameters,
+          :expected_status_code => 200,
+          :encode_parameters => true
+        )
       )
     end
 
     def fetch_meta_response
       @response = Transport::JSON.request(
         :get, url,
-        :parameters => request_parameters.merge(:limit => 0),
-        :expected_status_code => 200,
-        :encode_parameters => true
+        authentication_options.merge(
+          :parameters => request_parameters.merge(:limit => 0),
+          :expected_status_code => 200,
+          :encode_parameters => true
+        )
       )
     end
 
@@ -97,6 +101,10 @@ module CouchDB
       @entries = (@response["rows"] || [ ]).map{ |row_hash| Row.new @database, row_hash }
     end
 
+    def authentication_options
+      @database.authentication_options
+    end
+
     # A proxy class for the collection's fetched documents.
     class DocumentsProxy
 

data/lib/couchdb/database.rb

@@ -21,7 +21,7 @@ module CouchDB
     end
 
     def create!
-      Transport::JSON.request :put, url, :expected_status_code => 201
+      Transport::JSON.request :put, url, authentication_options.merge(:expected_status_code => 201)
     end
 
     def create_if_missing!
@@ -29,7 +29,7 @@ module CouchDB
     end
 
     def delete!
-      Transport::JSON.request :delete, url, :expected_status_code => 200
+      Transport::JSON.request :delete, url, authentication_options.merge(:expected_status_code => 200)
     end
 
     def delete_if_exists!
@@ -37,7 +37,7 @@ module CouchDB
     end
 
     def information
-      Transport::JSON.request :get, url, :expected_status_code => 200
+      Transport::JSON.request :get, url, authentication_options.merge(:expected_status_code => 200)
     end
 
     def exists?
@@ -52,6 +52,14 @@ module CouchDB
       Collection.new self, url + "/_all_docs", options
     end
 
+    def security
+      @security ||= CouchDB::Security.new self
+    end
+
+    def authentication_options
+      @server.authentication_options
+    end
+
   end
 
 end

data/lib/couchdb/document.rb

@@ -9,6 +9,9 @@ module CouchDB
     # doesn't exists.
     class NotFoundError < StandardError; end
 
+    # The UnauthorizedError will be raised if the authentication has failed.
+    class UnauthorizedError < StandardError; end
+
     attr_reader :database
 
     def initialize(database, properties = { })
@@ -48,6 +51,14 @@ module CouchDB
       @properties.delete "_rev"
     end
 
+    def fetch_rev
+      properties = Transport::JSON.request :get, url, authentication_options.merge(:expected_status_code => 200)
+      self.rev = properties["_rev"]
+    rescue Transport::UnexpectedStatusCodeError => error
+      raise error unless error.status_code == 404
+      @properties.delete "_rev"
+    end
+
     def ==(other)
       self.id == other.id
     end
@@ -57,7 +68,7 @@ module CouchDB
     end
 
     def exists?
-      Transport::JSON.request :get, url, :expected_status_code => 200
+      Transport::JSON.request :get, url, authentication_options.merge(:expected_status_code => 200)
       true
     rescue Transport::UnexpectedStatusCodeError => error
       raise error unless error.status_code == 404
@@ -65,10 +76,10 @@ module CouchDB
     end
 
     def load
-      @properties = Transport::JSON.request :get, url, :expected_status_code => 200
+      @properties = Transport::JSON.request :get, url, authentication_options.merge(:expected_status_code => 200)
       true
     rescue Transport::UnexpectedStatusCodeError => error
-      upgrade_unexpected_status_error error
+      upgrade_status_error error
     end
     alias reload load
 
@@ -78,11 +89,11 @@ module CouchDB
 
     def destroy
       return false if new?
-      Transport::JSON.request :delete, url, :headers => { "If-Match" => self.rev }, :expected_status_code => 200
+      Transport::JSON.request :delete, url, authentication_options.merge(:headers => { "If-Match" => self.rev }, :expected_status_code => 200)
       self.clear_rev
       true
     rescue Transport::UnexpectedStatusCodeError => error
-      upgrade_unexpected_status_error error
+      upgrade_status_error error
     end
 
     def url
@@ -92,27 +103,34 @@ module CouchDB
     private
 
     def create
-      response = Transport::JSON.request :post, @database.url, :body => @properties, :expected_status_code => 201
+      response = Transport::JSON.request :post, @database.url, authentication_options.merge(:body => @properties, :expected_status_code => 201)
       self.id  = response["id"]
       self.rev = response["rev"]
       true
-    rescue Transport::UnexpectedStatusCodeError
+    rescue Transport::UnexpectedStatusCodeError => error
+      upgrade_status_error error
       false
     end
 
     def update
-      response = Transport::JSON.request :put, url, :body => @properties, :expected_status_code => 201
+      response = Transport::JSON.request :put, url, authentication_options.merge(:body => @properties, :expected_status_code => 201)
       self.rev = response["rev"]
       true
-    rescue Transport::UnexpectedStatusCodeError
+    rescue Transport::UnexpectedStatusCodeError => error
+      upgrade_status_error error
       false
     end
 
-    def upgrade_unexpected_status_error(error)
+    def upgrade_status_error(error)
+      raise UnauthorizedError if error.status_code == 401
       raise NotFoundError if error.status_code == 404
       raise error
     end
 
+    def authentication_options
+      @database.authentication_options
+    end
+
     def method_missing(method_name, *arguments, &block)
       @properties.send method_name, *arguments, &block
     end

data/lib/couchdb/security.rb

@@ -0,0 +1,55 @@
+
+# Abstracts a CouchDB database security document.
+class CouchDB::Security
+
+  attr_reader :administrators
+  attr_reader :readers
+
+  def initialize(database)
+    @database = database
+
+    @document = CouchDB::Document.new @database
+    @document.id = "_security"
+    @document.fetch_rev
+    @document["admins"] = { }
+    @document["readers"] = { }
+
+    @administrators = UsersAndRolesProxy.new @document["admins"]
+    @readers = UsersAndRolesProxy.new @document["readers"]
+  end
+
+  def load
+    @document.load
+  end
+
+  def save
+    @document.save
+  rescue Transport::UnexpectedStatusCodeError => error
+    raise error unless error.status_code == 200
+  end
+
+  # Proxy to manipulate an array structure of users and roles.
+  class UsersAndRolesProxy
+
+    attr_reader :names
+    attr_reader :roles
+
+    def initialize(hash)
+      @hash = hash
+      @names = @hash["names"] = [ ]
+      @roles = @hash["roles"] = [ ]
+    end
+
+    def clear!
+      @names.clear
+      @roles.clear
+    end
+
+    def <<(user_or_role)
+      @names << user_or_role.name if user_or_role.is_a?(CouchDB::User)
+      @roles << user_or_role if user_or_role.is_a?(String)
+    end
+
+  end
+
+end

data/lib/couchdb/server.rb

@@ -1,40 +1,66 @@
 
 module CouchDB
 
-  # The Server class provides methods to retrieve informations and statistics
+  # The Server class provides methods to retrieve information and statistics
   # of a CouchDB server.
   class Server
 
-    attr_reader :host
-    attr_reader :port
+    attr_writer :host
+    attr_writer :port
+    attr_accessor :username
+    attr_accessor :password
 
-    def initialize(host = "localhost", port = 5984)
-      @host, @port = host, port
+    attr_accessor :password_salt
+
+    def initialize(host = nil, port = nil, username = nil, password = nil)
+      @host, @port, @username, @password = host, port, username, password
+    end
+
+    def host
+      @host || "localhost"
+    end
+
+    def port
+      @port || 5984
     end
 
     def ==(other)
-      other.is_a?(self.class) && @host == other.host && @port == other.port
+      other.is_a?(self.class) && self.host == other.host && self.port == other.port
     end
 
     def information
-      Transport::JSON.request :get, url + "/", :expected_status_code => 200
+      Transport::JSON.request :get, url + "/", options
     end
 
     def statistics
-      Transport::JSON.request :get, url + "/_stats", :expected_status_code => 200
+      Transport::JSON.request :get, url + "/_stats", options
     end
 
     def database_names
-      Transport::JSON.request :get, url + "/_all_dbs", :expected_status_code => 200
+      Transport::JSON.request :get, url + "/_all_dbs", options
     end
 
     def uuids(count = 1)
-      response = Transport::JSON.request :get, url + "/_uuids", :expected_status_code => 200, :parameters => { :count => count }
+      response = Transport::JSON.request :get, url + "/_uuids", options.merge(:parameters => { :count => count })
       response["uuids"]
     end
 
+    def user_database
+      @user_database ||= UserDatabase.new self
+    end
+
     def url
-      "http://#{@host}:#{@port}"
+      "http://#{self.host}:#{self.port}"
+    end
+
+    def authentication_options
+      self.username && self.password ? { :auth_type => :basic, :username => self.username, :password => self.password } : { }
+    end
+
+    private
+
+    def options
+      authentication_options.merge :expected_status_code => 200
     end
 
   end

data/lib/couchdb/user.rb

@@ -0,0 +1,62 @@
+require 'digest/sha1'
+
+# Abstracts a CouchDB user.
+class CouchDB::User
+
+  attr_reader :user_database
+
+  attr_accessor :document
+
+  def initialize(user_database, name)
+    @user_database = user_database
+
+    @document = CouchDB::Document.new @user_database.database
+    @document["_id"] = "org.couchdb.user:#{name}"
+    @document["type"] = "user"
+    @document["name"] = name
+    @document["salt"] = @user_database.server.password_salt
+    @document["roles"] = [ ]
+  end
+
+  def id
+    @document["_id"]
+  end
+
+  def name
+    @document["name"]
+  end
+
+  def password=(value)
+    @document["password_sha"] = Digest::SHA1.hexdigest(value + @user_database.database.server.password_salt)
+  end
+
+  def password
+    @document["password_sha"]
+  end
+
+  def roles=(value)
+    @document["roles"] = value || [ ]
+  end
+
+  def roles
+    @document["roles"]
+  end
+
+  def ==(other)
+    @document == other.document
+  end
+
+  def load
+    @document.load
+  end
+
+  def save
+    @document.fetch_rev
+    @document.save
+  end
+
+  def destroy
+    @document.destroy
+  end
+
+end

data/lib/couchdb/user_database.rb

@@ -0,0 +1,25 @@
+
+# Wraps all methods for the user database.
+class CouchDB::UserDatabase
+
+  attr_reader :server
+  attr_reader :database
+
+  def initialize(server, name = "_users")
+    @server = server
+    @database = CouchDB::Database.new @server, name
+  end
+
+  def users
+    @database.documents.map do |row|
+      if row.id =~ /^org\.couchdb\.user:.+$/
+        user = CouchDB::User.new self, row.id.sub(/^org\.couchdb\.user:/, "")
+        user.load
+        user
+      else
+        nil
+      end
+    end.compact
+  end
+
+end

data/spec/acceptance/{database_spec.rb → database_management_spec.rb}

@@ -1,13 +1,13 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
-describe CouchDB::Database do
+describe "database management" do
 
   before :each do
-    @server = CouchDB::Server.new
-    @database = described_class.new @server, "test"
+    @server = make_test_server
+    @database = make_test_database @server
   end
 
-  describe "create!" do
+  describe "creating a database" do
 
     before :each do
       @database.delete_if_exists!
@@ -20,7 +20,7 @@ describe CouchDB::Database do
 
   end
 
-  describe "delete!" do
+  describe "deleting a database" do
 
     before :each do
       @database.create_if_missing!
@@ -33,7 +33,7 @@ describe CouchDB::Database do
 
   end
 
-  describe "information" do
+  describe "fetching information about a database" do
 
     before :each do
       @database.create_if_missing!
@@ -45,7 +45,7 @@ describe CouchDB::Database do
 
   end
 
-  describe "documents" do
+  describe "fetching all documents of a database" do
 
     it "should return a collection" do
       @database.documents.should be_instance_of(CouchDB::Collection)

data/spec/acceptance/database_security_spec.rb

@@ -0,0 +1,106 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe "database security" do
+
+  before :each do
+    @server = make_test_server
+    @server.password_salt = "salt"
+
+    @user_database = @server.user_database
+
+    @user = CouchDB::User.new @user_database, "test_user"
+    @user.password = "test"
+    @user.roles = [ "dummy" ]
+    @user.save
+
+    @database = make_test_database @server
+    @database.delete_if_exists!
+    @database.create_if_missing!
+    @database.security.administrators.clear!
+    @database.security.readers.clear!
+
+    @design = CouchDB::Design.new @database, "test"
+    @design.save
+  end
+
+  describe "adding an user to the database administrators" do
+
+    before :each do
+      @database.security.administrators << @user
+      @database.security.save
+
+      @server.username = "test_user"
+      @server.password = "test"
+    end
+
+    it "should allow the user to manipulate the database content" do
+      result = @design.save
+      result.should be_true
+    end
+
+  end
+
+  describe "adding an user to the database readers" do
+
+    before :each do
+      @database.security.readers << @user
+      @database.security.save
+
+      @server.username = "test_user"
+      @server.password = "test"
+    end
+
+    it "should allow the user to read the database content" do
+      result = @design.load
+      result.should be_true
+    end
+
+    it "should deny the user to manipulate the database content" do
+      lambda do
+        @design.save
+      end.should raise_error(CouchDB::Document::UnauthorizedError)
+    end
+
+  end
+
+  describe "adding a role to the database administrators" do
+
+    before :each do
+      @database.security.administrators << "dummy"
+      @database.security.save
+
+      @server.username = "test_user"
+      @server.password = "test"
+    end
+
+    it "should allow the user to manipulate the database content" do
+      result = @design.save
+      result.should be_true
+    end
+
+  end
+
+  describe "adding a role to the database readers" do
+
+    before :each do
+      @database.security.readers << "dummy"
+      @database.security.save
+
+      @server.username = "test_user"
+      @server.password = "test"
+    end
+
+    it "should allow the user to read the database content" do
+      result = @design.load
+      result.should be_true
+    end
+
+    it "should deny the user to manipulate the database content" do
+      lambda do
+        @design.save
+      end.should raise_error(CouchDB::Document::UnauthorizedError)
+    end
+
+  end
+
+end

data/spec/acceptance/{document_spec.rb → document_handling_spec.rb}

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
-describe CouchDB::Document do
+describe "document handling" do
 
   before :each do
-    @server = CouchDB::Server.new
-    @database = CouchDB::Database.new @server, "test"
+    @server = make_test_server
+    @database = make_test_database @server
     @database.delete_if_exists!
     @database.create_if_missing!
 
-    @document = described_class.new @database, "_id" => "test_document_1", "test" => "test value"
+    @document = CouchDB::Document.new @database, "_id" => "test_document_1", "test" => "test value"
     @document.save
   end
 
@@ -16,7 +16,7 @@ describe CouchDB::Document do
     @document.destroy
   end
 
-  describe "load" do
+  describe "loading" do
 
     it "should load the document's properties" do
       @document["test"] = nil
@@ -26,9 +26,9 @@ describe CouchDB::Document do
 
   end
 
-  describe "save" do
+  describe "saving" do
 
-    context "on a new model" do
+    context "of a new model" do
 
       before :each do
         begin
@@ -46,7 +46,7 @@ describe CouchDB::Document do
 
     end
 
-    context "on an existing model" do
+    context "of an existing model" do
 
       it "should update the document" do
         lambda do
@@ -59,7 +59,7 @@ describe CouchDB::Document do
 
   end
 
-  describe "destroy" do
+  describe "destroying" do
 
     it "should destroy the document" do
       lambda do

data/spec/acceptance/server_spec.rb

@@ -1,12 +1,12 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
-describe CouchDB::Server do
+describe "server" do
 
   before :each do
-    @server = described_class.new
+    @server = make_test_server
   end
 
-  describe "information" do
+  describe "fetching information" do
 
     it "should return some information about the server" do
       @server.information.should == { "couchdb" => "Welcome", "version" => "1.0.1" }
@@ -14,7 +14,7 @@ describe CouchDB::Server do
 
   end
 
-  describe "statistics" do
+  describe "fetching statistics" do
 
     it "should return some statistics about the server" do
       @server.statistics.should be_instance_of(Hash)
@@ -22,7 +22,7 @@ describe CouchDB::Server do
 
   end
 
-  describe "database_names" do
+  describe "fetching database_names" do
 
     it "should return the names of all databases" do
       @server.database_names.should be_instance_of(Array)
@@ -30,7 +30,7 @@ describe CouchDB::Server do
 
   end
 
-  describe "uuids" do
+  describe "fetching uuids" do
 
     it "should return the given number of generated uuids" do
       uuids = @server.uuids 4

data/spec/acceptance/user_management_spec.rb

@@ -0,0 +1,84 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe "user management" do
+
+  before :each do
+    @server = make_test_server
+    @server.password_salt = "salt"
+
+    @user_database = @server.user_database
+  end
+
+  describe "creating an user" do
+
+    before :each do
+      @user = CouchDB::User.new @user_database, "test_user"
+      @user.password = "test"
+      @user.roles = [ "dummy" ]
+    end
+
+    it "should be indicated by a #save method that returns true" do
+      result = @user.save
+      result.should be_true
+    end
+
+    it "should create the user" do
+      @user.save
+      @user_database.users.should include(@user)
+    end
+
+    it "should store all attributes" do
+      @user.save
+      @user.load
+      @user.name.should == "test_user"
+      @user.password.should == "f438229716cab43569496f3a3630b3727524b81b"
+      @user.roles.should == [ "dummy" ]
+    end
+
+  end
+
+  describe "updating an user" do
+
+    before :each do
+      @user = CouchDB::User.new @user_database, "test_user"
+      @user.password = "test"
+      @user.roles = [ "dummy" ]
+      @user.save
+      @user.password = "another_test"
+    end
+
+    it "should be indicated by a #save method that returns true" do
+      result = @user.save
+      result.should be_true
+    end
+
+    it "should update all attributes" do
+      @user.save
+      @user.load
+      @user.password.should == "9ab52af5e5eb1cac7c2ff6eac610872bf0e6ab5c"
+    end
+
+  end
+
+  describe "destroying an user" do
+
+    before :each do
+      @user = CouchDB::User.new @user_database, "test_user"
+      @user.password = "test"
+      @user.roles = [ "dummy" ]
+      @user.save
+    end
+
+    it "should be indicated by a #destroy method that returns true" do
+      result = @user.destroy
+      result.should be_true
+    end
+
+    it "should remove the user" do
+      @user.destroy
+      @user_database.users.should_not include(@user)
+    end
+
+  end
+
+end

data/spec/acceptance/views_spec.rb

@@ -3,19 +3,21 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 describe "views" do
 
   before :each do
-    @server = CouchDB::Server.new
-    @database = CouchDB::Database.new @server, "test"
+    @server = make_test_server
+    @database = make_test_database @server
     @database.delete_if_exists!
     @database.create_if_missing!
 
     @document_one = CouchDB::Document.new @database, "_id" => "test_document_1", "category" => "one"
     @document_one.save
-    @document_two = CouchDB::Document.new @database, "_id" => "test_document_2", "category" => "two"
+    @document_two = CouchDB::Document.new @database, "_id" => "test_document_2", "category" => "one"
     @document_two.save
+    @document_three = CouchDB::Document.new @database, "_id" => "test_document_3", "category" => "two"
+    @document_three.save
 
     @design = CouchDB::Design.new @database, "design_1"
     @view = CouchDB::Design::View.new @design, "view_1",
-      "function(document) { emit([ document['category'], document['_id'] ]); }"
+      "function(document) { emit([ document['category'], document['_id'] ], 1); }"
     @design.save
   end
 
@@ -34,16 +36,39 @@ describe "views" do
 
     it "should return a collection including the right rows" do
       collection = @view.collection :startkey => [ "one", nil ], :endkey => [ "one", { } ]
-      collection.size.should == 1
+      collection.size.should == 2
       collection[0].id.should == "test_document_1"
       collection[0].key.should == [ "one", "test_document_1" ]
-      collection[0].value.should be_nil
+      collection[0].value.should == 1
+      collection[1].id.should == "test_document_2"
+      collection[1].key.should == [ "one", "test_document_2" ]
+      collection[1].value.should == 1
     end
 
     it "should return a collection including the right documents" do
       collection = @view.collection :startkey => [ "one", nil ], :endkey => [ "one", { } ]
       collection.documents.should include(@document_one)
-      collection.documents.should_not include(@document_two)
+      collection.documents.should include(@document_two)
+      collection.documents.should_not include(@document_three)
+    end
+
+  end
+
+  describe "reduced collection" do
+
+    before :each do
+      @view = CouchDB::Design::View.new @design, "view_2",
+        "function(document) { emit(document['category'], 1); }",
+        "function(key, values, rereduce) { return sum(values); }"
+      @design.save
+    end
+
+    it "should return a collection including the right rows" do
+      collection = @view.collection :key => "one", :group => true
+      collection.size.should == 1
+      collection[0].id.should be_nil
+      collection[0].key.should == "one"
+      collection[0].value.should == 2
     end
 
   end
@@ -52,7 +77,7 @@ describe "views" do
 
     it "should return a collection with all documents of the database" do
       collection = @database.documents
-      collection.size.should == 3 # two documents plus the design
+      collection.size.should == 4 # three documents plus the design
     end
 
   end

data/spec/lib/couchdb/collection_spec.rb

@@ -4,7 +4,7 @@ describe CouchDB::Collection do
 
   before :each do
     Transport::JSON.stub(:request)
-    @database = mock CouchDB::Database
+    @database = mock CouchDB::Database, :authentication_options => { }
 
     @collection = described_class.new @database, "http://host:1234/test/_all_docs"
   end

data/spec/lib/couchdb/database_spec.rb

@@ -3,8 +3,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 describe CouchDB::Database do
 
   before :each do
-    Transport::JSON.stub(:request)
-    @server = mock CouchDB::Server, :url => "http://host:1234", :database_names => [ "test" ]
+    Transport::JSON.stub :request => nil
+    @server = mock CouchDB::Server,
+                   :url => "http://host:1234",
+                   :database_names => [ "test" ],
+                   :authentication_options => { }
 
     @database = CouchDB::Database.new @server, "test"
   end

data/spec/lib/couchdb/document_spec.rb

@@ -4,7 +4,9 @@ describe CouchDB::Document do
 
   before :each do
     Transport::JSON.stub(:request)
-    @database = mock CouchDB::Database, :url => "http://host:1234/test"
+    @database = mock CouchDB::Database,
+                     :url => "http://host:1234/test",
+                     :authentication_options => { }
     @document = described_class.new @database, "_id" => "test_document_1"
   end
 
@@ -182,9 +184,11 @@ describe CouchDB::Document do
         @document.rev.should == 1
       end
 
-      it "should return false on wrong status code" do
-        Transport::JSON.stub(:request).and_raise(Transport::UnexpectedStatusCodeError.new(404))
-        @document.save.should be_false
+      it "should upgrade some status errors" do
+        Transport::JSON.stub(:request).and_raise(Transport::UnexpectedStatusCodeError.new(401))
+        lambda do
+          @document.save
+        end.should raise_error(CouchDB::Document::UnauthorizedError)
       end
 
     end
@@ -219,9 +223,11 @@ describe CouchDB::Document do
         @document.rev.should == 2
       end
 
-      it "should return false on wrong status code" do
-        Transport::JSON.stub!(:request).and_raise(Transport::UnexpectedStatusCodeError.new(404))
-        @document.save.should be_false
+      it "should upgrade some status errors" do
+        Transport::JSON.stub(:request).and_raise(Transport::UnexpectedStatusCodeError.new(401))
+        lambda do
+          @document.save
+        end.should raise_error(CouchDB::Document::UnauthorizedError)
       end
 
     end

data/spec/lib/couchdb/server_spec.rb

@@ -3,11 +3,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 describe CouchDB::Server do
 
   before :each do
-    Transport::JSON.stub(:request)
-    @server = CouchDB::Server.new "host", 1234
+    Transport::JSON.stub :request => nil
+
+    @server = CouchDB::Server.new "host", 1234, "test", "test"
   end
 
-  describe "initialize" do
+  describe "#initialize" do
 
     it "should set the host" do
       @server.host.should == "host"
@@ -17,9 +18,17 @@ describe CouchDB::Server do
       @server.port.should == 1234
     end
 
+    it "should set the username" do
+      @server.username.should == "test"
+    end
+
+    it "should set the password" do
+      @server.password.should == "test"
+    end
+
   end
 
-  describe "==" do
+  describe "#==" do
 
     it "should be true when comparing two equal servers" do
       @server.should == described_class.new("host", 1234)
@@ -31,9 +40,22 @@ describe CouchDB::Server do
 
   end
 
-  describe "information" do
+  describe "#information" do
 
     it "should request server information" do
+      Transport::JSON.should_receive(:request).with(
+        :get,
+        "http://host:1234/",
+        :expected_status_code => 200,
+        :auth_type => :basic,
+        :username => "test",
+        :password => "test"
+      ).and_return("result")
+      @server.information.should == "result"
+    end
+
+    it "should request server information without authentication if no credentials are given" do
+      @server.username = @server.password = nil
       Transport::JSON.should_receive(:request).with(
         :get,
         "http://host:1234/",
@@ -44,39 +66,48 @@ describe CouchDB::Server do
 
   end
 
-  describe "statistics" do
+  describe "#statistics" do
 
     it "should request server statistics" do
       Transport::JSON.should_receive(:request).with(
         :get,
         "http://host:1234/_stats",
-        :expected_status_code => 200
+        :expected_status_code => 200,
+        :auth_type => :basic,
+        :username => "test",
+        :password => "test"
       ).and_return("result")
       @server.statistics.should == "result"
     end
 
   end
 
-  describe "database_names" do
+  describe "#database_names" do
 
     it "should request the names of all databases" do
       Transport::JSON.should_receive(:request).with(
         :get,
         "http://host:1234/_all_dbs",
-        :expected_status_code => 200
+        :expected_status_code => 200,
+        :auth_type => :basic,
+        :username => "test",
+        :password => "test"
       ).and_return("result")
       @server.database_names.should == "result"
     end
 
   end
 
-  describe "uuids" do
+  describe "#uuids" do
 
     it "should request a given number of uuids" do
       Transport::JSON.should_receive(:request).with(
         :get,
         "http://host:1234/_uuids",
         :expected_status_code => 200,
+        :auth_type => :basic,
+        :username => "test",
+        :password => "test",
         :parameters => { :count => 3 }
       ).and_return({ "uuids" => "result" })
       @server.uuids(3).should == "result"

data/spec/spec_helper.rb

@@ -3,3 +3,11 @@ gem 'rspec', '>= 2'
 require 'rspec'
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "couchdb"))
+
+def make_test_server
+  CouchDB::Server.new "localhost", 5984, "test", "test"
+end
+
+def make_test_database(server)
+  CouchDB::Database.new server, "test"
+end

metadata

@@ -1,137 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: couchdb
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Philipp Br\xC3\xBCll"
+authors:
+- Philipp Brüll
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-21 00:00:00 +01:00
+date: 2011-08-26 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: transport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20665540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *20665540
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &20664860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: reek
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *20664860
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: &20664200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id003
-description: A straight-forward client for CouchDB REST API. The resources exposed by the API are simply wrapped into classes.
+  prerelease: false
+  version_requirements: *20664200
+description: A straight-forward client for CouchDB REST API. The resources exposed
+  by the API are simply wrapped into classes.
 email: b.phifty@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - LICENSE
 - Rakefile
-- lib/couchdb/server.rb
-- lib/couchdb/design/view.rb
 - lib/couchdb/design.rb
 - lib/couchdb/database.rb
 - lib/couchdb/row.rb
-- lib/couchdb/collection.rb
+- lib/couchdb/user_database.rb
+- lib/couchdb/user.rb
 - lib/couchdb/document.rb
+- lib/couchdb/security.rb
+- lib/couchdb/design/view.rb
+- lib/couchdb/collection.rb
+- lib/couchdb/server.rb
 - lib/couchdb.rb
-- spec/lib/couchdb/design/view_spec.rb
-- spec/lib/couchdb/collection_spec.rb
 - spec/lib/couchdb/row_spec.rb
-- spec/lib/couchdb/document_spec.rb
 - spec/lib/couchdb/database_spec.rb
-- spec/lib/couchdb/server_spec.rb
+- spec/lib/couchdb/document_spec.rb
 - spec/lib/couchdb/design_spec.rb
+- spec/lib/couchdb/collection_spec.rb
+- spec/lib/couchdb/server_spec.rb
+- spec/lib/couchdb/design/view_spec.rb
 - spec/spec_helper.rb
-- spec/acceptance/document_spec.rb
-- spec/acceptance/database_spec.rb
 - spec/acceptance/views_spec.rb
+- spec/acceptance/user_management_spec.rb
+- spec/acceptance/database_management_spec.rb
 - spec/acceptance/server_spec.rb
+- spec/acceptance/database_security_spec.rb
+- spec/acceptance/document_handling_spec.rb
 has_rdoc: true
 homepage: http://github.com/phifty/couchdb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: couchdb
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A straight-forward client for CouchDB REST API.
-test_files: 
-- spec/lib/couchdb/design/view_spec.rb
-- spec/lib/couchdb/collection_spec.rb
+test_files:
 - spec/lib/couchdb/row_spec.rb
-- spec/lib/couchdb/document_spec.rb
 - spec/lib/couchdb/database_spec.rb
-- spec/lib/couchdb/server_spec.rb
+- spec/lib/couchdb/document_spec.rb
 - spec/lib/couchdb/design_spec.rb
-- spec/acceptance/document_spec.rb
-- spec/acceptance/database_spec.rb
+- spec/lib/couchdb/collection_spec.rb
+- spec/lib/couchdb/server_spec.rb
+- spec/lib/couchdb/design/view_spec.rb
 - spec/acceptance/views_spec.rb
+- spec/acceptance/user_management_spec.rb
+- spec/acceptance/database_management_spec.rb
 - spec/acceptance/server_spec.rb
+- spec/acceptance/database_security_spec.rb
+- spec/acceptance/document_handling_spec.rb