ipynbdiff 0.4.3 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4439ffa7f5fb1abc1243c5ab32d1196bb9bb37130c2a1eebe8461a4b0d1bf1bb
-  data.tar.gz: 1767b4eccbc36b2644cc2c5c4b50589b0b967dff46e50b4898c328e171adc1f4
+  metadata.gz: ff3a6405d5c4034108fee997d678bee634a516f1d773b0aa9e8c7e4f50b7f28e
+  data.tar.gz: 3a80027ec239810e6b3daaa637fc338c5a34e3ae75c2f33043303eb6e16f6980
 SHA512:
-  metadata.gz: 86fd17c557336d668abfd4677e1883b20d7af02c75afcfe2d4357149953c54520578afd1c7b902591746a3b1ba113778e1794026b57fe44fcf53fc66ace4ddb0
-  data.tar.gz: 85b800b3776a519c471be72979a9a0ea186ad4a3251ff4276e2e732c9aed906fd8327ce9797ade66ada6734e248116e1b8338b6b035c607615b0fc21c602a136
+  metadata.gz: 6d126961600c8073f2ead97b26d2879f987f15d6e3c74f0c9e2bd64c020bc8fd7963f4b50a69fd28c98728c645b595dbdda5883f4f56e18aa949df589e3787d0
+  data.tar.gz: 30e2c855b51de45ad2147419a455a4adc8f4f3cd30445f32a9667e3f17a072c3e59bcc8e603e34be2c7216e0b9671e2ed283e827780b4da25bff4be03f733ed6

data/lib/ipynb_symbol_map.rb

@@ -7,8 +7,8 @@ module IpynbDiff
   # Creates a symbol map for a ipynb file (JSON format)
   class IpynbSymbolMap
     class << self
-      def parse(notebook)
-        IpynbSymbolMap.new(notebook).parse('')
+      def parse(notebook, objects_to_ignore = [])
+        IpynbSymbolMap.new(notebook, objects_to_ignore).parse('')
       end
     end
 
@@ -18,14 +18,17 @@ module IpynbDiff
 
     VALUE_STOPPERS = [',', '[', ']', '{', '}', *WHITESPACE_CHARS].freeze
 
-    def initialize(notebook)
+    def initialize(notebook, objects_to_ignore = [])
       @chars = notebook.chars
       @current_line = 0
       @char_idx = 0
       @results = {}
+      @objects_to_ignore = objects_to_ignore
     end
 
     def parse(prefix = '.')
+      raise_if_file_ended
+
       skip_whitespaces
 
       if (c = current_char) == '"'
@@ -49,6 +52,8 @@ module IpynbDiff
       current_should_be '['
 
       loop do
+        raise_if_file_ended
+
         break if skip_beginning(']')
 
         new_prefix = "#{prefix}.#{i}"
@@ -67,13 +72,11 @@ module IpynbDiff
       current_should_be '{'
 
       loop do
-        break if skip_beginning('}')
+        raise_if_file_ended
 
-        prop_name = parse_string
-
-        new_prefix = "#{prefix}.#{prop_name}"
+        break if skip_beginning('}')
 
-        add_result(new_prefix, current_line)
+        prop_name = parse_string(return_value: true)
 
         next_and_skip_whitespaces
 
@@ -81,26 +84,34 @@ module IpynbDiff
 
         next_and_skip_whitespaces
 
-        parse(new_prefix)
+        if @objects_to_ignore.include? prop_name
+          skip
+        else
+          new_prefix = "#{prefix}.#{prop_name}"
+
+          add_result(new_prefix, current_line)
+
+          parse(new_prefix)
+        end
       end
     end
 
-    def parse_string
+    def parse_string(return_value: false)
       current_should_be '"'
       init_idx = @char_idx
 
       loop do
         increment_char_index
 
-        break if @char_idx > @chars.length
+        raise_if_file_ended
 
-        if current_char == '"' && prev_char != '\\'
+        if current_char == '"' && !prev_backslash?
           init_idx += 1
           break
         end
       end
 
-      @chars[init_idx...@char_idx].join
+      @chars[init_idx...@char_idx].join if return_value
     end
 
     def add_result(key, line_number)
@@ -108,11 +119,12 @@ module IpynbDiff
     end
 
     def parse_value
-      increment_char_index until VALUE_STOPPERS.include?(current_char)
+      increment_char_index until raise_if_file_ended || VALUE_STOPPERS.include?(current_char)
     end
 
     def skip_whitespaces
       while WHITESPACE_CHARS.include?(current_char)
+        raise_if_file_ended
         check_for_new_line
         increment_char_index
       end
@@ -128,11 +140,13 @@ module IpynbDiff
     end
 
     def current_char
+      raise_if_file_ended
+
       @chars[@char_idx]
     end
 
-    def prev_char
-      @chars[@char_idx - 1]
+    def prev_backslash?
+      @chars[@char_idx - 1] == '\\' && @chars[@char_idx - 2] != '\\'
     end
 
     def current_should_be(another_char)
@@ -143,6 +157,55 @@ module IpynbDiff
       @current_line += 1 if current_char == "\n"
     end
 
+    def raise_if_file_ended
+      @char_idx >= @chars.size && raise(InvalidTokenError)
+    end
+
+    def skip
+      raise_if_file_ended
+
+      skip_whitespaces
+
+      if (c = current_char) == '"'
+        parse_string
+      elsif c == '['
+        skip_array
+      elsif c == '{'
+        skip_object
+      else
+        parse_value
+      end
+    end
+
+    def skip_array
+      loop do
+        raise_if_file_ended
+
+        break if skip_beginning(']')
+
+        skip
+      end
+    end
+
+    def skip_object
+
+      loop do
+        raise_if_file_ended
+
+        break if skip_beginning('}')
+
+        parse_string
+
+        next_and_skip_whitespaces
+
+        current_should_be ':'
+
+        next_and_skip_whitespaces
+
+        skip
+      end
+    end
+
     def skip_beginning(closing_char)
 
       check_for_new_line

data/lib/output_transformer.rb

@@ -52,24 +52,20 @@ module IpynbDiff
       new_symbol = symbol_prefix / output_type
       case output_type
       when 'image/png', 'image/jpeg'
-        transform_image(output_type, output_element, new_symbol)
+        transform_image(output_type + ';base64', output_element, new_symbol)
       when 'image/svg+xml'
-        transform_svg(output_element, new_symbol)
+        transform_image(output_type + ';utf8', output_element, new_symbol)
       when 'text/markdown', 'text/latex', 'text/plain', 'text'
         transform_text(output_element, new_symbol)
       end
     end
 
     def transform_image(image_type, image_content, symbol)
-      _(symbol, "    ![](data:#{image_type};base64,#{image_content.gsub("\n", '')})")
-    end
-
-    def transform_svg(image_content, symbol)
       lines = image_content.is_a?(Array) ? image_content : [image_content]
 
       single_line = lines.map(&:strip).join.gsub(/\s+/, ' ')
 
-      _(symbol, "    ![](data:image/svg+xml;utf8,#{single_line})")
+      _(symbol, "    ![](data:#{image_type},#{single_line})")
     end
 
     def transform_text(text_content, symbol)

data/lib/transformer.rb

@@ -15,6 +15,7 @@ module IpynbDiff
     include SymbolizedMarkdownHelper
 
     @include_frontmatter = true
+    @objects_to_ignore = ['application/javascript', 'application/vnd.holoviews_load.v0+json']
 
     def initialize(include_frontmatter: true)
       @include_frontmatter = include_frontmatter

data/lib/version.rb

@@ -1,5 +1,5 @@
 # lib/emoticon/version.rb
 
 module IpynbDiff
-  VERSION = "0.4.3"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipynbdiff
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.6
 platform: ruby
 authors:
 - Eduardo Bonet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy