notion_ruby_mapping 2.0.1 → 3.0.0

data/lib/notion_ruby_mapping/properties/property.rb

@@ -30,14 +30,14 @@ module NotionRubyMapping
 
     # @param [String] new_name
     def new_name=(new_name)
-      assert_database_property __method__
+      assert_data_source_property __method__
       @will_update = true
       @new_name = new_name
     end
 
     # @return [NotionRubyMapping::Property] self
     def remove
-      assert_database_property __method__
+      assert_data_source_property __method__
       @will_update = true
       @remove = true
       self
@@ -143,6 +143,14 @@ module NotionRubyMapping
       @base_type == "database"
     end
 
+    def data_source?
+      @base_type == "data_source"
+    end
+
+    def database_or_data_source?
+      %w[database data_source].include? @base_type
+    end
+
     # @return [TrueClass, FalseClass] true if it has Property contents
     def contents?
       !instance_of? Property
@@ -188,15 +196,25 @@ module NotionRubyMapping
       raise StandardError, "#{method} can execute only Database property." unless database?
     end
 
+    # @param [Symbol, nil] method
+    def assert_database_or_data_source_property(method)
+      raise StandardError, "#{method} can execute only Database property." if page?
+    end
+
     # @return [Hash]
     def property_schema_json
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       {@name => {type => property_schema_json_sub}}
     end
 
+    ## DataSource property only methods
+    def assert_data_source_property(method)
+      raise StandardError, "#{method} can execute only DataSource property." unless data_source?
+    end
+
     # @return [Hash]
     def update_property_schema_json
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       if @remove
         {@name => nil}
       elsif @new_name
@@ -210,7 +228,7 @@ module NotionRubyMapping
 
     # @param [Symbol, nil] method
     def assert_page_property(method)
-      raise StandardError, "#{method} can execute only Page property." if database?
+      raise StandardError, "#{method} can execute only Page property." if database? || data_source?
     end
 
     # @return [NotionRubyMapping::Property, Array<UserObject>, nil]

data/lib/notion_ruby_mapping/properties/relation_property.rb

@@ -44,20 +44,20 @@ module NotionRubyMapping
 
     ## Database property only methods
 
-    # @return [String] relation database_id
+    # @return [String] relation data_source_id
     # @see https://www.notion.so/hkob/RelationProperty-f608ab41a1f0476b98456620346fba03#eb40f1a2ad5c4e368d343870a7e529f9
-    def relation_database_id
-      assert_database_property __method__
-      @json["database_id"]
+    def relation_data_source_id
+      assert_data_source_property __method__
+      @json["data_source_id"]
     end
 
-    # @param [String] database_id
+    # @param [String] data_source_id
     # @param [String] synced_property_name
     # @see https://www.notion.so/hkob/RelationProperty-f608ab41a1f0476b98456620346fba03#7f5029fb7f6e4c009f22888b233e6f64
-    def replace_relation_database(database_id: nil, type: "dual_property")
-      assert_database_property __method__
+    def replace_relation_data_source(data_source_id: nil, type: "dual_property")
+      assert_database_or_data_source_property __method__
       @will_update = true
-      @json["database_id"] = database_id if database_id
+      @json["data_source_id"] = data_source_id if data_source_id
       @json["type"] = type
       @json[type] = {}
       @json.delete type == "dual_property" ? "single_property" : "dual_property"
@@ -75,7 +75,7 @@ module NotionRubyMapping
                    property_cache: nil, query: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache, query: query
-      @json = if database?
+      @json = if database_or_data_source?
                 json || {}
               elsif relation
                 Array(relation).map { |r| {"id" => r} }
@@ -88,7 +88,7 @@ module NotionRubyMapping
 
     # @return [Hash]
     def update_property_schema_json
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       ans = super
       return ans if ans != {} || !@will_update
 
@@ -97,16 +97,28 @@ module NotionRubyMapping
       ans
     end
 
-    def database_id
-      @json["database_id"]
+    def data_source_id
+      @json["data_source_id"]
+    end
+
+    # @return [TrueClass, FalseClass] true if dual_property
+    def dual_property?
+      assert_database_or_data_source_property __method__
+      @json["type"] == "dual_property"
+    end
+
+    # @return [TrueClass, FalseClass] true if single_property
+    def single_property?
+      assert_database_or_data_source_property __method__
+      @json["type"] == "single_property"
     end
 
     def synced_property_id
-      @json["type"] == "dual_property" ? @json["dual_property"]["synced_property_id"] : nil
+      dual_property? ? @json["dual_property"]["synced_property_id"] : nil
     end
 
     def synced_property_name
-      @json["type"] == "dual_property" ? @json["dual_property"]["synced_property_name"] : nil
+      dual_property? ? @json["dual_property"]["synced_property_name"] : nil
     end
 
     # @return [Hash] created json

data/lib/notion_ruby_mapping/properties/rich_text_property.rb

@@ -12,7 +12,7 @@ module NotionRubyMapping
     # @param [Hash] json
     def update_from_json(json)
       @will_update = false
-      if database?
+      if database_or_data_source?
         @json = json["rich_text"] || {}
       else
         @text_objects = RichTextArray.new "rich_text", json: json["rich_text"]

data/lib/notion_ruby_mapping/properties/rollup_property.rb

@@ -23,14 +23,14 @@ module NotionRubyMapping
     # @return [String] new or settled function
     # @see https://www.notion.so/hkob/RollupProperty-eb10fbac3a93436289e74e5c651e9134#94021d4e6c0b44519443c1e1cc6b3aba
     def function
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @json["function"]
     end
 
     # @param [String] func
     # @see https://www.notion.so/hkob/RollupProperty-eb10fbac3a93436289e74e5c651e9134#647c74803cac49a9b79199828157e17a
     def function=(func)
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @will_update = true
       @json["function"] = func
     end
@@ -38,14 +38,14 @@ module NotionRubyMapping
     # @return [String] new or settled relation_property_name
     # @see https://www.notion.so/hkob/RollupProperty-eb10fbac3a93436289e74e5c651e9134#684fc4739c4f4d6a9b93687f72cd8dad
     def relation_property_name
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @json["relation_property_name"]
     end
 
     # @param [String] rpn
     # @see https://www.notion.so/hkob/RollupProperty-eb10fbac3a93436289e74e5c651e9134#a61c2100758841c381edd820aa88ac65
     def relation_property_name=(rpn)
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @will_update = true
       @json["relation_property_name"] = rpn
     end
@@ -53,14 +53,14 @@ module NotionRubyMapping
     # @return [String] new or settled rollup_property_name
     # @see https://www.notion.so/hkob/RollupProperty-eb10fbac3a93436289e74e5c651e9134#8ce9ee31a2e2473ab7ba21781e4b440d
     def rollup_property_name
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @json["rollup_property_name"]
     end
 
     # @param [String] rpn
     # @see https://www.notion.so/hkob/RollupProperty-eb10fbac3a93436289e74e5c651e9134#66503f4472f2456aa9b383f03b1fe0a6
     def rollup_property_name=(rpn)
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @will_update = true
       @json["rollup_property_name"] = rpn
     end
@@ -82,7 +82,7 @@ module NotionRubyMapping
 
     # @return [Hash]
     def update_property_schema_json
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       ans = super
       return ans if ans != {} || !@will_update
 

data/lib/notion_ruby_mapping/properties/select_property.rb

@@ -38,7 +38,7 @@ module NotionRubyMapping
 
     # @return [Array] copyed multi select options
     def edit_select_options
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @will_update = true
       @json["options"] ||= []
     end
@@ -46,14 +46,14 @@ module NotionRubyMapping
     # @return [Array]
     # @see https://www.notion.so/hkob/SelectProperty-6d6a0defa70d4b26af0fdbdcfbf99f28#790a297f2c1b4ba5a4d86074d4c70a89
     def select_options
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @json["options"] || []
     end
 
     # @return [String]
     # @see https://www.notion.so/hkob/SelectProperty-6d6a0defa70d4b26af0fdbdcfbf99f28#72da1632793c4a5296f3bc89de2df413
     def select_names
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @json["options"].map { |s| s["name"] }
     end
 
@@ -78,7 +78,7 @@ module NotionRubyMapping
                    property_cache: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache
-      @json = if database?
+      @json = if database_or_data_source?
                 json || {"options" => []}
               else
                 json || {"name" => select}
@@ -89,7 +89,7 @@ module NotionRubyMapping
 
     # @return [Hash]
     def update_property_schema_json
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       ans = super
       return ans if ans != {} || !@will_update
 

data/lib/notion_ruby_mapping/properties/text_property.rb

@@ -33,7 +33,7 @@ module NotionRubyMapping
 
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache, query: query
-      @text_objects = if database?
+      @text_objects = if database_or_data_source?
                         json || {}
                       else
                         RichTextArray.new "title", json: json, text_objects: text_objects

data/lib/notion_ruby_mapping/properties/title_property.rb

@@ -21,7 +21,7 @@ module NotionRubyMapping
     # @param [Hash] json
     def update_from_json(json)
       @will_update = false
-      if database?
+      if database_or_data_source?
         @json = json || {}
       else
         @text_objects = TitleProperty.rich_text_array_from_json json

data/lib/notion_ruby_mapping/properties/unique_id_property.rb

@@ -30,7 +30,7 @@ module NotionRubyMapping
     def initialize(name, will_update: false, base_type: "page", json: nil, property_id: nil, property_cache: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id, property_cache: property_cache
       @json = json
-      @json ||= {} if database?
+      @json ||= {} if database_or_data_source?
     end
 
     # @param [Hash] json

data/lib/notion_ruby_mapping/properties/url_property.rb

@@ -37,7 +37,7 @@ module NotionRubyMapping
     def initialize(name, will_update: false, base_type: "page", json: nil, property_id: nil, property_cache: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache
-      @json = json || (database? ? {} : nil)
+      @json = json || (database_or_data_source? ? {} : nil)
     end
 
     ## Page property only methods

data/lib/notion_ruby_mapping/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "2.0.1"
-  NOTION_VERSION = "2022-06-28"
+  VERSION = "3.0.0"
+  NOTION_VERSION = "2025-09-03"
 end

data/lib/notion_ruby_mapping.rb

@@ -4,16 +4,16 @@ require "yaml"
 
 require_relative "notion_ruby_mapping/version"
 {
-  blocks: %w[base block database list page url_caption_base_block bookmark_block breadcrumb_block
+  blocks: %w[base block database data_source list page url_caption_base_block bookmark_block breadcrumb_block
              text_sub_block_color_base_block bulleted_list_item_block callout_block child_base_block
              child_database_block child_page_block code_block column_list_block column_block divider_block
              embed_block equation_block file_base_block file_block heading1_block heading2_block heading3_block
              image_block toggle_heading1_block toggle_heading2_block toggle_heading3_block url_base_block
              link_preview_block link_to_page_block numbered_list_item_block paragraph_block pdf_block quote_block
-             synced_block table_block table_row_block table_of_contents_block template_block to_do_block
+             synced_block table_block table_row_block table_of_contents_block to_do_block
              toggle_block video_block],
   controllers: %w[notion_cache payload property_cache query rich_text_array discussion_thread search mermaid
-                  mermaid_database],
+                  mermaid_data_source],
   objects: %w[rich_text_object emoji_object equation_object file_object mention_object text_object user_object
               comment_object file_upload_object],
   properties: %w[property checkbox_property multi_property created_by_property date_base_property created_time_property

data/tools/an

@@ -8,7 +8,7 @@ module NotionRubyMapping
   # you Notion API token
   NOTION_API_TOKEN = "secret_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx"
   # your task Database id
-  DATABASE_ID = "0123456789abcdef0123456789abcdef"
+  DATA_SOURCE_ID = "0123456789abcdef0123456789abcdef"
   # your Title name
   TITLE_NAME = "タスク名"
   # your DateProperty name
@@ -75,10 +75,10 @@ module NotionRubyMapping
       usage
     end
 
-    NotionCache.instance.create_client NOTION_API_TOKEN
+    NotionRubyMapping.configure { |c| c.token = NOTION_API_TOKEN }
 
-    # create database object without API call and create a child page
-    db = Database.new id: DATABASE_ID
+    # create data_source object without API call and create a child page
+    DataSource.new id: DATA_SOURCE_ID
     page = db.create_child_page TitleProperty, TITLE_NAME, DateProperty, DATE_NAME
 
     # obtain title and date properties and set values

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
@@ -153,10 +153,7 @@ description: Mapping tool from Notion Database/Page/Block to Ruby Objects.
 email:
 - hkob@metro-cit.ac.jp
 executables:
-- erdToNotionDb.rb
 - notionErDiagram.rb
-- notionSitemap.rb
-- notionTimeRecorder.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -175,10 +172,7 @@ files:
 - examples/change_title.md
 - examples/renumbering_pages.md
 - examples/set_icon_to_all_icon_unsettled_pages.md
-- exe/erdToNotionDb.rb
 - exe/notionErDiagram.rb
-- exe/notionSitemap.rb
-- exe/notionTimeRecorder.rb
 - images/post_set_icon.png
 - images/pre_set_icon.png
 - images/serial_number.png
@@ -195,6 +189,7 @@ files:
 - lib/notion_ruby_mapping/blocks/code_block.rb
 - lib/notion_ruby_mapping/blocks/column_block.rb
 - lib/notion_ruby_mapping/blocks/column_list_block.rb
+- lib/notion_ruby_mapping/blocks/data_source.rb
 - lib/notion_ruby_mapping/blocks/database.rb
 - lib/notion_ruby_mapping/blocks/divider_block.rb
 - lib/notion_ruby_mapping/blocks/embed_block.rb
@@ -217,7 +212,6 @@ files:
 - lib/notion_ruby_mapping/blocks/table_block.rb
 - lib/notion_ruby_mapping/blocks/table_of_contents_block.rb
 - lib/notion_ruby_mapping/blocks/table_row_block.rb
-- lib/notion_ruby_mapping/blocks/template_block.rb
 - lib/notion_ruby_mapping/blocks/text_sub_block_color_base_block.rb
 - lib/notion_ruby_mapping/blocks/to_do_block.rb
 - lib/notion_ruby_mapping/blocks/toggle_block.rb
@@ -229,7 +223,7 @@ files:
 - lib/notion_ruby_mapping/blocks/video_block.rb
 - lib/notion_ruby_mapping/controllers/discussion_thread.rb
 - lib/notion_ruby_mapping/controllers/mermaid.rb
-- lib/notion_ruby_mapping/controllers/mermaid_database.rb
+- lib/notion_ruby_mapping/controllers/mermaid_data_source.rb
 - lib/notion_ruby_mapping/controllers/notion_cache.rb
 - lib/notion_ruby_mapping/controllers/payload.rb
 - lib/notion_ruby_mapping/controllers/property_cache.rb

data/exe/erdToNotionDb.rb

@@ -1,56 +0,0 @@
-#! /usr/bin/env ruby
-
-require "notion_ruby_mapping"
-include NotionRubyMapping
-
-if ARGV.length < 2
-  print "Usage: erdToNotion.rb code_block_id target_page_id [--inline]"
-  exit
-end
-
-mermaid_url, target_page_url, inline_flag = ARGV
-inline = inline_flag == "--inline"
-NotionRubyMapping.configure { |c| c.notion_token = ENV["NOTION_API_KEY"] }
-nc = NotionCache.instance
-mermaid_block = Block.find mermaid_url
-unless mermaid_block.is_a? CodeBlock
-  print "#{mermaid_url} is not CodeBlock's id"
-  exit
-end
-
-# Parse mermaid ER
-mermaid = Mermaid.new mermaid_block.rich_text_array.full_text
-
-# Retrieve child databases
-target_page = Page.find target_page_url
-target_page_id = target_page.id
-db_titles = target_page.children.select { |b| b.is_a? ChildDatabaseBlock }.map(&:title)
-exist_dbs = Search.new(query: "(#{db_titles.join('|')})", database_only: true).exec.select do |db|
-  nc.hex_id(db.parent_id) == target_page_id
-end
-
-# Attach existing databases to mermaid database
-exist_dbs.each do |db|
-  mermaid.attach_database db
-end
-
-mermaid.create_notion_db target_page, inline
-mermaid.update_title
-pass = 1
-pre_remain = nil
-loop do
-  print "=== Pass #{pass} ===\n"
-  mermaid.update_databases
-  mermaid.rename_reverse_name
-  count = mermaid.count
-  remain = mermaid.remain
-  print "Pass #{pass} Remain #{remain} in #{count}\n"
-  if pre_remain == remain
-    print "Dependency loop detected.\n"
-    exit
-  end
-  pre_remain = remain
-  break if remain.zero?
-  pass += 1
-end
-print "Finish!!!"

data/exe/notionSitemap.rb

@@ -1,131 +0,0 @@
-#! /usr/bin/env ruby
-
-require "notion_ruby_mapping"
-include NotionRubyMapping
-
-# see https://zenn.dev/kinkinbeer135ml/articles/f08ce790091aca
-def escape_title(title)
-  title.gsub /[(){}\[\]！”＃＄％＆’（）＝＾〜｜￥１２３４５６７８９０＠｀「」｛｝；：＋＊＜＞、。・？＿]/, ""
-end
-
-class Sitemap
-  def initialize(top_page, orient, nolink)
-    @top_page = top_page
-    @code = {@top_page => "p0"}
-    @queue = [@top_page]
-    @finished = {}
-    @page_links = Hash.new { |h, k| h[k] = [] }
-    @text = ["flowchart #{orient}"]
-    @nolink = nolink
-  end
-  attr_reader :text
-
-  def dig_pages
-    until @queue.empty?
-      page = @queue.shift
-      @finished[page] = true
-      search_blocks(page)
-      @text << %(click #{@code[page]} "#{page["url"]}")
-    end
-  end
-
-  def code_with_title(page)
-    "#{@code[page]}(#{escape_title page.title})"
-  end
-
-  def search_blocks(page)
-    print "#{page.title}\n"
-    @children = []
-    @block_queue = page.children.to_a
-    search_block page, @block_queue.shift until @block_queue.empty?
-    unless @children.empty?
-      title = page == @top_page ? code_with_title(page) : @code[page]
-      @text << [title, @children.map { |p| code_with_title p }.join(" & ")].join(" --> ")
-    end
-    print "\n"
-  end
-
-  def search_block(page, block)
-    case block
-    when ChildPageBlock
-      child_block = block.children.first
-      add_child child_block.parent if child_block
-    when LinkToPageBlock
-      add_link page, block.page_id unless @nolink
-    else
-      @block_queue += block.children.to_a if block.has_children
-      search_link_in_rta(page, block.rich_text_array) if !@nolink && block.is_a?(TextSubBlockColorBaseBlock)
-    end
-  end
-
-  def add_child(child)
-    @queue << child
-    @children << child
-    set_code child
-    print "  --> #{child.title}\n"
-  end
-
-  def set_code(page)
-    @code[page] ||= "p#{@code.length}"
-  end
-
-  def add_link(page, link_page_id)
-    return unless link_page_id
-
-    begin
-      link_page = Page.find link_page_id
-    rescue
-      print "\n#{link_page_id} can not read by this integration\n"
-      return
-    end
-    set_code link_page
-    @page_links[page] << link_page
-    print "  -.-> #{link_page.title} "
-  end
-
-  def search_link_in_rta(page, rta)
-    rta.each { |to| add_link page, to.page_id if to.is_a?(MentionObject) && to.page_id }
-  end
-
-  def link_pages
-    @page_links.each do |org, array|
-      link_finished = {}
-      array.each do |lp|
-        link_finished[lp] = @finished[lp] ? @code[lp] : code_with_title(lp)
-      end
-      @text << [@code[org], link_finished.values.join(" & ")].join(" -.-> ")
-    end
-  end
-end
-
-if ARGV.length < 3
-  print "Usage: notionSitemap.rb top_page_id code_block_id orient(LR or TD) [--nolink]"
-  exit
-end
-top_page_id, code_block_id, orient, nolink = ARGV
-NotionCache.instance.create_client ENV["NOTION_API_KEY"]
-code_block = Block.find code_block_id
-unless code_block.is_a? CodeBlock
-  print "#{code_block_id} is not CodeBlock's id"
-  exit
-end
-
-top_page = Page.find top_page_id
-sm = Sitemap.new top_page, orient, nolink == "--nolink"
-sm.dig_pages
-sm.link_pages unless nolink
-text_objects = sm.text.each_with_object([]) do |str, ans|
-  strn = "#{str}\n"
-  if (last = ans.last)
-    if last.length + strn.length > 1999
-      ans << strn
-    else
-      ans[-1] += strn
-    end
-  else
-    ans << strn
-  end
-end
-code_block.rich_text_array.rich_text_objects = text_objects
-code_block.language = "mermaid"
-code_block.save