ipynbdiff 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f722c49e19511d249e90f620b67e69869d6dbd226c280f007b21b68e8675482
-  data.tar.gz: b77b6733387649d2b9ad26fc9143d4520a54901bca63b9f94b6e70e67c02288b
+  metadata.gz: 4439ffa7f5fb1abc1243c5ab32d1196bb9bb37130c2a1eebe8461a4b0d1bf1bb
+  data.tar.gz: 1767b4eccbc36b2644cc2c5c4b50589b0b967dff46e50b4898c328e171adc1f4
 SHA512:
-  metadata.gz: 2a5c9d3ba57aee0bfab6f6e435804ce70f7128cf3e19cb04396fcf286a3a7b8fc3f0f451d2c4d4cf91c52dc0013fe5b55b3aa169744801037e0505689be61792
-  data.tar.gz: 977baf80af614a98af4405816c8776fa9e9ac7323a5886ec5ff7af8e4b3c151aeff1b2b2398cbdc5d1f5d4f815065b974292527980a13c7ac7eeb2077f036a73
+  metadata.gz: 86fd17c557336d668abfd4677e1883b20d7af02c75afcfe2d4357149953c54520578afd1c7b902591746a3b1ba113778e1794026b57fe44fcf53fc66ace4ddb0
+  data.tar.gz: 85b800b3776a519c471be72979a9a0ea186ad4a3251ff4276e2e732c9aed906fd8327ce9797ade66ada6734e248116e1b8338b6b035c607615b0fc21c602a136

data/.gitlab-ci.yml

@@ -1,42 +1,43 @@
+# You can override the included template(s) by including variable overrides
+# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
+# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
 image: ruby:2.7
-
 stages:
-  - test
-  - build
-  - rubygems
-
+- test
+- build
+- rubygems
 specs:
   stage: test
   script:
-    - bundle install
-    - bundle exec rspec
-
+  - bundle install
+  - bundle exec rspec
 build-gem:
   stage: build
   script:
-    - bundle install
-    - cat .VERSION.TMPL | sed s/GEM_VERSION/0.0.0/ > lib/version.rb
-    - gem build ipynbdiff.gemspec
+  - bundle install
+  - cat .VERSION.TMPL | sed s/GEM_VERSION/0.0.0/ > lib/version.rb
+  - gem build ipynbdiff.gemspec
   artifacts:
     paths:
     - ipynbdiff-0.0.0.gem
   needs:
-    - specs
-
+  - specs
 deploy-gem:
   stage: rubygems
   script:
-    - bundle install
-    - cat .VERSION.TMPL | sed s/GEM_VERSION/$CI_COMMIT_TAG/ > lib/version.rb
-    - gem build ipynbdiff.gemspec
-    - gem push ipynbdiff-$CI_COMMIT_TAG.gem
+  - bundle install
+  - cat .VERSION.TMPL | sed s/GEM_VERSION/$CI_COMMIT_TAG/ > lib/version.rb
+  - gem build ipynbdiff.gemspec
+  - gem push ipynbdiff-$CI_COMMIT_TAG.gem
   only:
-    - tags
+  - tags
   except:
-    - branches
-  needs: 
-    - build-gem
+  - branches
+  needs:
+  - build-gem
   when: manual
-  
-
-
+include:
+- template: Security/Dependency-Scanning.gitlab-ci.yml

data/ipynbdiff.gemspec

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'lib/version'
+lib = File.expand_path('lib/..', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+
+require 'lib/version'
 
 Gem::Specification.new do |s|
   s.name        = 'ipynbdiff'

data/lib/ipynb_symbol_map.rb

@@ -86,19 +86,21 @@ module IpynbDiff
     end
 
     def parse_string
-      value = ''
-      prev_char = nil
-
       current_should_be '"'
+      init_idx = @char_idx
 
       loop do
         increment_char_index
-        break if (c = current_char) == '"' && prev_char != '\\'
 
-        value += (prev_char = c)
+        break if @char_idx > @chars.length
+
+        if current_char == '"' && prev_char != '\\'
+          init_idx += 1
+          break
+        end
       end
 
-      value
+      @chars[init_idx...@char_idx].join
     end
 
     def add_result(key, line_number)
@@ -129,6 +131,10 @@ module IpynbDiff
       @chars[@char_idx]
     end
 
+    def prev_char
+      @chars[@char_idx - 1]
+    end
+
     def current_should_be(another_char)
       raise InvalidTokenError unless current_char == another_char
     end

data/lib/output_transformer.rb

@@ -8,7 +8,8 @@ module IpynbDiff
 
     ORDERED_KEYS = {
       'execute_result' => %w[image/png image/svg+xml image/jpeg text/markdown text/latex text/plain],
-      'display_data' => %w[image/png image/svg+xml image/jpeg text/markdown text/latex]
+      'display_data' => %w[image/png image/svg+xml image/jpeg text/markdown text/latex],
+      'stream' => %w[text]
     }.freeze
 
     def transform(output, symbol)
@@ -17,15 +18,17 @@ module IpynbDiff
                       transform_error(output['traceback'], symbol / 'traceback')
                     when 'execute_result', 'display_data'
                       transform_non_error(ORDERED_KEYS[output_type], output['data'], symbol / 'data')
+                    when 'stream'
+                      transform_element('text', output['text'], symbol)
                     end
 
-      decorate_output(transformed, output, symbol) if transformed
+      transformed ? decorate_output(transformed, output, symbol) : []
     end
 
     def decorate_output(output_rows, output, symbol)
       [
         _,
-        symbol, %(%%%% Output: #{output['output_type']}),
+        _(symbol, %(%%%% Output: #{output['output_type']})),
         _,
         *output_rows
       ]
@@ -34,7 +37,7 @@ module IpynbDiff
     def transform_error(traceback, symbol)
       traceback.map.with_index do |t, idx|
         t.split("\n").map do |l|
-          [symbol / idx, l.gsub(/\[[0-9][0-9;]*m/, '').sub("\u001B", '    ').gsub(/\u001B/, '').rstrip]
+          _(symbol / idx, l.gsub(/\[[0-9][0-9;]*m/, '').sub("\u001B", '    ').gsub(/\u001B/, '').rstrip)
         end
       end
     end
@@ -52,13 +55,13 @@ module IpynbDiff
         transform_image(output_type, output_element, new_symbol)
       when 'image/svg+xml'
         transform_svg(output_element, new_symbol)
-      when 'text/markdown', 'text/latex', 'text/plain'
+      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", '')})"]
+      _(symbol, "    ![](data:#{image_type};base64,#{image_content.gsub("\n", '')})")
     end
 
     def transform_svg(image_content, symbol)
@@ -66,7 +69,7 @@ module IpynbDiff
 
       single_line = lines.map(&:strip).join.gsub(/\s+/, ' ')
 
-      [symbol, "    ![](data:image/svg+xml;utf8,#{single_line})"]
+      _(symbol, "    ![](data:image/svg+xml;utf8,#{single_line})")
     end
 
     def transform_text(text_content, symbol)

data/lib/symbolized_markdown_helper.rb

@@ -4,8 +4,8 @@ module IpynbDiff
   # Helper functions
   module SymbolizedMarkdownHelper
 
-    def _(content = '')
-      [nil, content]
+    def _(symbol = nil, content = '')
+      { symbol: symbol, content: content }
     end
 
     def array_if_not_array(thing)
@@ -14,9 +14,9 @@ module IpynbDiff
 
     def symbolize_array(symbol, content, &block)
       if content.is_a?(Array)
-        content.map.with_index { |l, idx| [symbol / idx, block.call(l)] }
+        content.map.with_index { |l, idx| _(symbol / idx, block.call(l)) }
       else
-        [symbol, content]
+        _(symbol, content)
       end
     end
   end

data/lib/transformed_notebook.rb

@@ -11,9 +11,9 @@ module IpynbDiff
 
     private
 
-    def initialize(lines = [], symbols = [], symbol_map = {})
-      @blocks = lines.zip(symbols).map do |line, symbol|
-        { content: line, source_symbol: symbol, source_line: symbol && symbol_map[symbol] }
+    def initialize(lines = [], symbol_map = {})
+      @blocks = lines.map do |line|
+        { content: line[:content], source_symbol: (symbol = line[:symbol]), source_line: symbol && symbol_map[symbol] }
       end
     end
   end

data/lib/transformer.rb

@@ -38,13 +38,7 @@ module IpynbDiff
       transformed = transform_document(notebook_json)
       symbol_map = IpynbSymbolMap.parse(notebook)
 
-      symbols, lines = if transformed && !transformed.empty?
-                         transformed.partition.each_with_index { |_el, i| i.even? }
-                       else
-                         [[], []]
-                       end
-
-      TransformedNotebook.new(lines, symbols, symbol_map)
+      TransformedNotebook.new(transformed, symbol_map)
     end
 
     def transform_document(notebook)
@@ -63,9 +57,9 @@ module IpynbDiff
       type = cell['cell_type'] || 'raw'
 
       [
-        symbol, %(%% Cell type:#{type} id:#{cell['id']} tags:#{tags&.join(',')}),
+        _(symbol, %(%% Cell type:#{type} id:#{cell['id']} tags:#{tags&.join(',')})),
         _,
-        *rows,
+        rows,
         _
       ]
     end
@@ -76,9 +70,9 @@ module IpynbDiff
 
     def transform_code_cell(cell, notebook, symbol)
       [
-        symbol / 'source', %(``` #{notebook.dig('metadata', 'kernelspec', 'language') || ''}),
+        _(symbol / 'source', %(``` #{notebook.dig('metadata', 'kernelspec', 'language') || ''})),
         symbolize_array(symbol / 'source', cell['source'], &:rstrip),
-        _('```'),
+        _(nil, '```'),
         cell['outputs'].map.with_index do |output, idx|
           @output_transformer.transform(output, symbol / ['outputs', idx])
         end
@@ -99,7 +93,7 @@ module IpynbDiff
         }
       }.to_yaml
 
-      as_yaml.split("\n").map { |l| _(l) }.append(_('---'), _)
+      as_yaml.split("\n").map { |l| _(nil, l) }.append(_(nil, '---'), _)
     end
   end
 end

data/lib/version.rb

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

metadata

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