ipynbdiff 0.4.2 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4b3e7e96694361ee62a498007e9bda9165b47b2ef9a31b41322cf8cdd8781f
-  data.tar.gz: 1680189fc74e0b8e8909d671ce3b77abff51e8ccd0d4304cf088b43a3254a311
+  metadata.gz: 0f26544b121fc120490029ee5e708efbd1e90ad085e5bf973fbb29214a04d7c8
+  data.tar.gz: cbcfa68cdf53ce539374c3053b95d7ebb4e27e57d09bf77b23b1f1297bced097
 SHA512:
-  metadata.gz: fd5cf9cad8f9c20db2051a8b66a998a8174d066ca71e8a45c7bb5e1e274478919ed44fee1a38b296b7a5c679df686da96e402c750d51df0a68db7328260181a7
-  data.tar.gz: a7ba937ec71caa7a5a5a31cd47ea047f9b2518bd6c7f8a61f120b62deb7d3e6a07dc8ba76e8719b725dab8b6f78cb9b86771273a5a46d9798d744c2bc25d00bf
+  metadata.gz: 897ddec211a46b69ab9cdd8a0ecddc946c67f1a51557f7205a305ae1ce35a32890120a1cb640082b4f3d7e8739c2172e56085d2987badfa32775adc48ca87b1d
+  data.tar.gz: 7516f6c3b5ac3d2a38f3ea78c54f293b49643260321f4ca452d46d4adc11e6d9447de4938cc5cb9de2c6b9d9b71abebf407de7252edffe3df51e997c919622fe

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('}')
-
-        prop_name = parse_string
+        raise_if_file_ended
 
-        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,24 +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
-      value = ''
-      prev_char = nil
-
+    def parse_string(return_value: false)
       current_should_be '"'
+      init_idx = @char_idx
 
       loop do
         increment_char_index
-        break if (c = current_char) == '"' && prev_char != '\\'
 
-        value += (prev_char = c)
+        raise_if_file_ended
+
+        if current_char == '"' && !prev_backslash?
+          init_idx += 1
+          break
+        end
       end
 
-      value
+      @chars[init_idx...@char_idx].join if return_value
     end
 
     def add_result(key, line_number)
@@ -106,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
@@ -126,9 +140,15 @@ module IpynbDiff
     end
 
     def current_char
+      raise_if_file_ended
+
       @chars[@char_idx]
     end
 
+    def prev_backslash?
+      @chars[@char_idx - 1] == '\\' && @chars[@char_idx - 2] != '\\'
+    end
+
     def current_should_be(another_char)
       raise InvalidTokenError unless current_char == another_char
     end
@@ -137,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/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.2"
+  VERSION = "0.4.5"
 end

metadata

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