iruby 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c4aaa733ee27b0adb838ebed8d38cd67f857ef2466aa055105943df8647845
-  data.tar.gz: be54a5310326f5e052f07a2bb0625acb823618ab9b0a85dc0dedae01a86ebbc9
+  metadata.gz: ea24babb0bbbb88c3a3bacfbb2ca4438903d9cffa1e6609976e066cfa3e72ff5
+  data.tar.gz: 428513fab78f77f82632f3d66cbd2dc6a81344ea781c213164af038530ecf90e
 SHA512:
-  metadata.gz: 19cb3579f143fa0b720bb1fddc1e50b17b910ba2484bd794e9d382e6b3d029675d8bda801f77b19a26afae69a9038f9779a8f50a93d4ae51dadfde53dd3168f0
-  data.tar.gz: 2f1adf37fb436345d110c87352bad3725ffba0068740c13e16bcd3f4be7132a9a8968bcecda43c257613d4ccd08ab7592c9bae27d60501ac393c54a0f86519cd
+  metadata.gz: 1d451a1d683ef25e3f1beeb235db1a2c082199b1a3196b3fa3c1468c505f2d7406931cdc03f678ee0b792f8b7fdf7ffe75979e9f5c2e1470c83a9c8cc1f7fc05
+  data.tar.gz: 2ff9d61912037029eb3b6c087d129cee9b4473f825b51a492e165ee40e0370c46bc2b41159f8f8510f0e083c1c2bb200c46b6fa1ea18c5d11f4e12bf5c61416b

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.7.3 (2021-07-08)
+
+## Bug Fixes
+
+* Do not call default renderers when to_iruby_mimebundle is available (@mrkn)
+
 # 0.7.2 (2021-06-23)
 
 ## Bug Fixes

data/lib/iruby/display.rb

@@ -40,13 +40,23 @@ module IRuby
           raise 'Invalid mime type' unless exact_mime.include?('/')
         end
 
-        data = render_mimebundle(obj, exact_mime, fuzzy_mime)
+        data = if obj.respond_to?(:to_iruby_mimebundle)
+                 render_mimebundle(obj, exact_mime, fuzzy_mime)
+               else
+                 {}
+               end
 
         # 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|
+        default_renderers = if obj.respond_to?(:to_iruby_mimebundle)
+                              # Do not use Hash#slice for Ruby < 2.5
+                              {"text/plain" => DEFAULT_MIME_TYPE_FORMAT_METHODS["text/plain"]}
+                            else
+                              DEFAULT_MIME_TYPE_FORMAT_METHODS
+                            end
+        default_renderers.each do |mime, methods|
           next if mime.nil? && !data.empty? # for to_iruby
 
           next if mime && data.key?(mime)   # do not overwrite
@@ -109,13 +119,11 @@ module IRuby
 
       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
+        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
         data

data/lib/iruby/version.rb

@@ -1,3 +1,3 @@
 module IRuby
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/test/iruby/display_test.rb

@@ -59,14 +59,12 @@ module IRubyTest
         def to_iruby_mimebundle(include: [])
           @to_iruby_mimebundle_called = true
           mimes = if include.empty?
-                    ["text/html", "text/markdown", "application/json"]
+                    ["text/markdown", "application/json"]
                   else
                     include
                   end
           formats = mimes.map { |mime|
             result = case mime
-                     when "text/html"
-                       "<i>html</i>"
                      when "text/markdown"
                        "**markdown**"
                      when "application/json"
@@ -170,7 +168,6 @@ module IRubyTest
           def test_display
             assert_iruby_display({
                                    result: {
-                                     "text/html" => "<i>html</i>",
                                      "text/markdown" => "**markdown**",
                                      "application/json" => %Q[{"mimebundle": "json"}],
                                      "text/plain" => "!!! inspect !!!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Daniel Mendler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: Ruby Kernel for Jupyter