0001-add-indexing-of-pages-6793.patch

Frédéric Péters, 05 mars 2017 09:13

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/2] add indexing of pages (#6793)

 combo/apps/newsletters/models.py           |  6 ++-
 combo/apps/notifications/models.py         |  6 +--
 combo/data/models.py                       | 20 +++++++++-
 combo/data/search_indexes.py               | 37 ++++++++++++++++++
 combo/data/templates/combo/search/page.txt |  5 +++
 combo/settings.py                          | 10 +++++
 tests/test_search.py                       | 60 +++++++++++++++++++++++++++++-
 7 files changed, 137 insertions(+), 7 deletions(-)
 create mode 100644 combo/data/search_indexes.py
 create mode 100644 combo/data/templates/combo/search/page.txt

                 context['form'] = form
             return super(NewslettersCell, self).render(context)
         def is_relevant(self, context):
             return bool(context.get('user').is_authenticated())
         def is_visible(self, user=None):
             if user is None or not user.is_authenticated():
                 return False
             return super(NewslettersCell, self).is_visible(user)

         class Meta:
             verbose_name = _('User Notifications')
         def is_relevant(self, context):
             if not (getattr(context['request'], 'user', None) and context['request'].user.is_authenticated()):
         def is_visible(self, user=None):
             if user is None or not user.is_authenticated():
                 return False
             return True
             return super(NotificationsCell, self).is_visible(user)
         def get_cell_extra_context(self, context):
             extra_context = super(NotificationsCell, self).get_cell_extra_context(context)

     from django.forms import models as model_forms
     from django import forms
     from django import template
     from django.utils.html import strip_tags
     from django.utils.safestring import mark_safe
     from django.utils.text import slugify
     from django.utils.translation import ugettext_lazy as _
-...
         def is_visible(self, user=None):
             return element_is_visible(self, user=user)
         def get_cells(self):
             return CellBase.get_cells(page_id=self.id)
         def get_serialized_page(self):
             cells = CellBase.get_cells(page_id=self.id)
             cells = self.get_cells()
             serialized_page = json.loads(serializers.serialize('json', [self],
                 use_natural_foreign_keys=True, use_natural_primary_keys=True))[0]
             del serialized_page['model']
-...
             '''Apply changes to the template context that must visible to all cells in the page'''
             return context
         def render_for_search(self):
             context = Context({'synchronous': True})
             if not self.is_enabled():
                 return
             if not self.is_visible(user=None):
                 return
             if not self.is_relevant(context):
                 return
             from HTMLParser import HTMLParser
             return HTMLParser().unescape(strip_tags(self.render(context)))
     @register_cell_class
     class TextCell(CellBase):
-...
                     root_page=self.root_page, depth=self.depth)
             return ctx
         def render_for_search(self):
             return ''
     @register_cell_class
     class LinkCell(CellBase):

     # combo - content management system
     # Copyright (C) 2014-2017  Entr'ouvert
+    #
     # This program is free software: you can redistribute it and/or modify it
     # under the terms of the GNU Affero General Public License as published
     # by the Free Software Foundation, either version 3 of the License, or
     # (at your option) any later version.
+    #
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
+    #
     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from haystack import indexes
     from haystack.exceptions import SkipDocument
     from .models import Page, CellBase
     class PageIndex(indexes.SearchIndex, indexes.Indexable):
         title = indexes.CharField(model_attr='title', boost=1.5)
         text = indexes.CharField(document=True, use_template=True,
                 template_name='combo/search/page.txt')
         url = indexes.CharField(indexed=False)
         def get_model(self):
             return Page
         def prepare_url(self, obj):
             return obj.get_online_url()
         def prepare(self, obj):
             if not obj.is_visible(user=None):
                 raise SkipDocument()
             return super(PageIndex, self).prepare(obj)

combo/data/templates/combo/search/page.txt
	1	{{object.title}}
	2
	3	{% for cell in object.get_cells %}
	4	{{ cell.render_for_search }}
	5	{% endfor %}

         'django.contrib.staticfiles',
         'rest_framework',
         'ckeditor',
         'haystack',
         'gadjo',
         'cmsplugin_blurp',
         'combo.data',
-...
     CKEDITOR_UPLOAD_PATH = 'uploads/'
     CKEDITOR_IMAGE_BACKEND = 'pillow'
     CKEDITOR_CONFIGS = {
         'default': {
             'allowedContent': True,
-...
         },
+    }
     HAYSTACK_CONNECTIONS = {
         'default': {
             'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
             'PATH': os.path.join(BASE_DIR, 'whoosh_index'),
         },
+    }
     COMBO_DEFAULT_PUBLIC_TEMPLATE = 'standard'
     COMBO_PUBLIC_TEMPLATES = {
         'standard': {

     from django.template import Context
     from django.core.urlresolvers import reverse
     from haystack.exceptions import SkipDocument
     from combo.apps.search.models import SearchCell
     from combo.data.models import Page, JsonCell
     from combo.data.models import Page, JsonCell, TextCell, MenuCell
     from combo.data.search_indexes import PageIndex
     pytestmark = pytest.mark.django_db
-...
                 requests_get.return_value = mock.Mock(content=json.dumps(data), status_code=200)
                 resp = app.get(url)
                 assert requests_get.call_args[0][0] == 'http://www.example.net/search/foo/'
     def test_search_cell_visibility(app):
         page = Page(title='example page', slug='example-page')
         page.save()
         with SearchServices(SEARCH_SERVICES):
             cell = SearchCell(page=page, order=0)
             assert not cell.is_visible()
             cell._search_service = '_text'
             assert cell.is_visible()
     def test_search_contents():
         page = Page(title='example page', slug='example-page')
         page.save()
         # no indexation of private cells (is_visible check)
         cell = TextCell(page=page, text='foobar', public=False, order=0)
         assert cell.render_for_search() == ''
         # no indexation of empty cells (is_relevant check)
         cell = TextCell(page=page, text='', order=0)
         assert cell.render_for_search() == ''
         # indexation
         cell = TextCell(page=page, text='<p>foobar</p>', order=0)
         assert cell.render_for_search().strip() == 'foobar'
         # no indexation of menu cells
         cell = MenuCell(page=page, order=0)
         assert cell.render_for_search() == ''
     def test_search_contents_index():
         page = Page(title='example page', slug='example-page')
         page.save()
         page_index = PageIndex()
         assert page_index.get_model() is Page
         assert page_index.prepare_url(page) == '/example-page/'
         page_index.prepare(page)
         page.public = False
         with pytest.raises(SkipDocument):
             page_index.prepare(page)
         page.public = True
         cell = TextCell(page=page, text='<p>foobar</p>', order=0)
         cell.save()
         prepared_data = page_index.prepare(page)
         assert page.title in prepared_data['text']
         assert 'foobar' in prepared_data['text']
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-add-indexing-of-pages-6793.patch