From 4ffb4ed4efa4f6d670762710be7cfb89a3b51296 Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Tue, 26 Mar 2013 07:46:25 -0700
Subject: [PATCH 01/10] #57: re-factor to make it easy to deploy and support
 other web technologies.

- the displayable module knows how to display figures
- the deployable module knows how to deploy figures
- favor os.sep of hardcoding / in path
- replaced string replace calls with jinja2 template module
---
 d3py/deployable.py         |  53 +++++++++++++
 d3py/displayable.py        | 137 +++++++++++++++++++++++++++++++++
 d3py/figure.py             | 154 ++++++++-----------------------------
 d3py/networkx_figure.py    |   3 +-
 d3py/pandas_figure.py      |   9 +--
 examples/d3py_area.py      |  16 ++--
 examples/d3py_bar.py       |  19 ++---
 examples/d3py_graph.py     |  10 ++-
 examples/d3py_line.py      |  12 +--
 examples/d3py_multiline.py |  17 ++--
 examples/d3py_scatter.py   |  13 ++--
 examples/util.py           |  25 ++++++
 12 files changed, 296 insertions(+), 172 deletions(-)
 create mode 100644 d3py/deployable.py
 create mode 100644 d3py/displayable.py
 create mode 100644 examples/util.py

diff --git a/d3py/deployable.py b/d3py/deployable.py
new file mode 100644
index 0000000..71eef60
--- /dev/null
+++ b/d3py/deployable.py
@@ -0,0 +1,53 @@
+from abc import ABCMeta
+from exceptions import NotImplementedError
+
+import logging
+import os
+
+class deployable():
+    """
+    Given a d3py.figure, deployable stores it persistently. Concrete classes
+    may simply save the files to the file system or be used to deploy them 
+    in the cloud. 
+    """
+    
+    __metaclass__ = ABCMeta
+
+    def save(self, fig):
+        raise NotImplementedError
+
+class FileSystem(deployable):
+    """
+    Concrete class which simply saves the files to the file system
+    """
+    def __init__(self, fig, dest_dir, host="localhost", port=8000, logging=False):
+        self.fig = fig
+        self.host = host
+        self.port = port
+        self.dest_dir = dest_dir
+
+    def save(self):
+        """
+        Save the figure to dest_dir
+        """
+        self.fig.update()
+        self.fig.save()
+        self.fig.renderHtml(self.host, self.port)
+
+        if self.dest_dir is None:
+            raise Exception("Destination directory not defined")
+        if not os.path.exists(self.dest_dir):
+            raise IOError("Destination directory, {d} , does not exist.".format(d=self.dest_dir))
+        os.chdir(self.dest_dir)
+        static_dir = self.dest_dir + os.sep + "static"
+        if not os.path.exists(static_dir): 
+            os.mkdir(static_dir)
+        for k_filename in self.fig.filemap:
+            f = self.dest_dir + os.sep + k_filename
+            with open(f, 'w',0644) as fd_out:
+                fd_in = self.fig.filemap[k_filename]["fd"]
+                fd_in.seek(0)
+                # import pdb; pdb.set_trace()
+                for line in fd_in.readlines():
+                    fd_out.write(line)
+                fd_out.close()
diff --git a/d3py/displayable.py b/d3py/displayable.py
new file mode 100644
index 0000000..ba1f9ad
--- /dev/null
+++ b/d3py/displayable.py
@@ -0,0 +1,137 @@
+from abc import ABCMeta
+from exceptions import NotImplementedError
+
+import logging
+
+# in support of SimplyServer 
+import threading
+import webbrowser
+from HTTPHandler import CustomHTTPRequestHandler, ThreadedHTTPServer
+
+# requires IPython 0.11.0 or higher
+import IPython.core.display
+
+class displayable():
+    """
+    Given a d3py.figure, displayables present the graph to the user. 
+    The first displayable is based on python's SimpleHTTPServer class.
+    
+    These classes should know nothing of html, css or javascript which
+    live in the figure class. 
+    """
+    __metaclass__ = ABCMeta
+    
+    def show(self, fig):
+        raise NotImplementedError
+
+class SimplyServer(displayable):
+    """
+    Use Python's SimpleHTTPServer class to present this resulting d3 output
+    to the user. 
+    """
+    def __init__(self, fig, host="localhost", port=8000, 
+        interactive=False, logging=False):
+
+        self.fig = fig
+        self.host = host
+        self.port = port
+        self._server_thread = None
+        self.httpd = None
+        # interactive is True by default as this is designed to be a command line tool
+        # we do not want to block interaction after plotting.
+        self.interactive = interactive
+
+    def ion(self):
+        """
+        Turns interactive mode on ala pylab
+        """
+        self.interactive = True
+    
+    def ioff(self):
+        """
+        Turns interactive mode off
+        """
+        self.interactive = False
+
+    def show(self, interactive=None):
+        self.fig.update()
+        self.fig.save()
+        self.fig.renderHtml(self.host, self.port)
+        if interactive is not None:
+            blocking = not interactive
+        else:
+            blocking = not self.interactive
+
+        if blocking:
+            self._serve(blocking=True)
+        else:
+            # if not blocking, we serve the 
+            self._serve(blocking=False)
+            # fire up a browser
+            webbrowser.open_new_tab("http://%s:%s/%s.html"%(self.host,self.port, self.name))
+
+    def _serve(self, blocking=True):
+        """
+        start up a server to serve the files for this vis.
+        """
+        msgparams = (self.host, self.port, self.fig.name)
+        url = "http://%s:%s/%s.html"%msgparams
+        if self._server_thread is None or self._server_thread.active_count() == 0:
+            Handler = CustomHTTPRequestHandler
+            Handler.filemap = self.fig.filemap
+            Handler.logging = self.fig.logging
+            try:
+                self.httpd = ThreadedHTTPServer(("", self.port), Handler)
+            except Exception, e:
+                print "Exception %s"%e
+                return False
+            if blocking:
+                logging.info('serving forever on port: %s'%msgparams[1])
+                msg = "You can find your chart at " + url
+                print msg
+                print "Ctrl-C to stop serving the chart and quit!"
+                self._server_thread = None
+                self.httpd.serve_forever()
+            else:
+                logging.info('serving asynchronously on port %s'%msgparams[1])
+                self._server_thread = threading.Thread(
+                    target=self.httpd.serve_forever
+                )
+                self._server_thread.daemon = True
+                self._server_thread.start()
+                msg = "You can find your chart at " + url
+                print msg
+
+
+    def __enter__(self):
+        self.interactive = False
+        return self
+
+    def __exit__(self, ex_type, ex_value, ex_tb):
+        if ex_tb is not None:
+            print "Cleanup after exception: %s: %s"%(ex_type, ex_value)
+        self._cleanup()
+
+    def __del__(self):
+        self._cleanup()
+
+    def _cleanup(self):
+        try:
+            if self.httpd is not None:
+                print "Shutting down httpd"
+                self.httpd.shutdown()
+                self.httpd.server_close()
+        except Exception, e:
+            print "Error in clean-up: %s"%e
+
+class IPython(displayable):
+    """
+    IPython integration 
+    """
+    def __init__(self):
+        pass
+        
+    def show(self, fig):
+        html = "<iframe src=http://%s:%s/%s.html width=%s height=%s>" % (
+            self.host, self.port, self.name, fig.width, fig.height)
+        IPython.core.display.HTML(html)
diff --git a/d3py/figure.py b/d3py/figure.py
index d816448..abc24bf 100644
--- a/d3py/figure.py
+++ b/d3py/figure.py
@@ -1,38 +1,32 @@
 import logging
-import webbrowser
-from HTTPHandler import CustomHTTPRequestHandler, ThreadedHTTPServer
-import IPython.core.display
-import threading
-from cStringIO import StringIO
+
+from StringIO import StringIO
 import time
 import json
 import os
 
+from jinja2 import Template # well-known templating module
+
 from css import CSS
 import javascript as JS
 
 class Figure(object):
-    def __init__(self, name, width, height, interactive, font, logging,  template, host, port, **kwargs):
+    """
+    Maintains in internal representation of d3 geometries. This implies
+    an understanding of css,html and javascript. 
+    """
+    def __init__(self, name, width, height, font, logging, template, **kwargs):
 
         # store data
         self.name = '_'.join(name.split())
         d3py_path = os.path.abspath(os.path.dirname(__file__))
         self.filemap = {
-            "static/d3.js":{
-                "fd":open(d3py_path+"/d3.js","r"), 
+            "static" + os.sep + "d3.js":{
+                "fd":open(d3py_path + os.sep + "d3.js","r"), 
                 "timestamp":time.time()
             },
         }
 
-        # Networking stuff
-        self.host = host
-        self.port = port
-        self._server_thread = None
-        self.httpd = None
-
-        # interactive is True by default as this is designed to be a command line tool
-        # we do not want to block interaction after plotting.
-        self.interactive = interactive
         self.logging = logging
 
         # initialise strings
@@ -48,8 +42,9 @@ def __init__(self, name, width, height, interactive, font, logging,  template, h
         
         # we use bostock's scheme http://bl.ocks.org/1624660
         self.css = CSS()
-        self.html = ""
-        self.template = template or "".join(open(d3py_path+'/d3py_template.html').readlines())
+
+        self.html = template or "".join(open(
+            d3py_path + os.sep + 'd3py_template.html').readlines())
         self.js_geoms = JS.JavaScript()
         self.css_geoms = CSS()
         self.geoms = []
@@ -67,7 +62,6 @@ def _build(self):
         logging.debug('building chart')
         self._build_js()
         self._build_css()
-        self._build_html()
         self._build_geoms()
 
     def update(self):
@@ -76,39 +70,22 @@ def update(self):
         self.save()
 
     def save(self):
+        """
+        Saving the chart. We need to wait to save the html because 
+        we do not know how this will be displayed or deployed. The
+        assoicated displayable will provide the remaining information
+        when it calls renderHtml() 
+        """
         logging.debug('saving chart')
         self._save_data()
         self._save_css()
         self._save_js()
-        self._save_html()
 
     def _clanup(self):
-        raise NotImplementedError
-
-
-    def __enter__(self):
-        self.interactive = False
-        return self
-
-    def __exit__(self, ex_type, ex_value, ex_tb):
-        if ex_tb is not None:
-            print "Cleanup after exception: %s: %s"%(ex_type, ex_value)
-        self._cleanup()
-
-    def __del__(self):
-        self._cleanup()
-
-    def ion(self):
-        """
-        Turns interactive mode on ala pylab
-        """
-        self.interactive = True
-    
-    def ioff(self):
         """
-        Turns interactive mode off
+        What is the intent of this stub? see  https://github.com/mikedewar/d3py/issues/62
         """
-        self.interactive = False
+        raise NotImplementedError
 
     def _set_data(self):
         self.update()
@@ -123,13 +100,6 @@ def _build_css(self):
         chart.update(self.args)
         self.css["#chart"] = chart
 
-    def _build_html(self):
-        # we start the html using a template - it's pretty simple
-        self.html = self.template
-        self.html = self.html.replace("{{ name }}", self.name)
-        self.html = self.html.replace("{{ font }}", self.font)
-        self._save_html()
-
     def _build_geoms(self):
         self.js_geoms = JS.JavaScript()
         self.css_geoms = CSS()
@@ -194,76 +164,16 @@ def _save_js(self):
         self.filemap[filename] = {"fd":StringIO(js),
                 "timestamp":time.time()}
 
-    def _save_html(self):
-        # update the html with the correct port number
-        self.html = self.html.replace("{{ port }}", str(self.port))
-        self.html = self.html.replace("{{ host }}", str(self.host))
-        # write html
-        filename = "%s.html"%self.name
-        self.filemap[filename] = {"fd":StringIO(self.html),
-                "timestamp":time.time()}
-
-    def show(self, interactive=None):
-        self.update()
-        self.save()
-        if interactive is not None:
-            blocking = not interactive
-        else:
-            blocking = not self.interactive
-
-        if blocking:
-            self._serve(blocking=True)
-        else:
-            # if not blocking, we serve the 
-            self._serve(blocking=False)
-            # fire up a browser
-            webbrowser.open_new_tab("http://%s:%s/%s.html"%(self.host,self.port, self.name))
-
-    def display(self, width=700, height=400):
-        html = "<iframe src=http://%s:%s/%s.html width=%s height=%s>" %(self.host, self.port, self.name, width, height)
-        IPython.core.display.HTML(html)
-
-    def _serve(self, blocking=True):
+    def renderHtml(self, a_host, a_port):
         """
-        start up a server to serve the files for this vis.
+        Bind a var in the html template code with that value provided. 
+        Implies all related variables defined. 
+        Implies all related variables defined. 
         """
-        msgparams = (self.host, self.port, self.name)
-        url = "http://%s:%s/%s.html"%msgparams
-        if self._server_thread is None or self._server_thread.active_count() == 0:
-            Handler = CustomHTTPRequestHandler
-            Handler.filemap = self.filemap
-            Handler.logging = self.logging
-            try:
-                self.httpd = ThreadedHTTPServer(("", self.port), Handler)
-            except Exception, e:
-                print "Exception %s"%e
-                return False
-            if blocking:
-                logging.info('serving forever on port: %s'%msgparams[1])
-                msg = "You can find your chart at " + url
-                print msg
-                print "Ctrl-C to stop serving the chart and quit!"
-                self._server_thread = None
-                self.httpd.serve_forever()
-            else:
-                logging.info('serving asynchronously on port %s'%msgparams[1])
-                self._server_thread = threading.Thread(
-                    target=self.httpd.serve_forever
-                )
-                self._server_thread.daemon = True
-                self._server_thread.start()
-                msg = "You can find your chart at " + url
-                print msg
-
-
-    def _cleanup(self):
-        try:
-            if self.httpd is not None:
-                print "Shutting down httpd"
-                self.httpd.shutdown()
-                self.httpd.server_close()
-        except Exception, e:
-            print "Error in clean-up: %s"%e
-
-
+        self.html_filename = "%s.html"%self.name
+        template = Template(self.html)
+        self.filemap[self.html_filename] = {
+            "fd":StringIO(template.render(name=self.name, host=a_host, port=a_port)),
+            "timestamp":time.time()
+        }
 
diff --git a/d3py/networkx_figure.py b/d3py/networkx_figure.py
index 1b4da91..ea967df 100644
--- a/d3py/networkx_figure.py
+++ b/d3py/networkx_figure.py
@@ -35,8 +35,7 @@ def __init__(self, graph, name="figure", width=400, height=100,
         """
         super(NetworkXFigure, self).__init__(
             name=name, width=width, height=height, 
-            interactive=interactive, font=font, logging=logging,  template=template,
-            port=port, **kwargs
+            font=font, logging=logging,  template=template, **kwargs
         )
         # store data
         self.G = graph
diff --git a/d3py/pandas_figure.py b/d3py/pandas_figure.py
index 048a1ae..68a2d0c 100644
--- a/d3py/pandas_figure.py
+++ b/d3py/pandas_figure.py
@@ -7,8 +7,7 @@
 
 class PandasFigure(Figure):
     def __init__(self, data, name="figure", width=800, height=400, 
-        interactive=True, font="Asap", logging=False,  template=None,
-        host="localhost", port=8000, **kwargs):
+        font="Asap", logging=False,  template=None, **kwargs):
         """
         data : dataFrame
             pandas dataFrame used for the plot. This dataFrame is column centric
@@ -20,9 +19,6 @@ def __init__(self, data, name="figure", width=800, height=400,
             width of the figure in pixels (default is 1024)
         height : int 
             height of the figure in pixels (default is 768)
-        interactive : boolean
-            set this to false if you are drawing the graph using a script and
-            not in the command line (default is True)
         font : string
             name of the font you'd like to use. See     
             http://www.google.com/webfonts for options (default is Asap)
@@ -33,8 +29,7 @@ def __init__(self, data, name="figure", width=800, height=400,
         """
         super(PandasFigure, self).__init__(
             name=name, width=width, height=height, 
-            interactive=interactive, font=font, logging=logging,  template=template,
-            host=host, port=port, **kwargs
+            font=font, logging=logging,  template=template, **kwargs
         )
         # store data
         self.data = data
diff --git a/examples/d3py_area.py b/examples/d3py_area.py
index 99c1f2e..a179f53 100644
--- a/examples/d3py_area.py
+++ b/examples/d3py_area.py
@@ -1,7 +1,10 @@
+
 import numpy as np
-import d3py
 import pandas
 
+import d3py
+import util
+
 N = 500
 T = 5*np.pi
 x = np.linspace(-T,T,N)
@@ -14,8 +17,9 @@
     'y0' : y0,
 })
 
-with d3py.PandasFigure(df, 'd3py_area', width=500, height=250) as fig:
-    fig += d3py.geoms.Area('x', 'y', 'y0')
-    fig += d3py.geoms.xAxis('x')
-    fig += d3py.geoms.yAxis('y')
-    fig.show()
+fig = d3py.PandasFigure(df, 'd3py_area', width=500, height=250) 
+fig += d3py.geoms.Area('x', 'y', 'y0')
+fig += d3py.geoms.xAxis('x')
+fig += d3py.geoms.yAxis('y')
+
+util.display(fig)
diff --git a/examples/d3py_bar.py b/examples/d3py_bar.py
index bda8e4d..c48705a 100644
--- a/examples/d3py_bar.py
+++ b/examples/d3py_bar.py
@@ -1,10 +1,10 @@
 import pandas
 import d3py
+import util 
 
 import logging
 logging.basicConfig(level=logging.DEBUG)
 
-
 df = pandas.DataFrame(
     {
         "count" : [1,4,7,3,2,9],
@@ -12,17 +12,8 @@
     }
 )
 
-# use 'with' if you are writing a script and want to serve this up forever
-with d3py.PandasFigure(df) as p:
-    p += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
-    p += d3py.xAxis(x = "apple_type")
-    p.show()
+fig = d3py.PandasFigure(df)
+fig += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
+fig += d3py.xAxis(x = "apple_type")
+util.display(fig)
 
-# if you are writing in a terminal, use without 'with' to keep everything nice
-# and interactive
-"""
-p = d3py.PandasFigure(df)
-p += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
-p += d3py.xAxis(x = "apple_type")
-p.show()
-"""
diff --git a/examples/d3py_graph.py b/examples/d3py_graph.py
index 99c73ba..61c6049 100644
--- a/examples/d3py_graph.py
+++ b/examples/d3py_graph.py
@@ -1,4 +1,5 @@
 import d3py
+import util 
 import networkx as nx
 
 import logging
@@ -11,7 +12,8 @@
 G.add_edge(3,4)
 G.add_edge(4,2)
 
-# use 'with' if you are writing a script and want to serve this up forever
-with d3py.NetworkXFigure(G, width=500, height=500) as p:
-    p += d3py.ForceLayout()
-    p.show()
+fig = d3py.NetworkXFigure(G, width=500, height=500)
+fig += d3py.ForceLayout() 
+
+util.display(fig)
+# util.deploy(fig)
diff --git a/examples/d3py_line.py b/examples/d3py_line.py
index b3f8559..545bd8e 100644
--- a/examples/d3py_line.py
+++ b/examples/d3py_line.py
@@ -1,5 +1,6 @@
 import numpy as np
 import d3py
+import util 
 import pandas
 
 T = 5*np.pi
@@ -12,8 +13,9 @@
     'y' : y
 })
 
-with d3py.PandasFigure(df, 'd3py_line', width=600, height=200) as fig:
-    fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
-    fig += d3py.xAxis('x')
-    fig += d3py.yAxis('y')
-    fig.show()
+fig = d3py.PandasFigure(df, 'd3py_line', width=600, height=200)
+fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
+fig += d3py.xAxis('x')
+fig += d3py.yAxis('y')
+
+util.display(fig)
diff --git a/examples/d3py_multiline.py b/examples/d3py_multiline.py
index 6b59cec..94c0e80 100644
--- a/examples/d3py_multiline.py
+++ b/examples/d3py_multiline.py
@@ -1,7 +1,9 @@
 import numpy as np
-import d3py
 import pandas
 
+import d3py
+import util 
+
 T = 5*np.pi
 x = np.linspace(-T,T,100)
 a = 0.05
@@ -14,9 +16,10 @@
     'z' : z,
 })
 
-with d3py.PandasFigure(df, 'd3py_line', width=600, height=200) as fig:
-    fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
-    fig += d3py.geoms.Line('x', 'z', stroke='DeepPink')
-    fig += d3py.xAxis('x')
-    fig += d3py.yAxis('y')
-    fig.show()
+fig = d3py.PandasFigure(df, 'd3py_line', width=600, height=200) 
+fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
+fig += d3py.geoms.Line('x', 'z', stroke='DeepPink')
+fig += d3py.xAxis('x')
+fig += d3py.yAxis('y')
+
+util.display(fig)
diff --git a/examples/d3py_scatter.py b/examples/d3py_scatter.py
index e513925..56ee055 100644
--- a/examples/d3py_scatter.py
+++ b/examples/d3py_scatter.py
@@ -1,6 +1,9 @@
 import numpy as np
 import pandas
+
 import d3py
+import util
+
 n = 400
 
 df = pandas.DataFrame({
@@ -8,8 +11,8 @@
     'd2': np.random.normal(0, 1, n)
 })
 
-with d3py.PandasFigure(df, "example scatter plot using d3py", width=400, height=400) as fig:
-    fig += d3py.Point("d1", "d2", fill="DodgerBlue")
-    fig += d3py.xAxis('d1', label="Random")
-    fig += d3py.yAxis('d2', label="Also random")
-    fig.show()
+fig = d3py.PandasFigure(df, "example scatter plot using d3py", width=400, height=400)
+fig += d3py.Point("d1", "d2", fill="DodgerBlue")
+fig += d3py.xAxis('d1', label="Random")
+fig += d3py.yAxis('d2', label="Also random")
+util.display(fig)
diff --git a/examples/util.py b/examples/util.py
new file mode 100644
index 0000000..622e9df
--- /dev/null
+++ b/examples/util.py
@@ -0,0 +1,25 @@
+import datetime
+import os
+import sys
+import tempfile
+
+from d3py.displayable import SimplyServer
+from d3py.deployable import FileSystem
+
+def display(fig):
+    with SimplyServer(fig) as server:
+       server.show()
+
+def deploy(fig):
+    test_dir = tempfile.gettempdir() 
+    if test_dir is not None:
+        test_dir += (os.sep 
+            + "d3py_test" + os.sep 
+            + os.path.splitext(os.path.basename(sys.argv[0]))[0]
+            + "_"
+            + datetime.date.today().strftime("%j")) # %j is day of year
+        print("creating test dir, {0}.".format(test_dir))
+        os.makedirs(test_dir)
+        fs = FileSystem(fig, test_dir) 
+        fs.save()
+

From f1c5c7619d1906ced9fad266228b6c7f57197012 Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Sat, 30 Mar 2013 20:00:34 -0700
Subject: [PATCH 02/10] applied Micha's suggestion to use os.path.join.

---
 d3py/deployable.py | 4 ++--
 d3py/figure.py     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/d3py/deployable.py b/d3py/deployable.py
index 71eef60..36971eb 100644
--- a/d3py/deployable.py
+++ b/d3py/deployable.py
@@ -39,11 +39,11 @@ def save(self):
         if not os.path.exists(self.dest_dir):
             raise IOError("Destination directory, {d} , does not exist.".format(d=self.dest_dir))
         os.chdir(self.dest_dir)
-        static_dir = self.dest_dir + os.sep + "static"
+        static_dir = os.path.join(self.dest_dir, "static")
         if not os.path.exists(static_dir): 
             os.mkdir(static_dir)
         for k_filename in self.fig.filemap:
-            f = self.dest_dir + os.sep + k_filename
+            f = os.path.join(self.dest_dir, k_filename)
             with open(f, 'w',0644) as fd_out:
                 fd_in = self.fig.filemap[k_filename]["fd"]
                 fd_in.seek(0)
diff --git a/d3py/figure.py b/d3py/figure.py
index abc24bf..d9d3d79 100644
--- a/d3py/figure.py
+++ b/d3py/figure.py
@@ -21,8 +21,8 @@ def __init__(self, name, width, height, font, logging, template, **kwargs):
         self.name = '_'.join(name.split())
         d3py_path = os.path.abspath(os.path.dirname(__file__))
         self.filemap = {
-            "static" + os.sep + "d3.js":{
-                "fd":open(d3py_path + os.sep + "d3.js","r"), 
+            os.path.join("static", "d3.js"):{
+                "fd":open(os.path.join(d3py_path,"d3.js"),"r"), 
                 "timestamp":time.time()
             },
         }
@@ -44,7 +44,7 @@ def __init__(self, name, width, height, font, logging, template, **kwargs):
         self.css = CSS()
 
         self.html = template or "".join(open(
-            d3py_path + os.sep + 'd3py_template.html').readlines())
+            os.path.join(d3py_path, 'd3py_template.html')).readlines())
         self.js_geoms = JS.JavaScript()
         self.css_geoms = CSS()
         self.geoms = []

From f89fe207cad81ac8a402df343264a561cea81766 Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Mon, 8 Apr 2013 08:12:35 -0700
Subject: [PATCH 03/10] effectively reverting the examples by checking out the
 original versions and committing them

---
 examples/d3py_area.py      | 16 ++++++----------
 examples/d3py_bar.py       | 19 ++++++++++++++-----
 examples/d3py_graph.py     | 10 ++++------
 examples/d3py_line.py      | 12 +++++-------
 examples/d3py_multiline.py | 17 +++++++----------
 examples/d3py_scatter.py   | 13 +++++--------
 6 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/examples/d3py_area.py b/examples/d3py_area.py
index a179f53..99c1f2e 100644
--- a/examples/d3py_area.py
+++ b/examples/d3py_area.py
@@ -1,9 +1,6 @@
-
 import numpy as np
-import pandas
-
 import d3py
-import util
+import pandas
 
 N = 500
 T = 5*np.pi
@@ -17,9 +14,8 @@
     'y0' : y0,
 })
 
-fig = d3py.PandasFigure(df, 'd3py_area', width=500, height=250) 
-fig += d3py.geoms.Area('x', 'y', 'y0')
-fig += d3py.geoms.xAxis('x')
-fig += d3py.geoms.yAxis('y')
-
-util.display(fig)
+with d3py.PandasFigure(df, 'd3py_area', width=500, height=250) as fig:
+    fig += d3py.geoms.Area('x', 'y', 'y0')
+    fig += d3py.geoms.xAxis('x')
+    fig += d3py.geoms.yAxis('y')
+    fig.show()
diff --git a/examples/d3py_bar.py b/examples/d3py_bar.py
index c48705a..bda8e4d 100644
--- a/examples/d3py_bar.py
+++ b/examples/d3py_bar.py
@@ -1,10 +1,10 @@
 import pandas
 import d3py
-import util 
 
 import logging
 logging.basicConfig(level=logging.DEBUG)
 
+
 df = pandas.DataFrame(
     {
         "count" : [1,4,7,3,2,9],
@@ -12,8 +12,17 @@
     }
 )
 
-fig = d3py.PandasFigure(df)
-fig += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
-fig += d3py.xAxis(x = "apple_type")
-util.display(fig)
+# use 'with' if you are writing a script and want to serve this up forever
+with d3py.PandasFigure(df) as p:
+    p += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
+    p += d3py.xAxis(x = "apple_type")
+    p.show()
 
+# if you are writing in a terminal, use without 'with' to keep everything nice
+# and interactive
+"""
+p = d3py.PandasFigure(df)
+p += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
+p += d3py.xAxis(x = "apple_type")
+p.show()
+"""
diff --git a/examples/d3py_graph.py b/examples/d3py_graph.py
index 61c6049..99c73ba 100644
--- a/examples/d3py_graph.py
+++ b/examples/d3py_graph.py
@@ -1,5 +1,4 @@
 import d3py
-import util 
 import networkx as nx
 
 import logging
@@ -12,8 +11,7 @@
 G.add_edge(3,4)
 G.add_edge(4,2)
 
-fig = d3py.NetworkXFigure(G, width=500, height=500)
-fig += d3py.ForceLayout() 
-
-util.display(fig)
-# util.deploy(fig)
+# use 'with' if you are writing a script and want to serve this up forever
+with d3py.NetworkXFigure(G, width=500, height=500) as p:
+    p += d3py.ForceLayout()
+    p.show()
diff --git a/examples/d3py_line.py b/examples/d3py_line.py
index 545bd8e..b3f8559 100644
--- a/examples/d3py_line.py
+++ b/examples/d3py_line.py
@@ -1,6 +1,5 @@
 import numpy as np
 import d3py
-import util 
 import pandas
 
 T = 5*np.pi
@@ -13,9 +12,8 @@
     'y' : y
 })
 
-fig = d3py.PandasFigure(df, 'd3py_line', width=600, height=200)
-fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
-fig += d3py.xAxis('x')
-fig += d3py.yAxis('y')
-
-util.display(fig)
+with d3py.PandasFigure(df, 'd3py_line', width=600, height=200) as fig:
+    fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
+    fig += d3py.xAxis('x')
+    fig += d3py.yAxis('y')
+    fig.show()
diff --git a/examples/d3py_multiline.py b/examples/d3py_multiline.py
index 94c0e80..6b59cec 100644
--- a/examples/d3py_multiline.py
+++ b/examples/d3py_multiline.py
@@ -1,8 +1,6 @@
 import numpy as np
-import pandas
-
 import d3py
-import util 
+import pandas
 
 T = 5*np.pi
 x = np.linspace(-T,T,100)
@@ -16,10 +14,9 @@
     'z' : z,
 })
 
-fig = d3py.PandasFigure(df, 'd3py_line', width=600, height=200) 
-fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
-fig += d3py.geoms.Line('x', 'z', stroke='DeepPink')
-fig += d3py.xAxis('x')
-fig += d3py.yAxis('y')
-
-util.display(fig)
+with d3py.PandasFigure(df, 'd3py_line', width=600, height=200) as fig:
+    fig += d3py.geoms.Line('x', 'y', stroke='BlueViolet')
+    fig += d3py.geoms.Line('x', 'z', stroke='DeepPink')
+    fig += d3py.xAxis('x')
+    fig += d3py.yAxis('y')
+    fig.show()
diff --git a/examples/d3py_scatter.py b/examples/d3py_scatter.py
index 56ee055..e513925 100644
--- a/examples/d3py_scatter.py
+++ b/examples/d3py_scatter.py
@@ -1,9 +1,6 @@
 import numpy as np
 import pandas
-
 import d3py
-import util
-
 n = 400
 
 df = pandas.DataFrame({
@@ -11,8 +8,8 @@
     'd2': np.random.normal(0, 1, n)
 })
 
-fig = d3py.PandasFigure(df, "example scatter plot using d3py", width=400, height=400)
-fig += d3py.Point("d1", "d2", fill="DodgerBlue")
-fig += d3py.xAxis('d1', label="Random")
-fig += d3py.yAxis('d2', label="Also random")
-util.display(fig)
+with d3py.PandasFigure(df, "example scatter plot using d3py", width=400, height=400) as fig:
+    fig += d3py.Point("d1", "d2", fill="DodgerBlue")
+    fig += d3py.xAxis('d1', label="Random")
+    fig += d3py.yAxis('d2', label="Also random")
+    fig.show()

From 7bc0a7e9637229f3c8a3655bf657df5041ea347c Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Mon, 8 Apr 2013 08:16:08 -0700
Subject: [PATCH 04/10] remove util.py from examples directory

---
 examples/util.py | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 examples/util.py

diff --git a/examples/util.py b/examples/util.py
deleted file mode 100644
index 622e9df..0000000
--- a/examples/util.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import datetime
-import os
-import sys
-import tempfile
-
-from d3py.displayable import SimplyServer
-from d3py.deployable import FileSystem
-
-def display(fig):
-    with SimplyServer(fig) as server:
-       server.show()
-
-def deploy(fig):
-    test_dir = tempfile.gettempdir() 
-    if test_dir is not None:
-        test_dir += (os.sep 
-            + "d3py_test" + os.sep 
-            + os.path.splitext(os.path.basename(sys.argv[0]))[0]
-            + "_"
-            + datetime.date.today().strftime("%j")) # %j is day of year
-        print("creating test dir, {0}.".format(test_dir))
-        os.makedirs(test_dir)
-        fs = FileSystem(fig, test_dir) 
-        fs.save()
-

From 0b9381d18b2bd7d7f3ebed4f57bc7db9ed50afcd Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Wed, 10 Apr 2013 12:55:29 -0700
Subject: [PATCH 05/10] use composition to encapsulate deployment and
 displayable

---
 d3py/__init__.py        |  1 +
 d3py/deployable.py      | 36 +++++++++++------------
 d3py/displayable.py     | 55 ++++++++++++++++++++---------------
 d3py/figure.py          | 64 ++++++++++++++++++++++++++++++++++++-----
 d3py/networkx_figure.py |  5 ++--
 d3py/pandas_figure.py   |  6 ++--
 6 files changed, 113 insertions(+), 54 deletions(-)

diff --git a/d3py/__init__.py b/d3py/__init__.py
index 5e9ed68..51b38e9 100644
--- a/d3py/__init__.py
+++ b/d3py/__init__.py
@@ -1,3 +1,4 @@
+from displayable import SimpleServer, displayable
 from pandas_figure import *
 from networkx_figure import *
 from geoms import *
diff --git a/d3py/deployable.py b/d3py/deployable.py
index 36971eb..2db2a65 100644
--- a/d3py/deployable.py
+++ b/d3py/deployable.py
@@ -15,39 +15,35 @@ class deployable():
 
     def save(self, fig):
         raise NotImplementedError
+    
+    @staticmethod
+    def default_deployable(fig):
+        return FileSystem(fig, os.path.join(os.getcwd(), 'deploy'))
 
 class FileSystem(deployable):
     """
     Concrete class which simply saves the files to the file system
     """
-    def __init__(self, fig, dest_dir, host="localhost", port=8000, logging=False):
-        self.fig = fig
-        self.host = host
-        self.port = port
-        self.dest_dir = dest_dir
+    def __init__(self, fig, dest_dir, logging=False):
+        self._fig = fig
+        self._dest_dir = dest_dir
 
     def save(self):
         """
         Save the figure to dest_dir
         """
-        self.fig.update()
-        self.fig.save()
-        self.fig.renderHtml(self.host, self.port)
-
-        if self.dest_dir is None:
+        if self._dest_dir is None:
             raise Exception("Destination directory not defined")
-        if not os.path.exists(self.dest_dir):
-            raise IOError("Destination directory, {d} , does not exist.".format(d=self.dest_dir))
-        os.chdir(self.dest_dir)
-        static_dir = os.path.join(self.dest_dir, "static")
-        if not os.path.exists(static_dir): 
-            os.mkdir(static_dir)
-        for k_filename in self.fig.filemap:
-            f = os.path.join(self.dest_dir, k_filename)
+        static_dir = os.path.join(self._dest_dir, "static")
+        if not os.path.exists(static_dir):
+            os.makedirs(static_dir)
+        # NB: while this method makes sure we can write the static directory to the file system, figure controls the structure of the subdirectory. 
+        os.chdir(self._dest_dir)
+        for k_filename in self._fig.filemap:
+            f = os.path.join(self._dest_dir, k_filename)
             with open(f, 'w',0644) as fd_out:
-                fd_in = self.fig.filemap[k_filename]["fd"]
+                fd_in = self._fig.filemap[k_filename]["fd"]
                 fd_in.seek(0)
                 # import pdb; pdb.set_trace()
                 for line in fd_in.readlines():
                     fd_out.write(line)
-                fd_out.close()
diff --git a/d3py/displayable.py b/d3py/displayable.py
index ba1f9ad..4f04622 100644
--- a/d3py/displayable.py
+++ b/d3py/displayable.py
@@ -3,7 +3,7 @@
 
 import logging
 
-# in support of SimplyServer 
+# in support of SimpleServer 
 import threading
 import webbrowser
 from HTTPHandler import CustomHTTPRequestHandler, ThreadedHTTPServer
@@ -23,8 +23,12 @@ class displayable():
     
     def show(self, fig):
         raise NotImplementedError
+        
+    @staticmethod
+    def default_displayable(fig):
+        return SimpleServer(fig)
 
-class SimplyServer(displayable):
+class SimpleServer(displayable):
     """
     Use Python's SimpleHTTPServer class to present this resulting d3 output
     to the user. 
@@ -32,35 +36,40 @@ class SimplyServer(displayable):
     def __init__(self, fig, host="localhost", port=8000, 
         interactive=False, logging=False):
 
-        self.fig = fig
-        self.host = host
-        self.port = port
+        self._fig = fig
+        self._host = host
+        self._port = port
         self._server_thread = None
-        self.httpd = None
+        self._httpd = None
         # interactive is True by default as this is designed to be a command line tool
         # we do not want to block interaction after plotting.
-        self.interactive = interactive
+        self._interactive = interactive
+
+    @property
+    def host(self):
+        return self._host 
+    
+    @property
+    def port(self):
+        return self._port
 
     def ion(self):
         """
         Turns interactive mode on ala pylab
         """
-        self.interactive = True
+        self._interactive = True
     
     def ioff(self):
         """
         Turns interactive mode off
         """
-        self.interactive = False
+        self._interactive = False
 
     def show(self, interactive=None):
-        self.fig.update()
-        self.fig.save()
-        self.fig.renderHtml(self.host, self.port)
         if interactive is not None:
             blocking = not interactive
         else:
-            blocking = not self.interactive
+            blocking = not self._interactive
 
         if blocking:
             self._serve(blocking=True)
@@ -74,14 +83,14 @@ def _serve(self, blocking=True):
         """
         start up a server to serve the files for this vis.
         """
-        msgparams = (self.host, self.port, self.fig.name)
+        msgparams = (self.host, self.port, self._fig.name)
         url = "http://%s:%s/%s.html"%msgparams
         if self._server_thread is None or self._server_thread.active_count() == 0:
             Handler = CustomHTTPRequestHandler
-            Handler.filemap = self.fig.filemap
-            Handler.logging = self.fig.logging
+            Handler.filemap = self._fig.filemap
+            Handler.logging = self._fig.logging
             try:
-                self.httpd = ThreadedHTTPServer(("", self.port), Handler)
+                self._httpd = ThreadedHTTPServer(("", self.port), Handler)
             except Exception, e:
                 print "Exception %s"%e
                 return False
@@ -91,11 +100,11 @@ def _serve(self, blocking=True):
                 print msg
                 print "Ctrl-C to stop serving the chart and quit!"
                 self._server_thread = None
-                self.httpd.serve_forever()
+                self._httpd.serve_forever()
             else:
                 logging.info('serving asynchronously on port %s'%msgparams[1])
                 self._server_thread = threading.Thread(
-                    target=self.httpd.serve_forever
+                    target=self._httpd.serve_forever
                 )
                 self._server_thread.daemon = True
                 self._server_thread.start()
@@ -104,7 +113,7 @@ def _serve(self, blocking=True):
 
 
     def __enter__(self):
-        self.interactive = False
+        self._interactive = False
         return self
 
     def __exit__(self, ex_type, ex_value, ex_tb):
@@ -117,10 +126,10 @@ def __del__(self):
 
     def _cleanup(self):
         try:
-            if self.httpd is not None:
+            if self._httpd is not None:
                 print "Shutting down httpd"
-                self.httpd.shutdown()
-                self.httpd.server_close()
+                self._httpd.shutdown()
+                self._httpd.server_close()
         except Exception, e:
             print "Error in clean-up: %s"%e
 
diff --git a/d3py/figure.py b/d3py/figure.py
index d9d3d79..e4f0df2 100644
--- a/d3py/figure.py
+++ b/d3py/figure.py
@@ -4,6 +4,8 @@
 import time
 import json
 import os
+import displayable
+import deployable
 
 from jinja2 import Template # well-known templating module
 
@@ -15,7 +17,8 @@ class Figure(object):
     Maintains in internal representation of d3 geometries. This implies
     an understanding of css,html and javascript. 
     """
-    def __init__(self, name, width, height, font, logging, template, **kwargs):
+    def __init__(self, name, width, height, font, 
+        logging, template, server, deploy, **kwargs):
 
         # store data
         self.name = '_'.join(name.split())
@@ -57,6 +60,56 @@ def __init__(self, name, width, height, font, logging, template, **kwargs):
         }
         kwargs = dict([(k[0].replace('_','-'), k[1]) for k in kwargs.items()])
         self.args.update(kwargs)
+        
+        if server is None: 
+            self._server = displayable.displayable.default_displayable(self)
+
+        if deploy is None:
+            self._deploy = deployable.deployable.default_deployable(self)
+
+        # assertion: All variables used by the html template are 
+        #  known. Write the html based on the template. 
+        self._save_html(self._server.host, self._server.port)
+
+
+    def __enter__(self):
+        """
+        It is important that the Figure support the python's with statement. 
+        At the moment, the heavy lifting is done by the displayable module. 
+        This stub is required, so that, the callee can use the 'with' 
+        syntax directly. 
+        """
+        return self
+    
+
+    def __exit__(self, ex_type, ex_value, ex_tb):
+        """
+        This snub is required, so that, the callee can use the with directly.
+        """
+        if ex_tb is not None:
+            print "Cleanup after exception: %s: %s"%(ex_type, ex_value)
+
+    def ion(self):
+        """
+        Turns interactive mode on ala pylab
+        """
+        self._server.ion()
+
+    def ioff(self):
+        """
+        Turns interactive mode off
+        """
+        self._server.ioff()
+
+    def show(self):
+        self.update()
+        self.save()
+        self._server.show()
+
+    def deploy(self):
+        self.update()
+        self.save()
+        self._deploy.save()
 
     def _build(self):
         logging.debug('building chart')
@@ -71,10 +124,8 @@ def update(self):
 
     def save(self):
         """
-        Saving the chart. We need to wait to save the html because 
-        we do not know how this will be displayed or deployed. The
-        assoicated displayable will provide the remaining information
-        when it calls renderHtml() 
+        Saving the chart. _save_html() is not called here. It relies
+        on an html template. Since all values are available during construction, __init__() calls _save_hmtl() once. 
         """
         logging.debug('saving chart')
         self._save_data()
@@ -164,11 +215,10 @@ def _save_js(self):
         self.filemap[filename] = {"fd":StringIO(js),
                 "timestamp":time.time()}
 
-    def renderHtml(self, a_host, a_port):
+    def _save_html(self, a_host, a_port):
         """
         Bind a var in the html template code with that value provided. 
         Implies all related variables defined. 
-        Implies all related variables defined. 
         """
         self.html_filename = "%s.html"%self.name
         template = Template(self.html)
diff --git a/d3py/networkx_figure.py b/d3py/networkx_figure.py
index ea967df..bd911db 100644
--- a/d3py/networkx_figure.py
+++ b/d3py/networkx_figure.py
@@ -8,7 +8,7 @@
 class NetworkXFigure(Figure):
     def __init__(self, graph, name="figure", width=400, height=100, 
         interactive=True, font="Asap", logging=False,  template=None,
-        port=8000, **kwargs):
+        server=None, deploy=None, **kwargs):
         """
         data : networkx gprah
             networkx graph used for the plot.
@@ -35,7 +35,8 @@ def __init__(self, graph, name="figure", width=400, height=100,
         """
         super(NetworkXFigure, self).__init__(
             name=name, width=width, height=height, 
-            font=font, logging=logging,  template=template, **kwargs
+            font=font, logging=logging,  template=template, 
+            server=server, deploy=deploy, **kwargs
         )
         # store data
         self.G = graph
diff --git a/d3py/pandas_figure.py b/d3py/pandas_figure.py
index 68a2d0c..0eb980a 100644
--- a/d3py/pandas_figure.py
+++ b/d3py/pandas_figure.py
@@ -7,7 +7,8 @@
 
 class PandasFigure(Figure):
     def __init__(self, data, name="figure", width=800, height=400, 
-        font="Asap", logging=False,  template=None, **kwargs):
+        font="Asap", logging=False,  template=None, 
+        server=None, deploy=None, **kwargs):
         """
         data : dataFrame
             pandas dataFrame used for the plot. This dataFrame is column centric
@@ -29,7 +30,8 @@ def __init__(self, data, name="figure", width=800, height=400,
         """
         super(PandasFigure, self).__init__(
             name=name, width=width, height=height, 
-            font=font, logging=logging,  template=template, **kwargs
+            font=font, logging=logging,  template=template, 
+            server=server,deploy=None, **kwargs
         )
         # store data
         self.data = data

From 66370107c6e6b9bb6349e2044bcf1f7fa9bb9627 Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Wed, 10 Apr 2013 19:58:10 -0700
Subject: [PATCH 06/10] implement __enter__ and __exit__

---
 d3py/displayable.py |  5 ++++-
 d3py/figure.py      | 41 +++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/d3py/displayable.py b/d3py/displayable.py
index 4f04622..f3a3f09 100644
--- a/d3py/displayable.py
+++ b/d3py/displayable.py
@@ -118,7 +118,10 @@ def __enter__(self):
 
     def __exit__(self, ex_type, ex_value, ex_tb):
         if ex_tb is not None:
-            print "Cleanup after exception: %s: %s"%(ex_type, ex_value)
+            if ex_value is None:
+                print "Cleanup after exception: %s"%(ex_type)
+            else:
+                print "Cleanup after exception: %s: %s"%(ex_type, ex_value)
         self._cleanup()
 
     def __del__(self):
diff --git a/d3py/figure.py b/d3py/figure.py
index e4f0df2..d1dfa10 100644
--- a/d3py/figure.py
+++ b/d3py/figure.py
@@ -1,9 +1,10 @@
 import logging
 
-from StringIO import StringIO
-import time
 import json
 import os
+from StringIO import StringIO
+import time
+
 import displayable
 import deployable
 
@@ -60,16 +61,9 @@ def __init__(self, name, width, height, font,
         }
         kwargs = dict([(k[0].replace('_','-'), k[1]) for k in kwargs.items()])
         self.args.update(kwargs)
-        
-        if server is None: 
-            self._server = displayable.displayable.default_displayable(self)
-
-        if deploy is None:
-            self._deploy = deployable.deployable.default_deployable(self)
-
-        # assertion: All variables used by the html template are 
-        #  known. Write the html based on the template. 
-        self._save_html(self._server.host, self._server.port)
+    
+        self._server = server 
+        self._deploy = deploy
 
 
     def __enter__(self):
@@ -79,6 +73,19 @@ def __enter__(self):
         This stub is required, so that, the callee can use the 'with' 
         syntax directly. 
         """
+        if self._server is None: 
+            self._server = displayable.displayable.default_displayable(self)
+            if hasattr(self._server,'__enter__'):
+                self._server.__enter__() 
+
+        if self._deploy is None:
+            self._deploy = deployable.deployable.default_deployable(self)
+            if hasattr(self._deploy,'__enter__'):
+                self._deploy.__enter__()
+        
+        # assertion: All variables used by the html template are 
+        #  known. Write the html based on the template. 
+        self._save_html(self._server.host, self._server.port)
         return self
     
 
@@ -86,8 +93,8 @@ def __exit__(self, ex_type, ex_value, ex_tb):
         """
         This snub is required, so that, the callee can use the with directly.
         """
-        if ex_tb is not None:
-            print "Cleanup after exception: %s: %s"%(ex_type, ex_value)
+        self._server.__exit__(ex_type, ex_value, ex_tb)
+        return false 
 
     def ion(self):
         """
@@ -132,12 +139,6 @@ def save(self):
         self._save_css()
         self._save_js()
 
-    def _clanup(self):
-        """
-        What is the intent of this stub? see  https://github.com/mikedewar/d3py/issues/62
-        """
-        raise NotImplementedError
-
     def _set_data(self):
         self.update()
 

From c60d28294b610b7d6b13b34c8d889ef285d37702 Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Wed, 10 Apr 2013 20:02:45 -0700
Subject: [PATCH 07/10] fixed up __exit__()

---
 d3py/figure.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/d3py/figure.py b/d3py/figure.py
index d1dfa10..4fd2967 100644
--- a/d3py/figure.py
+++ b/d3py/figure.py
@@ -68,10 +68,7 @@ def __init__(self, name, width, height, font,
 
     def __enter__(self):
         """
-        It is important that the Figure support the python's with statement. 
-        At the moment, the heavy lifting is done by the displayable module. 
-        This stub is required, so that, the callee can use the 'with' 
-        syntax directly. 
+        It is important that the Figure support the python's with statement.
         """
         if self._server is None: 
             self._server = displayable.displayable.default_displayable(self)
@@ -91,9 +88,12 @@ def __enter__(self):
 
     def __exit__(self, ex_type, ex_value, ex_tb):
         """
-        This snub is required, so that, the callee can use the with directly.
+        required to support with statement.
         """
-        self._server.__exit__(ex_type, ex_value, ex_tb)
+        if hasattr(self._server, '__exit__'):
+            self._server.__exit__(ex_type, ex_value, ex_tb)
+        if hasattr(self._deploy, '__exit__'):
+            self._deploy.__exit__(ex_type, ex_value, ex_tb)
         return false 
 
     def ion(self):

From 6f9f10c6a53df7dda93fb795e133a1bd8e50eb67 Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Thu, 11 Apr 2013 08:26:27 -0700
Subject: [PATCH 08/10] add example for deploy. eliminated circular dependency

---
 d3py/deployable.py      | 31 +++++++++++++++++++++++++------
 d3py/displayable.py     | 16 ++++++++++++----
 d3py/figure.py          | 22 ++++++++++++----------
 examples/d3py_deploy.py | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 20 deletions(-)
 create mode 100644 examples/d3py_deploy.py

diff --git a/d3py/deployable.py b/d3py/deployable.py
index 2db2a65..019bee5 100644
--- a/d3py/deployable.py
+++ b/d3py/deployable.py
@@ -17,21 +17,40 @@ def save(self, fig):
         raise NotImplementedError
     
     @staticmethod
-    def default_deployable(fig):
-        return FileSystem(fig, os.path.join(os.getcwd(), 'deploy'))
+    def default_deployable():
+        return FileSystem(dest_dir=os.path.join(os.getcwd(), 'deploy'))
 
 class FileSystem(deployable):
     """
     Concrete class which simply saves the files to the file system
     """
-    def __init__(self, fig, dest_dir, logging=False):
-        self._fig = fig
+    def __init__(self, dest_dir=None, logging=False):
+        self._fig = None
         self._dest_dir = dest_dir
 
-    def save(self):
+    @property
+    def fig(self):
+        return self._fig
+
+    @fig.setter
+    def fig(self, fig):
+        self._fig = fig
+        
+    @property
+    def dest_dir(self):
+        return self._dest_dir
+        
+    @dest_dir.setter
+    def dest_dir(self, new_dir):
+        self._dest_dir = new_dir
+
+    def save(self, ephermeral_dir=None):
         """
-        Save the figure to dest_dir
+        Save the figure to dest_dir.  If the user supplies a directory,
+        via the ephermeral_dir argument, use it for this call. 
         """
+        if ephermeral_dir is not None:
+            self._dest_dir = ephermeral_dir
         if self._dest_dir is None:
             raise Exception("Destination directory not defined")
         static_dir = os.path.join(self._dest_dir, "static")
diff --git a/d3py/displayable.py b/d3py/displayable.py
index f3a3f09..7f5b316 100644
--- a/d3py/displayable.py
+++ b/d3py/displayable.py
@@ -25,18 +25,18 @@ def show(self, fig):
         raise NotImplementedError
         
     @staticmethod
-    def default_displayable(fig):
-        return SimpleServer(fig)
+    def default_displayable():
+        return SimpleServer()
 
 class SimpleServer(displayable):
     """
     Use Python's SimpleHTTPServer class to present this resulting d3 output
     to the user. 
     """
-    def __init__(self, fig, host="localhost", port=8000, 
+    def __init__(self, host="localhost", port=8000, 
         interactive=False, logging=False):
 
-        self._fig = fig
+        self._fig = None
         self._host = host
         self._port = port
         self._server_thread = None
@@ -45,6 +45,14 @@ def __init__(self, fig, host="localhost", port=8000,
         # we do not want to block interaction after plotting.
         self._interactive = interactive
 
+    @property
+    def fig(self):
+        return self._fig
+
+    @fig.setter
+    def fig(self, fig):
+        self._fig = fig
+
     @property
     def host(self):
         return self._host 
diff --git a/d3py/figure.py b/d3py/figure.py
index 4fd2967..658b07e 100644
--- a/d3py/figure.py
+++ b/d3py/figure.py
@@ -71,15 +71,17 @@ def __enter__(self):
         It is important that the Figure support the python's with statement.
         """
         if self._server is None: 
-            self._server = displayable.displayable.default_displayable(self)
-            if hasattr(self._server,'__enter__'):
-                self._server.__enter__() 
+            self._server = displayable.displayable.default_displayable()
+        self._server.fig = self
+        if hasattr(self._server,'__enter__'):
+            self._server.__enter__() 
 
         if self._deploy is None:
-            self._deploy = deployable.deployable.default_deployable(self)
-            if hasattr(self._deploy,'__enter__'):
-                self._deploy.__enter__()
-        
+            self._deploy = deployable.deployable.default_deployable()
+        self._deploy.fig = self
+        if hasattr(self._deploy,'__enter__'):
+            self._deploy.__enter__()
+
         # assertion: All variables used by the html template are 
         #  known. Write the html based on the template. 
         self._save_html(self._server.host, self._server.port)
@@ -94,7 +96,7 @@ def __exit__(self, ex_type, ex_value, ex_tb):
             self._server.__exit__(ex_type, ex_value, ex_tb)
         if hasattr(self._deploy, '__exit__'):
             self._deploy.__exit__(ex_type, ex_value, ex_tb)
-        return false 
+        return False 
 
     def ion(self):
         """
@@ -113,10 +115,10 @@ def show(self):
         self.save()
         self._server.show()
 
-    def deploy(self):
+    def deploy(self, ephermeral_dir=None):
         self.update()
         self.save()
-        self._deploy.save()
+        self._deploy.save(ephermeral_dir)
 
     def _build(self):
         logging.debug('building chart')
diff --git a/examples/d3py_deploy.py b/examples/d3py_deploy.py
new file mode 100644
index 0000000..22048af
--- /dev/null
+++ b/examples/d3py_deploy.py
@@ -0,0 +1,33 @@
+import pandas
+import d3py
+from d3py import deployable
+
+import logging
+
+"""
+This example is based on d3py_bar.py but the goal is to highlight 
+how to deploy the figure. For the initial release, deploy simple allows
+one save the static files to the file system. One could imagine implemented
+other versions to deploy to the cloud. 
+"""
+
+df = pandas.DataFrame(
+    {
+        "count" : [1,4,7,3,2,9],
+        "apple_type": ["a", "b", "c", "d", "e", "f"],
+    }
+)
+
+# by default the deploy method will save the static files to the file system.
+with d3py.PandasFigure(df) as p:
+    p += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
+    p += d3py.xAxis(x = "apple_type")
+    # default = look for deploy directory in cwd.
+    p.deploy() 
+    # For a given call you can overide the default by providing an argument
+    p.deploy(ephermeral_dir='/tmp/d3py') 
+
+
+# if you want to change the default directory, set the dest_dir argument
+# in the FileSystem constructor.  
+p2 = d3py.PandasFigure(df, deploy=deployable.FileSystem(dest_dir="/tmp"))

From e8212b6a0fd95847a86116dbbf6fd6fd25d606fc Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Thu, 11 Apr 2013 08:42:46 -0700
Subject: [PATCH 09/10] add example to configure the server

---
 examples/d3py_server.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 examples/d3py_server.py

diff --git a/examples/d3py_server.py b/examples/d3py_server.py
new file mode 100644
index 0000000..9f78d5f
--- /dev/null
+++ b/examples/d3py_server.py
@@ -0,0 +1,26 @@
+import pandas
+import d3py
+from d3py.displayable import SimpleServer
+
+import logging
+
+"""
+This example is based on d3py_bar.py but the goal is to highlight 
+how to configure a server for your figure. For the initial release, 
+we simple support Python's SimpleHTTPServer. Got you sights on a different
+server? Look at the displayable module. 
+"""
+
+df = pandas.DataFrame(
+    {
+        "count" : [1,4,7,3,2,9],
+        "apple_type": ["a", "b", "c", "d", "e", "f"],
+    }
+)
+
+# by default point your browser to port 8000 at localhost
+# This example changes the port. 
+with d3py.PandasFigure(df,server=SimpleServer(port=7878)) as p:
+    p += d3py.Bar(x = "apple_type", y = "count", fill = "MediumAquamarine")
+    p += d3py.xAxis(x = "apple_type")    
+    p.show() 

From 4175c7522d633699150cac5e8cdcdb86ca08b169 Mon Sep 17 00:00:00 2001
From: John Kern <kern3020@gmail.com>
Date: Thu, 11 Apr 2013 13:39:33 -0700
Subject: [PATCH 10/10] allow code to refer to FileSystem directly

---
 examples/d3py_deploy.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/d3py_deploy.py b/examples/d3py_deploy.py
index 22048af..e8267b0 100644
--- a/examples/d3py_deploy.py
+++ b/examples/d3py_deploy.py
@@ -1,6 +1,6 @@
 import pandas
 import d3py
-from d3py import deployable
+from d3py.deployable import FileSystem
 
 import logging
 
@@ -30,4 +30,4 @@
 
 # if you want to change the default directory, set the dest_dir argument
 # in the FileSystem constructor.  
-p2 = d3py.PandasFigure(df, deploy=deployable.FileSystem(dest_dir="/tmp"))
+p2 = d3py.PandasFigure(df, deploy=FileSystem(dest_dir="/tmp"))