iruby 0.4.0 → 0.5.0

data/lib/iruby/display.rb

@@ -11,7 +11,10 @@ module IRuby
         obj = obj.object
 
         fuzzy_mime = options[:format] # Treated like a fuzzy mime type
-        raise 'Invalid argument :format' unless !fuzzy_mime || String === fuzzy_mime
+        unless !fuzzy_mime || String === fuzzy_mime
+          raise 'Invalid argument :format'
+        end
+
         if exact_mime = options[:mime]
           raise 'Invalid argument :mime' unless String === exact_mime
           raise 'Invalid mime type' unless exact_mime.include?('/')
@@ -27,32 +30,38 @@ module IRuby
 
         # As a last resort, interpret string representation of the object
         # as the given mime type.
-        data[exact_mime] = protect(exact_mime, obj) if exact_mime && !data.any? {|m,_| exact_mime == m }
+        if exact_mime && data.none? { |m, _| exact_mime == m }
+          data[exact_mime] = protect(exact_mime, obj)
+        end
 
         data
       end
 
-      def clear_output(wait=false)
-        IRuby::Kernel.instance.session.send(:publish, :clear_output, {wait: wait})
+      def clear_output(wait = false)
+        IRuby::Kernel.instance.session.send(:publish, :clear_output, wait: wait)
       end
 
       private
 
       def protect(mime, data)
-        MimeMagic.new(mime).text? ? data.to_s : [data.to_s].pack('m0')
+        MIME::Type.new(mime).ascii? ? data.to_s : [data.to_s].pack('m0')
       end
 
       def render(data, obj, exact_mime, fuzzy_mime)
         # Filter matching renderer by object type
-        renderer = Registry.renderer.select {|r| r.match?(obj) }
+        renderer = Registry.renderer.select { |r| r.match?(obj) }
 
         matching_renderer = nil
 
         # Find exactly matching display by exact_mime
-        matching_renderer = renderer.find {|r| exact_mime == r.mime } if exact_mime
+        if exact_mime
+          matching_renderer = renderer.find { |r| exact_mime == r.mime }
+        end
 
         # Find fuzzy matching display by fuzzy_mime
-        matching_renderer ||= renderer.find {|r| r.mime && r.mime.include?(fuzzy_mime) } if fuzzy_mime
+        if fuzzy_mime
+          matching_renderer ||= renderer.find { |r| r.mime&.include?(fuzzy_mime) }
+        end
 
         renderer.unshift matching_renderer if matching_renderer
 
@@ -73,7 +82,8 @@ module IRuby
       attr_reader :object, :options
 
       def initialize(object, options)
-        @object, @options = object, options
+        @object = object
+        @options = options
       end
 
       class << self
@@ -91,10 +101,13 @@ module IRuby
     end
 
     class Renderer
-      attr_reader :match, :mime, :render, :priority
+      attr_reader :match, :mime, :priority
 
       def initialize(match, mime, render, priority)
-        @match, @mime, @render, @priority = match, mime, render, priority
+        @match = match
+        @mime = mime
+        @render = render
+        @priority = priority
       end
 
       def match?(obj)
@@ -114,7 +127,7 @@ module IRuby
         @renderer ||= []
       end
 
-      SUPPORTED_MIMES = %w(
+      SUPPORTED_MIMES = %w[
         text/plain
         text/html
         text/latex
@@ -122,7 +135,8 @@ module IRuby
         application/javascript
         image/png
         image/jpeg
-        image/svg+xml)
+        image/svg+xml
+      ]
 
       def match(&block)
         @match = block
@@ -131,7 +145,7 @@ module IRuby
       end
 
       def respond_to(name)
-        match {|obj| obj.respond_to?(name) }
+        match { |obj| obj.respond_to?(name) }
       end
 
       def type(&block)
@@ -153,7 +167,7 @@ module IRuby
 
       def format(mime = nil, &block)
         renderer << Renderer.new(@match, mime, block, @priority)
-        renderer.sort_by! {|r| -r.priority }
+        renderer.sort_by! { |r| -r.priority }
 
         # Decrease priority implicitly for all formats
         # which are added later for a type.
@@ -170,6 +184,7 @@ module IRuby
       end
 
       type { Numo::NArray }
+      format 'text/plain', &:inspect
       format 'text/latex' do |obj|
         obj.ndim == 2 ?
         LaTeX.matrix(obj, obj.shape[0], obj.shape[1]) :
@@ -180,6 +195,7 @@ module IRuby
       end
 
       type { NArray }
+      format 'text/plain', &:inspect
       format 'text/latex' do |obj|
         obj.dim == 2 ?
         LaTeX.matrix(obj.transpose(1, 0), obj.shape[1], obj.shape[0]) :
@@ -241,37 +257,41 @@ module IRuby
 
       match do |obj|
         defined?(Magick::Image) && Magick::Image === obj ||
-        defined?(MiniMagick::Image) && MiniMagick::Image === obj
+          defined?(MiniMagick::Image) && MiniMagick::Image === obj
       end
       format 'image' do |obj|
         format = obj.format || 'PNG'
-        [format == 'PNG' ? 'image/png' : 'image/jpeg', obj.to_blob {|i| i.format = format }]
+        [format == 'PNG' ? 'image/png' : 'image/jpeg', obj.to_blob { |i| i.format = format }]
       end
 
-      type { Gruff::Base }
-      format 'image/png' do |obj|
-        obj.to_blob
+      match do |obj|
+        defined?(Vips::Image) && Vips::Image === obj
       end
+      format do |obj|
+        # handles Vips::Error, vips_image_get: field "vips-loader" not found
+        loader = obj.get('vips-loader') rescue nil
+        if loader == 'jpegload'
+          ['image/jpeg', obj.write_to_buffer('.jpg')]
+        else
+          # falls back to png for other/unknown types
+          ['image/png', obj.write_to_buffer('.png')]
+        end
+      end
+
+      type { Gruff::Base }
+      format 'image/png', &:to_blob
 
       respond_to :to_html
-      format 'text/html' do |obj|
-        obj.to_html
-      end
+      format 'text/html', &:to_html
 
       respond_to :to_latex
-      format 'text/latex' do |obj|
-        obj.to_latex
-      end
+      format 'text/latex', &:to_latex
 
       respond_to :to_tex
-      format 'text/latex' do |obj|
-        obj.to_tex
-      end
+      format 'text/latex', &:to_tex
 
       respond_to :to_javascript
-      format 'text/javascript' do |obj|
-        obj.to_javascript
-      end
+      format 'text/javascript', &:to_javascript
 
       respond_to :to_svg
       format 'image/svg+xml' do |obj|
@@ -280,21 +300,17 @@ module IRuby
       end
 
       respond_to :to_iruby
-      format do |obj|
-        obj.to_iruby
-      end
+      format(&:to_iruby)
 
-      match {|obj| obj.respond_to?(:path) && File.readable?(obj.path) }
+      match { |obj| obj.respond_to?(:path) && obj.method(:path).arity == 0 && File.readable?(obj.path) }
       format do |obj|
-        mime = MimeMagic.by_path(obj.path).to_s
+        mime = MIME::Types.of(obj.path).first.to_s
         [mime, File.read(obj.path)] if SUPPORTED_MIMES.include?(mime)
       end
 
       type { Object }
-      priority -1000
-      format 'text/plain' do |obj|
-        obj.inspect
-      end
+      priority(-1000)
+      format 'text/plain', &:inspect
     end
   end
 end

data/lib/iruby/formatter.rb

@@ -78,16 +78,16 @@ module IRuby
 
       if maxcols && keys.size > maxcols
         keys1 = keys[0...maxcols / 2]
-        keys2 = keys[-maxcols / 2...-1]
+        keys2 = keys[-maxcols / 2 + 1..-1]
         if header
           header1 = header[0...maxcols / 2]
-          header2 = header[-maxcols / 2...-1]
+          header2 = header[-maxcols / 2 + 1..-1]
         end
       end
 
       if maxrows && rows.size > maxrows
         rows1 = rows[0...maxrows / 2]
-        rows2 = rows[-maxrows / 2...-1]
+        rows2 = rows[-maxrows / 2 + 1..-1]
       end
 
       table = '<table>'

data/lib/iruby/input.rb

@@ -15,21 +15,21 @@ module IRuby
     end
 
     def form &block
-      builder = Builder.new &block
+      builder = Builder.new(&block)
       form = InputForm.new(
-        fields: builder.fields, 
+        fields: builder.fields,
         buttons: builder.buttons
       )
       form.widget_display
       builder.process_result form.submit
     end
-       
+
     def popup title='Input', &block
-      builder = Builder.new &block
+      builder = Builder.new(&block)
       form = InputForm.new fields: builder.fields
       popup = Popup.new(
-        title: title, 
-        form: form, 
+        title: title,
+        form: form,
         buttons: builder.buttons
       )
       popup.widget_display

data/lib/iruby/input/autoload.rb

@@ -2,7 +2,7 @@ begin
   require 'erector'
 rescue LoadError
   raise LoadError, <<-ERROR.gsub(/\s+/,' ')
-    IRuby::Input requires the erector gem. 
+    IRuby::Input requires the erector gem.
     `gem install erector` or add `gem 'erector'`
     it to your Gemfile to continue.
   ERROR

data/lib/iruby/input/builder.rb

@@ -21,7 +21,7 @@ module IRuby
       def html &block
         add_field Class.new(Widget) {
           define_method(:widget_html) { instance_eval &block }
-        }.new 
+        }.new
       end
 
       def text string
@@ -44,7 +44,7 @@ module IRuby
         end
       end
 
-      private 
+      private
 
       def process key, &block
         @processors[key.to_s] = block
@@ -52,14 +52,14 @@ module IRuby
 
       def unique_key key
         @keys ||= []
-        
+
         if @keys.include? key
           (2..Float::INFINITY).each do |i|
             test = "#{key}#{i}"
             break key = test unless @keys.include? test
           end
         end
-        
+
         @keys << key; key
       end
     end

data/lib/iruby/input/button.rb

@@ -10,7 +10,7 @@ module IRuby
         green: 'success',
         aqua: 'info',
         orange: 'warning',
-        red: 'danger', 
+        red: 'danger',
         none: 'link'
       }
 
@@ -37,7 +37,7 @@ module IRuby
       def widget_html
         button(
           @label || to_label(@key),
-          type: 'button', 
+          type: 'button',
           :'data-iruby-key' => @key,
           class: "btn btn-#{COLORS[@color]} pull-right #{@js_class}"
         )

data/lib/iruby/input/cancel.rb

@@ -22,7 +22,7 @@ module IRuby
       def widget_html
         button(
           @label,
-          type: 'button', 
+          type: 'button',
           :'data-dismiss' => 'modal',
           class: "btn btn-danger pull-right iruby-cancel"
         )

data/lib/iruby/input/checkbox.rb

@@ -56,10 +56,10 @@ module IRuby
         widget_label do
           div **params do
             @options.each do |option|
-              label class: 'checkbox-inline' do 
+              label class: 'checkbox-inline' do
                 input(
-                  name: @key, 
-                  value: option, 
+                  name: @key,
+                  value: option,
                   type: 'checkbox',
                   checked: @default.include?(option)
                 )

data/lib/iruby/input/date.rb

@@ -6,7 +6,7 @@ module IRuby
       builder :date do |key='date', **params|
         params[:default] ||= false
         params[:key] = unique_key key
-        
+
         if params[:default].is_a? Time
           params[:default] = params[:default].strftime('%m/%d/%Y')
         end
@@ -22,13 +22,13 @@ module IRuby
         '#ui-datepicker-div { z-index: 2000 !important; }'
       end
 
-      def widget_js 
+      def widget_js
         <<-JS
           $('.iruby-date').datepicker({
             dateFormat: 'mm/dd/yy',
             onClose: function(date) {
               $(this).data('iruby-value', date);
-            }  
+            }
           });
         JS
       end

data/lib/iruby/input/field.rb

@@ -17,9 +17,9 @@ module IRuby
       end
 
       def widget_html
-        widget_label do 
+        widget_label do
           input(
-            type: @type, 
+            type: @type,
             :'data-iruby-key' => @key,
             class: "form-control #{@js_class}",
             value: @default

data/lib/iruby/input/file.rb

@@ -13,10 +13,10 @@ module IRuby
 
           # get rid of Chrome's silly path
           name = value['name'].sub('C:\\fakepath\\','')
-          
+
           result[key.to_sym] = {
             name: name,
-            data: uri.data, 
+            data: uri.data,
             content_type: uri.content_type
           }
         end
@@ -46,7 +46,7 @@ module IRuby
       def widget_html
         widget_label do
           input(
-            type: 'file', 
+            type: 'file',
             :'data-iruby-key' => @key,
             class: 'form-control iruby-file'
           )

data/lib/iruby/input/form.rb

@@ -5,7 +5,7 @@ module IRuby
     class InputForm < Widget
       needs :fields, buttons: []
 
-      def widget_js 
+      def widget_js
         javascript = <<-JS
           var remove = function () {
             Jupyter.notebook.kernel.send_input_reply(
@@ -14,7 +14,7 @@ module IRuby
               })
             );
           };
-          
+
           $("#iruby-form").on("remove", remove);
 
           $('#iruby-form').submit(function() {
@@ -33,16 +33,16 @@ module IRuby
             Jupyter.notebook.kernel.send_input_reply(
               JSON.stringify({'#{@id}': result})
             );
-            
+
             $(this).remove();
             return false;
           });
 
           $('#iruby-form').keydown(function(event) {
-            if (event.keyCode == 13 && !event.shiftKey) { 
+            if (event.keyCode == 13 && !event.shiftKey) {
               $('#iruby-form').submit();
-            } else if (event.keyCode == 27) { 
-              $('#iruby-form').remove(); 
+            } else if (event.keyCode == 27) {
+              $('#iruby-form').remove();
             }
           });
         JS