Merge #8

Author: domitry

lib/nyaplot/core.rb

@@ -10,19 +10,6 @@ def self.extension_lists
     @@extension_lists
   end
 
-  # Enable to show plots on IRuby notebook
-  # @raise [RuntimeError] Raise error when being ran environment except IRuby notebook.
-  def self.init_iruby
-    raise "IRuby notebook is not loaded." unless defined? IRuby
-
-    path = File.expand_path("../templates/init.html.erb", __FILE__)
-    template = File.read(path)
-    dep_libraries = @@dep_libraries
-    additional_libraries = @@additional_libraries
-    html = ERB.new(template).result(binding)
-    return IRuby.html(html)
-  end
-
   # Tell JavaScript back-end library to load some extension libraries
   # @param [String] name The name of JavaScript extension library to load
   def self.add_extension(name)
@@ -34,8 +21,15 @@ def self.add_dependency(name, url)
     @@dep_libraries[name]=url;
   end
 
-  # Load extension library to IRuby notebook before Nyaplotjs is loaded
-  def self.add_additional_library(name, url)
-    @@additional_libraries[name]=url
+  # Enable to show plots on IRuby notebook
+  def self.init_iruby
+    path = File.expand_path("../templates/init.js.erb", __FILE__)
+    template = File.read(path)
+    dep_libraries = @@dep_libraries
+    additional_libraries = @@additional_libraries
+    js = ERB.new(template).result(binding)
+    IRuby.display(IRuby.javascript(js))
   end
+
+  init_iruby if defined? IRuby
 end

lib/nyaplot/frame.rb

@@ -33,17 +33,21 @@ def export_html
       template = File.read(path)
       model = self.to_json
       html = ERB.new(template).result(binding)
-      return html
+      html
     end
 
-    # show plot on IRuby notebook
-    def show
+    # show plot automatically on IRuby notebook
+    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
+
+    # show plot on IRuby notebook
+    def show
+      IRuby.display(self)
     end
 
     def before_to_json

lib/nyaplot/plot.rb

@@ -71,11 +71,15 @@ def add_with_df(df, type, *labels)
       return diagram
     end
 
+
+    # Show plot automatically on IRuby notebook
+    def to_iruby
+      Frame.new.tap {|f| f.add(self) }.to_iruby
+    end
+
     # Show plot on IRuby notebook
     def show
-      frame = Frame.new
-      frame.add(self)
-      frame.show
+      Frame.new.tap {|f| f.add(self) }.show
     end
 
     # @return [Array<String>] names of dataframe used by diagrams belog to this plot

lib/nyaplot/templates/init.html.erb renamed to lib/nyaplot/templates/init.js.erb

@@ -1,4 +1,3 @@
-<script>
 if(window['d3'] === undefined ||
    window['Nyaplot'] === undefined){
     var path = <%= dep_libraries.merge(additional_libraries).to_json %>;
@@ -46,4 +45,3 @@ end
 %>
 <%= str %>
 }
-</script>

lib/nyaplot/templates/iruby.erb

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