notion_ruby_mapping 2.0.1 → 3.0.0

data/lib/notion_ruby_mapping/controllers/{mermaid_database.rb → mermaid_data_source.rb}

@@ -1,5 +1,5 @@
 module NotionRubyMapping
-  class MermaidDatabase
+  class MermaidDataSource
     def initialize(key)
       @key = key
       @name = key
@@ -9,10 +9,10 @@ module NotionRubyMapping
       @working = []
       @relations = {}
       @relation_queue = []
-      @real_db = nil
+      @real_ds = nil
       @reverse_name_queue = {}
     end
-    attr_reader :properties, :relation_queue, :relations, :real_db, :title, :finish_flag
+    attr_reader :properties, :relation_queue, :relations, :real_ds, :title, :finish_flag
     attr_accessor :name
 
     def add_property(key, value)
@@ -27,8 +27,8 @@ module NotionRubyMapping
       @relation_queue << [relation, other]
     end
 
-    def attach_database(db)
-      @real_db = db
+    def attach_data_source(ds)
+      @real_ds = ds
     end
 
     # @param [NotionRubyMapping::Page] target_page
@@ -37,7 +37,7 @@ module NotionRubyMapping
         print "Database must have a title property"
         exit
       end
-      @real_db = target_page.create_child_database(@name, TitleProperty, @title) do |d, _|
+      @real_ds = target_page.create_child_database(@name, TitleProperty, @title) do |d, _|
         d.is_inline = inline
       end
     end
@@ -55,14 +55,14 @@ module NotionRubyMapping
     end
 
     def update_title
-      ps = @real_db.properties
+      ps = @real_ds.properties
       title_property = ps.select { |p| p.is_a? TitleProperty }.first
       title_property.new_name = @title unless title_property.name == @title
       @finish_flag[@title] = true
     end
 
     def update_properties
-      ps = @real_db.properties
+      ps = @real_ds.properties
       @properties.each do |(value, key)|
         name, *options = value.split("|")
         next if @finish_flag[name]
@@ -76,7 +76,7 @@ module NotionRubyMapping
             last_edited_time: LastEditedTimeProperty, people: PeopleProperty, phone_number: PhoneNumberProperty,
             rich_text: RichTextProperty, url: UrlProperty, status: StatusProperty
           }[key.to_sym]
-          @real_db.add_property klass, name unless property
+          @real_ds.add_property klass, name unless property
           @working << name
         when "formula"
           f_e = options.first&.gsub "@", '"'
@@ -86,7 +86,7 @@ module NotionRubyMapping
             if property
               property.formula_expression = f_e unless property.formula_expression == f_e
             else
-              @real_db.add_property(FormulaProperty, name) { |dp| dp.formula_expression = f_e }
+              @real_ds.add_property(FormulaProperty, name) { |dp| dp.formula_expression = f_e }
             end
             @working << name
           else
@@ -100,7 +100,7 @@ module NotionRubyMapping
               property.add_multi_select_option name: select_name, color: "default"
             end
           else
-            @real_db.add_property(MultiSelectProperty, name) do |dp|
+            @real_ds.add_property(MultiSelectProperty, name) do |dp|
               options.each do |select_name|
                 dp.add_multi_select_option name: select_name, color: "default"
               end
@@ -112,7 +112,7 @@ module NotionRubyMapping
           if property
             property.format = format_value unless property.format == format_value
           else
-            @real_db.add_property(NumberProperty, name) { |p| p.format = format_value }
+            @real_ds.add_property(NumberProperty, name) { |p| p.format = format_value }
           end
           @working << name
         when "rollup"
@@ -134,7 +134,7 @@ module NotionRubyMapping
                 property.relation_property_name = relation_name unless property.relation_property_name == relation_name
                 property.rollup_property_name = rollup_name unless property.rollup_property_name == rollup_name
               else
-                @real_db.add_property(RollupProperty, name) do |dp|
+                @real_ds.add_property(RollupProperty, name) do |dp|
                   dp.function = function
                   dp.relation_property_name = relation_name
                   dp.rollup_property_name = rollup_name
@@ -149,7 +149,7 @@ module NotionRubyMapping
               property.add_select_option name: select_name, color: "default"
             end
           else
-            @real_db.add_property(SelectProperty, name) do |dp|
+            @real_ds.add_property(SelectProperty, name) do |dp|
               options.each do |select_name|
                 dp.add_select_option name: select_name, color: "default"
               end
@@ -159,58 +159,58 @@ module NotionRubyMapping
         end
       end
       while (array = @relation_queue.shift)
-        value, relation_db = array
-        db_id = relation_db.real_db.id
+        value, relation_ds = array
+        db_is = relation_ds.real_ds.id
         forward, reverse = value.split("|").map(&:to_s)
         property = ps.values_at(forward).first
         if property
           if reverse
-            if property.database_id == db_id && property.synced_property_name == reverse
-              relation_db.add_property "relation", reverse
-              relation_db.finish_flag[reverse] = true
+            if property.data_source_id == db_is && property.synced_property_name == reverse
+              relation_ds.add_property "relation", reverse
+              relation_ds.finish_flag[reverse] = true
             else
               unless @finish_flag[forward]
-                property.replace_relation_database database_id: db_id
-                relation_db.append_reverse_name_queue self, forward, reverse
+                property.replace_relation_data_source data_source_id: db_is
+                relation_ds.append_reverse_name_queue self, forward, reverse
               end
               @working << forward
               add_property "relation", forward
             end
-            relation_db.relations[reverse] = self
+            relation_ds.relations[reverse] = self
           else
-            unless property.database_id == db_id
-              property.replace_relation_database database_id: db_id, type: "single_property"
+            unless property.data_source_id == db_is
+              property.replace_relation_data_source data_source_id: db_is, type: "single_property"
               @working << forward
               add_property "relation", forward
             end
           end
-          @relations[forward] = relation_db
+          @relations[forward] = relation_ds
         else
-          @real_db.add_property(RelationProperty, forward) do |p|
+          @real_ds.add_property(RelationProperty, forward) do |p|
             if reverse
-              p.replace_relation_database database_id: relation_db.real_db.id
-              relation_db.append_reverse_name_queue self, forward, reverse
-              relation_db.relations[reverse] = self
+              p.replace_relation_data_source data_source_id: relation_ds.real_ds.id
+              relation_ds.append_reverse_name_queue self, forward, reverse
+              relation_ds.relations[reverse] = self
             else
-              p.replace_relation_database database_id: relation_db.real_db.id, type: "single_property"
+              p.replace_relation_data_source data_source_id: relation_ds.real_ds.id, type: "single_property"
             end
           end
-          @relations[forward] = relation_db
+          @relations[forward] = relation_ds
           @working << forward
           add_property "relation", forward
         end
       end
-      @real_db.property_schema_json
+      @real_ds.property_schema_json
     end
 
-    def append_reverse_name_queue(other_db, forward, reverse)
-      @reverse_name_queue[reverse] = [other_db, forward]
+    def append_reverse_name_queue(other_ds, forward, reverse)
+      @reverse_name_queue[reverse] = [other_ds, forward]
       add_property "relation", reverse
     end
 
     def update_database
       update_properties
-      @real_db.save
+      @real_ds.save
       while (name = @working.shift)
         @finish_flag[name] = true
       end
@@ -221,19 +221,19 @@ module NotionRubyMapping
       reverses = []
       clears = []
       @reverse_name_queue.each do |reverse, (other_db, forward)|
-        frp = other_db.real_db.properties[forward]
+        frp = other_db.real_ds.properties[forward]
         rp_id = frp.synced_property_id
-        rrp = @real_db.properties.filter { |pp| pp.property_id == rp_id }.first
+        rrp = @real_ds.properties.filter { |pp| pp.property_id == rp_id }.first
         if rrp && rrp.name != reverse
           rrp.new_name = reverse
-          reverses << other_db.real_db
+          reverses << other_db.real_ds
           clears << rrp
           save = true
         end
         @finish_flag[reverse] = true
       end
       if save
-        @real_db.save
+        @real_ds.save
         clears.map(&:clear_will_update)
         reverses.map(&:reload)
       end

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -124,6 +124,12 @@ module NotionRubyMapping
       request :post, databases_path, payload
     end
 
+    # @param [Hash] payload
+    # @return [Hash] response
+    def create_data_source_request(payload)
+      request :post, data_sources_path, payload
+    end
+
     # @param [Hash] payload
     # @return [Hash] response
     def create_file_upload_request(payload = {})
@@ -142,23 +148,35 @@ module NotionRubyMapping
       object_for_key(id) { database_request id }
     end
 
+    # @param [String] id data_source_id (with or without "-")
+    # @return [NotionRubyMapping::Base] DataSource object or nil
+    def data_source(id)
+      object_for_key(id) { data_source_request id }
+    end
+
     # @param [String] database_id
-    # @return [String (frozen)] page_path
+    # @return [String (frozen)] database_path
     def database_path(database_id)
       "v1/databases/#{database_id}"
     end
 
+    # @param [String] database_id
+    # @return [String (frozen)] data_source_path
+    def data_source_path(data_source_id)
+      "v1/data_sources/#{data_source_id}"
+    end
+
     # @param [String] id page_id / block_id (with or without "-")
     # @param [NotionRubyMapping::Query] query query object
     # @return [NotionRubyMapping::Base] List object
     # def database_query(id, query)
-    #   Base.create_from_json database_query_request(id, query.query_json)
+    #   Base.create_from_json data_source_query_request(id, query.query_json)
     # end
 
-    # @param [String] database_id (with or without "-")
+    # @param [String] data_source_id (with or without "-")
     # @param [NotionRubyMapping::Query] query query object
-    def database_query_request(database_id, query)
-      request :post, "v1/databases/#{database_id}/query#{query.database_query_string}", query.query_json
+    def data_source_query_request(data_source_id, query)
+      request :post, "v1/data_sources/#{data_source_id}/query#{query.database_query_string}", query.query_json
     end
 
     # @param [String] database_id
@@ -167,11 +185,22 @@ module NotionRubyMapping
       request :get, database_path(database_id)
     end
 
+    # @param [String] data_source_id
+    # @return [Hash] response
+    def data_source_request(data_source_id)
+      request :get, data_source_path(data_source_id)
+    end
+
     # @return [String (frozen)] page_path
     def databases_path
       "v1/databases"
     end
 
+    # @return [String (frozen)] page_path
+    def data_sources_path
+      "v1/data_sources"
+    end
+
     # @param [String] id
     # @return [NotionRubyMapping::Base]
     def destroy_block(id)
@@ -288,8 +317,8 @@ module NotionRubyMapping
 
     # @param [String] database_id
     # @return [String (frozen)] page_path
-    def query_database_path(database_id)
-      "v1/databases/#{database_id}/query"
+    def query_data_source_path(data_source_id)
+      "v1/data_sources/#{data_source_id}/query"
     end
 
     # @param [String] block_id
@@ -367,6 +396,12 @@ module NotionRubyMapping
       request :patch, database_path(database_id), payload
     end
 
+    # @param [String] data_source_id
+    # @return [Hash] response
+    def update_data_source_request(data_source_id, payload)
+      request :patch, data_source_path(data_source_id), payload
+    end
+
     # @param [String] page_id
     # @param [Hash] payload
     # @return [Hash] response

data/lib/notion_ruby_mapping/controllers/property_cache.rb

@@ -11,7 +11,7 @@ module NotionRubyMapping
       @page_id = page_id
     end
     attr_writer :json
-    attr_reader :page_id
+    attr_reader :page_id, :base_type
 
     # @param [String] key
     # @return [Property] Property for key
@@ -33,6 +33,21 @@ module NotionRubyMapping
       end
     end
 
+    # @return [TrueClass, FalseClass] true if database type
+    def database?
+      @base_type == "database"
+    end
+
+    # @return [TrueClass, FalseClass] true if data_source type
+    def data_source?
+      @base_type == "data_source"
+    end
+
+    # @return [TrueClass, FalseClass] true if database or data_source type
+    def database_or_data_source?
+      %w[database data_source].include? @base_type
+    end
+
     # @return [Hash, Enumerator]
     def each(&block)
       return enum_for(:each) unless block_given?
@@ -41,7 +56,7 @@ module NotionRubyMapping
     end
 
     def generate_all_properties
-      if @json.empty?
+      if @json.nil? || @json.empty?
         @properties.values
       else
         @json.keys.map { |key| self[key] }
@@ -52,6 +67,11 @@ module NotionRubyMapping
       "PropertyCache"
     end
 
+    # @return [TrueClass, FalseClass] true if page type
+    def page?
+      @base_type == "page"
+    end
+
     # @return [Hash] created property values json
     def property_values_json
       @properties.each_with_object({}) do |(_, property), ans|
@@ -64,22 +84,24 @@ module NotionRubyMapping
 
     # @return [Hash] created property schema json
     def property_schema_json
-      @properties.each_with_object({}) do |(_, property), ans|
+      schema = @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
           ans["properties"] ||= {}
           ans["properties"].merge! property.property_schema_json
         end
       end
+      database? ? {"initial_data_source" => schema} : schema
     end
 
     # @return [Hash] created update property schema json
     def update_property_schema_json
-      @properties.each_with_object({}) do |(_, property), ans|
+      schema = @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
           ans["properties"] ||= {}
           ans["properties"].merge! property.update_property_schema_json
         end
       end
+      database? ? {"initial_data_source" => schema} : schema
     end
 
     # @param [Array] key

data/lib/notion_ruby_mapping/objects/file_upload_object.rb

@@ -2,7 +2,7 @@
 
 class FileUploadObject
   MAX_SIZE = 10 * 1024 * 1024 # 10 MB
-  # @param [String] id
+  # @param [String] fname
   def initialize(fname:, external_url: nil)
     @fname = fname
     if external_url

data/lib/notion_ruby_mapping/properties/checkbox_property.rb

@@ -36,7 +36,7 @@ module NotionRubyMapping
     def initialize(name, will_update: false, base_type: "page", property_id: nil, property_cache: nil, json: 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 || {}
               else
                 json || false

data/lib/notion_ruby_mapping/properties/created_by_property.rb

@@ -26,7 +26,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 || {}
               else
                 UserObject.new user_id: user_id, json: json
@@ -37,7 +37,7 @@ module NotionRubyMapping
     def update_from_json(json)
       @will_update = false
       cb = json["created_by"]
-      @json = database? ? cb : UserObject.new(json: cb)
+      @json = database_or_data_source? ? cb : UserObject.new(json: cb)
     end
 
     ## Page property only methods

data/lib/notion_ruby_mapping/properties/created_time_property.rb

@@ -25,7 +25,7 @@ module NotionRubyMapping
       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
 
     ## Page property only methods

data/lib/notion_ruby_mapping/properties/date_property.rb

@@ -102,7 +102,7 @@ module NotionRubyMapping
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache
       @json = json || {}
-      return if database?
+      return if database_or_data_source?
 
       @json = json || {}
       @json["start"] = start_date if start_date

data/lib/notion_ruby_mapping/properties/files_property.rb

@@ -40,7 +40,7 @@ module NotionRubyMapping
                    property_cache: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache
-      if database?
+      if database_or_data_source?
         @files = json || {}
       elsif json
         @files = json.map { |sub_json| FileObject.new json: sub_json }
@@ -68,7 +68,7 @@ module NotionRubyMapping
     end
 
     def update_from_json(json)
-      return if database?
+      return if database_or_data_source?
 
       @files = json["files"].map { |sub_json| FileObject.new json: sub_json }
       @file_names = json["files"].map { |sub_json| sub_json["name"] }

data/lib/notion_ruby_mapping/properties/formula_property.rb

@@ -23,14 +23,14 @@ module NotionRubyMapping
     # @return [String] formula_expression
     # @see https://www.notion.so/hkob/FormulaProperty-d6b22ca70822407a9fef0bac8925cd0d#a24d2a7b99254d2a9226c00153f1d516
     def formula_expression
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @json["expression"]
     end
 
     # @param [String] f_e
     # @see https://www.notion.so/hkob/FormulaProperty-d6b22ca70822407a9fef0bac8925cd0d#fdb3aaa8d0474440b7ed941673ee13b7
     def formula_expression=(f_e)
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @will_update = true
       @json["expression"] = f_e
     end
@@ -46,7 +46,7 @@ module NotionRubyMapping
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache
       @json = json || {}
-      return unless database?
+      return unless database_or_data_source?
 
       @json["expression"] = formula if formula
     end
@@ -55,7 +55,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/last_edited_by_property.rb

@@ -27,7 +27,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 || {}
               else
                 UserObject.new user_id: user_id, json: json
@@ -39,7 +39,7 @@ module NotionRubyMapping
     def update_from_json(json)
       @will_update = false
       leb = json["last_edited_by"]
-      @json = database? ? leb : UserObject.new(json: leb)
+      @json = database_or_data_source? ? leb : UserObject.new(json: leb)
     end
 
     ## Page property only methods

data/lib/notion_ruby_mapping/properties/last_edited_time_property.rb

@@ -25,7 +25,7 @@ module NotionRubyMapping
       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
 
     ## Page property only methods

data/lib/notion_ruby_mapping/properties/multi_select_property.rb

@@ -32,7 +32,7 @@ module NotionRubyMapping
 
     # @return [Array] copyed multi select options
     def edit_multi_select_options
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @will_update = true
       @json["options"] ||= []
     end
@@ -40,7 +40,7 @@ module NotionRubyMapping
     # @return [Array]
     # @see https://www.notion.so/hkob/MultiSelectProperty-b90bba1c55d540ba97131bb013d4ca74#5ff6ec299cf64049bde2416f61b30fa9
     def multi_select_options
-      assert_database_property __method__
+      assert_data_source_property __method__
       @json["options"] || []
     end
 
@@ -65,7 +65,7 @@ module NotionRubyMapping
                    property_id: nil, property_cache: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache
-      if database?
+      if database_or_data_source?
         @json = json || {"options" => []}
       else
         @json = json || []
@@ -77,7 +77,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/number_property.rb

@@ -23,7 +23,7 @@ module NotionRubyMapping
     # @return [String] new or settled format
     # @see https://www.notion.so/hkob/NumberProperty-964ebc1948074d7ca8340187aa352d40#5e3682ed9e124d518f735b236787d7a7
     def format
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @json["format"]
     end
 
@@ -31,7 +31,7 @@ module NotionRubyMapping
     # @return [String] settled format
     # @see https://www.notion.so/hkob/NumberProperty-964ebc1948074d7ca8340187aa352d40#89695432078643e48307c348e2983456
     def format=(format)
-      assert_database_property __method__
+      assert_database_or_data_source_property __method__
       @will_update = true
       @json["format"] = format
     end
@@ -58,7 +58,7 @@ module NotionRubyMapping
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
                   property_cache: property_cache
       @json = json
-      @json ||= {"format" => format || "number"} if database?
+      @json ||= {"format" => format || "number"} if database_or_data_source?
     end
 
     # @param [Hash] json
@@ -73,7 +73,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/people_property.rb

@@ -56,7 +56,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?
                 {}
               elsif people
                 Array(people).map { |uo| UserObject.user_object(uo) }
@@ -84,7 +84,7 @@ module NotionRubyMapping
     # @return [Hash, Array]
     def update_from_json(json)
       @will_update = false
-      @json = database? ? {} : PeopleProperty.people_from_json(json)
+      @json = database_or_data_source? ? {} : PeopleProperty.people_from_json(json)
     end
   end
 end

data/lib/notion_ruby_mapping/properties/phone_number_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 = database? ? {} : json
+      @json = database_or_data_source? ? {} : json
     end
 
     ## Page property only methods