notion_ruby_mapping 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b295b0ba6b110a2f9e2f559e251490005a446abd71d2b7cc67903f9b0e2e504a
-  data.tar.gz: 8b6d1ed3f4c53973c8391981cef7044628ba22894dd42f8b23364f9a995326d9
+  metadata.gz: 728ebd46ad3c0492c2454e60fec7c3ce271cc325ea0bfce9894f509c9cdcd809
+  data.tar.gz: 9d1670b5f6dc8a7b366eb84e3c7bbb99bf65007ee208d437f472cc64e5f861c8
 SHA512:
-  metadata.gz: 5d3e718b49fceea38ee34be30161496d9023158631b24a633408af4b9eb5f5507ae85484c74a4f0094a7e1d8aaa47c851cc2d47af128e45814d98a5c1f5a21f4
-  data.tar.gz: 95b5374a44768b1454d550abcad6343c06d24333d787045d5317ba91ef0a1f0a1ddb273879ca28e928e2808180b7acbd144a4e8f19c52cb7208d565083d19906
+  metadata.gz: c8474a85e8cf7b59cc7a0c60681f7a193234a6d6435136a9078872ed54057a39171de01c49232b6bd012ea3f804c4efddd54c02a71ff32324cedbacfd339e5de
+  data.tar.gz: 209a96f0365eb4d0c8f02283610e484d2a1018c2d453fd4ee3e7f08abd6c0e63077aea43ec5ef2c2aeecf7e69d492d6685c7b32848743498d4b3a9f08fb4e981

data/README.md

@@ -84,9 +84,11 @@ NotionCache.instance.create_client ENV["NOTION_API_TOKEN"] # from environment
 1. [Renumbering pages](examples/renumbering_pages.md)
 1. [Change title](examples/change_title.md)
 1. [Create erDiagram from Notion database](tools/createErDiagram.rb)
+
 ```shell
 Usage:
   ruby tools/createErDiagram.rb database_id code_block_id
+  ruby tools/createErDiagram.rb "database_url" "code_block_url"
 ```
 
 ### 2.5 API reference
@@ -95,6 +97,7 @@ Usage:
 
 ## 3. ChangeLog
 
+- 2022/8/9 [v0.6.4] url can be entered instead of page_id, block_id and database_id
 - 2022/8/9 [v0.6.3] update createErDiagram.rb (Fixed a bug with non-ASCII database titles)
 - 2022/8/7 [v0.6.2] add comment_object support
 - 2022/7/28 [v0.6.1] added createErDiagram.rb

data/lib/notion_ruby_mapping/blocks/base.rb

@@ -44,6 +44,22 @@ module NotionRubyMapping
       end
     end
 
+    def self.block_id(str)
+      if /^http/.match str
+        /#([\da-f]{32})/.match(str)[1]
+      else
+        NotionCache.instance.hex_id str
+      end
+    end
+
+    def self.database_id(str)
+      if /^http/.match str
+        /([\da-f]{32})\?/.match(str)[1]
+      else
+        NotionCache.instance.hex_id str
+      end
+    end
+
     # @param [Object] method
     # @param [Object] path
     # @param [nil] json
@@ -58,21 +74,29 @@ module NotionRubyMapping
       shell.join(" \\\n")
     end
 
+    def self.page_id(str)
+      if /^http/.match str
+        /([\da-f]{32})$/.match(str)[1]
+      else
+        NotionCache.instance.hex_id str
+      end
+    end
+
     def comments(query = nil, dry_run: false)
-      if page? || block?
-        if dry_run
-          self.class.dry_run_script :get, @nc.retrieve_comments_path(@id)
-        else
-          ans = {}
-          List.new(comment_parent: self,
-                   json: @nc.retrieve_comments_request(@id, query),
-                   query: query).each do |comment|
-            dt_id = comment.discussion_id
-            dt = ans[dt_id] ||= DiscussionThread.new dt_id
-            dt.comments << comment
-          end
-          ans
+      return unless page? || block?
+
+      if dry_run
+        self.class.dry_run_script :get, @nc.retrieve_comments_path(@id)
+      else
+        ans = {}
+        List.new(comment_parent: self,
+                 json: @nc.retrieve_comments_request(@id, query),
+                 query: query).each do |comment|
+          dt_id = comment.discussion_id
+          dt = ans[dt_id] ||= DiscussionThread.new dt_id
+          dt.comments << comment
         end
+        ans
       end
     end
 

data/lib/notion_ruby_mapping/blocks/block.rb

@@ -67,10 +67,11 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Block]
     def self.find(id, dry_run: false)
       nc = NotionCache.instance
+      block_id = Base.block_id id
       if dry_run
-        Base.dry_run_script :get, nc.block_path(id)
+        Base.dry_run_script :get, nc.block_path(block_id)
       else
-        nc.block id
+        nc.block block_id
       end
     end
 

data/lib/notion_ruby_mapping/blocks/database.rb

@@ -10,10 +10,11 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/Database-1462b24502424539a4231bedc07dc2f5#58ba9190fd544432a9e2a5823d6c33b7
     def self.find(id, dry_run: false)
       nc = NotionCache.instance
+      database_id = Base.database_id id
       if dry_run
-        dry_run_script :get, nc.database_path(id)
+        dry_run_script :get, nc.database_path(database_id)
       else
-        nc.database id
+        nc.database database_id
       end
     end
 

data/lib/notion_ruby_mapping/blocks/link_to_page_block.rb

@@ -25,9 +25,9 @@ module NotionRubyMapping
     def block_json(not_update: true)
       ans = super
       ans[type] = if @page_id
-                    {"type" => "page_id", "page_id" => @page_id}
+                    {"type" => "page_id", "page_id" => Base.page_id(@page_id)}
                   else
-                    {"type" => "database_id", "database_id" => @database_id}
+                    {"type" => "database_id", "database_id" => Base.database_id(@database_id)}
                   end
       ans
     end

data/lib/notion_ruby_mapping/blocks/page.rb

@@ -10,10 +10,11 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#7d868b8b81c3473082bbdc7370813a4a
     def self.find(id, dry_run: false)
       nc = NotionCache.instance
+      page_id = Base.page_id id
       if dry_run
-        Base.dry_run_script :get, nc.page_path(id)
+        Base.dry_run_script :get, nc.page_path(page_id)
       else
-        nc.page id
+        nc.page page_id
       end
     end
 

data/lib/notion_ruby_mapping/blocks/synced_block.rb

@@ -11,7 +11,7 @@ module NotionRubyMapping
         synced_from = @json[type]["synced_from"]
         @block_id = synced_from && @nc.hex_id(synced_from["block_id"])
       else
-        @block_id = block_id
+        @block_id = Base.block_id block_id
         add_sub_blocks sub_blocks
       end
       @can_have_children = @block_id.nil?

data/lib/notion_ruby_mapping/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
   NOTION_VERSION = "2022-06-28"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI