notion_to_md 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bba453442621ce806b36625a5febfd14a2f75d8051c49923d845435535e11574
-  data.tar.gz: bc8a6b8a8ba768728cbb88b88a5d4c4069aa173ac9275d5c6a9cb95a37827a43
+  metadata.gz: 26fb275bacfb3f94bc62bf1f15de2de6636f043a2a7d11b66ecba0f5df2a39ec
+  data.tar.gz: 53308f1bc92d17a1125969e030f6a070cc82384808b34787f6ed0c853fdbaca9
 SHA512:
-  metadata.gz: d7005a6bdfd26d3322a92ee49274ec8006549e90f850cc0d4fbc5907a0e0a9ecc526578b7c8964462563395e7980269a87d43d705fd6a2ccd8aaf26b240b6006
-  data.tar.gz: 9c52fe4feff24a090c19c6b736d1af5daaefc8dd5ce0fbe994acf6b41c2c1bbf8631846d71c59b5757219dc72583d50d6c316fc73bb81a453e8e3a02270407d6
+  metadata.gz: b0522c546ae98279d0a20aff3a8bf5d225dc74eea6c5504a0f35bdf6bb692e870c6719ea088251556fb49ad3318031f200754ac2691254fa3d0d4287035e4045
+  data.tar.gz: 2430ca47d1fe39e9f73cc9aad187d6457440edb94cd60dea9d1d82d562a057339acdef9c85ac8b1db79d34acd9db754493a62876643deab50af310472e125b06

data/lib/notion_to_md/blocks/normalizer.rb

@@ -11,11 +11,10 @@ module NotionToMd
         new(blocks: blocks).normalize
       end
 
-      attr_reader :blocks, :normalized_blocks
+      attr_reader :normalized_blocks
 
       def initialize(blocks:)
-        @blocks = blocks
-        @normalized_blocks = blocks
+        @normalized_blocks = blocks.dup
       end
 
       def normalize
@@ -35,23 +34,23 @@ module NotionToMd
             # we need to normalize the blocks we've collected so far.
             # Then we add the current block to the new blocks array.
             # This is because we want to keep the order of the blocks.
-            new_blocks << new_block_and_reset(type, blocks_to_normalize) unless blocks_to_normalize.empty?
+            new_blocks << new_block_and_reset_blocks_to_normalize(type) unless blocks_to_normalize.empty?
             new_blocks << block
           end
         end
 
-        # If the last block is of the provided type, it won't be added to the new blocks array.
+        # If the last block is the provided type, it won't be added to the new blocks array.
         # So, we need to normalize the blocks we've collected so far.
-        new_blocks << new_block_and_reset(type, blocks_to_normalize) unless blocks_to_normalize.empty?
+        new_blocks << new_block_and_reset_blocks_to_normalize(type) unless blocks_to_normalize.empty?
 
         normalized_blocks.replace(new_blocks)
       end
 
       private
 
-      def new_block_and_reset(type, children)
-        new_block = new_block_for(type, children)
-        reset_blocks_to_normalize
+      def new_block_and_reset_blocks_to_normalize(type)
+        new_block = new_block_for(type, blocks_to_normalize)
+        @blocks_to_normalize = []
         new_block
       end
 
@@ -59,10 +58,6 @@ module NotionToMd
         @blocks_to_normalize ||= []
       end
 
-      def reset_blocks_to_normalize
-        @blocks_to_normalize = []
-      end
-
       def new_block_for(type, children)
         case type
         when :bulleted_list_item

data/lib/notion_to_md/helpers/yaml_sanitizer.rb

@@ -0,0 +1,17 @@
+module NotionToMd
+  module Helpers
+    module YamlSanitizer
+      # Escape the frontmatter value if it contains a colon or a dash followed by a space
+      # @param value [String] the value to escape
+      # @return [String] the escaped value
+      def escape_frontmatter_value(value)
+        if value.match?(/: |-\s/)
+          # Escape the double quotes inside the string
+          "\"#{value.gsub('"', '\"')}\""
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/notion_to_md/helpers.rb

@@ -0,0 +1 @@
+require_relative './helpers/yaml_sanitizer'

data/lib/notion_to_md/page.rb

@@ -2,6 +2,8 @@
 
 module NotionToMd
   class Page
+    include Helpers::YamlSanitizer
+
     attr_reader :page, :blocks
 
     def initialize(page:, blocks:)
@@ -77,11 +79,11 @@ module NotionToMd
     def default_props
       @default_props ||= {
         'id' => id,
-        'title' => title,
+        'title' => escape_frontmatter_value(title),
         'created_time' => created_time,
         'cover' => cover,
         'icon' => icon,
-        'last_edited_time' => last_edited_time,
+        'last_edited_time' => last_edited_time.to_s.dump,
         'archived' => archived
       }
     end

data/lib/notion_to_md/page_property.rb

@@ -3,6 +3,8 @@
 module NotionToMd
   class PageProperty
     class << self
+      include Helpers::YamlSanitizer
+
       def file(prop)
         prop.dig(:file, :url)
       rescue NoMethodError
@@ -28,7 +30,7 @@ module NotionToMd
       end
 
       def select(prop)
-        prop.dig(:select, :name)
+        escape_frontmatter_value(prop.dig(:select, :name))
       rescue NoMethodError
         nil
       end
@@ -85,7 +87,8 @@ module NotionToMd
       end
 
       def rich_text(prop)
-        prop[:rich_text].map { |text| text[:plain_text] }.join
+        text = prop[:rich_text].map { |text| text[:plain_text] }.join
+        text.blank? ? nil : escape_frontmatter_value(text)
       rescue NoMethodError
         nil
       end

data/lib/notion_to_md/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NotionToMd
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

data/lib/notion_to_md.rb

@@ -4,6 +4,7 @@ require 'notion'
 require 'logger'
 require 'active_support/inflector'
 require 'active_support/core_ext/object/blank'
+require_relative './notion_to_md/helpers'
 require_relative './notion_to_md/version'
 require_relative './notion_to_md/converter'
 require_relative './notion_to_md/logger'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_to_md
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,6 +145,8 @@ files:
 - lib/notion_to_md/blocks/to_do_list_item_block.rb
 - lib/notion_to_md/blocks/types.rb
 - lib/notion_to_md/converter.rb
+- lib/notion_to_md/helpers.rb
+- lib/notion_to_md/helpers/yaml_sanitizer.rb
 - lib/notion_to_md/logger.rb
 - lib/notion_to_md/page.rb
 - lib/notion_to_md/page_property.rb