notion_ruby_mapping 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472fc98d3f7d94d134deced4cbbfb36810d0d2ea47c03922eee72e43e8c8b4fe
-  data.tar.gz: 227bd9482a3c65879114de1c980be9de0153fd7d4e79c39f012f1b59206a043e
+  metadata.gz: 2939f0091b98158d3e7f65b47ecc9b8a1e5d87c9e0546ac0b44ae76c03b3c97a
+  data.tar.gz: 20ef7923ab54c9528a672c059ebac70d40c2f377156ec1f1789737bcd517bf13
 SHA512:
-  metadata.gz: 910cab62b6fddad81b690b370664eca958130809aac2ff877eac6f6a8c75e2fa74db2de0d6adc9e00f396337d4fc05002b86493e2182bc74a20c4b70cdfa9a4e
-  data.tar.gz: ce540ca17fdbec6c5793cfa45c0d15556d328c3b28e86e942612c295cd8fdf3601bf76675c2bf6fe345da4dd7bfe9135ba3dab46ec334dfe0cdc4e7d8cc38564
+  metadata.gz: 49bce2621fb722fa1a3b38210b97931fec3eae6b2535a162bc658b4922a96225497eb4748f01693ecb204129332ca35ef965a7c64abfe45ee64f0cd058b08833
+  data.tar.gz: af85f46e2068ac9f6569d5c4ba53e803a8bec5f08a28f7555b68ebb32e42c1e2b3313416c7451b6a86851c6be5411a5c3fd6441efcac9ee73ce80cfe4164538c

data/README.md

@@ -15,9 +15,10 @@ Development note is here.
 - [notion\_ruby\_mapping](#notion_ruby_mapping)
   - [Table of Contents](#table-of-contents)
   - [0. History of Major Changes / 主な変更履歴](#0-history-of-major-changes--主な変更履歴)
-    - [0.1 Changes in v0.7.0](#01-changes-in-v070)
-    - [0.2 Changes in v0.6.0](#02-changes-in-v060)
-    - [0.3 Changes in v0.5.0](#03-changes-in-v050)
+    - [0.1 Changes in v3.0.0](#01-changes-in-v300)
+    - [0.2 Changes in v0.7.0](#02-changes-in-v070)
+    - [0.3 Changes in v0.6.0](#03-changes-in-v060)
+    - [0.4 Changes in v0.5.0](#04-changes-in-v050)
   - [1. Installation / インストール方法](#1-installation--インストール方法)
   - [2. How to use / 利用方法](#2-how-to-use--利用方法)
     - [2.1 Create a New Integration / インテグレーションの作成](#21-create-a-new-integration--インテグレーションの作成)
@@ -32,13 +33,21 @@ Development note is here.
 
 ## 0. History of Major Changes / 主な変更履歴
 
-### 0.1 Changes in v0.7.0
+### 0.1 Changes in v3.0.0
+
+NotionRubyMapping v3.0.0 now supports Notion-Version 2025-09-03.
+
+NotionRubyMapping v3.0.0 は、Notion-Version 2025-09-03 に対応しました。
+これまで Database で実行していた API は、ほとんど DataSource の API に変更になりました。
+そのため、NotionRubyMapping でも新規に DataSource クラスを追加しました。
+
+### 0.2 Changes in v0.7.0
 
 Since the number of Japanese users has increased, we decided to include Japanese as well.  In addition, we have simplified the method of setting up integration tokens.
 
 日本のユーザが増えたので、日本語も併記することにしました。また、インテグレーショントークンの設定方法を簡単にしました。
 
-### 0.2 Changes in v0.6.0
+### 0.3 Changes in v0.6.0
 
 NotionRubyMapping v0.6.0 now supports Notion-Version 2022-06-28.
 ~~In 2022-06-28, property values are no longer returned when retrieving pages.  NotionRubyMapping temporarily creates a Property Object and calls the retrieve a property item API when a value is needed.  Therefore, users do not need to be aware of any differences, and existing scripts should work as they are.~~
@@ -46,7 +55,7 @@ NotionRubyMapping v0.6.0 now supports Notion-Version 2022-06-28.
 NotionRubyMapping v0.6.0 は、Notion-Version 2022-06-28 に対応しました。
 ~~ 2022-06-28 では、ページを取得する際にプロパティ値を返さなくなりました。NotionRubyMapping は、一時的に Property Object を作成し、値が必要なときにプロパティ項目を取得する API を呼び出します。そのため、ユーザーはこの違いを意識する必要はなく、既存のスクリプトはそのまま動作するはずです。~~
 
-### 0.3 Changes in v0.5.0
+### 0.4 Changes in v0.5.0
 
 NotionRubyMapping v0.5.0 now supports block updates.
 For efficiency, subclasses are provided under Block class. As a result, they are no longer compatible with the scripts used in v0.4.0.
@@ -127,6 +136,7 @@ NotionRubyMapping.configuration { |c| c.notion_token = ENV["NOTION_API_TOKEN"] }
 
 ## 3. ChangeLog
 
+- 2025/9/15 [v3.0.0] updates for Notion-Version 2025-09-03 (Add DataSource class)
 - 2025/6/29 [v2.0.1] add creating FileUploadObject with external url
 - 2025/6/26 [v2.0.0] [FIX] remove symbolize_names: true (only use String)
 - 2025/6/11 [v1.0.0] Update Faraday to 2.13.1 and Change symbolize_names: true (Broken version)

data/exe/notionErDiagram.rb

@@ -3,53 +3,59 @@
 require "notion_ruby_mapping"
 include NotionRubyMapping
 
-def append_database(text, db, db_titles)
-  base_title = db_title db
-  normalize_db_title(db, db_titles) if db_titles[db].nil?
-  text << "  #{db_titles[db]} {"
-  text << %(    Database title "#{base_title}") unless base_title == db_titles[db]
-  db.properties.reject { |p| p.is_a? RelationProperty }.each_with_index do |p, i|
-    class_name = p.class.name.split("::").last.sub /Property/, ""
+def append_data_source(text, ds, ds_titles)
+  base_title = ds_title ds
+  normalize_ds_title(ds, ds_titles) if ds_titles[ds].nil?
+  text << "  #{ds_titles[ds]} {"
+  text << %(    Database title "#{base_title}") unless base_title == ds_titles[ds]
+  ds.properties.reject { |p| p.is_a? RelationProperty }.each_with_index do |p, i|
+    class_name = p.class.name.split("::").last.sub(/Property/, "")
     text << %(    #{class_name} p#{i} "#{p.name}")
   end
   text << "  }\n"
 end
 
-def normalize_db_title(db, db_titles)
-  base_title = db_title db
+def normalize_ds_title(db, db_titles)
+  base_title = ds_title db
   db_titles[db] = base_title.gsub(/[\w\d\-_]+/, "").empty? ? base_title : "d#{db_titles.count}"
 end
 
-def db_title(db)
-  db.database_title.full_text.gsub " ", "_"
+def ds_title(db)
+  db.data_source_title.full_text.gsub " ", "_"
 end
 
 if ARGV.length < 2
-  print "Usage: notionErDiagram.rb top_database_id code_block_id"
+  print "Usage: notionErDiagram.rb top_data_source_id code_block_id"
   exit
 end
-database_id, code_block_id = ARGV
+data_source_id, code_block_id = ARGV
 NotionRubyMapping.configure { |c| c.notion_token = ENV["NOTION_API_KEY"] }
 block = Block.find code_block_id
 unless block.is_a? CodeBlock
   print "#{code_block_id} is not CodeBlock's id"
   exit
 end
-dbs = [Database.find(database_id)]
+dss = [DataSource.find(data_source_id)]
 text = %w[erDiagram]
 
 finished = {}
-db_titles = {}
-until dbs.empty?
-  db = dbs.shift
-  finished[db] = true
-  append_database(text, db, db_titles)
-  db.properties.select { |pp| pp.is_a? RelationProperty }.each_with_index do |pp, i|
-    new_db = Database.find pp.relation_database_id
-    normalize_db_title(new_db, db_titles) if db_titles[new_db].nil?
-    text << "  #{db_titles[db]} |o--o{ #{db_titles[new_db]} : r#{i}"
-    dbs << new_db unless finished[new_db]
+ds_titles = {}
+until dss.empty?
+  ds = dss.shift
+  append_data_source(text, ds, ds_titles)
+  ds.properties.select { |pp| pp.is_a? RelationProperty }.each_with_index do |pp, _i|
+    new_ds = DataSource.find pp.relation_data_source_id
+    normalize_ds_title(new_ds, ds_titles) if ds_titles[new_ds].nil?
+    if pp.dual_property?
+      unless finished[new_ds]
+        text << %(  #{ds_titles[ds]} }o--o{ #{ds_titles[new_ds]} : "#{pp.name} / #{pp.synced_property_name}" )
+      end
+    else
+      text << %(  #{ds_titles[ds]} |o--o{ #{ds_titles[new_ds]} : "#{pp.name}")
+    end
+    dss << new_ds unless finished[new_ds]
   end
+  finished[ds] = true
   text << ""
 end
 

data/lib/notion_ruby_mapping/blocks/base.rb

@@ -33,6 +33,8 @@ module NotionRubyMapping
       case json["object"]
       when "page"
         Page.new json: json
+      when "data_source"
+        DataSource.new json: json
       when "database"
         Database.new json: json
       when "list"
@@ -52,6 +54,14 @@ module NotionRubyMapping
       end
     end
 
+    # @param [String] str id or URL
+    # @return [String] data_source_id
+    def self.data_source_id(str)
+      NotionCache.instance.hex_id str
+    end
+
+    # @param [String] str id or URL
+    # @return [String] database_id
     def self.database_id(str)
       if /^http/.match str
         /([\da-f]{32})\?/.match(str)[1]
@@ -66,7 +76,7 @@ module NotionRubyMapping
     def self.dry_run_script(method, path, json = nil)
       shell = [
         "#!/bin/sh\ncurl #{method == :get ? "" : "-X #{method.to_s.upcase}"} 'https://api.notion.com/#{path}'",
-        "  -H 'Notion-Version: 2022-06-28'",
+        "  -H 'Notion-Version: #{NotionRubyMapping::NOTION_VERSION}'",
         "  -H 'Authorization: Bearer '\"$NOTION_API_KEY\"''",
       ]
       shell << "  -H 'Content-Type: application/json'" if %i[post patch].include?(method)
@@ -166,10 +176,16 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Property] generated property
     def assign_property(klass, title)
       @property_cache ||= PropertyCache.new({},
-                                            base_type: database? ? "database" : "page",
+                                            base_type: if database?
+                                                         "database"
+                                                       else
+                                                         data_source? ? "data_source" : "page"
+                                                       end,
                                             page_id: page? ? @id : nil)
       property = if database?
                    klass.new(title, will_update: new_record?, base_type: "database")
+                 elsif data_source?
+                   klass.new(title, will_update: new_record?, base_type: "data_source")
                  else
                    klass.new(title, will_update: true, base_type: "page", property_cache: @property_cache)
                  end
@@ -212,6 +228,11 @@ module NotionRubyMapping
       is_a? Database
     end
 
+    # @return [TrueClass, FalseClass] true if Database object
+    def data_source?
+      is_a? DataSource
+    end
+
     # @return [Hash, nil] obtained Hash
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#e13d526bd709451e9b06fd32e8d07fcd
     def icon
@@ -280,7 +301,11 @@ module NotionRubyMapping
           reload
         end
         @property_cache = PropertyCache.new json_properties,
-                                            base_type: database? ? "database" : "page",
+                                            base_type: if database?
+                                                         "database"
+                                                       else
+                                                         data_source? ? "data_source" : "page"
+                                                       end,
                                             page_id: page? ? @id : nil
       end
       @property_cache
@@ -343,7 +368,10 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#62eea67af7824496820c6bb903503540
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#e13d526bd709451e9b06fd32e8d07fcd
     def set_icon(emoji: nil, url: nil, file_upload_object: nil)
-      @payload.set_icon(emoji: emoji, url: url, file_upload_object: file_upload_object) if page? || database?
+      if page? || database? || data_source?
+        @payload.set_icon(emoji: emoji, url: url,
+                          file_upload_object: file_upload_object)
+      end
       self
     end
 

data/lib/notion_ruby_mapping/blocks/block.rb

@@ -44,7 +44,6 @@ module NotionRubyMapping
           table: TableBlock,
           table_row: TableRowBlock,
           table_of_contents: TableOfContentsBlock,
-          template: TemplateBlock,
           to_do: ToDoBlock,
           toggle: ToggleBlock,
           video: VideoBlock,

data/lib/notion_ruby_mapping/blocks/column_block.rb

@@ -5,11 +5,16 @@ module NotionRubyMapping
   class ColumnBlock < Block
     # @param [NotionRubyMapping::Block, Array<NotionRubyMapping::Block>, nil] sub_blocks
     # @see https://www.notion.so/hkob/ColumnBlock-91cb314fc6594ff6b0c77c1eae6c7fab#4b4486cdf26a474eab1c92f9c6ea8a91
-    def initialize(sub_blocks = [], json: nil, id: nil, parent: nil)
+    def initialize(sub_blocks = [], json: nil, id: nil, parent: nil, width_ratio: nil)
       super(json: json, id: id, parent: parent)
       add_sub_blocks sub_blocks unless json
       @can_have_children = true
       @can_append = false
+      @width_ratio = if !width_ratio.nil?
+                       width_ratio
+                     elsif json && json["column"] && json["column"]["width_ratio"]
+                       json["column"]["width_ratio"]
+                     end
     end
 
     # @return [String]
@@ -21,7 +26,7 @@ module NotionRubyMapping
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type] = {}
+      ans[type] = @width_ratio ? {"width_ratio" => @width_ratio} : {}
       ans[type]["children"] = @sub_blocks.map(&:block_json) if @sub_blocks
       ans
     end

data/lib/notion_ruby_mapping/blocks/data_source.rb

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+module NotionRubyMapping
+  # Notion data_source
+  class DataSource < Base
+    ### Public announced methods
+
+    # @param [String] id
+    # @param [Boolean] dry_run true if dry_run
+    # @return [NotionRubyMapping::DataSource, String]
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#58ba9190fd544432a9e2a5823d6c33b7
+    def self.find(id, dry_run: false)
+      nc = NotionCache.instance
+      data_source_id = Base.data_source_id id
+      if dry_run
+        dry_run_script :get, nc.data_source_path(data_source_id)
+      else
+        nc.data_source data_source_id
+      end
+    end
+
+    # @param [String] key
+    # @return [NotionRubyMapping::PropertyCache, Hash] obtained Page value or PropertyCache
+    def [](key)
+      get key
+    end
+
+    # @param [Class] klass
+    # @param [String] title
+    # @return [NotionRubyMapping::Property]
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#c9d24269123c444295af88b9b27074a9
+    def add_property(klass, title)
+      prop = assign_property klass, title
+      yield prop if block_given?
+      @payload.merge_property prop.property_schema_json
+      prop.clear_will_update
+      prop
+    end
+
+    # @param [Array<Property, Class, String>] assign
+    # @return [NotionRubyMapping::Base]
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#c217ce78020a4de79b720790fce3092d
+    def build_child_page(*assign)
+      assign = properties.map { |p| [p.class, p.name] }.flatten if assign.empty?
+      page = Page.new assign: assign, parent: {"data_source_id" => @id}
+      pp = page.properties
+      pp.clear_will_update
+      yield page, pp if block_given?
+      page
+    end
+
+    # @param [Array<Property, Class, String>] assign
+    # @param [Boolean] dry_run true if dry_run
+    # @return [NotionRubyMapping::Base]
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#c217ce78020a4de79b720790fce3092d
+    def create_child_page(*assign, dry_run: false)
+      assign = properties.map { |p| [p.class, p.name] }.flatten if assign.empty?
+      page = Page.new assign: assign, parent: {"data_source_id" => @id}
+      pp = page.properties
+      pp.clear_will_update
+      yield page, pp if block_given?
+      page.save dry_run: dry_run
+    end
+
+    # @return [NotionRubyMapping::RichTextArray]
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#217a7d988c404d68b270c4874a9117b4
+    def data_source_title
+      @data_source_title ||= RichTextArray.new "title", json: (self["title"]), will_update: new_record?
+    end
+
+    # @return [NotionRubyMapping::RichTextArray]
+    def description
+      RichTextArray.new "description", json: self["description"]
+    end
+
+    # @param [RichTextArray, String, Array<String>, RichTextObject, Array<RichTextObject>] text_info
+    def description=(text_info)
+      @payload.description = text_info
+    end
+
+    # @return [Boolean]
+    def is_inline
+      self["is_inline"]
+    end
+
+    # @param [Boolean] flag
+    def is_inline=(flag)
+      @payload.is_inline = flag
+    end
+
+    # @return [Hash] created json for property schemas (for create data_source)
+    def property_schema_json
+      @payload.property_schema_json @property_cache, data_source_title
+    end
+
+    # @return [Hash] created json for property values
+    def property_values_json
+      @payload.property_values_json @property_cache, data_source_title
+    end
+
+    # @param [NotionRubyMapping::Query] query object
+    # @param [Boolean] dry_run true if dry_run
+    # @return [NotionRubyMapping::List, String]
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#6bd9acf62c454f64bc555c8828057e6b
+    def query_data_source(query = Query.new, dry_run: false)
+      if dry_run
+        Base.dry_run_script :post, @nc.query_data_source_path(@id), query.query_json
+      else
+        response = @nc.data_source_query_request @id, query
+        List.new json: response, type: "data_source", value: self, query: query
+      end
+    end
+
+    # @param [Array] property_names
+    # @return [Array<NotionRubyMapping::Property>]
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#5d15354be2604141adfbf78d14d49942
+    def remove_properties(*property_names)
+      property_names.map { |n| properties[n] }.each(&:remove)
+    end
+
+    # @param [String] old_property_name
+    # @param [String] new_property_name
+    # @return [NotionRubyMapping::DataSource]
+    def rename_property(old_property_name, new_property_name)
+      properties[old_property_name].new_name = new_property_name
+      self
+    end
+
+    # @return [Hash] created json for property schemas (for update data_source)
+    def update_property_schema_json
+      @payload.update_property_schema_json @property_cache, data_source_title
+    end
+
+    protected
+
+    # @param [Boolean] dry_run true if dry_run
+    def create(dry_run: false)
+      if dry_run
+        dry_run_script :post, @nc.data_sources_path, :property_schema_json
+      else
+        json = @nc.create_data_source_request(property_schema_json)
+        @new_record = false
+        update_json json
+      end
+    end
+
+    # @return [Hash]
+    def reload_json
+      @nc.data_source_request @id
+    end
+
+    # @param [Boolean] dry_run true if dry_run
+    # @return [NotionRubyMapping::Base, String]
+    def update(dry_run: false)
+      if dry_run
+        dry_run_script :patch, @nc.data_source_path(@id), :update_property_schema_json
+      else
+        payload = update_property_schema_json
+        begin
+          update_json @nc.update_data_source_request(@id, payload)
+        rescue StandardError => e
+          raise StandardError, "#{e.message} by #{payload}"
+        end
+      end
+    end
+  end
+end

data/lib/notion_ruby_mapping/blocks/database.rb

@@ -37,22 +37,46 @@ module NotionRubyMapping
       prop
     end
 
+    # @param [String] title
+    # @param [Array<String, Property>] assigns
+    # @return [NotionRubyMapping::DataSource]
+    # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#71f680d59b874930bf9f488a7cd6a49e
+    def build_child_data_source(title, *assigns)
+      ds = DataSource.new json: {"title" => [TextObject.new(title).property_values_json]},
+                          assign: assigns, parent: {"type" => "database_id", "database_id" => @id}
+      yield ds, ds.properties if block_given?
+      ds
+    end
+
+    # @param [String] title
+    # @param [Array<String, Property>] assigns
+    # @param [Boolean] dry_run true if dry_run
+    # @return [NotionRubyMapping::DataSource, String]
+    # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#e3f1d21e0f724f589e48431468772eed
+    def create_child_data_source(title, *assigns, dry_run: false)
+      ds = DataSource.new json: {"title" => [TextObject.new(title).property_values_json]},
+                          assign: assigns, parent: {"type" => "database_id", "database_id" => @id}
+      yield ds, ds.properties if block_given?
+      ds.save dry_run: dry_run
+    end
+
     # @param [Array<Property, Class, String>] assign
     # @return [NotionRubyMapping::Base]
-    # @see https://www.notion.so/hkob/Database-1462b24502424539a4231bedc07dc2f5#c217ce78020a4de79b720790fce3092d
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#c217ce78020a4de79b720790fce3092d
     def build_child_page(*assign)
-      assign = properties.map { |p| [p.class, p.name] }.flatten if assign.empty?
-      page = Page.new assign: assign, parent: {"database_id" => @id}
-      pp = page.properties
-      pp.clear_will_update
-      yield page, pp if block_given?
-      page
+      unless data_sources.length == 1
+        raise StandardError, "Database #{id} is linked with multiple data_sources, use data_source.build_child_page"
+      end
+
+      data_sources.first.build_child_page(*assign) do |page, pp|
+        yield page, pp if block_given?
+      end
     end
 
     # @param [Array<Property, Class, String>] assign
     # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Base]
-    # @see https://www.notion.so/hkob/Database-1462b24502424539a4231bedc07dc2f5#c217ce78020a4de79b720790fce3092d
+    # @see https://www.notion.so/hkob/DataSource-1462b24502424539a4231bedc07dc2f5#c217ce78020a4de79b720790fce3092d
     def create_child_page(*assign, dry_run: false)
       assign = properties.map { |p| [p.class, p.name] }.flatten if assign.empty?
       page = Page.new assign: assign, parent: {"database_id" => @id}
@@ -68,6 +92,15 @@ module NotionRubyMapping
       @database_title ||= RichTextArray.new "title", json: (self["title"]), will_update: new_record?
     end
 
+    def data_sources
+      return @data_sources if @data_sources
+
+      reload if @json.nil? || !@json.key?("data_sources")
+      @data_sources = @json["data_sources"].map do |json|
+        DataSource.find json["id"]
+      end
+    end
+
     # @return [NotionRubyMapping::RichTextArray]
     def description
       RichTextArray.new "description", json: self["description"]
@@ -98,19 +131,6 @@ module NotionRubyMapping
       @payload.property_values_json @property_cache, database_title
     end
 
-    # @param [NotionRubyMapping::Query] query object
-    # @param [Boolean] dry_run true if dry_run
-    # @return [NotionRubyMapping::List, String]
-    # @see https://www.notion.so/hkob/Database-1462b24502424539a4231bedc07dc2f5#6bd9acf62c454f64bc555c8828057e6b
-    def query_database(query = Query.new, dry_run: false)
-      if dry_run
-        Base.dry_run_script :post, @nc.query_database_path(@id), query.query_json
-      else
-        response = @nc.database_query_request @id, query
-        List.new json: response, type: "database", value: self, query: query
-      end
-    end
-
     # @param [Array] property_names
     # @return [Array<NotionRubyMapping::Property>]
     # @see https://www.notion.so/hkob/Database-1462b24502424539a4231bedc07dc2f5#5d15354be2604141adfbf78d14d49942

data/lib/notion_ruby_mapping/blocks/file_base_block.rb

@@ -3,18 +3,18 @@
 module NotionRubyMapping
   # Notion block
   class FileBaseBlock < Block
-    # @param [String, nil] url
+    # @param [String, FileUploadObject, NilClass] url or file upload object
     # @param [RichTextArray, String, Array<String>, RichTextObject, Array<RichTextObject>, nil] caption
     # @see https://www.notion.so/hkob/FileBlock-08f2aa6948364d00b92beacaac9a619c#ace53d2e6ff2404f937179ae1e966e98
     # @see https://www.notion.so/hkob/ImageBlock-806b3d2a9a2c4bf5a5aca6e3fbc8a7e2#4cb790b8b5c847acab4341d55e4fa66a
-    def initialize(url = nil, caption: [], json: nil, id: nil, parent: nil)
+    def initialize(url_or_fuo = nil, caption: [], json: nil, id: nil, parent: nil)
       super(json: json, id: id, parent: parent)
       if @json
         @file_object = FileObject.new json: @json[type]
         decode_block_caption
         @can_append = @file_object.external?
       else
-        @file_object = FileObject.file_object url
+        @file_object = FileObject.file_object url_or_fuo
         @caption = RichTextArray.rich_text_array "caption", caption
       end
     end

data/lib/notion_ruby_mapping/blocks/list.rb

@@ -13,8 +13,8 @@ module NotionRubyMapping
       case type
       when "comment_parent"
         @comment_parent = value
-      when "database"
-        @database = value
+      when "data_source"
+        @data_source = value
       when "parent"
         @parent = value
       when "property"
@@ -40,9 +40,9 @@ module NotionRubyMapping
                  query: -> { @parent.children @query },
                  create_object: ->(json) { Base.create_from_json json },
                  &block
-      elsif @database
-        each_sub base: @database,
-                 query: -> { @nc.database_query_request @database.id, @query },
+      elsif @data_source
+        each_sub base: @data_source,
+                 query: -> { @nc.data_source_query_request @data_source.id, @query },
                  create_object: ->(json) { Base.create_from_json json },
                  &block
       elsif @property

data/lib/notion_ruby_mapping/controllers/mermaid.rb

@@ -5,10 +5,10 @@ module NotionRubyMapping
     # @param [String] full_text
     def initialize(full_text)
       @lines = full_text.split "\n"
-      @databases = Hash.new {}
+      @data_sources = Hash.new {}
       parse_text
     end
-    attr_reader :lines, :databases
+    attr_reader :lines, :data_sources
 
     def parse_text
       return unless @lines.shift =~ /^erDiagram/
@@ -25,7 +25,7 @@ module NotionRubyMapping
     end
 
     def db_or_create(db_name)
-      @databases[db_name] ||= MermaidDatabase.new db_name
+      @data_sources[db_name] ||= MermaidDataSource.new db_name
     end
 
     def append_db_with_attributes(db_name)
@@ -34,7 +34,7 @@ module NotionRubyMapping
         case @lines.shift
         when /^ *} *$/
           break
-        when /^ *Database +title +"(.*)" *$/
+        when /^ *DataSource +title +"(.*)" *$/
           db.name = Regexp.last_match(1)
         when /^ *([^ ]+) +[^ ]+ +"(.*)" *$/
           db.add_property Regexp.last_match(1), Regexp.last_match(2)
@@ -44,36 +44,36 @@ module NotionRubyMapping
       end
     end
 
-    def attach_database(db)
-      @databases.values.select { |mdb| mdb.name == db.database_title.full_text }.first&.attach_database(db)
+    def attach_data_source(ds)
+      @data_sources.values.select { |mds| mds.name == ds.data_source_title.full_text }.first&.attach_data_source(ds)
     end
 
     def create_notion_db(target_page, inline)
-      @databases.each_value do |mdb|
+      @data_sources.each_value do |mdb|
         mdb.create_notion_db(target_page, inline) unless mdb.real_db
       end
     end
 
     def update_title
-      @databases.each_value do |mdb|
+      @data_sources.each_value do |mdb|
         mdb.update_title
       end
     end
 
-    def update_databases
-      @databases.each_value(&:update_database)
+    def update_data_sources
+      @data_sources.each_value(&:update_database)
     end
 
     def rename_reverse_name
-      @databases.each_value(&:rename_reverse_name)
+      @data_sources.each_value(&:rename_reverse_name)
     end
 
     def count
-      @databases.values.map(&:count).sum
+      @data_sources.values.map(&:count).sum
     end
 
     def remain
-      @databases.values.map(&:remain).sum
+      @data_sources.values.map(&:remain).sum
     end
   end
 end