iruby 0.5.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1576475a17c04bbdc5080fede4710cf609c9cfb1268f692e8a11653095c2902b
-  data.tar.gz: 46c737c267739a44dc2a7a9d4ccd5c8d3fcf89fda1b4163e74d941bd0740ec44
+  metadata.gz: 97c4aaa733ee27b0adb838ebed8d38cd67f857ef2466aa055105943df8647845
+  data.tar.gz: be54a5310326f5e052f07a2bb0625acb823618ab9b0a85dc0dedae01a86ebbc9
 SHA512:
-  metadata.gz: 0225f7c54c11dc9668d6bbceff3dac9ba6e1d32e041355ab429b7f6b0bc204f8050f3420dfede65474614c259e7dba346db051f5414be5fb1fd2dffd9b5de894
-  data.tar.gz: 803cbe952a48614e1d7aeefef51f772c4420aeb07bf63a679384147fe12f10469380d733834126d206342a2c6a01d7d57d6202b8d64bd90921cd3825684d22c3
+  metadata.gz: 19cb3579f143fa0b720bb1fddc1e50b17b910ba2484bd794e9d382e6b3d029675d8bda801f77b19a26afae69a9038f9779a8f50a93d4ae51dadfde53dd3168f0
+  data.tar.gz: 2f1adf37fb436345d110c87352bad3725ffba0068740c13e16bcd3f4be7132a9a8968bcecda43c257613d4ccd08ab7592c9bae27d60501ac393c54a0f86519cd

data/.github/workflows/ubuntu.yml

@@ -1,8 +1,14 @@
 name: CI
 
 on:
-- push
-- pull_request
+  push:
+    branches:
+    - master
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
 
 jobs:
   test:
@@ -35,6 +41,7 @@ jobs:
 
     - name: Install requirements on ubuntu
       run: |
+        sudo apt update
         sudo apt install -y --no-install-recommends \
                  libczmq-dev \
                  python3 \

data/CHANGES.md

@@ -0,0 +1,226 @@
+# 0.7.2 (2021-06-23)
+
+## Bug Fixes
+
+* Fix IRuby.table for Ruby >= 2.7 https://github.com/SciRuby/iruby/pull/305 (@topofocus)
+* Fix PlainBackend to include modules https://github.com/SciRuby/iruby/issues/303 (@UliKuch, @mrkn)
+
+# 0.7.1 (2021-06-21)
+
+## Enhancements
+
+* Add support of `to_iruby_mimebundle` format method https://github.com/SciRuby/iruby/pull/304 (@mrkn)
+
+## Bug Fixes
+
+* Prevent unintentional display the result of Session#send (@mrkn)
+* Update display formatter for Gruff::Base to prevent warning (@mrkn)
+
+# 0.7.0 (2021-05-28)
+
+## Enhancements
+
+* The default backend is changed to IRB (@mrkn)
+* Add IRuby::Kernel#switch_backend! method (@mrkn)
+
+## Bug Fixes
+
+* Fix the handling of image/svg+xml https://github.com/SciRuby/iruby/pull/300, https://github.com/SciRuby/iruby/pull/301 (@kojix2)
+
+# 0.6.1 (2021-05-26)
+
+## Bug Fixes
+
+* Follow the messages and hooks orders during execute_request processing (@mrkn)
+
+# 0.6.0 (2021-05-25)
+
+## Bug Fixes
+
+* Fix the handling of application/javascript https://github.com/SciRuby/iruby/issues/292, https://github.com/SciRuby/iruby/pull/294 (@kylekyle, @mrkn)
+
+## Enhancements
+
+* Add the `initialized` event in `IRuby::Kernel` class https://github.com/SciRuby/iruby/pull/168, https://github.com/SciRuby/iruby/pull/296 (@Yuki-Inoue, @mrkn)
+* Add the following four events https://github.com/SciRuby/iruby/pull/295 (@mrkn):
+  * `pre-execute` -- occurs before every code execution
+  * `pre-run-cell` -- occurs before every non-silent code execution
+  * `post-execute` -- occurs after every code execution
+  * `post-run-cell` -- occurs after every non-silent code execution
+* Replace Bond with IRB in PlainBackend https://github.com/SciRuby/iruby/pull/276, https://github.com/SciRuby/iruby/pull/297 (@cfis, @mrkn)
+
+# 0.5.0 (2021-03-25)
+
+## Bug Fixes
+
+* Fix Jupyter console crashes issue https://github.com/SciRuby/iruby/pull/210 (@kojix2)
+* Fix syntax highlighting issue on Jpyter Lab https://github.com/SciRuby/iruby/issues/224 (@kojix2)
+* Fix interoperability issue with ruby-git https://github.com/SciRuby/iruby/pull/139 (@habemus-papadum)
+* Fix the issue of `$stderr.write` that cannot handle multiple arguments https://github.com/SciRuby/iruby/issues/206 (@kojix2)
+* Remove a buggy `inspect_request` implementation https://github.com/SciRuby/iruby/pull/119 (@LunarLanding)
+* Fix uninitialized constant `Fiddle` caused in initialization phase https://github.com/SciRuby/iruby/issues/264 (@MatthewSteen, @kjoix2)
+* Fix the issue on displaying a table https://github.com/SciRuby/iruby/pull/281 (@ankane)
+
+## Enhancements
+
+* Add `IRuby.clear_output` method https://github.com/SciRuby/iruby/pull/220 (@kojix2)
+* Make backtrace on exception simplify and more appropriate for code in a cell https://github.com/SciRuby/iruby/pull/249 (@zheng-yongping)
+* Make syntax error message more appropriate https://github.com/SciRuby/iruby/pull/251 (@zheng-yongping)
+* Remove top-level `In` and `Out` constants https://github.com/SciRuby/iruby/pull/229 (@kojix2)
+* Use text/plain for the default format of `Numo::NArray` objects https://github.com/SciRuby/iruby/pull/255 (@kojix2)
+* Use ffi-rzmq as the default ZeroMQ adapter https://github.com/SciRuby/iruby/pull/256 (@kojix2)
+* Drop rbczmq support https://github.com/SciRuby/iruby/pull/260 (@rstammer)
+* Add ruby-vips image support https://github.com/SciRuby/iruby/pull/279 (@ankane)
+* Replace mimemagic with mime-types https://github.com/SciRuby/iruby/pull/291 (@mrkn)
+
+# 0.4.0 (2019-07-31)
+
+(TBD)
+
+# 0.3 (2017-03-26)
+
+## Bug Fixes
+
+* Disable Jupyter keyboard manager for all popups made using IRuby.popup (@kylekyle).
+* Fix Iruby/Input date values bug that set date fields to whatever the last date value was (@kylekyle).
+* Fix a bug where time strings put into prompter would give an 'out of range' error (@kylekyle).
+
+## Enhancements
+
+* Improvements to IRuby dependency detection using `Bundler::Dependencies#specs` (@kou).
+* Use less memory forcing pry to store only the last 3 commands in memory (@kylekyle).
+* Use bigger z-index that is used accross all browsers (@kylekyle).
+* Ability to input date values as DateTime objects in IRuby/Input (@kylekyle).
+* Add option to have check boxes checked by default (@kylekyle).
+* Option for multi-select in drop down menus in the prompter (@kylekyle).
+* Add support for multiple widgets using `IRuby::Input::Multiple` (@kylekyle).
+* Calender icon for date selector icon (@kylekyle).
+* Add support for Numo/NArray (@zalt50).
+* Text now only completes after a space (@zalt50).
+* Remove the DONTWAIT flag when receiving a message (@cloud-oak).
+* Add support for CZTop (@kou).
+
+# 0.2.9 (2016-05-02)
+  
+## Bug Fixes
+
+* Fix an error where a NoMethodError was being raised where a table rendered using an Array of Hashes has more than `maxcols` columns. (@CGamesPlay)
+* Patch PryBackend to throw unterminated string and unexpected end-of-file syntax errors (@kylekyle)
+
+## Enhnacements
+
+* Add an IRuby::Input class which provides widgets for getting inputs from users. (@kylekyle)
+* Add data_uri dependency (@kylekyle)
+* Added a clear_output display function (@mrkn)
+* Doc fixes for installation (@kozo2, @generall)
+
+# 0.2.8 (2015-12-06)
+
+* Add compatibility with ffi-rzmq
+* Windows support
+
+# 0.2.7 (2015-07-02)
+
+* Fix problem with autoloaded constants in Display, problem with sciruby gem
+
+# 0.2.6 (2015-06-21)
+
+* Check registered kernel and Gemfile to prevent gem loading problems
+* Support to_tex method for the rendering
+
+# 0.2.5 (2015-06-07)
+
+* Fix #29, empty signatures
+* Move iruby utils to IRuby::Utils module
+* Add IRuby.tex alias for IRuby.latex
+* Remove example notebooks from gem
+
+# 0.2.4 (2015-06-02)
+
+* Better exception handling
+* Fix ctrl-C issue #17
+* Fix timeout issue #19
+
+# 0.2.3 (2015-05-31)
+
+* Fix notebook indentation
+* Fix tab completion for multiple lines
+
+# 0.2.2 (2015-05-26)
+
+* Support history variables In, Out, _, _i etc
+* Internal refactoring and minor bugfixes
+
+# 0.2.1 (2015-05-26)
+
+* Copy Ruby logo to kernel specification
+
+# 0.2.0 (2015-05-25)
+
+* Dropped IPython2 support
+* Dropped Ruby < 2.0.0 support
+* Supports and requires now IPython3/Jupyter
+* Switch from ffi-rzmq to rbczmq
+* Added IRuby::Conn (experimental, to be used by widgets)
+* iruby register/unregister commands to register IRuby kernel in Jupyter
+
+# 0.1.13 (2014-08-19)
+
+* Improved IRuby.table, supports :maxrows and :maxcols
+* IRuby#javascript workaround (https://github.com/ipython/ipython/issues/6259)
+
+# 0.1.12 (2014-08-01)
+
+* IRuby#table add option maxrows
+* powerful display system with format and datatype registry, see #25
+* Add IRuby#javascript
+* Add IRuby#svg
+
+# 0.1.11 (2014-07-08)
+
+* Push binding if pry binding stack is empty
+
+# 0.1.10 (2014-07-08)
+
+* Fix #19 (pp)
+* Handle exception when symlink cannot be created
+* Fix dependencies and Pry backend
+
+# 0.1.9 (2014-02-28)
+
+* Check IPython version
+
+# 0.1.7/0.1.8
+
+* Bugfixes #11, #12, #13
+
+# 0.1.6 (2013-10-11)
+
+* Print Matrix and GSL::Matrix as LaTeX
+* Add check for Pry version
+
+# 0.1.5 (2013-10-03)
+
+* Implement a rich display system
+* Fix error output
+
+# 0.1.4 (2013-10-03)
+
+* Extract display handler from kernel
+* Always return a text/plain response
+
+# 0.1.3 (2013-10-03)
+
+* Implement missing request handlers
+* Detect if Bundler is running and set kernel_cmd appropriately
+* Improve Pry integration
+* Add support for the gems gnuplot, gruff, rmagick and mini_magick
+
+# 0.1.2 (2013-10-02)
+
+* Support for Pry added
+* Launch `iruby console` if plain `iruby` is started
+
+# 0.1.0 (2013-10-02)
+
+* Cleanup and rewrite of some parts

data/README.md

@@ -31,8 +31,8 @@ If both ffi-rzmq and cztop are installed, ffi-rzmq is used. If you prefer cztop,
 export IRUBY_SESSION_ADAPTER="cztop"
 ```
 
-* We recommend the [Pry](https://github.com/pry/pry) backend for full functionality.
-* If you want to install the latest version of IRuby from the source code, try [specific_install](https://github.com/rdp/specific_install).
+* [Pry][Pry], if you want to use [Pry][Pry] instead of IRB for the code execution backend
+* If you want to install the development version of IRuby from the source code, try [specific_install](https://github.com/rdp/specific_install).
 
 ```
 gem specific_install https://github.com/SciRuby/iruby
@@ -148,6 +148,19 @@ If you have already used IRuby with a different version, you need to generate a
 $ iruby register --force
 ```
 
+## Backends
+
+There are two backends: PlainBackend and PryBackend.
+
+* PlainBackend is the default backend.  It uses [IRB](https://github.com/ruby/irb).
+* PryBackend uses [Pry][Pry].
+
+You can switch the backend to PryBackend by running the code below.
+
+```ruby
+IRuby::Kernel.instance.switch_backend!(:pry)
+```
+
 ## Notebooks
 
 Take a look at the [example notebook](http://nbviewer.ipython.org/urls/raw.github.com/SciRuby/sciruby-notebooks/master/getting_started.ipynb)
@@ -167,3 +180,5 @@ In February 2021, [IRuby became the canonical repository](https://github.com/Sci
 Copyright (c) IRuby contributors and the Ruby Science Foundation.
 
 Licensed under the [MIT](LICENSE) license.
+
+[Pry]: https://github.com/pry/pry

data/iruby.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'bond', '~> 0.5'
   s.add_dependency 'data_uri', '~> 0.1'
   s.add_dependency 'ffi-rzmq'
+  s.add_dependency 'irb'
   s.add_dependency 'mime-types', '>= 3.3.1'
   s.add_dependency 'multi_json', '~> 1.11'
 

data/lib/iruby.rb

@@ -1,12 +1,16 @@
+require 'fileutils'
 require 'mime/types'
 require 'multi_json'
 require 'securerandom'
 require 'openssl'
 require 'tempfile'
 require 'set'
+require 'stringio'
 
 require 'iruby/version'
 require 'iruby/jupyter'
+require 'iruby/event_manager'
+require 'iruby/logger'
 require 'iruby/kernel'
 require 'iruby/backend'
 require 'iruby/ostream'

data/lib/iruby/backend.rb

@@ -3,7 +3,7 @@ module IRuby
 
   module History
     def eval(code, store_history)
-      b = TOPLEVEL_BINDING
+      b = eval_binding
 
       b.local_variable_set(:_ih, In)  unless b.local_variable_defined?(:_ih)
       b.local_variable_set(:_oh, Out) unless b.local_variable_defined?(:_oh)
@@ -36,17 +36,38 @@ module IRuby
     prepend History
 
     def initialize
-      require 'bond'
-      Bond.start(debug: true)
-      @eval_path = '(iruby)'
+      require 'irb'
+      require 'irb/completion'
+      IRB.setup(nil)
+      @main = TOPLEVEL_BINDING.eval("self").dup
+      init_main_object(@main)
+      @workspace = IRB::WorkSpace.new(@main)
+      @irb = IRB::Irb.new(@workspace)
+      @eval_path = @irb.context.irb_path
+      IRB.conf[:MAIN_CONTEXT] = @irb.context
+    end
+
+    def eval_binding
+      @workspace.binding
     end
 
     def eval(code, store_history)
-      TOPLEVEL_BINDING.eval(code, @eval_path, 1)
+      @irb.context.evaluate(code, 0)
+      @irb.context.last_value
     end
 
     def complete(code)
-      Bond.agent.call(code, code)
+      IRB::InputCompletor::CompletionProc.call(code)
+    end
+
+    private
+
+    def init_main_object(main)
+      wrapper_module = Module.new
+      main.extend(wrapper_module)
+      main.define_singleton_method(:include) do |*args|
+        wrapper_module.include(*args)
+      end
     end
   end
 
@@ -64,6 +85,10 @@ module IRuby
       reset
     end
 
+    def eval_binding
+      TOPLEVEL_BINDING
+    end
+
     def eval(code, store_history)
       Pry.current_line = 1
       @pry.last_result = nil
@@ -96,7 +121,7 @@ module IRuby
     end
 
     def reset
-      @pry = Pry.new(output: $stdout, target: TOPLEVEL_BINDING)
+      @pry = Pry.new(output: $stdout, target: eval_binding)
     end
   end
 end

data/lib/iruby/command.rb

@@ -1,7 +1,4 @@
-require 'iruby/jupyter'
-
-require 'fileutils'
-require 'multi_json'
+require 'iruby'
 
 module IRuby
   class Command
@@ -92,7 +89,6 @@ Try `ipython help` for more information.
     end
 
     def run_kernel
-      require 'iruby/logger'
       IRuby.logger = MultiLogger.new(*Logger.new(STDOUT))
       STDOUT.sync = true # FIXME: This can make the integration test.
 
@@ -131,7 +127,7 @@ Try `ipython help` for more information.
       check_registered_kernel
       check_bundler {|e| STDERR.puts "Could not load bundler: #{e.message}" }
 
-      Kernel.exec('ipython', *@args)
+      Process.exec('ipython', *@args)
     end
 
     def check_registered_kernel

data/lib/iruby/display.rb

@@ -1,10 +1,30 @@
+require "set"
+
 module IRuby
   module Display
+    DEFAULT_MIME_TYPE_FORMAT_METHODS = {
+      "text/html" => :to_html,
+      "text/markdown" => :to_markdown,
+      "image/svg+xml" => :to_svg,
+      "image/png" => :to_png,
+      "appliation/pdf" => :to_pdf,
+      "image/jpeg" => :to_jpeg,
+      "text/latex" => [:to_latex, :to_tex],
+      # NOTE: Do not include the entry of "application/json" because
+      #       all objects can respond to `to_json` due to json library
+      # "application/json" => :to_json,
+      "application/javascript" => :to_javascript,
+      nil => :to_iruby,
+      "text/plain" => :inspect
+    }.freeze
+
     class << self
+      # @private
       def convert(obj, options)
         Representation.new(obj, options)
       end
 
+      # @private
       def display(obj, options = {})
         obj = convert(obj, options)
         options = obj.options
@@ -20,23 +40,48 @@ module IRuby
           raise 'Invalid mime type' unless exact_mime.include?('/')
         end
 
-        data = {}
-
-        # Render additional representation
-        render(data, obj, exact_mime, fuzzy_mime)
-
-        # IPython always requires a text representation
-        render(data, obj, 'text/plain', nil) unless data['text/plain']
+        data = render_mimebundle(obj, exact_mime, fuzzy_mime)
+
+        # Render by additional formatters
+        render_by_registry(data, obj, exact_mime, fuzzy_mime)
+
+        # Render by to_xxx methods
+        DEFAULT_MIME_TYPE_FORMAT_METHODS.each do |mime, methods|
+          next if mime.nil? && !data.empty? # for to_iruby
+
+          next if mime && data.key?(mime)   # do not overwrite
+
+          method = Array(methods).find {|m| obj.respond_to?(m) }
+          next if method.nil?
+
+          result = obj.send(method)
+          case mime
+          when nil # to_iruby
+            case result
+            when nil
+              # do nothing
+              next
+            when Array
+              mime, result = result
+            else
+              warn(("Ignore the result of to_iruby method of %p because " +
+                    "it does not return a pair of mime-type and formatted representation") % obj)
+              next
+            end
+          end
+          data[mime] = result
+        end
 
         # As a last resort, interpret string representation of the object
         # as the given mime type.
-        if exact_mime && data.none? { |m, _| exact_mime == m }
+        if exact_mime && !data.key?(exact_mime)
           data[exact_mime] = protect(exact_mime, obj)
         end
 
         data
       end
 
+      # @private
       def clear_output(wait = false)
         IRuby::Kernel.instance.session.send(:publish, :clear_output, wait: wait)
       end
@@ -44,10 +89,39 @@ module IRuby
       private
 
       def protect(mime, data)
-        MIME::Type.new(mime).ascii? ? data.to_s : [data.to_s].pack('m0')
+        ascii?(mime) ? data.to_s : [data.to_s].pack('m0')
       end
 
-      def render(data, obj, exact_mime, fuzzy_mime)
+      # Each of the following mime types must be a text type,
+      # but mime-types library tells us it is a non-text type.
+      FORCE_TEXT_TYPES = Set[
+        "application/javascript",
+        "image/svg+xml"
+      ].freeze
+
+      def ascii?(mime)
+        if FORCE_TEXT_TYPES.include?(mime)
+          true
+        else
+          MIME::Type.new(mime).ascii?
+        end
+      end
+
+      private def render_mimebundle(obj, exact_mime, fuzzy_mime)
+        data = {}
+        if obj.respond_to?(:to_iruby_mimebundle)
+          include_mime = [exact_mime].compact
+          formats, metadata = obj.to_iruby_mimebundle(include: include_mime)
+          formats.each do |mime, value|
+            if fuzzy_mime.nil? || mime.include?(fuzzy_mime)
+              data[mime] = value
+            end
+          end
+        end
+        data
+      end
+
+      private def render_by_registry(data, obj, exact_mime, fuzzy_mime)
         # Filter matching renderer by object type
         renderer = Registry.renderer.select { |r| r.match?(obj) }
 
@@ -68,6 +142,8 @@ module IRuby
         # Return first render result which has the right mime type
         renderer.each do |r|
           mime, result = r.render(obj)
+          next if data.key?(mime)
+
           if mime && result && (!exact_mime || exact_mime == mime) && (!fuzzy_mime || mime.include?(fuzzy_mime))
             data[mime] = protect(mime, result)
             break
@@ -78,6 +154,19 @@ module IRuby
       end
     end
 
+    private def render_by_to_iruby(data, obj)
+      if obj.respond_to?(:to_iruby)
+        result = obj.to_iruby
+        mime, rep = case result
+                    when Array
+                      result
+                    else
+                      [nil, result]
+                    end
+        data[mime] = rep
+      end
+    end
+
     class Representation
       attr_reader :object, :options
 
@@ -100,6 +189,60 @@ module IRuby
       end
     end
 
+    class FormatMatcher
+      def initialize(&block)
+        @block = block
+      end
+
+      def call(obj)
+        @block.(obj)
+      end
+
+      def inspect
+        "#{self.class.name}[%p]" % @block
+      end
+    end
+
+    class RespondToFormatMatcher < FormatMatcher
+      def initialize(name)
+        super() {|obj| obj.respond_to?(name) }
+        @name = name
+      end
+
+      attr_reader :name
+
+      def inspect
+        "#{self.class.name}[respond_to?(%p)]" % name
+      end
+    end
+
+    class TypeFormatMatcher < FormatMatcher
+      def initialize(class_block)
+        super() do |obj|
+          begin
+            self.klass === obj
+          # We have to rescue all exceptions since constant autoloading could fail with a different error
+          rescue Exception
+            false
+          end
+        end
+        @class_block = class_block
+      end
+
+      def klass
+        @class_block.()
+      end
+
+      def inspect
+        klass = begin
+                  @class_block.()
+                rescue Exception
+                  @class_block
+                end
+        "#{self.class.name}[%p]" % klass
+      end
+    end
+
     class Renderer
       attr_reader :match, :mime, :priority
 
@@ -127,37 +270,22 @@ module IRuby
         @renderer ||= []
       end
 
-      SUPPORTED_MIMES = %w[
-        text/plain
-        text/html
-        text/latex
-        application/json
-        application/javascript
-        image/png
-        image/jpeg
-        image/svg+xml
-      ]
-
       def match(&block)
-        @match = block
+        @match = FormatMatcher.new(&block)
         priority 0
         nil
       end
 
       def respond_to(name)
-        match { |obj| obj.respond_to?(name) }
+        @match = RespondToFormatMatcher.new(name)
+        priority 0
+        nil
       end
 
       def type(&block)
-        match do |obj|
-          begin
-            block.call === obj
-          # We have to rescue all exceptions since constant autoloading could fail with a different error
-          rescue Exception
-          rescue #NameError
-            false
-          end
-        end
+        @match = TypeFormatMatcher.new(block)
+        priority 0
+        nil
       end
 
       def priority(p)
@@ -255,13 +383,24 @@ module IRuby
         end
       end
 
+      format_magick_image = ->(obj) do
+        format = obj.format || 'PNG'
+        [
+          format == 'PNG' ? 'image/png' : 'image/jpeg',
+          obj.to_blob {|i| i.format = format }
+        ]
+      end
+
       match do |obj|
         defined?(Magick::Image) && Magick::Image === obj ||
           defined?(MiniMagick::Image) && MiniMagick::Image === obj
       end
+      format 'image', &format_magick_image
+
+      type { Gruff::Base }
       format 'image' do |obj|
-        format = obj.format || 'PNG'
-        [format == 'PNG' ? 'image/png' : 'image/jpeg', obj.to_blob { |i| i.format = format }]
+        image = obj.to_image
+        format_magick_image.(obj.to_image)
       end
 
       match do |obj|
@@ -278,39 +417,19 @@ module IRuby
         end
       end
 
-      type { Gruff::Base }
-      format 'image/png', &:to_blob
-
-      respond_to :to_html
-      format 'text/html', &:to_html
-
-      respond_to :to_latex
-      format 'text/latex', &:to_latex
-
-      respond_to :to_tex
-      format 'text/latex', &:to_tex
-
-      respond_to :to_javascript
-      format 'text/javascript', &:to_javascript
-
-      respond_to :to_svg
+      type { Rubyvis::Mark }
       format 'image/svg+xml' do |obj|
-        obj.render if defined?(Rubyvis) && Rubyvis::Mark === obj
+        obj.render
         obj.to_svg
       end
 
-      respond_to :to_iruby
-      format(&:to_iruby)
-
       match { |obj| obj.respond_to?(:path) && obj.method(:path).arity == 0 && File.readable?(obj.path) }
       format do |obj|
         mime = MIME::Types.of(obj.path).first.to_s
-        [mime, File.read(obj.path)] if SUPPORTED_MIMES.include?(mime)
+        if mime && DEFAULT_MIME_TYPE_FORMAT_METHODS.key?(mime)
+          [mime, File.read(obj.path)]
+        end
       end
-
-      type { Object }
-      priority(-1000)
-      format 'text/plain', &:inspect
     end
   end
 end