From b68085299cee6e5488e8301042cde13d040494ca Mon Sep 17 00:00:00 2001 From: Aleksey Lim Date: Mon, 03 Feb 2014 11:45:49 +0000 Subject: Rename Context.preview to Context.logo to leave a space for previews --- diff --git a/doc/objects.dia b/doc/objects.dia index 11710bc..f232524 100644 --- a/doc/objects.dia +++ b/doc/objects.dia @@ -2,10 +2,10 @@ - + - + @@ -37,9 +37,6 @@ - - - @@ -56,7 +53,7 @@ - + @@ -64,51 +61,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ## @@ -145,41 +100,20 @@ - - - - - - - - - - - - - - - - - - - - - - + - + - - - - + + + + @@ -189,6 +123,18 @@ + + + + + + + + + + + + ## @@ -225,20 +171,34 @@ - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + - + @@ -250,16 +210,16 @@ - + - + - + #Context# @@ -300,20 +260,17 @@ - - - - + - + - + @@ -501,7 +458,7 @@ ## - #Icon, in PNG or SVG format, to represent the Context# + #Icon in PNG and 55x55 size# @@ -538,7 +495,7 @@ - #preview# + #logo# #blob [R WA]# @@ -547,7 +504,30 @@ ## - #Screenshot in PNG# + #Logo in PNG and 140x140 size# + + + + + + + + + + + + + + #previews# + + + #[blob] [R WA]# + + + ## + + + #List of screenshot in PNG and arbitrary sizes# @@ -667,20 +647,17 @@ - - - - + - + - + @@ -873,20 +850,17 @@ - - - - + - + - + @@ -1071,29 +1045,6 @@ - - - - - - - - - - - - - - - - - - - - - - - ## @@ -1130,20 +1081,34 @@ - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + - + @@ -1152,13 +1117,13 @@ - + - + - + @@ -1205,20 +1170,17 @@ - - - - + - + - + @@ -1542,19 +1504,19 @@ - + - + - + - + #Report# @@ -1595,20 +1557,17 @@ - - - - + - + - + @@ -1747,7 +1706,6 @@ - @@ -1768,7 +1726,7 @@ - + @@ -1782,7 +1740,7 @@ - + @@ -1799,7 +1757,7 @@ - + @@ -1815,7 +1773,7 @@ - + @@ -1832,7 +1790,7 @@ - + @@ -1848,7 +1806,7 @@ - + @@ -1865,7 +1823,7 @@ - + @@ -1881,7 +1839,7 @@ - + @@ -1898,7 +1856,7 @@ - + @@ -1914,7 +1872,7 @@ - + @@ -1931,7 +1889,7 @@ - + @@ -1947,7 +1905,7 @@ - + @@ -1964,7 +1922,7 @@ - + @@ -1980,7 +1938,7 @@ - + @@ -1997,7 +1955,7 @@ - + @@ -2013,7 +1971,7 @@ - + @@ -2030,7 +1988,7 @@ - + @@ -2046,7 +2004,7 @@ - + @@ -2063,7 +2021,7 @@ - + @@ -2079,7 +2037,7 @@ - + @@ -2096,7 +2054,7 @@ - + @@ -2112,7 +2070,7 @@ - + @@ -2129,7 +2087,7 @@ - + @@ -2143,19 +2101,19 @@ - + - + - + - + - + #Release# @@ -2196,20 +2154,17 @@ - - - - + - + - + @@ -2371,10 +2326,10 @@ #[str] [R]# - #List of dependencies; see Wiki for details# + ## - ## + #List of dependencies; see Wiki for details# diff --git a/sugar_network/client/releases.py b/sugar_network/client/releases.py index 98b14b2..ff35d16 100644 --- a/sugar_network/client/releases.py +++ b/sugar_network/client/releases.py @@ -155,7 +155,7 @@ class Routes(object): if not contexts.exists(guid): context = self._call(method='GET', path=['context', guid]) contexts.create(context, setters=True) - for prop in ('icon', 'artifact_icon', 'preview'): + for prop in ('icon', 'artifact_icon', 'logo'): blob = self._call(method='GET', path=['context', guid, prop]) if blob is not None: contexts.update(guid, {prop: {'blob': blob}}) diff --git a/sugar_network/model/context.py b/sugar_network/model/context.py index 85d9be8..1763d65 100644 --- a/sugar_network/model/context.py +++ b/sugar_network/model/context.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 Aleksey Lim +# Copyright (C) 2012-2014 Aleksey Lim # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -95,19 +95,19 @@ class Context(db.Resource): }) @db.blob_property(mime_type='image/png') - def preview(self, value): + def logo(self, value): if value: return value if 'package' in self['type']: return Blob({ - 'url': '/static/images/package-preview.png', - 'blob': static.path('images', 'package-preview.png'), + 'url': '/static/images/package-logo.png', + 'blob': static.path('images', 'package-logo.png'), 'mime_type': 'image/png', }) else: return Blob({ - 'url': '/static/images/missing-preview.png', - 'blob': static.path('images', 'missing-preview.png'), + 'url': '/static/images/missing-logo.png', + 'blob': static.path('images', 'missing-.png'), 'mime_type': 'image/png', }) @@ -159,4 +159,4 @@ class Context(db.Resource): 'digest': hashlib.sha1(svg).hexdigest(), } props['icon'] = convert(55, 55) - props['preview'] = convert(140, 140) + props['logo'] = convert(140, 140) diff --git a/sugar_network/model/post.py b/sugar_network/model/post.py index fda366f..88c6956 100644 --- a/sugar_network/model/post.py +++ b/sugar_network/model/post.py @@ -71,8 +71,8 @@ class Post(db.Resource): if value: return value return Blob({ - 'url': '/static/images/missing-preview.png', - 'blob': static.path('images', 'missing-preview.png'), + 'url': '/static/images/missing-logo.png', + 'blob': static.path('images', 'missing-logo.png'), 'mime_type': 'image/png', }) diff --git a/sugar_network/static/httpdocs/images/missing-preview.png b/sugar_network/static/httpdocs/images/missing-logo.png index 98be121..98be121 100644 --- a/sugar_network/static/httpdocs/images/missing-preview.png +++ b/sugar_network/static/httpdocs/images/missing-logo.png Binary files differ diff --git a/sugar_network/static/httpdocs/images/package-preview.png b/sugar_network/static/httpdocs/images/package-logo.png index c6cf086..c6cf086 100644 --- a/sugar_network/static/httpdocs/images/package-preview.png +++ b/sugar_network/static/httpdocs/images/package-logo.png Binary files differ diff --git a/tests/integration/master_personal.py b/tests/integration/master_personal.py index 82c66b2..ec87942 100755 --- a/tests/integration/master_personal.py +++ b/tests/integration/master_personal.py @@ -78,7 +78,7 @@ class MasterPersonalTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview1', + 'logo': 'logo1', 'layer': 'pilot', }) guid_2 = master.post(['context'], { @@ -87,7 +87,7 @@ class MasterPersonalTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview2', + 'logo': 'logo2', 'layer': 'pilot', }) @@ -98,7 +98,7 @@ class MasterPersonalTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview3', + 'logo': 'logo3', 'layer': 'pilot', }) guid_4 = client.post(['context'], { @@ -107,7 +107,7 @@ class MasterPersonalTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview4', + 'logo': 'logo4', 'layer': 'pilot', }) stats_timestamp = int(time.time()) @@ -134,11 +134,11 @@ class MasterPersonalTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview5', + 'logo': 'logo5', 'layer': 'pilot', }) master.put(['context', guid_1, 'title'], 'title_1_') - master.put(['context', guid_3, 'preview'], 'preview3_') + master.put(['context', guid_3, 'logo'], 'logo3_') # Update data on client guid_6 = client.post(['context'], { @@ -147,11 +147,11 @@ class MasterPersonalTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview6', + 'logo': 'logo6', 'layer': 'pilot', }) client.put(['context', guid_3, 'title'], 'title_3_') - client.put(['context', guid_1, 'preview'], 'preview1_') + client.put(['context', guid_1, 'logo'], 'logo1_') # Export client changes trigger = self.wait_for_events(client, event='sync_complete') @@ -186,18 +186,18 @@ class MasterPersonalTest(tests.Test): ]}, client.get(['context'], reply=['guid', 'title'], layer='pilot')) - self.assertEqual('preview1_', master.request('GET', ['context', guid_1, 'preview']).content) - self.assertEqual('preview2', master.request('GET', ['context', guid_2, 'preview']).content) - self.assertEqual('preview3_', master.request('GET', ['context', guid_3, 'preview']).content) - self.assertEqual('preview4', master.request('GET', ['context', guid_4, 'preview']).content) - self.assertEqual('preview5', master.request('GET', ['context', guid_5, 'preview']).content) - self.assertEqual('preview6', master.request('GET', ['context', guid_6, 'preview']).content) - self.assertEqual('preview1_', client.request('GET', ['context', guid_1, 'preview']).content) - self.assertEqual('preview2', client.request('GET', ['context', guid_2, 'preview']).content) - self.assertEqual('preview3_', client.request('GET', ['context', guid_3, 'preview']).content) - self.assertEqual('preview4', client.request('GET', ['context', guid_4, 'preview']).content) - self.assertEqual('preview5', client.request('GET', ['context', guid_5, 'preview']).content) - self.assertEqual('preview6', client.request('GET', ['context', guid_6, 'preview']).content) + self.assertEqual('logo1_', master.request('GET', ['context', guid_1, 'logo']).content) + self.assertEqual('logo2', master.request('GET', ['context', guid_2, 'logo']).content) + self.assertEqual('logo3_', master.request('GET', ['context', guid_3, 'logo']).content) + self.assertEqual('logo4', master.request('GET', ['context', guid_4, 'logo']).content) + self.assertEqual('logo5', master.request('GET', ['context', guid_5, 'logo']).content) + self.assertEqual('logo6', master.request('GET', ['context', guid_6, 'logo']).content) + self.assertEqual('logo1_', client.request('GET', ['context', guid_1, 'logo']).content) + self.assertEqual('logo2', client.request('GET', ['context', guid_2, 'logo']).content) + self.assertEqual('logo3_', client.request('GET', ['context', guid_3, 'logo']).content) + self.assertEqual('logo4', client.request('GET', ['context', guid_4, 'logo']).content) + self.assertEqual('logo5', client.request('GET', ['context', guid_5, 'logo']).content) + self.assertEqual('logo6', client.request('GET', ['context', guid_6, 'logo']).content) self.assertEqual('1', file('master/files/1/1').read()) self.assertEqual('2', file('master/files/2/2').read()) diff --git a/tests/integration/master_slave.py b/tests/integration/master_slave.py index 9a870e3..0bf9f4f 100755 --- a/tests/integration/master_slave.py +++ b/tests/integration/master_slave.py @@ -66,7 +66,7 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview1', + 'logo': 'logo1', 'layer': 'pilot', }) self.touch(('master/files/file1', 'file1')) @@ -77,7 +77,7 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview2', + 'logo': 'logo2', 'layer': 'pilot', }) slave.post(['user', tests.UID], { @@ -89,9 +89,9 @@ class MasterSlaveTest(tests.Test): slave.post(cmd='online-sync') self.assertEqual('title1', master.get(['context', context1, 'title'])) - self.assertEqual('preview1', master.request('GET', ['context', context1, 'preview']).content) + self.assertEqual('logo1', master.request('GET', ['context', context1, 'logo']).content) self.assertEqual('title2', master.get(['context', context2, 'title'])) - self.assertEqual('preview2', master.request('GET', ['context', context2, 'preview']).content) + self.assertEqual('logo2', master.request('GET', ['context', context2, 'logo']).content) stats = Rrd('master/stats/user/%s/%s' % (tests.UID[:2], tests.UID), 1) self.assertEqual([ @@ -118,11 +118,11 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview3', + 'logo': 'logo3', 'layer': 'pilot', }) master.put(['context', context1, 'title'], 'title1_') - master.put(['context', context2, 'preview'], 'preview2_') + master.put(['context', context2, 'logo'], 'logo2_') self.touch(('master/files/file1', 'file1_')) self.touch(('master/files/file2', 'file2')) @@ -132,11 +132,11 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview4', + 'logo': 'logo4', 'layer': 'pilot', }) slave.put(['context', context2, 'title'], 'title2_') - slave.put(['context', context1, 'preview'], 'preview1_') + slave.put(['context', context1, 'logo'], 'logo1_') slave.post(['user', tests.UID], { 'name': 'db', 'values': [(ts + 1, {'field': 2})], @@ -146,13 +146,13 @@ class MasterSlaveTest(tests.Test): slave.post(cmd='online-sync') self.assertEqual('title1_', master.get(['context', context1, 'title'])) - self.assertEqual('preview1_', master.request('GET', ['context', context1, 'preview']).content) + self.assertEqual('logo1_', master.request('GET', ['context', context1, 'logo']).content) self.assertEqual('title2_', master.get(['context', context2, 'title'])) - self.assertEqual('preview2_', master.request('GET', ['context', context2, 'preview']).content) + self.assertEqual('logo2_', master.request('GET', ['context', context2, 'logo']).content) self.assertEqual('title3', master.get(['context', context3, 'title'])) - self.assertEqual('preview3', master.request('GET', ['context', context3, 'preview']).content) + self.assertEqual('logo3', master.request('GET', ['context', context3, 'logo']).content) self.assertEqual('title4', master.get(['context', context4, 'title'])) - self.assertEqual('preview3', master.request('GET', ['context', context3, 'preview']).content) + self.assertEqual('logo3', master.request('GET', ['context', context3, 'logo']).content) stats = Rrd('master/stats/user/%s/%s' % (tests.UID[:2], tests.UID), 1) self.assertEqual([ [('db', ts, {'field': 1.0}), ('db', ts + 1, {'field': 2.0})] @@ -162,13 +162,13 @@ class MasterSlaveTest(tests.Test): self.assertEqual('file2', file('master/files/file2').read()) self.assertEqual('title1_', slave.get(['context', context1, 'title'])) - self.assertEqual('preview1_', slave.request('GET', ['context', context1, 'preview']).content) + self.assertEqual('logo1_', slave.request('GET', ['context', context1, 'logo']).content) self.assertEqual('title2_', slave.get(['context', context2, 'title'])) - self.assertEqual('preview2_', slave.request('GET', ['context', context2, 'preview']).content) + self.assertEqual('logo2_', slave.request('GET', ['context', context2, 'logo']).content) self.assertEqual('title3', slave.get(['context', context3, 'title'])) - self.assertEqual('preview3', slave.request('GET', ['context', context3, 'preview']).content) + self.assertEqual('logo3', slave.request('GET', ['context', context3, 'logo']).content) self.assertEqual('title4', slave.get(['context', context4, 'title'])) - self.assertEqual('preview4', slave.request('GET', ['context', context4, 'preview']).content) + self.assertEqual('logo4', slave.request('GET', ['context', context4, 'logo']).content) stats = Rrd('slave/stats/user/%s/%s' % (tests.UID[:2], tests.UID), 1) self.assertEqual([ [('db', ts, {'field': 1.0}), ('db', ts + 1, {'field': 2.0})] @@ -192,7 +192,7 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview1', + 'logo': 'logo1', 'layer': 'pilot', }) guid_2 = master.post(['context'], { @@ -201,7 +201,7 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview2', + 'logo': 'logo2', 'layer': 'pilot', }) @@ -212,7 +212,7 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview3', + 'logo': 'logo3', 'layer': 'pilot', }) guid_4 = slave.post(['context'], { @@ -221,7 +221,7 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview4', + 'logo': 'logo4', 'layer': 'pilot', }) stats_timestamp = int(time.time()) @@ -246,11 +246,11 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview5', + 'logo': 'logo5', 'layer': 'pilot', }) master.put(['context', guid_1, 'title'], 'title_1_') - master.put(['context', guid_3, 'preview'], 'preview3_') + master.put(['context', guid_3, 'logo'], 'logo3_') # Update data on slave guid_6 = slave.post(['context'], { @@ -259,11 +259,11 @@ class MasterSlaveTest(tests.Test): 'summary': 'summary', 'description': 'description', 'artifact_icon': 'artifact_icon', - 'preview': 'preview6', + 'logo': 'logo6', 'layer': 'pilot', }) slave.put(['context', guid_3, 'title'], 'title_3_') - slave.put(['context', guid_1, 'preview'], 'preview1_') + slave.put(['context', guid_1, 'logo'], 'logo1_') # Export slave changes slave.post(cmd='offline-sync', path=tests.tmpdir + '/sync2/sugar-network-sync') @@ -294,18 +294,18 @@ class MasterSlaveTest(tests.Test): ]}, slave.get(['context'], reply=['guid', 'title'], layer='pilot')) - self.assertEqual('preview1_', master.request('GET', ['context', guid_1, 'preview']).content) - self.assertEqual('preview2', master.request('GET', ['context', guid_2, 'preview']).content) - self.assertEqual('preview3_', master.request('GET', ['context', guid_3, 'preview']).content) - self.assertEqual('preview4', master.request('GET', ['context', guid_4, 'preview']).content) - self.assertEqual('preview5', master.request('GET', ['context', guid_5, 'preview']).content) - self.assertEqual('preview6', master.request('GET', ['context', guid_6, 'preview']).content) - self.assertEqual('preview1_', slave.request('GET', ['context', guid_1, 'preview']).content) - self.assertEqual('preview2', slave.request('GET', ['context', guid_2, 'preview']).content) - self.assertEqual('preview3_', slave.request('GET', ['context', guid_3, 'preview']).content) - self.assertEqual('preview4', slave.request('GET', ['context', guid_4, 'preview']).content) - self.assertEqual('preview5', slave.request('GET', ['context', guid_5, 'preview']).content) - self.assertEqual('preview6', slave.request('GET', ['context', guid_6, 'preview']).content) + self.assertEqual('logo1_', master.request('GET', ['context', guid_1, 'logo']).content) + self.assertEqual('logo2', master.request('GET', ['context', guid_2, 'logo']).content) + self.assertEqual('logo3_', master.request('GET', ['context', guid_3, 'logo']).content) + self.assertEqual('logo4', master.request('GET', ['context', guid_4, 'logo']).content) + self.assertEqual('logo5', master.request('GET', ['context', guid_5, 'logo']).content) + self.assertEqual('logo6', master.request('GET', ['context', guid_6, 'logo']).content) + self.assertEqual('logo1_', slave.request('GET', ['context', guid_1, 'logo']).content) + self.assertEqual('logo2', slave.request('GET', ['context', guid_2, 'logo']).content) + self.assertEqual('logo3_', slave.request('GET', ['context', guid_3, 'logo']).content) + self.assertEqual('logo4', slave.request('GET', ['context', guid_4, 'logo']).content) + self.assertEqual('logo5', slave.request('GET', ['context', guid_5, 'logo']).content) + self.assertEqual('logo6', slave.request('GET', ['context', guid_6, 'logo']).content) self.assertEqual('1', file('master/files/1/1').read()) self.assertEqual('2', file('master/files/2/2').read()) diff --git a/tests/integration/node_packages.py b/tests/integration/node_packages.py index f4bae67..91b6f16 100755 --- a/tests/integration/node_packages.py +++ b/tests/integration/node_packages.py @@ -83,7 +83,7 @@ class NodePackagesSlaveTest(tests.Test): 'title': 'title', 'summary': 'summary', 'description': 'description', - 'preview': 'preview', + 'logo': 'logo', 'layer': 'pilot', 'type': 'package', 'aliases': {'Fedora': {'binary': [['package']]}}, diff --git a/tests/units/client/offline_routes.py b/tests/units/client/offline_routes.py index a0d5045..b14ccd6 100755 --- a/tests/units/client/offline_routes.py +++ b/tests/units/client/offline_routes.py @@ -146,30 +146,30 @@ class OfflineRoutes(tests.Test): 'summary': 'summary', 'description': 'description', }) - blob = 'preview_blob' - ipc.request('PUT', ['context', guid, 'preview'], blob) + blob = 'logo_blob' + ipc.request('PUT', ['context', guid, 'logo'], blob) self.assertEqual( blob, - ipc.request('GET', ['context', guid, 'preview']).content) + ipc.request('GET', ['context', guid, 'logo']).content) self.assertEqual({ - 'preview': { - 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid, + 'logo': { + 'url': 'http://127.0.0.1:5555/context/%s/logo' % guid, 'blob_size': len(blob), 'digest': hashlib.sha1(blob).hexdigest(), 'mime_type': 'image/png', }, }, - ipc.get(['context', guid], reply=['preview'])) + ipc.get(['context', guid], reply=['logo'])) self.assertEqual([{ - 'preview': { - 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid, + 'logo': { + 'url': 'http://127.0.0.1:5555/context/%s/logo' % guid, 'blob_size': len(blob), 'digest': hashlib.sha1(blob).hexdigest(), 'mime_type': 'image/png', }, }], - ipc.get(['context'], reply=['preview'])['result']) + ipc.get(['context'], reply=['logo'])['result']) self.assertEqual( file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(), diff --git a/tests/units/client/online_routes.py b/tests/units/client/online_routes.py index 1d1b780..cf14834 100755 --- a/tests/units/client/online_routes.py +++ b/tests/units/client/online_routes.py @@ -233,30 +233,30 @@ class OnlineRoutes(tests.Test): 'summary': 'summary', 'description': 'description', }) - blob = 'preview_blob' - ipc.request('PUT', ['context', guid, 'preview'], blob, headers={'content-type': 'image/png'}) + blob = 'logo_blob' + ipc.request('PUT', ['context', guid, 'logo'], blob, headers={'content-type': 'image/png'}) self.assertEqual( blob, - ipc.request('GET', ['context', guid, 'preview']).content) + ipc.request('GET', ['context', guid, 'logo']).content) self.assertEqual({ - 'preview': { - 'url': 'http://127.0.0.1:8888/context/%s/preview' % guid, + 'logo': { + 'url': 'http://127.0.0.1:8888/context/%s/logo' % guid, 'blob_size': len(blob), 'digest': hashlib.sha1(blob).hexdigest(), 'mime_type': 'image/png', }, }, - ipc.get(['context', guid], reply=['preview'])) + ipc.get(['context', guid], reply=['logo'])) self.assertEqual([{ - 'preview': { - 'url': 'http://127.0.0.1:8888/context/%s/preview' % guid, + 'logo': { + 'url': 'http://127.0.0.1:8888/context/%s/logo' % guid, 'blob_size': len(blob), 'digest': hashlib.sha1(blob).hexdigest(), 'mime_type': 'image/png', }, }], - ipc.get(['context'], reply=['preview'])['result']) + ipc.get(['context'], reply=['logo'])['result']) self.assertEqual( file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(), diff --git a/tests/units/client/server_routes.py b/tests/units/client/server_routes.py index 6bbb955..8c72468 100755 --- a/tests/units/client/server_routes.py +++ b/tests/units/client/server_routes.py @@ -130,30 +130,30 @@ class ServerRoutesTest(tests.Test): 'summary': 'summary', 'description': 'description', }) - blob = 'preview_blob' - ipc.request('PUT', ['context', guid, 'preview'], blob) + blob = 'logo_blob' + ipc.request('PUT', ['context', guid, 'logo'], blob) self.assertEqual( blob, - ipc.request('GET', ['context', guid, 'preview']).content) + ipc.request('GET', ['context', guid, 'logo']).content) self.assertEqual({ - 'preview': { - 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid, + 'logo': { + 'url': 'http://127.0.0.1:5555/context/%s/logo' % guid, 'blob_size': len(blob), 'digest': hashlib.sha1(blob).hexdigest(), 'mime_type': 'image/png', }, }, - ipc.get(['context', guid], reply=['preview'])) + ipc.get(['context', guid], reply=['logo'])) self.assertEqual([{ - 'preview': { - 'url': 'http://127.0.0.1:5555/context/%s/preview' % guid, + 'logo': { + 'url': 'http://127.0.0.1:5555/context/%s/logo' % guid, 'blob_size': len(blob), 'digest': hashlib.sha1(blob).hexdigest(), 'mime_type': 'image/png', }, }], - ipc.get(['context'], reply=['preview'])['result']) + ipc.get(['context'], reply=['logo'])['result']) self.assertEqual( file(src_root + '/sugar_network/static/httpdocs/images/package.png').read(), diff --git a/tests/units/model/context.py b/tests/units/model/context.py index f2de64d..3389f41 100755 --- a/tests/units/model/context.py +++ b/tests/units/model/context.py @@ -57,7 +57,7 @@ class ContextTest(tests.Test): }) assert exists('master/context/gu/guid/artifact_icon.blob') assert exists('master/context/gu/guid/icon.blob') - assert exists('master/context/gu/guid/preview.blob') + assert exists('master/context/gu/guid/logo.blob') def test_RatingSort(self): directory = db.Volume('db', [Context])['context'] diff --git a/tests/units/node/node.py b/tests/units/node/node.py index 9ad5726..d8f00ec 100755 --- a/tests/units/node/node.py +++ b/tests/units/node/node.py @@ -869,7 +869,7 @@ class NodeTest(tests.Test): context['description']) self.assertEqual(svg, file(context['artifact_icon']['blob']).read()) assert 'blob' in context['icon'] - assert 'blob' in context['preview'] + assert 'blob' in context['logo'] self.assertEqual('http://wiki.sugarlabs.org/go/Activities/Image_Viewer', context['homepage']) self.assertEqual(['image/bmp', 'image/gif'], context['mime_types']) -- cgit v0.9.1