Changeset 190

Timestamp:

08/28/07 19:14:26 (6 years ago)

Author:

bbangert

Message:

- Fixed bug in associable not properly picking out its own plural name when

none is provided. Added unit test for the bug.

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/ext/associable.py (modified) (1 diff)
• tests/test_associable.py (modified) (4 diffs)

elixir/trunk/CHANGES

@@ -1 +1 @@
 0.4.0
+- Fixed bug in associable not properly picking out its own plural name when
+  none is provided. Added unit test for the bug.
 - Added ext sub-package for additional Elixir statements.
 - Added ext.associable for generating polymorphic associations with Elixir

elixir/trunk/elixir/ext/associable.py

@@ -120 +120 @@
     interface_name = entity.table.name
     able_name = interface_name + 'able'
-    attr_name = "%s_rel" % interface_name
+    
+    if plural_name:
+        attr_name = "%s_rel" % plural_name
+    else:
+        plural_name = interface_name
+        attr_name = "%s_rel" % interface_name
     
     association_table = sa.Table("%s" % able_name, entity._descriptor.metadata,

elixir/trunk/tests/test_associable.py

@@ -12 +12 @@
     using_options(shortnames=True)
 
+
+class Comment(Entity):
+    has_field('id', Integer, primary_key=True)
+    has_field('name', Unicode)
+    has_field('text', String)
+
 is_addressable = associable(Address, 'addresses')
+is_commentable = associable(Comment, 'comments')
 
 class Person(Entity):
@@ -20 +27 @@
     using_options(shortnames=True)
     is_addressable()
+    is_commentable()
 
 class Order(Entity):
@@ -27 +35 @@
     using_options(shortnames=True)
     is_addressable('address', uselist=False)
+
+class Foo(Entity):
+    pass
+
+class Bar(Entity):
+    pass
+
+is_fooable = associable(Foo)
+is_barable = associable(Bar)
+
+class Quux(Entity):
+    is_fooable()
+    is_barable()
 
 class TestOrders(object):
@@ -37 +58 @@
         cleanup_all()
     
-    def test_bidirectional(self):
+    def test_basic(self):
         home = Address(street='123 Elm St.', city='Spooksville')
         work = Address(street='243 Hooper st.', city='Cupertino')