Hello version 0.0.9!

CHANGES.rst

@@ -1,3 +1,8 @@
+0.0.9 (2015-06-11)
+==================
+
+- fix settings['pyramid_sacrud.models'] with one table in list
+
 0.0.8 (2015-06-04)
 ==================
 

pyramid_sacrud/__init__.py

@@ -10,6 +10,9 @@
 Includeme of SACRUD
 """
 
+CONFIG_MODELS = 'pyramid_sacrud.models'
+CONFIG_DASHBOARD_ROW_LEN = 'pyramid_sacrud.dashboard_row_len'
+
 
 def includeme(config):
     config.include('.includes')

pyramid_sacrud/common/__init__.py

@@ -10,12 +10,14 @@
 Any helpers for Pyramid
 """
 import itertools
+from collections import OrderedDict
 
 import colander
 import sqlalchemy
-
 from sacrud.common import get_attrname_by_colname, get_columns
 
+from .. import CONFIG_MODELS
+
 
 def preprocessing_value(value):
     if value is colander.null:
@@ -78,19 +80,28 @@ def set_jinja2_silent_none(config):  # pragma: no cover
     jinja2_env.finalize = _silent_none
 
 
-def get_settings_param(request, name):
-    settings = request.registry.settings
-    return settings.get(name, {})
+def get_settings_param(settings, name):
+    if not isinstance(settings, dict):
+        settings = settings.registry.settings
+    param = settings.get(name)
+    if isinstance(param, str):
+        return import_from_string(param)
+    return param
 
 
-def get_obj_from_settings(request, name):
-    settings = request
-    if not isinstance(request, dict):
-        settings = request.registry.settings
-    position_model = settings.get(name)
-    if isinstance(position_model, str):
-        return import_from_string(position_model)
-    return position_model
+def get_models_from_settings(settings):
+    models = get_settings_param(settings, CONFIG_MODELS)
+    if not models:
+        return OrderedDict()
+    try:
+        for key, value in models:
+            break
+    except ValueError:
+        models = (models, )
+    return OrderedDict(
+        [(key, value) if hasattr(value, '__iter__') else (key, [value, ])
+         for key, value in models]
+    )
 
 
 def sacrud_env(fun):
@@ -116,8 +127,7 @@ def wrapped(self, *args, **kwargs):
 def get_table(tname, request):
     """ Return table by table name from pyramid_sacrud.models in settings.
     """
-    pyramid_sacrud_models = get_settings_param(request,
-                                               'pyramid_sacrud.models')
+    pyramid_sacrud_models = get_models_from_settings(request)
     try:
         models = dict(pyramid_sacrud_models)
     except ValueError:
@@ -139,10 +149,3 @@ def get_table_verbose_name(table):
     elif hasattr(table, '__tablename__'):
         return table.__tablename__
     return table.name
-
-
-def update_difference_object(obj, key, value):
-    if isinstance(obj, dict):
-        obj.update({key: value})
-    else:
-        setattr(obj, key, value)

pyramid_sacrud/tests/test_common.py

@@ -13,15 +13,14 @@
 
 import colander
 from pyramid import testing
-
 from pyramid_sacrud.breadcrumbs import breadcrumbs, get_crumb
-from pyramid_sacrud.common import (get_obj_from_settings, get_table,
+from pyramid_sacrud.common import (get_settings_param, get_table,
                                    get_table_verbose_name, import_from_string,
-                                   preprocessing_value,
-                                   update_difference_object)
-from pyramid_sacrud.security import (PYRAMID_SACRUD_CREATE,
-                                     PYRAMID_SACRUD_HOME, PYRAMID_SACRUD_LIST,
-                                     PYRAMID_SACRUD_UPDATE)
+                                   preprocessing_value)
+from pyramid_sacrud.security import (
+    PYRAMID_SACRUD_CREATE, PYRAMID_SACRUD_HOME,
+    PYRAMID_SACRUD_LIST, PYRAMID_SACRUD_UPDATE
+)
 
 from .models.auth import User
 from .test_views import _TransactionalFixture
@@ -103,15 +102,15 @@ def test_get_obj_from_settings(self):
         config = testing.setUp(request=request)
         config.registry.settings['foo.User'] =\
             'pyramid_sacrud.tests.models.auth:User'
-        obj = get_obj_from_settings(request, 'foo.User')
+        obj = get_settings_param(request, 'foo.User')
         self.assertEqual(obj, User)
 
         config.registry.settings['foo.User'] = User
-        obj = get_obj_from_settings(request, 'foo.User')
+        obj = get_settings_param(request, 'foo.User')
         self.assertEqual(obj, User)
 
         config.registry.settings['foo.User'] = 'bad string'
-        obj = get_obj_from_settings(request, 'foo.User')
+        obj = get_settings_param(request, 'foo.User')
         self.assertEqual(obj, None)
 
     def test_import_from_string(self):
@@ -122,17 +121,6 @@ def test_import_from_string(self):
             User,
             import_from_string(User))
 
-    def test_update_difference_object(self):
-        class Foo:
-            pass
-        obj = Foo()
-        update_difference_object(obj, "foo", "bar")
-        self.assertEqual(obj.foo, "bar")
-
-        obj = {}
-        update_difference_object(obj, "foo", "bar")
-        self.assertEqual(obj["foo"], "bar")
-
     def test_get_table(self):
         request = testing.DummyRequest()
         self._init_pyramid_sacrud_settings(request)

pyramid_sacrud/views/__init__.py

@@ -9,12 +9,11 @@
 """
 Views for Pyramid frontend
 """
-from collections import OrderedDict
-
 from pyramid.events import BeforeRender, subscriber
 from pyramid.view import view_config
 
-from ..common import get_settings_param
+from .. import CONFIG_DASHBOARD_ROW_LEN
+from ..common import get_models_from_settings, get_settings_param
 from ..security import (PYRAMID_SACRUD_CREATE, PYRAMID_SACRUD_DELETE,
                         PYRAMID_SACRUD_HOME, PYRAMID_SACRUD_LIST,
                         PYRAMID_SACRUD_UPDATE)
@@ -34,9 +33,7 @@ def add_global(event):
     route_name=PYRAMID_SACRUD_HOME,
     permission=PYRAMID_SACRUD_HOME)
 def sa_home(request):
-    tables = OrderedDict(get_settings_param(
-        request, 'pyramid_sacrud.models'))
-    dashboard_row_len = get_settings_param(
-        request, 'pyramid_sacrud.dashboard_row_len')
+    tables = get_models_from_settings(request)
+    dashboard_row_len = get_settings_param(request, CONFIG_DASHBOARD_ROW_LEN)
     return {'dashboard_row_len': int(dashboard_row_len or 3),
             'tables': tables}

setup.py

@@ -11,7 +11,7 @@ def read(name):
 
 setup(
     name='pyramid_sacrud',
-    version="0.0.8",
+    version="0.0.9",
     url='http://github.com/ITCase/pyramid_sacrud/',
     author='Svintsov Dmitry',
     author_email='sacrud@uralbash.ru',