notion_to_md 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bba453442621ce806b36625a5febfd14a2f75d8051c49923d845435535e11574
-  data.tar.gz: bc8a6b8a8ba768728cbb88b88a5d4c4069aa173ac9275d5c6a9cb95a37827a43
+  metadata.gz: fb94bccdf9dca4374bfaeb42164cce77f3a1963048a96b83a53e238ff9768163
+  data.tar.gz: '039b7d197fc03a6a04ffaf1cb90f3f758dd597a7381a2002da677065d48f2d76'
 SHA512:
-  metadata.gz: d7005a6bdfd26d3322a92ee49274ec8006549e90f850cc0d4fbc5907a0e0a9ecc526578b7c8964462563395e7980269a87d43d705fd6a2ccd8aaf26b240b6006
-  data.tar.gz: 9c52fe4feff24a090c19c6b736d1af5daaefc8dd5ce0fbe994acf6b41c2c1bbf8631846d71c59b5757219dc72583d50d6c316fc73bb81a453e8e3a02270407d6
+  metadata.gz: ce0dd31c6a1eb871468b151e2374311799b802b0f58e6e450bcc24aaa76f586f9755ad63953f3b61b45e0102d1440fa3d8f66538c014dbc921fc8ecf01a69a6f
+  data.tar.gz: 1a008da641c3c449b401ede3e2d65608a47192cae908888bcebd96eba7162e70f7640e549a881c459e9010cd1703248c49fa8d65d3a516489601a80c48e0e87d

data/README.md

@@ -102,6 +102,10 @@ created_time: 2022-01-23T12:31:00.000Z
 last_edited_time: 2022-01-23T12:31:00.000Z
 icon: 💥
 archived: false
+created_by_id: db313571-0280-411f-a6de-70e826421d16
+created_by_object: user
+last_edited_by_id: db313571-0280-411f-a6de-70e826421d16
+last_edited_by_object: user
 ---
 ```
 

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/blocks/types.rb

@@ -5,7 +5,7 @@ module NotionToMd
     class Types
       class << self
         def paragraph(block)
-          return blank if block.rich_text.empty?
+          return blank if block[:rich_text].empty?
 
           convert_text(block)
         end
@@ -124,7 +124,7 @@ module NotionToMd
           href = text[:href]
           return content if href.nil?
 
-          "[#{content}](#{href})"
+          "[#{content}](#{CGI.unescape(href)})"
         end
 
         def add_annotations(text, content)

data/lib/notion_to_md/page.rb

@@ -29,11 +29,27 @@ module NotionToMd
     end
 
     def created_time
-      DateTime.parse(page['created_time'])
+      page['created_time']
+    end
+
+    def created_by_object
+      page.dig(:created_by, :object)
+    end
+
+    def created_by_id
+      page.dig(:created_by, :id)
     end
 
     def last_edited_time
-      DateTime.parse(page['last_edited_time'])
+      page['last_edited_time']
+    end
+
+    def last_edited_by_object
+      page.dig(:last_edited_by, :object)
+    end
+
+    def last_edited_by_id
+      page.dig(:last_edited_by, :id)
     end
 
     def url
@@ -77,12 +93,16 @@ module NotionToMd
     def default_props
       @default_props ||= {
         'id' => id,
-        'title' => title,
+        'title' => title.dump,
         'created_time' => created_time,
         'cover' => cover,
         'icon' => icon,
         'last_edited_time' => last_edited_time,
-        'archived' => archived
+        'archived' => archived,
+        'created_by_object' => created_by_object,
+        'created_by_id' => created_by_id,
+        'last_edited_by_object' => last_edited_by_object,
+        'last_edited_by_id' => last_edited_by_id
       }
     end
 

data/lib/notion_to_md/page_property.rb

@@ -28,7 +28,7 @@ module NotionToMd
       end
 
       def select(prop)
-        prop.dig(:select, :name)
+        prop.dig(:select, :name).dump
       rescue NoMethodError
         nil
       end
@@ -73,7 +73,16 @@ module NotionToMd
       # - end
       # - time_zone
       def date(prop)
-        prop.dig(:date, :start)
+        date = prop.dig(:date, :start)
+
+        case date
+        when Date
+          date.to_time
+        when String
+          Time.parse(date)
+        else
+          date # Time or nil
+        end
       rescue NoMethodError
         nil
       end
@@ -85,7 +94,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 : text.dump
       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.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_to_md
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport