Add Frame#to_iruby, Plot#to_iruby

- This allows automatic plotting by just returning the Plot/Frame object
- Plot#show and Frame#show calls IRuby#display

Author: minad

lib/nyaplot/frame.rb

@@ -27,16 +27,19 @@ def export_html
       template = File.read(path)
       model = self.to_json
       html = ERB.new(template).result(binding)
-      return html
+      html
     end
 
-    def show
+    def to_iruby
       path = File.expand_path("../templates/iruby.erb", __FILE__)
       template = File.read(path)
       id = SecureRandom.uuid()
       model = self.to_json
-      html = ERB.new(template).result(binding)
-      return IRuby.html(html)
+      ['text/html', ERB.new(template).result(binding)]
+    end
+
+    def show
+      IRuby.display(self)
     end
 
     def configure(&block)

lib/nyaplot/plot.rb

@@ -27,10 +27,12 @@ def add_with_df(df, type, *labels)
       return diagram
     end
 
+    def to_iruby
+      Frame.new.tap {|f| f.add(self) }.to_iruby
+    end
+
     def show
-      frame = Frame.new
-      frame.add(self)
-      frame.show
+      Frame.new.tap {|f| f.add(self) }.show
     end
 
     def df_list

lib/nyaplot/templates/iruby.erb

@@ -8,7 +8,8 @@
     if(window['Nyaplot']==undefined){
         window.addEventListener('load_nyaplot', render, false);
 	return;
+    } else {
+       render();
     }
-    render();
 })();
 </script>