Changeset 263

Timestamp:

11/03/07 17:17:44 (6 years ago)

Author:

ged

Message:

• minor style improvements, correct typos, ...
  
• bump version to 0.4.1
  

Location:

elixir/trunk

Files:

• TODO (modified) (1 diff)
• elixir/__init__.py (modified) (3 diffs)
• elixir/ext/associable.py (modified) (1 diff)
• elixir/ext/encrypted.py (modified) (5 diffs)
• elixir/ext/versioned.py (modified) (4 diffs)
• elixir/relationships.py (modified) (1 diff)

elixir/trunk/TODO

@@ -12 +12 @@
     - multiple files (modules) models
     - demonstrate common raltionships options (order_by, ...)
+    - inverse relationships matching (with a link to BehindTheScene)
 
     ? autoload

elixir/trunk/elixir/__init__.py

@@ -16 +16 @@
 '''
 
+try:
+    set
+except NameError:
+    from sets import Set as set
+
 import sqlalchemy
-
 from sqlalchemy.types import *
 
@@ -26 +30 @@
 from elixir.fields import has_field, with_fields, Field
 from elixir.relationships import belongs_to, has_one, has_many, \
-                                 has_and_belongs_to_many
-from elixir.relationships import ManyToOne, OneToOne, OneToMany, ManyToMany
+                                 has_and_belongs_to_many, \
+                                 ManyToOne, OneToOne, OneToMany, ManyToMany
 from elixir.properties import has_property, GenericProperty, ColumnProperty
 from elixir.statements import Statement
 
-try:
-    set
-except NameError:
-    from sets import Set as set
 
-__version__ = '0.4.0'
+__version__ = '0.4.1'
 
 __all__ = ['Entity', 'EntityMeta',
@@ -51 +51 @@
 
 __doc_all__ = ['create_all', 'drop_all',
-                 'setup_all', 'cleanup_all',
-                 'metadata', 'session']
+               'setup_all', 'cleanup_all',
+               'metadata', 'session']
 
 

elixir/trunk/elixir/ext/associable.py

@@ -113 +113 @@
 import elixir as el
 import sqlalchemy as sa
+
+__doc_all__ = ['associable']
 
 def associable(assoc_entity, plural_name=None, lazy=True):

elixir/trunk/elixir/ext/encrypted.py

@@ -17 +17 @@
         password = Field(Unicode)
         ssn = Field(Unicode)
-        acts_as_encrypted(for_columns=['password', 'ssn'], with_secret='secret')
+        acts_as_encrypted(for_columns=['password', 'ssn'], 
+                          with_secret='secret')
 
 The above Person entity will automatically encrypt and decrypt the password and
@@ -28 +29 @@
 from sqlalchemy.orm         import MapperExtension, EXT_PASS
 
+__all__ = ['acts_as_encrypted']
+__doc_all__ = []
 
 #
@@ -34 +37 @@
 
 def encrypt_value(value, secret):
-    return Blowfish.new(secret, Blowfish.MODE_CFB).encrypt(value).encode('string_escape')
+    return Blowfish.new(secret, Blowfish.MODE_CFB) \
+                   .encrypt(value).encode('string_escape')
 
 def decrypt_value(value, secret):
-    return Blowfish.new(secret, Blowfish.MODE_CFB).decrypt(value.decode('string_escape'))
+    return Blowfish.new(secret, Blowfish.MODE_CFB) \
+                   .decrypt(value.decode('string_escape'))
 
 
@@ -70 +75 @@
                 return EXT_PASS
             
-            def populate_instance(self, mapper, selectcontext, row, instance, *args, **kwargs):
-                mapper.populate_instance(selectcontext, instance, row, *args, **kwargs)
+            def populate_instance(self, mapper, selectcontext, row, instance, 
+                                  *args, **kwargs):
+                mapper.populate_instance(selectcontext, instance, row, 
+                                         *args, **kwargs)
                 perform_decryption(instance)
                 return True
@@ -81 +88 @@
 acts_as_encrypted = Statement(ActsAsEncrypted)
 
-
-__all__ = [
-    'acts_as_encrypted'
-]

elixir/trunk/elixir/ext/versioned.py

@@ -44 +44 @@
 '''
 
-from elixir                import Integer, DateTime
-from elixir.statements     import Statement
+from datetime              import datetime
+import inspect
+
 from sqlalchemy            import Table, Column, and_, desc
 from sqlalchemy.orm        import mapper, MapperExtension, EXT_PASS, \
                                   object_session
-from datetime              import datetime
-
-import inspect
-
+
+from elixir                import Integer, DateTime
+from elixir.statements     import Statement
+
+__all__ = ['acts_as_versioned', 'after_revert']
+__doc_all__ = []
 
 #
@@ -68 +71 @@
 def get_history_where(instance):
     clauses = []
+    history_columns = instance.__history_table__.primary_key.columns
     for column in instance.table.primary_key.columns:
         instance_value = getattr(instance, column.name)
-        history_column = getattr(instance.__history_table__.primary_key.columns, column.name)
+        history_column = getattr(history_columns, column.name)
         clauses.append(history_column==instance_value)
     return and_(*clauses)
@@ -184 +188 @@
         # attach utility methods and properties to the entity
         def get_versions(self):
-            return object_session(self).query(Version).filter(get_history_where(self)).all()
+            return object_session(self).query(Version) \
+                                       .filter(get_history_where(self)) \
+                                       .all()
         
         def get_as_of(self, dt):
@@ -238 +244 @@
         Version.compare_with = compare_with
 
-#def acts_as_versioned_handler(entity, ignore=[]):
-#    builder = VersionedEntityBuilder(entity, ignore)
-#    entity._descriptor.builders.append(builder)
-
-#acts_as_versioned = ClassMutator(acts_as_versioned_handler)
 acts_as_versioned = Statement(VersionedEntityBuilder)
 
 
-#
-# decorator for watching for revert events
-#
-
 def after_revert(func):
+    """
+    Decorator for watching for revert events.
+    """
     func._elixir_after_revert = True
     return func
 
 
-__all__ = ['acts_as_versioned', 'after_revert']

elixir/trunk/elixir/relationships.py

@@ -725 +725 @@
             # target's table
 
-            # In some databases (at lease MySQL) the constraint names need 
+            # In some databases (at least MySQL) the constraint names need 
             # to be unique for the whole database, instead of per table.
             source_fk_name = "%s_fk" % source_part