Merge 19d7f8a into 67cb86b

sc/social/like/browser/configure.zcml

@@ -77,4 +77,12 @@
         permission="cmf.ManagePortal"
         />
 
+    <browser:page
+       name="sociallike-fallback-image"
+       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+       class=".imagefallback.ImageFallBack"
+       layer="..interfaces.ISocialLikeLayer"
+       permission="zope.Public"
+       />
+
 </configure>

sc/social/like/browser/imagefallback.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from plone import api
+from plone.formwidget.namedfile.converter import b64decode_file
+from plone.namedfile.browser import Download
+from plone.namedfile.file import NamedImage
+from sc.social.like.interfaces import ISocialLikeSettings
+
+
+class ImageFallBack(Download):
+
+    filename = None
+    data = None
+
+    def __call__(self):
+        self.setup()
+        super(ImageFallBack, self).__call__()
+
+    def setup(self):
+        fallback_image = api.portal.get_registry_record('fallback_image', interface=ISocialLikeSettings)
+        if fallback_image:
+            filename, data = b64decode_file(fallback_image)
+            data = NamedImage(data=data, filename=filename)
+            self.data = data
+            self.filename = filename
+
+    def _getFile(self):
+        return self.data

sc/social/like/browser/viewlets.py

@@ -10,6 +10,7 @@
 from sc.social.like.interfaces import ISocialLikeSettings
 from sc.social.like.plugins.facebook.utils import facebook_language
 from sc.social.like.utils import get_content_image
+from sc.social.like.utils import get_fallback_image
 from sc.social.like.utils import get_language
 from zope.component import getMultiAdapter
 from zope.component import getUtility
@@ -110,7 +111,7 @@ def image_url(self):
         if img:
             return img.url
         else:
-            return self.portal_url() + '/logo.png'
+            return self.portal_url() + get_fallback_image()
 
     def image_width(self):
         return self.image.width

sc/social/like/configure.zcml

@@ -22,6 +22,11 @@
        name="sc.social.likes.plugins"
        />
 
+     <utility
+       component=".vocabularies.image_scales_vocabulary"
+       name="sc.social.likes.ImagesScales"
+       />
+
   <subscriber
       for="plone.registry.interfaces.IRecordModifiedEvent"
       handler=".subscribers.social_media_record_synchronizer"

sc/social/like/interfaces.py

@@ -1,9 +1,12 @@
 # -*- coding:utf-8 -*-
+from plone.autoform import directives as form
+from plone.formwidget.namedfile.widget import NamedImageFieldWidget
 from plone.supermodel import model
 from sc.social.like import LikeMessageFactory as _
 from sc.social.like.config import DEFAULT_ENABLED_CONTENT_TYPES
 from sc.social.like.config import DEFAULT_PLUGINS_ENABLED
 from sc.social.like.utils import validate_canonical_domain
+from sc.social.like.utils import validate_image_settings
 from sc.social.like.vocabularies import FacebookButtonsVocabulary
 from sc.social.like.vocabularies import FacebookVerbsVocabulary
 from sc.social.like.vocabularies import TypeButtonVocabulary
@@ -212,3 +215,29 @@ class ISocialLikeSettings(model.Schema):
         required=False,
         default='',
     )
+
+    model.fieldset(
+        'open_graph', label=u'Open Graph', fields=['fallback_image', 'image_scale'])
+
+    form.widget('fallback_image', NamedImageFieldWidget)
+    fallback_image = schema.ASCII(
+        title=_(u'Image fallback'),
+        description=_(
+            u'help_fallback_image',
+            default=u'Content that does not have an image will be displayed on the share.\n '
+                    u'If you do not enter a \"logo.png\" image will be the default.',
+        ),
+        required=False,
+        constraint=validate_image_settings,
+    )
+
+    image_scale = schema.Choice(
+        title=_(u'Image scale for shared'),
+        description=_(
+            u'help_image_scale',
+            default=u'Scale size of the image of the content to be shared.',
+        ),
+        required=True,
+        default=u'large',
+        vocabulary='sc.social.likes.ImagesScales',
+    )

sc/social/like/locales/pt_BR/LC_MESSAGES/sc.social.like.po

@@ -422,3 +422,23 @@ msgstr "Cancelar"
 #: sc/social/like/vocabularies.py:36
 msgid "vertical"
 msgstr "vertical"
+
+#: ./sc/social/like/interfaces.py:209
+msgid "Open Graph"
+msgstr "Open Graph"
+
+#: ./sc/social/like/interfaces.py:211
+msgid "Image fallback"
+msgstr "Imagem"
+
+#: ./sc/social/like/interfaces.py:213
+msgid "help_fallback_image"
+msgstr "O conteúdo que não possuir uma imagem essa será exibida no compartilhamento.\n Caso não informe uma, a imagem \"logo.png\" será a padrão."
+
+#: ./sc/social/like/interfaces.py:223
+msgid "Image scale for shared"
+msgstr "Tamanho da imagem do compartilhamento"
+
+#: ./sc/social/like/interfaces.py:225
+msgid "help_image_scale"
+msgstr "Tamanho em escala da imagem do conteúdo que será compartilhado."

sc/social/like/locales/sc.social.like.pot

@@ -422,3 +422,23 @@ msgstr ""
 #: ./sc/social/like/vocabularies.py:36
 msgid "vertical"
 msgstr ""
+
+#: ./sc/social/like/interfaces.py:209
+msgid "Open Graph"
+msgstr ""
+
+#: ./sc/social/like/interfaces.py:211
+msgid "Image fallback"
+msgstr ""
+
+#: ./sc/social/like/interfaces.py:213
+msgid "help_fallback_image"
+msgstr ""
+
+#: ./sc/social/like/interfaces.py:223
+msgid "Image scale for shared"
+msgstr ""
+
+#: ./sc/social/like/interfaces.py:225
+msgid "help_image_scale"
+msgstr ""

sc/social/like/profiles/default/metadata.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>3047</version>
+  <version>3048</version>
 </metadata>

sc/social/like/tests/test_controlpanel.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
+# from cStringIO import StringIO
 from plone import api
 from plone.app.testing import logout
+# from plone.formwidget.namedfile.converter import b64decode_file
 from plone.registry.interfaces import IRegistry
 from sc.social.like.config import PROJECTNAME
 from sc.social.like.interfaces import ISocialLikeSettings
@@ -107,6 +109,14 @@ def test_twitter_username_record_in_registry(self):
         self.assertTrue(hasattr(self.settings, 'twitter_username'))
         self.assertEqual(self.settings.twitter_username, '')
 
+    def test_fallback_image_record_in_registry(self):
+        self.assertTrue(hasattr(self.settings, 'fallback_image'))
+        self.assertEqual(self.settings.fallback_image, None)
+
+    def test_image_scale_record_in_registry(self):
+        self.assertTrue(hasattr(self.settings, 'image_scale'))
+        self.assertEqual(self.settings.image_scale, 'large')
+
     def test_records_removed_on_uninstall(self):
         qi = self.portal['portal_quickinstaller']
 
@@ -126,6 +136,8 @@ def test_records_removed_on_uninstall(self):
             ISocialLikeSettings.__identifier__ + '.fbbuttons',
             ISocialLikeSettings.__identifier__ + '.fbshowlikes',
             ISocialLikeSettings.__identifier__ + '.twitter_username',
+            ISocialLikeSettings.__identifier__ + '.fallback_image',
+            ISocialLikeSettings.__identifier__ + '.image_scale',
         ]
 
         for r in records:

sc/social/like/upgrades/v3047/__init__.py

@@ -0,0 +1 @@
+# -*- coding:utf-8 -*-

sc/social/like/upgrades/v3047/configure.zcml

@@ -3,8 +3,8 @@
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup">
 
   <genericsetup:upgradeSteps
-      source="3046"
-      destination="3047"
+      source="3047"
+      destination="3048"
       profile="sc.social.like:default">
 
     <genericsetup:upgradeDepends

sc/social/like/utils.py

@@ -1,5 +1,8 @@
 # -*- coding:utf-8 -*-
 from Acquisition import aq_base
+from plone import api
+from plone.formwidget.namedfile.converter import b64decode_file
+from plone.namedfile.file import NamedBlobImage
 from Products.Archetypes.interfaces import IBaseContent
 from Products.CMFPlone.utils import safe_hasattr
 from sc.social.like import LikeMessageFactory as _
@@ -198,3 +201,40 @@ def validate_og_lead_image(image):
         raise ValueError(MSG_INVALID_OG_LEAD_IMAGE_ASPECT_RATIO)
 
     return True
+
+
+def get_fallback_image():
+    from sc.social.like.interfaces import ISocialLikeSettings
+
+    fallback_image = api.portal.get_registry_record('fallback_image', interface=ISocialLikeSettings)
+    if fallback_image:
+        filename, data = b64decode_file(fallback_image)
+        return '/@@sociallike-fallback-image/' + filename
+    else:
+        return '/logo.png'
+
+
+def validate_image_settings(value):
+    """Check image fallback be in formats mime type, dimensions and size."""
+
+    filename, data = b64decode_file(value)
+    image = NamedBlobImage(data=data, filename=filename)
+
+    if image is None:
+        return True
+
+    if image.contentType not in OG_LEAD_IMAGE_MIME_TYPES:
+        raise Invalid(MSG_INVALID_OG_LEAD_IMAGE_MIME_TYPE)
+
+    if image.getSize() > OG_LEAD_IMAGE_MAX_SIZE:
+        raise Invalid(MSG_INVALID_OG_LEAD_IMAGE_SIZE)
+
+    width, height = image.getImageSize()
+    if width < OG_LEAD_IMAGE_MIN_WIDTH or height < OG_LEAD_IMAGE_MIN_HEIGHT:
+        raise Invalid(MSG_INVALID_OG_LEAD_IMAGE_DIMENSIONS)
+
+    aspect_ratio = float(width) / float(height)
+    if aspect_ratio < OG_LEAD_IMAGE_MIN_ASPECT_RATIO:
+        raise Invalid(MSG_INVALID_OG_LEAD_IMAGE_ASPECT_RATIO)
+
+    return True

sc/social/like/vocabularies.py

@@ -1,9 +1,13 @@
 # -*- coding:utf-8 -*-
+from plone.app.imaging.utils import getAllowedSizes
 from plone.memoize import forever
 from sc.social.like import LikeMessageFactory as _
+from sc.social.like.config import OG_LEAD_IMAGE_MIN_HEIGHT
+from sc.social.like.config import OG_LEAD_IMAGE_MIN_WIDTH
 from sc.social.like.plugins import IPlugin
 from zope.component import getUtilitiesFor
 from zope.interface import implementer
+from zope.interface import provider
 from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
@@ -46,3 +50,18 @@ def __call__(self, context):
     SimpleTerm(value=u'Like', title=_(u'Like')),
     SimpleTerm(value=u'Share', title=_(u'Share')),
 ])
+
+
+@provider(IVocabularyFactory)
+def image_scales_vocabulary(object):
+    """Obtains available scales from plone.app.imaging"""
+    terms = []
+    for scale, (width, height) in getAllowedSizes().iteritems():
+        if width >= OG_LEAD_IMAGE_MIN_WIDTH and height >= OG_LEAD_IMAGE_MIN_HEIGHT:
+            translated = _(
+                'imagescale_{0:s}'.format(scale),
+                default='{0:s} ${{width}}x${{height}}'.format(scale),
+                mapping={'width': str(width), 'height': str(height)})
+            terms.append(SimpleTerm(scale, scale, translated))
+
+    return SimpleVocabulary(terms)