rename app name to ctp_blogr

ctp_blogr/__init__.py

@@ -16,7 +16,7 @@ def main(global_config, **settings):
                             callback=groupfinder, hashalg='sha512', timeout=36000)
     authorization_policy = ACLAuthorizationPolicy()
     with Configurator(settings=settings,
-                    root_factory='cao_blogr.security.RootFactory',
+                    root_factory='ctp_blogr.security.RootFactory',
                     authentication_policy=authentication_policy,
                     authorization_policy=authorization_policy) as config:
         config.include('pyramid_jinja2')

ctp_blogr/alembic/env.py

@@ -3,7 +3,7 @@ from alembic import context
 from pyramid.paster import get_appsettings, setup_logging
 from sqlalchemy import engine_from_config
 
-from cao_blogr.models.meta import Base
+from ctp_blogr.models.meta import Base
 
 config = context.config
 

ctp_blogr/models/__init__.py

@@ -55,7 +55,7 @@ def includeme(config):
     """
     Initialize the model for a Pyramid app.
 
-    Activate this setup using ``config.include('cao_blogr.models')``.
+    Activate this setup using ``config.include('ctp_blogr.models')``.
 
     """
     settings = config.get_settings()

ctp_blogr/models/blog_record.py

@@ -1,5 +1,5 @@
 import datetime #<- will be used to set default dates on models
-from cao_blogr.models.meta import Base  #<- we need to import our sqlalchemy metadata from which model classes will inherit
+from ctp_blogr.models.meta import Base  #<- we need to import our sqlalchemy metadata from which model classes will inherit
 from sqlalchemy import (
     Column,
     Integer,

ctp_blogr/models/portfolio.py

@@ -1,5 +1,5 @@
 import datetime #<- will be used to set default dates on models
-from cao_blogr.models.meta import Base  #<- we need to import our sqlalchemy metadata from which model classes will inherit
+from ctp_blogr.models.meta import Base  #<- we need to import our sqlalchemy metadata from which model classes will inherit
 from sqlalchemy.orm import relationship
 from sqlalchemy import (
     Column,

ctp_blogr/models/user.py

@@ -1,5 +1,5 @@
 import datetime #<- will be used to set default dates on models
-from cao_blogr.models.meta import Base  #<- we need to import our sqlalchemy metadata from which model classes will inherit
+from ctp_blogr.models.meta import Base  #<- we need to import our sqlalchemy metadata from which model classes will inherit
 from sqlalchemy import (
     Column,
     Integer,

ctp_blogr/templates/404.jinja2

@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="content">
-  <h1><span class="font-semi-bold">CAO Blog</span></h1>
+  <h1><span class="font-semi-bold">CTP Blog</span></h1>
   <p class="lead"><span class="font-semi-bold">404</span> Page Not Found</p>
 </div>
 {% endblock content %}

ctp_blogr/templates/blog.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "layout.jinja2" %}
 
 {% block content %}
     {% if request.authenticated_userid %}

ctp_blogr/templates/blog_edit.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "layout.jinja2" %}
 
 {% block content %}
     <form action="{{ url }}" method="post" class="form">

ctp_blogr/templates/blog_search.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "layout.jinja2" %}
 
 {% block content %}
 	<form id="search-form" class="form-horizontal" role="form" action="/blog_search" method="post">

ctp_blogr/templates/layout.jinja2

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="pyramid web application">
-    <link rel="shortcut icon" href="{{request.static_url('cao_blogr:static/mythosaur_skull_red.ico')}}">
+    <link rel="shortcut icon" href="{{request.static_url('ctp_blogr:static/mythosaur_skull_red.ico')}}">
 
     <title>{{page_title}}</title>
 
@@ -15,7 +15,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
   
     <!-- Custom styles for this scaffold -->
-    <link href="{{request.static_url('cao_blogr:static/theme.css')}}" rel="stylesheet">
+    <link href="{{request.static_url('ctp_blogr:static/theme.css')}}" rel="stylesheet">
 
   </head>
 
@@ -29,7 +29,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="{{ request.route_url('home') }}"><img src="{{request.static_url('cao_blogr:static/mythosaur_skull_60x150.png')}}" /></a>
+        <a class="navbar-brand" href="{{ request.route_url('home') }}"><img src="{{request.static_url('ctp_blogr:static/mythosaur_skull_60x150.png')}}" /></a>
     </div>
     <div class="collapse navbar-collapse" id="myNavbar">
       <ul class="nav navbar-nav navbar-right">

ctp_blogr/templates/portfolio/actif2_edit.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "ctp_blogr:templates/layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/portfolio/actif_edit.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "ctp_blogr:templates/layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/portfolio/allocation_edit.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "ctp_blogr:templates/layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/portfolio/histo_edit.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "ctp_blogr:templates/layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/portfolio/histo_list.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "ctp_blogr:templates/layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/portfolio/portfolio.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "ctp_blogr:templates/layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/tag_edit.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/tags.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/user_add.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/templates/user_pwd.jinja2

@@ -1,4 +1,4 @@
-{% extends "cao_blogr:templates/layout.jinja2" %}
+{% extends "layout.jinja2" %}
 
 {% block content %}
 

ctp_blogr/views/blog.py

@@ -6,7 +6,7 @@ from ..forms import BlogCreateForm, BlogUpdateForm, BlogSearchForm, TagForm
 import markdown
 import datetime #<- will be used to set default dates on models
 
-@view_config(route_name='blog', renderer='cao_blogr:templates/blog.jinja2')
+@view_config(route_name='blog', renderer='ctp_blogr:templates/blog.jinja2')
 def blog(request):
     # get post id from request
     blog_id = request.matchdict['id']
@@ -35,7 +35,7 @@ def blog(request):
         }
 
 
-@view_config(route_name='blog_edit', renderer='cao_blogr:templates/blog_edit.jinja2', permission='view')
+@view_config(route_name='blog_edit', renderer='ctp_blogr:templates/blog_edit.jinja2', permission='view')
 def blog_edit(request):
     # get post id from request
     blog_id = request.matchdict['id']
@@ -98,7 +98,7 @@ def blog_edit(request):
         'blog_id': blog_id,
         'entry': entry,        }
 
-@view_config(route_name='blog_bytag', renderer='cao_blogr:templates/blog_bytag.jinja2')
+@view_config(route_name='blog_bytag', renderer='ctp_blogr:templates/blog_bytag.jinja2')
 def blog_bytag(request):
     # get tag parameters from request
     tag = request.matchdict['tag'] 
@@ -117,7 +117,7 @@ def blog_bytag(request):
         }
 
 
-@view_config(route_name='blog_search', renderer='cao_blogr:templates/blog_search.jinja2')
+@view_config(route_name='blog_search', renderer='ctp_blogr:templates/blog_search.jinja2')
 def blog_search(request):
 
     criteria = ''
@@ -139,7 +139,7 @@ def blog_search(request):
         'tags': tags,
     }
 
-@view_config(route_name='tags', renderer='cao_blogr:templates/tags.jinja2', permission='view')
+@view_config(route_name='tags', renderer='ctp_blogr:templates/tags.jinja2', permission='view')
 def tags(request):
 
     # get the list of tags 
@@ -150,7 +150,7 @@ def tags(request):
         'tags': tags,
         }
 
-@view_config(route_name='tag_edit', renderer='cao_blogr:templates/tag_edit.jinja2', permission='view')
+@view_config(route_name='tag_edit', renderer='ctp_blogr:templates/tag_edit.jinja2', permission='view')
 def tag_edit(request):
     # get tag parameters from request
     tag_id = request.matchdict['id'] 

ctp_blogr/views/default.py

@@ -10,7 +10,7 @@ from ..forms import UserCreateForm
 from ..models.user import User
 
 
-@view_config(route_name='home', renderer='cao_blogr:templates/home.jinja2')
+@view_config(route_name='home', renderer='../templates/home.jinja2')
 def home(request):
     # get the last created posts
     last_ten = BlogRecordService.get_last_created(request)
@@ -26,7 +26,7 @@ def home(request):
 
 
 @view_config(route_name='apropos',
-             renderer='cao_blogr:templates/apropos.jinja2')
+             renderer='../templates/apropos.jinja2')
 def apropos(request):
 
     return {
@@ -34,8 +34,8 @@ def apropos(request):
         }
 
 
-@view_config(route_name='login', renderer='cao_blogr:templates/login.jinja2')
-@forbidden_view_config(renderer='cao_blogr:templates/login.jinja2')
+@view_config(route_name='login', renderer='../templates/login.jinja2')
+@forbidden_view_config(renderer='../templates/login.jinja2')
 def login(request):
     login_url = request.route_url('login')
 
@@ -73,7 +73,7 @@ def logout(request):
     return HTTPFound(location=request.route_url('home'), headers=headers)
 
 
-@view_config(route_name='users', renderer='cao_blogr:templates/users.jinja2', permission='manage')
+@view_config(route_name='users', renderer='../templates/users.jinja2', permission='manage')
 def users(request):
     # get all users
     users = UserService.all(request)
@@ -83,7 +83,7 @@ def users(request):
         }
 
 
-@view_config(route_name='user_add', renderer='cao_blogr:templates/user_add.jinja2', permission='manage')
+@view_config(route_name='user_add', renderer='../templates/user_add.jinja2', permission='manage')
 def user_add(request):
     name = request.matchdict['name']
 
@@ -104,7 +104,7 @@ def user_add(request):
         }
 
 
-@view_config(route_name='user_pwd', renderer='cao_blogr:templates/user_pwd.jinja2', permission='manage')
+@view_config(route_name='user_pwd', renderer='../templates/user_pwd.jinja2', permission='manage')
 def user_pwd(request):
     # reset password or delete user
     name = request.matchdict['name']

development.ini

@@ -4,7 +4,7 @@
 ###
 
 [app:main]
-use = egg:cao_blogr
+use = egg:ctp_blogr
 
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -14,7 +14,7 @@ pyramid.default_locale_name = en
 pyramid.includes =
     pyramid_debugtoolbar
 
-sqlalchemy.url = sqlite:///%(here)s/cao_blogr.sqlite
+sqlalchemy.url = sqlite:///%(here)s/ctp_blogr.sqlite
 
 retry.attempts = 3
 
@@ -23,7 +23,7 @@ retry.attempts = 3
 # debugtoolbar.hosts = 127.0.0.1 ::1
 
 [pshell]
-setup = cao_blogr.pshell.setup
+setup = ctp_blogr.pshell.setup
 
 ###
 # wsgi server configuration
@@ -31,7 +31,7 @@ setup = cao_blogr.pshell.setup
 
 [alembic]
 # path to migration scripts
-script_location = cao_blogr/alembic
+script_location = ctp_blogr/alembic
 file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s
 # file_template = %%(rev)s_%%(slug)s
 
@@ -45,7 +45,7 @@ listen = localhost:9280
 ###
 
 [loggers]
-keys = root, cao_blogr, sqlalchemy
+keys = root, ctp_blogr, sqlalchemy
 
 [handlers]
 keys = console
@@ -57,10 +57,10 @@ keys = generic
 level = INFO
 handlers = console
 
-[logger_cao_blogr]
+[logger_ctp_blogr]
 level = DEBUG
 handlers =
-qualname = cao_blogr
+qualname = ctp_blogr
 
 [logger_sqlalchemy]
 level = WARN

production.ini

@@ -4,7 +4,7 @@
 ###
 
 [app:main]
-use = egg:cao_blogr
+use = egg:ctp_blogr
 
 pyramid.reload_templates = false
 pyramid.debug_authorization = false
@@ -12,12 +12,12 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.default_locale_name = en
 
-sqlalchemy.url = sqlite:///%(here)s/cao_blogr.sqlite
+sqlalchemy.url = sqlite:///%(here)s/ctp_blogr.sqlite
 
 retry.attempts = 3
 
 [pshell]
-setup = cao_blogr.pshell.setup
+setup = ctp_blogr.pshell.setup
 
 ###
 # wsgi server configuration
@@ -25,7 +25,7 @@ setup = cao_blogr.pshell.setup
 
 [alembic]
 # path to migration scripts
-script_location = cao_blogr/alembic
+script_location = ctp_blogr/alembic
 file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s
 # file_template = %%(rev)s_%%(slug)s
 
@@ -40,7 +40,7 @@ url_scheme = https
 ###
 
 [loggers]
-keys = root, cao_blogr, sqlalchemy
+keys = root, ctp_blogr, sqlalchemy
 
 [handlers]
 keys = console
@@ -52,10 +52,10 @@ keys = generic
 level = WARN
 handlers = console
 
-[logger_cao_blogr]
+[logger_ctp_blogr]
 level = WARN
 handlers =
-qualname = cao_blogr
+qualname = ctp_blogr
 
 [logger_sqlalchemy]
 level = WARN

pytest.ini

@@ -1,3 +1,3 @@
 [pytest]
-testpaths = cao_blogr
+testpaths = ctp_blogr
 python_files = test*.py

setup.py

@@ -35,9 +35,9 @@ tests_require = [
 ]
 
 setup(
-    name='cao_blogr',
+    name='ctp_blogr',
     version='1.0',
-    description='cao_blogr',
+    description='ctp_blogr',
     long_description=README + '\n\n' + CHANGES,
     classifiers=[
         'Programming Language :: Python',
@@ -58,10 +58,10 @@ setup(
     install_requires=requires,
     entry_points={
         'paste.app_factory': [
-            'main = cao_blogr:main',
+            'main = ctp_blogr:main',
         ],
         'console_scripts': [
-            'initialize_cao_blogr_db=cao_blogr.scripts.initialize_db:main',
+            'initialize_ctp_blogr_db=ctp_blogr.scripts.initialize_db:main',
         ],
     },
 )