add leo_bridge_demo example, add @cl (data class) support (e.g. @cl csvdata, @cl tmpfile, @cl rfile)

doc/examples/leo_bridge_demo.leo

@@ -0,0 +1,76 b''
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet ekr_test?>
+<leo_file>
+<leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/>
+<globals body_outline_ratio="0.5">
+	<global_window_position top="263" left="521" height="600" width="800"/>
+	<global_log_window_position top="0" left="0" height="0" width="0"/>
+</globals>
+<preferences/>
+<find_panel_settings/>
+<vnodes>
+<v t="vivainio.20080218184525"><vh>@chapters</vh></v>
+<v t="vivainio.20080218184540" a="E"><vh>@ipy-startup</vh>
+<v t="vivainio.20080218184613"><vh>a</vh></v>
+<v t="vivainio.20080218184613.1"><vh>b</vh></v>
+<v t="vivainio.20080218200031" a="E"><vh>Some classes</vh>
+<v t="vivainio.20080218190816"><vh>File-like access</vh></v>
+<v t="vivainio.20080218200106" a="TV"><vh>csv data</vh></v>
+</v>
+</v>
+<v t="vivainio.20080218195413" a="E"><vh>Class tests</vh>
+<v t="vivainio.20080218200509"><vh>csvr</vh></v>
+<v t="vivainio.20080218191007"><vh>tempfile</vh></v>
+<v t="vivainio.20080218195413.1"><vh>rfile</vh></v>
+</v>
+</vnodes>
+<tnodes>
+<t tx="vivainio.20080218184525"></t>
+<t tx="vivainio.20080218184540"># this stuff will be pushed at ipython bridge startup
+
+@others</t>
+<t tx="vivainio.20080218184613">print "hello"</t>
+<t tx="vivainio.20080218184613.1">print "world"</t>
+<t tx="vivainio.20080218190816">def rfile(body):
+    """ @cl rfile 
+
+    produces a StringIO (file like obj of the rest of the body) """
+
+    import StringIO
+    return StringIO.StringIO(body)
+
+def tmpfile(body):
+    """ @cl tmpfile
+
+    Produces a temporary file, with node body as contents
+
+    """
+    import tempfile
+    h, fname = tempfile.mkstemp()
+    f = open(fname,'w')
+    f.write(body)
+    f.close()
+    return fname
+</t>
+<t tx="vivainio.20080218191007">@cl tmpfile
+
+Hello</t>
+<t tx="vivainio.20080218195413"></t>
+<t tx="vivainio.20080218195413.1">@cl rfile
+These
+lines
+should 
+be
+readable </t>
+<t tx="vivainio.20080218200031"></t>
+<t tx="vivainio.20080218200106">def csvdata(body):
+    import csv
+    d = csv.Sniffer().sniff(body)
+    reader = csv.reader(body.splitlines(), dialect = d)
+    return reader</t>
+<t tx="vivainio.20080218200509">@cl csvdata
+
+a,b,b
+1,2,2</t>
+</tnodes>
+</leo_file>

IPython/Extensions/ipy_leo.py

@@ -28,6 +28,10 b" ip.user_ns['g'] = g"
 from IPython.external.simplegeneric import generic 
 import pprint
 
+def es(s):    
+    g.es(s, tabName = 'IPython')
+    pass
+
 @generic
 def format_for_leo(obj):
     """ Convert obj to string representiation (for editing in Leo)"""
@@ -74,6 +78,21 b' class TrivialLeoWorkbook:'
 
 ip.user_ns['nodes'] = TrivialLeoWorkbook()            
 
+def eval_node(n):
+    body = n.b    
+    if not body.startswith('@cl'):
+        # plain python repr node, just eval it
+        return ip.ev(n.b)
+    # @cl nodes deserve special treatment - first eval the first line (minus cl), then use it to call the rest of body
+    first, rest = body.split('\n',1)
+    cl, hd = first.split(None, 1)
+    if cl != '@cl':
+        return None
+    xformer = ip.ev(hd.strip())
+    es('Transform w/ %s' % repr(xformer))
+    return xformer(rest)
+    
+    
 
 class LeoNode(object):
     def __init__(self,p):
@@ -104,7 +123,7 b' class LeoNode(object):'
     def set_val(self, val):
         self.b = pprint.pformat(val)
         
-    v = property(lambda self: ip.ev(self.b.strip()), set_val)
+    v = property(lambda self: eval_node(self), set_val)
     
     def set_l(self,val):
         self.b = '\n'.join(val )
@@ -184,12 +203,12 b' def push_script(p):'
             has_output = True
             inp = ip.IP.input_hist[idx]
             if inp.strip():
-                g.es('In: %s' % (inp[:40], ),  tabName = 'IPython')
+                es('In: %s' % (inp[:40], ))
                 
-            g.es('<%d> %s' % (idx, pprint.pformat(ohist[idx],width = 40)), tabName = 'IPython')
+            es('<%d> %s' % (idx, pprint.pformat(ohist[idx],width = 40)))
         
         if not has_output:
-            g.es('ipy run: %s' %( p.headString(),), tabName = 'IPython')
+            es('ipy run: %s' %( p.headString(),))
     finally:
         c.endUpdate()
     
@@ -206,14 +225,15 b' def push_variable(p,varname):'
     body = p.bodyString()
     val = eval_body(body.strip())
     ip.user_ns[varname] = val
-    g.es('ipy var: %s' % (varname,), tabName = "IPython")
+    es('ipy var: %s' % (varname,))
 
 def push_plain_python(p):
     script = g.getScript(c,p,useSelectedText=False,forcePythonSentinels=False,useSentinels=False)
     exec script in ip.user_ns
-    g.es('ipy plain: %s' % (p.headString(),), tabName = "IPython")
+    es('ipy plain: %s' % (p.headString(),))
     
 def push_from_leo(p):
+    nod = LeoNode(p)
     h =  p.headString()   
     tup = h.split(None,1)
     # @ipy foo is variable foo
@@ -224,7 +244,10 b' def push_from_leo(p):'
     if h.endswith('P'):
         push_plain_python(p)
         return
-
+    if nod.b.startswith('@cl'):
+        es(nod.v)
+        return
+    
     push_script(p)
     return
     
@@ -277,7 +300,7 b' def show_welcome():'
     print "Welcome to Leo-enabled IPython session!"
     print "Try %leoref for quick reference."
     import IPython.platutils
-    IPython.platutils.set_term_title('Leo IPython')
+    IPython.platutils.set_term_title('ILeo')
     IPython.platutils.freeze_term_title()
 
 def run_leo_startup_node():