Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collection props #122

Merged
merged 3 commits into from Jun 10, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions tests/test_objects.py
Expand Up @@ -17,6 +17,7 @@

import os
from bson import objectid, timestamp
from pymongo.write_concern import WriteConcern
import txmongo
from txmongo import database
from txmongo import collection
Expand Down Expand Up @@ -52,6 +53,34 @@ def test_MongoObjects(self):
self.assertRaises(TypeError, mydb.drop_collection, None)
yield conn.disconnect()

@defer.inlineCallbacks
def test_Properties(self):
conn = txmongo.MongoConnection(mongo_host, mongo_port)
db = conn.mydb
coll = db.mycol

try:
# names
self.assertEqual(db.name, u"mydb")
self.assertEqual(coll.name, u"mycol")
self.assertEqual(coll.full_name, u"mydb.mycol")
self.assertEqual(coll.subcoll.name, u"mycol.subcoll")
self.assertEqual(coll.subcoll.full_name, u"mydb.mycol.subcoll")

# database
self.assertTrue(coll.database is db)

# Write concern
w2 = coll.with_options(write_concern=WriteConcern(w=2))
dbw2 = database.Database(conn, "mydb", write_concern=WriteConcern(w=2))
self.assertEqual(w2.write_concern, WriteConcern(w=2))
self.assertEqual(dbw2.write_concern, WriteConcern(w=2))

# Connection
self.assertTrue(db.connection is conn)
finally:
yield conn.disconnect()

@defer.inlineCallbacks
def test_MongoOperations(self):
""" Tests mongo operations """
Expand Down
12 changes: 12 additions & 0 deletions txmongo/collection.py
Expand Up @@ -47,6 +47,18 @@ def __str__(self):
def __repr__(self):
return "Collection(%s, %s)" % (self._database, self._collection_name)

@property
def full_name(self):
return '{0}.{1}'.format(str(self._database), self._collection_name)

@property
def name(self):
return self._collection_name

@property
def database(self):
return self._database

def __getitem__(self, collection_name):
return Collection(self._database,
"%s.%s" % (self._collection_name, collection_name))
Expand Down