notion_to_md 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b181c658f60d77ec9e3564ee70ac9cc59d4288512a8617386251c708404fe65
-  data.tar.gz: e540275064b3873031fb48ea57d076039b79ec7e518b0644019b293916e7d5c4
+  metadata.gz: 2afa81a1825a9ebf8efaa1759908803baa3e556fabeccd464d75be001016fd05
+  data.tar.gz: 7d72ae2095612e43e54147d8c23d6d8eb7f4d7c3c4dec0e5ce3e91d311c31347
 SHA512:
-  metadata.gz: d8902cc80c1237de34d2bb3c351be176a13117d0fe3a15ff009c5205bdc0850102268a230e7f152a4eb1622523ffd7988b29f3ca48bb0dbf0f2aaa97711b151d
-  data.tar.gz: e90cac1fdaf6955310841678285a4ac8dff267042052e8adf14f8bd0623b2dbf2a6c8a5c8ac6625674fee6998e30bea624c111483c96b56f876e189477e4899a
+  metadata.gz: 246785dfc4372f8ac87f1e51c955402f297293ff2092ce19d4fed7a8ba57664d10ad8b87f62d5252ce05842d7a660633aff9593b7b0335271503a2ccc04c748e
+  data.tar.gz: 52765f8dbcaa3e81064aa29111f2d13957f1eee7ba638f301e44776e21088b4311ed45a2db5e97b6f3c1e7684384b963e45f6d7a2de15575ca0f4639ea5eaa2f

data/lib/notion_to_md/page.rb

@@ -16,11 +16,11 @@ module NotionToMd
     end
 
     def cover
-      page.dig(:cover, :external, :url)
+      PageProperty.external(page[:cover]) || PageProperty.file(page[:cover])
     end
 
     def icon
-      page.dig(:icon, :file, :url) || page.dig(:icon, :emoji)
+      PageProperty.emoji(page[:icon]) || PageProperty.external(page[:icon]) || PageProperty.file(page[:icon])
     end
 
     def id
@@ -51,8 +51,8 @@ module NotionToMd
       @frontmatter ||= <<~CONTENT
         ---
         #{props.to_a.map do |k, v|
-          "#{k}: #{v}"
-        end.join("\n")}
+            "#{k}: #{v}"
+          end.join("\n")}
         ---
       CONTENT
     end
@@ -85,55 +85,9 @@ module NotionToMd
       }
     end
 
-    class CustomProperty
-      class << self
-        def multi_select(prop)
-          prop.multi_select.map(&:name)
-        end
-
-        def select(prop)
-          prop['select']&.name
-        end
-
-        def people(prop)
-          prop.people.map(&:name)
-        end
-
-        def files(prop)
-          prop.files.map { |f| f.file.url }
-        end
-
-        def phone_number(prop)
-          prop.phone_number
-        end
-
-        def number(prop)
-          prop.number
-        end
-
-        def email(prop)
-          prop.email
-        end
-
-        def checkbox(prop)
-          prop.checkbox.to_s
-        end
-
-        # date type properties not supported:
-        # - end
-        # - time_zone
-        def date(prop)
-          prop.date.start
-        end
-
-        def url(prop)
-          prop.url
-        end
-
-        def rich_text(prop)
-          prop.rich_text.map(&:plain_text).join
-        end
-      end
+    # This class is kept for retro compatibility reasons.
+    # Use instead the PageProperty class.
+    class CustomProperty < PageProperty
     end
   end
 end

data/lib/notion_to_md/page_property.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module NotionToMd
+  class PageProperty
+    class << self
+      def file(prop)
+        prop.dig(:file, :url)
+      rescue NoMethodError
+        nil
+      end
+
+      def external(prop)
+        prop.dig(:external, :url)
+      rescue NoMethodError
+        nil
+      end
+
+      def emoji(prop)
+        prop[:emoji]
+      rescue NoMethodError
+        nil
+      end
+
+      def multi_select(prop)
+        prop[:multi_select].map { |sel| sel[:name] }
+      rescue NoMethodError
+        nil
+      end
+
+      def select(prop)
+        prop.dig(:select, :name)
+      rescue NoMethodError
+        nil
+      end
+
+      def people(prop)
+        prop[:people].map { |sel| sel[:name] }
+      rescue NoMethodError
+        nil
+      end
+
+      def files(prop)
+        prop[:files].map { |f| file(f) || external(f) }
+      rescue NoMethodError
+        nil
+      end
+
+      def phone_number(prop)
+        prop[:phone_number]
+      rescue NoMethodError
+        nil
+      end
+
+      def number(prop)
+        prop[:number]
+      rescue NoMethodError
+        nil
+      end
+
+      def email(prop)
+        prop[:email]
+      rescue NoMethodError
+        nil
+      end
+
+      def checkbox(prop)
+        prop[:checkbox].nil? ? nil : prop[:checkbox].to_s
+      rescue NoMethodError
+        nil
+      end
+
+      # date type properties not supported:
+      # - end
+      # - time_zone
+      def date(prop)
+        prop.dig(:date, :start)
+      rescue NoMethodError
+        nil
+      end
+
+      def url(prop)
+        prop[:url]
+      rescue NoMethodError
+        nil
+      end
+
+      def rich_text(prop)
+        prop[:rich_text].map { |text| text[:plain_text] }.join
+      rescue NoMethodError
+        nil
+      end
+    end
+  end
+end

data/lib/notion_to_md/version.rb

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

data/lib/notion_to_md.rb

@@ -7,6 +7,7 @@ require 'active_support/core_ext/object/blank'
 require_relative './notion_to_md/version'
 require_relative './notion_to_md/converter'
 require_relative './notion_to_md/logger'
+require_relative './notion_to_md/page_property'
 require_relative './notion_to_md/page'
 require_relative './notion_to_md/blocks'
 require_relative './notion_to_md/text'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_to_md
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,7 @@ files:
 - lib/notion_to_md/converter.rb
 - lib/notion_to_md/logger.rb
 - lib/notion_to_md/page.rb
+- lib/notion_to_md/page_property.rb
 - lib/notion_to_md/text.rb
 - lib/notion_to_md/text_annotation.rb
 - lib/notion_to_md/version.rb