Skip to content

change templates to chameleon #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sidloki wants to merge 4 commits into
base: master
Choose a base branch
from
Open

change templates to chameleon #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
936818a
change templates to chameleon
sidloki Dec 11, 2013
d886926
fix
sidloki Dec 11, 2013
12fe045
update tests
sidloki Dec 12, 2013
5590d16
update deps
sidloki Dec 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion player/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


def includeme(cfg):
cfg.include('pyramid_jinja2')
cfg.include('pyramid_chameleon')

import os
from pyramid.path import AssetResolver
Expand Down
7 changes: 4 additions & 3 deletions player/templates/message/error.jinja2 → player/templates/message/error.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% for err in errors %}
<tal:block tal:repeat="err errors">
<div class="alert alert-error alert-danger">
<a class="close" data-dismiss="alert">×</a>
{{err|safe}}
${err}
</div>
{% endfor %}
</tal:block>

2 changes: 1 addition & 1 deletion player/templates/message/info.jinja2 → player/templates/message/info.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="alert alert-info">
<a class="close" data-dismiss="alert">×</a>
{{context|safe}}
${context}
</div>
2 changes: 1 addition & 1 deletion player/templates/message/success.jinja2 → player/templates/message/success.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="alert alert-success">
<a class="close" data-dismiss="alert">×</a>
{{context|safe}}
${context}
</div>
2 changes: 1 addition & 1 deletion player/templates/message/warning.jinja2 → player/templates/message/warning.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="alert alert-warning">
<a class="close" data-dismiss="alert">×</a>
{{context|safe}}
${context}
</div>
0 player/tests/bundle/dir1/view.jinja2 → player/tests/bundle/dir1/view.pt
View file
Open in desktop
File renamed without changes.
0 player/tests/dir1/actions.jinja2 → player/tests/dir1/actions.pt
View file
Open in desktop
File renamed without changes.
0 player/tests/dir1/view.jinja2 → player/tests/dir1/view.pt
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion player/tests/message/custom.jinja2
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions player/tests/message/custom.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="customMsg">${context}</div>
1 change: 0 additions & 1 deletion player/tests/test-layout-html.jinja2
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions player/tests/test-layout-html.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<html>${structure:content}</html>
1 change: 0 additions & 1 deletion player/tests/test-layout.jinja2
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions player/tests/test-layout.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div>${structure:content}</div>
26 changes: 13 additions & 13 deletions player/tests/test_layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def __call__(self):

self.config.add_layout(
'test', context=Context,
renderer='player:tests/test-layout-html.jinja2')
renderer='player:tests/test-layout-html.pt')

renderer = LayoutRenderer('test')
res = renderer('View: test', Context(), self.request)
Expand Down Expand Up @@ -92,39 +92,39 @@ def test_layout_simple_chain_multi_level(self):
from player.layout_impl import LayoutRenderer

self.config.add_layout(
'test', parent='.', renderer='player:tests/test-layout.jinja2')
'test', parent='.', renderer='player:tests/test-layout.pt')
self.config.add_layout(
'', context=Root, parent=None,
renderer='player:tests/test-layout-html.jinja2')
renderer='player:tests/test-layout-html.pt')

root = Root()
context = Context(root)
renderer = LayoutRenderer('test')

res = renderer('View: test', context, self.request)
self.assertIn('<html><div>View: test</div></html>', text_(res))
self.assertIn('<html><div>View: test</div>\n</html>', text_(res))

def test_layout_chain_same_layer_id_on_different_levels(self):
from player.layout_impl import LayoutRenderer

self.config.add_layout(
'', context=Context, parent='.',
renderer='player:tests/test-layout.jinja2')
renderer='player:tests/test-layout.pt')
self.config.add_layout(
'', context=Root, parent=None,
renderer='player:tests/test-layout-html.jinja2')
renderer='player:tests/test-layout-html.pt')

root = Root()
context1 = Context2(root)
context2 = Context(context1)
renderer = LayoutRenderer('')

res = renderer('View: test', context2, self.request)
self.assertIn('<html><div>View: test</div></html>', text_(res))
self.assertIn('<html><div>View: test</div>\n</html>', text_(res))

def test_layout_chain_parent_notfound(self):
self.config.add_layout('', context=Context, parent='page',
renderer='player:tests/test-layout.jinja2')
renderer='player:tests/test-layout.pt')

root = Root()
context = Context(root)
Expand Down Expand Up @@ -246,7 +246,7 @@ def test_layout_renderer_no_layouts(self, m):
def test_layout_renderer_layout_debug(self):
from player.layout_impl import LayoutRenderer
self.config.add_layout('test', view=View,
renderer='player:tests/test-layout.jinja2')
renderer='player:tests/test-layout.pt')
self.request.__layout_debug__ = True

rendr = LayoutRenderer('test')
Expand All @@ -262,10 +262,10 @@ def test_layout_renderer(self, m):
m.choice.return_value = 'red'

self.config.add_layout('test', view=View,
renderer='player:tests/test-layout.jinja2')
renderer='player:tests/test-layout.pt')
self.config.add_view(
name='view.html',
renderer=player.layout('player:tests/dir1/view.jinja2', 'test'))
renderer=player.layout('player:tests/dir1/view.pt', 'test'))

from pyramid.view import render_view_to_response

Expand All @@ -284,7 +284,7 @@ def view(request):
self.config.add_view(
name='view.html', view=view, renderer=player.layout())
self.config.add_layout(
'', view=View, renderer='player:tests/test-layout.jinja2')
'', view=View, renderer='player:tests/test-layout.pt')

res = render_view_to_response(Context(), self.request, 'view.html')
self.assertEqual('<div>test</div>', res.text.strip())
Expand All @@ -300,7 +300,7 @@ def view(request):
self.config.add_view(
name='view.html', renderer=player.layout())
self.config.add_layout(
'', view=view, renderer='player:tests/test-layout.jinja2')
'', view=view, renderer='player:tests/test-layout.pt')

res = render_view_to_response(Context(), self.request, 'view.html')
self.assertIsInstance(res, HTTPFound)
Expand Down
8 changes: 4 additions & 4 deletions player/tests/test_message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class TestStatusMessages(BaseTestCase):
def test_messages_addmessage(self):
add_message(self.request, 'message')

res = render_messages(self.request)
res = render_messages(self.request).strip()

self.assertEqual(
res,
Expand All @@ -22,7 +22,7 @@ def test_messages_warning_msg(self):
add_message(self.request, 'warning', 'warning')

self.assertEqual(
render_messages(self.request),
render_messages(self.request).strip(),
text_('<div class="alert alert-warning">\n <a class="close" data-dismiss="alert">×</a>\n warning\n</div>','utf-8'))

def test_messages_error_msg(self):
Expand Down Expand Up @@ -78,7 +78,7 @@ def test_messages_render(self):
add_message(self.request, 'message')

self.assertEqual(
render_messages(self.request),
render_messages(self.request).strip(),
text_('<div class="alert alert-info">\n <a class="close" data-dismiss="alert">×</a>\n message\n</div>','utf-8'))

msg = render_messages(self.request)
Expand All @@ -98,7 +98,7 @@ def test_messages_request_attr(self):
req = self.make_request()
req.add_message('message')

res = req.render_messages()
res = req.render_messages().strip()

self.assertEqual(
res,
Expand Down
2 changes: 1 addition & 1 deletion player/tests/test_renderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,5 @@ def test_render_standard(self):
It is possible to use standard renderers as asset var
"""
text = player.render(
self.request, 'player:tests/dir1/view.jinja2')
self.request, 'player:tests/dir1/view.pt')
self.assertEqual(text, '<h1>Test</h1>')
6 changes: 3 additions & 3 deletions player/tests/test_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def test(): pass
val = self.out.getvalue()
self.assertIn('* Layer: test1', val)
self.assertIn('player:tests/dir1/', val)
self.assertIn('actions: .jinja2 (test_script.py: test)', val)
self.assertIn('actions: .pt (test_script.py: test)', val)
self.assertIn('* Layer: test2', val)

@mock.patch('player.script.bootstrap')
Expand All @@ -118,7 +118,7 @@ def test_list_templates_limit(self, m_bs):
val = self.out.getvalue()
self.assertIn('* Layer: test1', val)
self.assertIn('player:tests/dir1/', val)
self.assertIn('actions: .jinja2', val)
self.assertIn('actions: .pt', val)
self.assertNotIn('* Layer: test2', val)

@mock.patch('player.script.bootstrap')
Expand Down Expand Up @@ -193,4 +193,4 @@ def test_customize_success(self, m_bs):

layer.main()

self.assertTrue(os.path.join(self.dir, 'view.jinja2'))
self.assertTrue(os.path.join(self.dir, 'view.pt'))
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

install_requires = ['setuptools',
'pyramid >= 1.4',
'pyramid_jinja2',
'pyramid_chameleon',
]

if sys.version_info[:2] == (2, 6):
Expand Down