Use dicts instead of dots in pgwui settings

diff --git a/src/pgwui_upload/templates/upload.mak b/src/pgwui_upload/templates/upload.mak
index eb2414620858e2a7f40e19a21f4b9879b8587d7a..425c41fc54cf04c54e2ec22fb5682560b36e9f55 100644 (file)
--- a/src/pgwui_upload/templates/upload.mak
+++ b/src/pgwui_upload/templates/upload.mak
@@ -1,5 +1,6 @@
 <%doc>
-  Copyright (C) 2015, 2018 The Meme Factory, Inc.  http://www.meme.com/
+  Copyright (C) 2015, 2018, 2020 The Meme Factory, Inc.
+  http://www.karlpinc.com/
  
      This file is part of PGWUI_Upload.
     
@@ -19,7 +20,7 @@
 
   Template for generic upload page.
  
-  Karl O. Pinc <kop@meme.com>
+  Karl O. Pinc <kop@karlpinc.com>
 
   This template uses the following variables in it's context:
 

diff --git a/src/pgwui_upload/views/upload.py b/src/pgwui_upload/views/upload.py
index b5718180d754a1ad6c897ad4a2e7c30166800f33..e8a44b8fb2c11a043cb6efedd3fc1df3b2f311c5 100644 (file)
--- a/src/pgwui_upload/views/upload.py
+++ b/src/pgwui_upload/views/upload.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2015, 2018 The Meme Factory, Inc.  http://www.meme.com/
+# Copyright (C) 2015, 2018, 2020 The Meme Factory, Inc.
+# http://www.karlpinc.com/
 
 # This file is part of PGWUI_Upload.
 #
@@ -17,7 +18,7 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-# Karl O. Pinc <kop@meme.com>
+# Karl O. Pinc <kop@karlpinc.com>
 #
 # Bugs:
 #  All data is presented to the db as a string, which could result
@@ -171,7 +172,7 @@ class TableUploadHandler(TabularFileUploadHandler):
         '''Return boolean -- whether to take column names literally
         '''
         settings = self.request.registry.settings
-        quoter_setting = settings.get('pgwui.literal_column_headings')
+        quoter_setting = settings['pgwui'].get('literal_column_headings')
         if quoter_setting == 'on':
             return True
         elif quoter_setting == 'ask':
@@ -260,7 +261,7 @@ class TableUploadHandler(TabularFileUploadHandler):
         return SaveLine(ue, self, insert_stmt)
 
 
-@view_config(route_name='upload',
+@view_config(route_name='pgwui_upload',
              renderer='pgwui_upload:templates/upload.mak')
 @auth_base_view
 def upload_view(request):
@@ -268,8 +269,10 @@ def upload_view(request):
     response = UploadEngine(TableUploadHandler(request)).run()
 
     settings = request.registry.settings
-    quoter_setting = settings.get('pgwui.literal_column_headings')
+    quoter_setting = settings['pgwui'].get('literal_column_headings')
     response['ask_about_literal_cols'] = quoter_setting == 'ask'
+    response.setdefault('pgwui', dict())
+    response['pgwui']['pgwui_upload'] = settings['pgwui']['pgwui_upload']
 
     if response['db_changed']:
         if is_checked(response['csv_checked']):

diff --git a/tests/views/test_upload.py b/tests/views/test_upload.py
index 52eaba7c129118de5083461b15a52ff8b6491fd4..3fad198e196360230a611f61ade5186feac0933a 100644 (file)
--- a/tests/views/test_upload.py
+++ b/tests/views/test_upload.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2018, 2019 The Meme Factory, Inc.  http://www.karlpinc.com/
+# Copyright (C) 2018, 2019, 2020 The Meme Factory, Inc.
+# http://www.karlpinc.com/
 
 # This file is part of PGWUI_Upload.
 #
@@ -130,7 +131,7 @@ def test_tableuploadhandler_quote_columns_on(get_quote_columns):
     True
     '''
     result = get_quote_columns(UPLOAD_FORM_W_LIT_CHECKED,
-                               {'pgwui.literal_column_headings': 'on'})
+                               {'pgwui': {'literal_column_headings': 'on'}})
     assert result is True
 
 
@@ -139,7 +140,7 @@ def test_tableuploadhandler_quote_columns_off(get_quote_columns):
     False
     '''
     result = get_quote_columns(UPLOAD_FORM_W_LIT_CHECKED,
-                               {'pgwui.literal_column_headings': 'off'})
+                               {'pgwui': {'literal_column_headings': 'off'}})
     assert result is False
 
 
@@ -147,7 +148,7 @@ def test_tableuploadhandler_quote_columns_default(get_quote_columns):
     '''When the settings literal_column_headings is not present return
     False (as default)
     '''
-    result = get_quote_columns(UPLOAD_FORM_W_LIT_CHECKED, {})
+    result = get_quote_columns(UPLOAD_FORM_W_LIT_CHECKED, {'pgwui': {}})
     assert result is False
 
 
@@ -155,7 +156,7 @@ def test_tableuploadhandler_quote_columns_ask_on(get_quote_columns):
     '''When the form asks for literal column headings return True
     '''
     result = get_quote_columns(UPLOAD_FORM_W_LIT_CHECKED,
-                               {'pgwui.literal_column_headings': 'ask'})
+                               {'pgwui': {'literal_column_headings': 'ask'}})
     assert result is True
 
 
@@ -163,7 +164,7 @@ def test_tableuploadhandler_quote_columns_ask_off(get_quote_columns):
     '''When the form does not ask for literal column headings return False
     '''
     result = get_quote_columns({'literal_col_headings': False},
-                               {'pgwui.literal_column_headings': 'ask'})
+                               {'pgwui': {'literal_column_headings': 'ask'}})
     assert result is False
 
 
@@ -220,7 +221,7 @@ def test_upload_view_literal_cols_ask(isolate_upload_view):
     response = UNCHANGED_RESPONSE
 
     settings = get_current_registry().settings
-    settings['pgwui.literal_column_headings'] = 'ask'
+    settings['pgwui'] = {'literal_column_headings': 'ask'}
 
     isolate_upload_view(response)
     result = upload.upload_view(get_current_request())
@@ -234,7 +235,7 @@ def test_upload_view_literal_cols_noask(isolate_upload_view):
     response = UNCHANGED_RESPONSE
 
     settings = get_current_registry().settings
-    settings['pgwui.literal_column_headings'] = 'no'
+    settings['pgwui'] = {'literal_column_headings': 'no'}
 
     isolate_upload_view(response)
     result = upload.upload_view(get_current_request())