iruby 0.1.4 → 0.1.5

data/lib/iruby/kernel.rb

@@ -60,7 +60,7 @@ module IRuby
     end
 
     def display(obj, options={})
-      if obj
+      unless obj.nil?
         content = { data: Display.new(obj, options).data, metadata: {}, execution_count: @execution_count }
         @session.send(@pub_socket, 'pyout', content)
       end
@@ -101,6 +101,13 @@ module IRuby
       result = nil
       begin
         result = @backend.eval(code)
+        content = {
+          status: 'ok',
+          payload: [],
+          user_variables: {},
+          user_expressions: {},
+          execution_count: @execution_count
+        }
       rescue Exception => e
         content = {
           ename: e.class.to_s,
@@ -112,17 +119,8 @@ module IRuby
         }
         @session.send(@pub_socket, 'pyerr', content)
       end
-
-      content = {
-        status: 'ok',
-        payload: [],
-        user_variables: {},
-        user_expressions: {},
-        execution_count: @execution_count
-      }
       @session.send(@reply_socket, 'execute_reply', content, ident)
-
-      display(result) if result && !msg[:content]['silent']
+      display(result) unless msg[:content]['silent']
       send_status('idle')
     end
 

data/lib/iruby/static/custom/custom.js

@@ -7,4 +7,5 @@ $([IPython.events]).on('app_initialized.NotebookApp', function(){
     // add here logic that shoudl be run once per **page load**
     $.getScript('/static/components/codemirror/mode/ruby/ruby.js');
     IPython.CodeCell.options_default['cm_config']['mode'] = 'ruby';
+    IPython.CodeCell.options_default['cm_config']['indentUnit'] = 2;
 });

data/lib/iruby/utils.rb

@@ -1,9 +1,71 @@
 module IRuby
-  module Utils
-    def display(obj, options={})
-      Kernel.instance.display(obj, options)
+  class MimeString < String
+    attr_reader :mime
+
+    def initialize(mime, data)
+      super(data.to_s)
+      @mime = mime
+    end
+
+    def to_iruby
+      [@mime, self]
     end
   end
-end
 
-include IRuby::Utils
+  def self.display(obj, options={})
+    Kernel.instance.display(obj, options)
+  end
+
+  def self.table(obj)
+    return obj unless Enumerable === obj
+    keys = nil
+    size = 0
+    rows = []
+    obj.each do |row|
+      row = row.flatten(1) if obj.respond_to?(:keys)
+      if row.respond_to?(:keys)
+        # Array of Hashes
+        keys ||= Set.new
+        keys.merge(row.keys)
+      elsif row.respond_to?(:map)
+        # Array of Arrays
+        size = row.size if size < row.size
+      end
+      rows << row
+    end
+    table = '<table>'
+    if keys
+      keys.merge(0...size)
+      table << '<tr>' << keys.map {|k| "<th>#{k}</th>"}.join << '</tr>'
+    else
+      keys = 0...size
+    end
+    rows.each do |row|
+      table << '<tr>'
+      if row.respond_to?(:map)
+        row = keys.map {|k| "<td>#{row[k] rescue nil}</td>" }
+        if row.empty?
+          table << "<td#{keys.size > 1 ? " colspan='#{keys.size}'" : ''}></td>"
+        else
+          table << row.join
+        end
+      else
+        table << "<td#{keys.size > 1 ? " colspan='#{keys.size}'" : ''}>#{row}</td>"
+      end
+      table << '</tr>'
+    end
+    html(table << '</table>')
+  end
+
+  def self.latex(s)
+    MimeString.new('text/latex', s)
+  end
+
+  def self.math(s)
+    MimeString.new('text/latex', "$$#{s}$$")
+  end
+
+  def self.html(s)
+    MimeString.new('text/html', s)
+  end
+end

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Damián Silvani
@@ -130,10 +130,10 @@ post_install_message: |+
     * pry-syntax-hacks
     * pry-git
     * awesome_print
-    * hirb
     * gruff
     * rmagick
     * gnuplot
+    * rubyvis
 
 rdoc_options: []
 require_paths: