New upstream version 8.1.2.upstream/8.1.2

1 files changed, 15 insertions, 10 deletions

diff --git a/nikola/plugins/compile/rest/vimeo.py b/nikola/plugins/compile/rest/vimeo.py
index c694a87..7047b03 100644
--- a/nikola/plugins/compile/rest/vimeo.py
+++ b/nikola/plugins/compile/rest/vimeo.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2015 Roberto Alsina and others.
+# Copyright © 2012-2020 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -26,18 +26,17 @@
 
 """Vimeo directive for reStructuredText."""
 
-from docutils import nodes
-from docutils.parsers.rst import Directive, directives
-
-import requests
 import json
 
+import requests
+from docutils import nodes
+from docutils.parsers.rst import Directive, directives
 
 from nikola.plugin_categories import RestExtension
+from nikola.plugins.compile.rest import _align_choice, _align_options_base
 
 
 class Plugin(RestExtension):
-
     """Plugin for vimeo reST directive."""
 
     name = "rest_vimeo"
@@ -46,13 +45,15 @@ class Plugin(RestExtension):
         """Set Nikola site."""
         self.site = site
         directives.register_directive('vimeo', Vimeo)
-        return super(Plugin, self).set_site(site)
+        return super().set_site(site)
 
 
-CODE = """<iframe src="//player.vimeo.com/video/{vimeo_id}"
+CODE = """<div class="vimeo-video{align}">
+<iframe src="https://player.vimeo.com/video/{vimeo_id}"
 width="{width}" height="{height}"
 frameborder="0" webkitAllowFullScreen="webkitAllowFullScreen" mozallowfullscreen="mozallowfullscreen" allowFullScreen="allowFullScreen">
 </iframe>
+</div>
 """
 
 VIDEO_DEFAULT_HEIGHT = 500
@@ -60,7 +61,6 @@ VIDEO_DEFAULT_WIDTH = 281
 
 
 class Vimeo(Directive):
-
     """reST extension for inserting vimeo embedded videos.
 
     Usage:
@@ -75,6 +75,7 @@ class Vimeo(Directive):
     option_spec = {
         "width": directives.positive_int,
         "height": directives.positive_int,
+        "align": _align_choice
     }
 
     # set to False for not querying the vimeo api for size
@@ -94,6 +95,10 @@ class Vimeo(Directive):
                 return err
             self.set_video_size()
         options.update(self.options)
+        if self.options.get('align') in _align_options_base:
+            options['align'] = ' align-' + self.options['align']
+        else:
+            options['align'] = ''
         return [nodes.raw('', CODE.format(**options), format='html')]
 
     def check_modules(self):
@@ -109,7 +114,7 @@ class Vimeo(Directive):
 
             if json:  # we can attempt to retrieve video attributes from vimeo
                 try:
-                    url = ('//vimeo.com/api/v2/video/{0}'
+                    url = ('https://vimeo.com/api/v2/video/{0}'
                            '.json'.format(self.arguments[0]))
                     data = requests.get(url).text
                     video_attributes = json.loads(data)[0]