Fix test_terminator

Author: Martin Journois

folium/plugins/terminator.py

@@ -5,19 +5,11 @@
 
 Leaflet.Terminator is a simple plug-in to the Leaflet library to overlay day and night regions on maps.
 """
-try:
-    from urllib.request import urlopen as _urlopen
-except:
-    from urllib import urlopen as _urlopen
+from jinja2 import Template
 
-from .plugin import Plugin
+from folium.element import JavascriptLink, MacroElement, Figure
 
-# As LO.Terminator.js is not served on both HTTP and HTTPS, we need to embed it explicitely into the code.
-_request = _urlopen("http://rawgithub.com/joergdietrich/Leaflet.Terminator/master/L.Terminator.js")
-assert _request.getcode()==200, "Error while loading Leaflet.terminator.js"
-_terminator_script = _request.read().decode('utf8')
-
-class Terminator(Plugin):
+class Terminator(MacroElement):
     """Leaflet.Terminator is a simple plug-in to the Leaflet library to overlay day and night regions on maps."""
     def __init__(self):
         """Creates a Terminator plugin to append into a map with
@@ -27,12 +19,20 @@ def __init__(self):
         ----------
         """
         super(Terminator, self).__init__()
-        self.plugin_name = 'Terminator'
+        self._name = 'Terminator'
+
+        self._template = Template(u"""
+            {% macro script(this, kwargs) %}
+                L.terminator().addTo({{this._parent.get_name()}});
+            {% endmacro %}
+            """)
+    def render(self,**kwargs):
+        super(Terminator,self).render(**kwargs)
 
-    def render_header(self, nb):
-        """Generates the header part of the plugin."""
-        return '<script type="text/javascript">'+_terminator_script+'</script>' if nb==0 else ""
+        figure = self.get_root()
+        assert isinstance(figure,Figure), ("You cannot render this Element "
+            "if it's not in a Figure.")
 
-    def render_js(self, nb):
-        """Generates the Javascript part of the plugin."""
-        return "L.terminator().addTo(map);" if nb==0 else ""
+        figure.header.add_children(\
+            JavascriptLink("https://rawgithub.com/joergdietrich/Leaflet.Terminator/master/L.Terminator.js"),
+                                   name='markerclusterjs')

tests/test_plugins.py

@@ -33,9 +33,9 @@ def test_marker_cluster(self):
 
     def test_terminator(self):
         mapa = folium.Map([45., 3.], zoom_start=1)
-        mapa.add_plugin(plugins.Terminator())
-        mapa.add_plugin(plugins.ScrollZoomToggler())
-        mapa._build_map()
+        mapa.add_children(plugins.Terminator())
+        mapa.add_children(plugins.ScrollZoomToggler())
+        mapa._repr_html_()
 
     def test_boat_marker(self):
         mapa = folium.Map([30., 0.], zoom_start=3)