notion_ruby_mapping 0.5.4 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eebf655e3f67cf1b8efd0b2e143550004b3d6277bb5bc9071d496c2814df2538
-  data.tar.gz: e940233fed8804f92318434feaa99160f7ce3288b2e68e45eb09e3f4763f6efe
+  metadata.gz: 5d2f6819154bd2ae6fb448cd36d06311d20e6ba29a0e2e4fda6584d49ca58732
+  data.tar.gz: 042e30bda77b5c21a3226a37579254e52eb19d537abaa94a5233238846ba6a76
 SHA512:
-  metadata.gz: aa4de2b82ccb55272ae93e36900036a666b5197671aedc7b54fe141d4a9bdfaaa7acd180765bf2e3948bf8dd2030f0e05aa4adfa4bd9539eb152c7e64f42ccb8
-  data.tar.gz: 8f91372152624213a0fdde007c8d8a6fe3a0a9b76a9d17b0c8b123020aac498ab0a1f5e6a5187170c7666a87b21ddb2f2f0c68911074941b0918a2320a545d19
+  metadata.gz: 69419656c3c728d5472aade37de759a2a9b58124cd6856df7ecfa9b0838f5755af84f80a9936434a82991a7418a9f33de6188c87b20afff32573565c64ea5099
+  data.tar.gz: '093e56922c2f2aef5b6efd45043472e165b8bc3d04cce3613b9d1f363d779adca495982c818091e067dc9413107afbd26371ba73676d4def61b8abc1e1ea83b8'

data/README.md

@@ -8,7 +8,9 @@ Development note is here. → [Idea note of "notion_ruby_mapping"](https://www.n
 
 - [notion_ruby_mapping](#notion_ruby_mapping)
   - [Table of Contents](#table-of-contents)
-  - [0. Changes in v0.5.0](#0-changes-in-v050)
+  - [0. Changes](#0-changes)
+    - [0.1 Changes in v0.6.0](#01-changes-in-v060)
+    - [0.2 Changes in v0.5.0](#02-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)
@@ -21,9 +23,18 @@ Development note is here. → [Idea note of "notion_ruby_mapping"](https://www.n
   - [5. License](#5-license)
   - [6. Code of Conduct](#6-code-of-conduct)
 
-## 0. Changes in v0.5.0
+## 0. Changes
 
-NotionRubyMapping v.0.5.0 now supports block updates.
+### 0.1 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.
+
+### 0.2 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.
 
 ## 1. Installation
@@ -79,6 +90,11 @@ NotionCache.instance.create_client ENV["NOTION_API_TOKEN"] # from environment
 
 ## 3. ChangeLog
 
+- 2022/7/22 [v0.6.0] updates for Notion-Version 2022-06-28 (lazy retrieve property values, retrieve page/database/block parent, single_property/dual_property for RelationProperty)
+- 2022/6/24 [v0.5.5] add file_names= to FileProperty
+- 2022/6/23 [v0.5.4] add update 'is_inline' and 'description' for database object
+- 2022/6/14 [v0.5.3] add time zone for query database by Date (before, after, on_or_before, on_or_after)
+- 2022/6/8 [v0.5.2] Change query database filter for date with time zone
 - 2022/6/5 [v0.5.1] bug fix for append_block_children.  added synced_block_original to SyncedBlock
 - 2022/6/4 [v0.5.0]  added subclasses of the block class and update_block API support
 - 2022/5/19 [v0.4.1] added delete_block

data/lib/notion_ruby_mapping/blocks/base.rb

@@ -50,7 +50,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-02-22'",
+        "  -H 'Notion-Version: 2022-06-28'",
         "  -H 'Authorization: Bearer '\"$NOTION_API_KEY\"''",
       ]
       shell << "  -H 'Content-Type: application/json'" if %i[post patch].include?(method)
@@ -120,11 +120,13 @@ module NotionRubyMapping
     # @param [String] title
     # @return [NotionRubyMapping::Property] generated property
     def assign_property(klass, title)
-      @property_cache ||= PropertyCache.new({}, base_type: database? ? :database : :page)
+      @property_cache ||= PropertyCache.new({},
+                                            base_type: database? ? :database : :page,
+                                            page_id: page? ? @id : nil)
       property = if database?
                    klass.new(title, will_update: new_record?, base_type: :database)
                  else
-                   klass.new(title, will_update: true, base_type: :page)
+                   klass.new(title, will_update: true, base_type: :page, property_cache: @property_cache)
                  end
       @property_cache.add_property property
       property
@@ -192,6 +194,24 @@ module NotionRubyMapping
       is_a? Page
     end
 
+    def parent(dry_run: false)
+      parent_json = @json && @json["parent"]
+      raise StandardError, "Unknown parent" if parent_json.nil?
+
+      type = parent_json["type"]
+      klass = case type
+              when "database_id"
+                Database
+              when "page_id"
+                Page
+              when "block_id"
+                Block
+              else
+                raise StandardError, "List does not have any parent"
+              end
+      klass.find parent_json[type], dry_run: dry_run
+    end
+
     # @return [NotionRubyMapping::PropertyCache] get or created PropertyCache object
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#8f0b28e09dd74e2a9ff06126c48d64d4
     def properties
@@ -201,7 +221,9 @@ module NotionRubyMapping
 
           reload
         end
-        @property_cache = PropertyCache.new json_properties, base_type: database? ? :database : :page
+        @property_cache = PropertyCache.new json_properties,
+                                            base_type: database? ? :database : :page,
+                                            page_id: page? ? @id : nil
       end
       @property_cache
     end
@@ -225,20 +247,28 @@ module NotionRubyMapping
       return unless is_a?(Page) || is_a?(Database)
 
       ps.each do |key, json|
-        properties[key].update_from_json json
+        if json["type"]
+          properties[key].update_from_json json
+        else
+          properties[key]&.clear_will_update
+        end
       end
       self
     end
 
     # @param [Boolean] dry_run
-    # @return [NotionRubyMapping::Base, String]
+    # @return [NotionRubyMapping::Base, NotionRubyMapping::Database, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#277085c8439841c798a4b94eae9a7326
     def save(dry_run: false)
       if dry_run
         @new_record ? create(dry_run: true) : update(dry_run: true)
       else
         @new_record ? create : update
-        @property_cache.clear_will_update unless block?
+        if block?
+
+        else
+          @property_cache.clear_will_update
+        end
         @payload.clear
         self
       end

data/lib/notion_ruby_mapping/blocks/list.rb

@@ -5,12 +5,13 @@ module NotionRubyMapping
   class List < Base
     include Enumerable
 
-    def initialize(json: nil, id: nil, database: nil, parent: nil, query: nil)
+    def initialize(json: nil, id: nil, database: nil, parent: nil, property: nil, query: nil)
       super(json: json, id: id)
       @has_more = @json["has_more"]
       @load_all_contents = !@has_more
       @database = database
       @parent = parent
+      @property = property
       @query = query
       @index = 0
       @has_content = true
@@ -80,6 +81,38 @@ module NotionRubyMapping
             @has_content = false
           end
         end
+      elsif @property
+        while @has_content
+          if @index < results.length
+            json = results[@index]
+            object = case json["type"]
+                     when "people"
+                       UserObject.new json: json["people"]
+                     when "relation"
+                       json["relation"]["id"]
+                     when "rich_text"
+                       RichTextObject.create_from_json json["rich_text"]
+                     when "title"
+                       RichTextObject.create_from_json json["title"]
+                     else
+                       json
+                     end
+            @index += 1
+            yield object
+          elsif @has_more
+            if @property
+              @query ||= Query.new
+              @query.start_cursor = @json["next_cursor"]
+              @json = NotionCache.instance.page_property_request @property.property_cache.page_id, @property.property_id, @query.query_json
+              @index = 0
+              @has_more = @json["has_more"]
+            else
+              @has_content = false
+            end
+          else
+            @has_content = false
+          end
+        end
       end
       self
     end

data/lib/notion_ruby_mapping/blocks/page.rb

@@ -26,7 +26,7 @@ module NotionRubyMapping
     # @param [String] title
     # @param [Array<String, Property>] assigns
     # @return [NotionRubyMapping::Database]
-    # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#2e8ca5408afb4f83a92b7b84c0dc9903
+    # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#71f680d59b874930bf9f488a7cd6a49e
     def build_child_database(title, *assigns)
       db = Database.new json: {"title" => [TextObject.new(title).property_values_json]},
                         assign: assigns, parent: {"type" => "page_id", "page_id" => @id}
@@ -34,18 +34,19 @@ module NotionRubyMapping
       db
     end
 
+    # @param [String] title
+    # @param [Array<String, Property>] assigns
+    # @return [NotionRubyMapping::Database]
+    # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#e3f1d21e0f724f589e48431468772eed
     def create_child_database(title, *assigns, dry_run: false)
-      build_child_database title, *assigns
-      db = Database.new json: {"title" => [TextObject.new(title).property_values_json]},
-                        assign: assigns, parent: {"type" => "page_id", "page_id" => @id}
-      yield db, db.properties
-      db.save dry_run: dry_run
+      build_child_database(title, *assigns).save dry_run: dry_run
     end
 
     # @return [String] title
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#2ff7209055f346fbbda454cdbb40b1c8
     def title
-      properties.select { |p| p.is_a? TitleProperty }.map(&:full_text).join ""
+      tp = properties.select { |p| (p.is_a?(TitleProperty)) || (p.is_a?(Property) && p.property_id == "title") }
+      tp.map(&:full_text).join ""
     end
 
     protected

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -183,6 +183,20 @@ module NotionRubyMapping
       "v1/pages/#{page_id}"
     end
 
+    # @param [String] page_id
+    # @param [String] property_id
+    # @return [String (frozen)] page_property_path
+    def page_property_path(page_id, property_id)
+      [page_path(page_id), "properties/#{property_id}"].join "/"
+    end
+
+    # @param [String] page_id
+    # @param [String] property_id
+    # @return [Hash] response
+    def page_property_request(page_id, property_id, query = {})
+      request :get, page_property_path(page_id, property_id), query
+    end
+
     # @param [String] page_id
     # @return [Hash] response
     def page_request(page_id)

data/lib/notion_ruby_mapping/controllers/payload.rb

@@ -15,6 +15,7 @@ module NotionRubyMapping
 
     # @return [Hash] {}
     def clear
+      @update_block_key = []
       @json = {}
     end
 

data/lib/notion_ruby_mapping/controllers/property_cache.rb

@@ -4,23 +4,26 @@ module NotionRubyMapping
   # PropertyCache class
   class PropertyCache
     include Enumerable
-    def initialize(json = {}, base_type: :page)
+    def initialize(json = {}, base_type: :page, page_id: nil)
       @properties = {}
       @json = json
       @base_type = base_type
+      @page_id = page_id
     end
     attr_writer :json
+    attr_reader :page_id
 
     # @param [String] key
     # @return [Property] Property for key
     # @see https://www.notion.so/hkob/PropertyCache-2451fa64a814432db4809831cc77ba25#9709e2b2a7a0479f9951291a501f65c8
     def [](key)
-      @properties[key] ||= Property.create_from_json key, @json[key], @base_type
+      @properties[key] ||= Property.create_from_json key, @json[key], @base_type, self
     end
 
     # @param [Property] property added Property
     def add_property(property)
       @properties[property.name] = property
+      property.property_cache = self
       self
     end
 

data/lib/notion_ruby_mapping/controllers/rich_text_array.rb

@@ -46,6 +46,13 @@ module NotionRubyMapping
       @rich_text_objects[index]
     end
 
+    # @return [FalseClass]
+    def clear_will_update
+      @will_update = false
+      @rich_text_objects.each(&:clear_will_update)
+      false
+    end
+
     # @param [Array] json
     # @return [Array] RichTextArray
     def create_from_json(json = [])

data/lib/notion_ruby_mapping/objects/rich_text_object.rb

@@ -73,6 +73,11 @@ module NotionRubyMapping
       }.merge annotations_json
     end
 
+    # @return [FalseClass]
+    def clear_will_update
+      @will_update = false
+    end
+
     # @param [String] url
     # @return [String] input text
     def href=(url)

data/lib/notion_ruby_mapping/properties/checkbox_property.rb

@@ -33,8 +33,8 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [Boolean, Hash] json
-    def initialize(name, will_update: false, base_type: :page, json: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, property_cache: nil, json: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = if database?
                 json || {}
               else

data/lib/notion_ruby_mapping/properties/created_by_property.rb

@@ -22,8 +22,8 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [String] user_id user_id (optional)
     # @param [Hash] json json (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = if database?
                 json || {}
               else
@@ -37,5 +37,12 @@ module NotionRubyMapping
       cb = json["created_by"]
       @json = database? ? cb : UserObject.new(json: cb)
     end
+
+    ## Page property only methods
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/properties/created_time_property.rb

@@ -21,10 +21,17 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [String] json created_time value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = json
       @json ||= {} if database?
     end
+
+    ## Page property only methods
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/properties/date_property.rb

@@ -75,8 +75,8 @@ module NotionRubyMapping
     # @param [Date, Time, DateTime, String, nil] start_date
     # @param [Date, Time, DateTime, String, nil] end_date
     # @param [String, nil] time_zone
-    def initialize(name, will_update: false, base_type: :page, json: nil, start_date: nil, end_date: nil, time_zone: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, start_date: nil, end_date: nil, time_zone: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = json || {}
       return if database?
 

data/lib/notion_ruby_mapping/properties/email_property.rb

@@ -32,8 +32,8 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = json || {}
     end
 

data/lib/notion_ruby_mapping/properties/files_property.rb

@@ -19,14 +19,22 @@ module NotionRubyMapping
       @file_names = Array(files)
     end
 
+    def file_names=(file_names = [])
+      array_file_names = Array(file_names)
+      raise StandardError, "files and file_names must be the same sizes." unless @files.length == array_file_names.length
+
+      @will_update = true
+      @file_names = array_file_names
+    end
+
     ### Not public announced methods
 
     ## Common methods
 
     # @param [String] name Property name
     # @param [String] files files value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, files: [])
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, files: [], property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       if database?
         @files = json || {}
       elsif json
@@ -58,7 +66,7 @@ module NotionRubyMapping
       @files = json["files"].map { |sub_json| FileObject.new json: sub_json }
       @file_names = json["files"].map { |sub_json| sub_json["name"] }
       @will_update = false
-      p self
+      self
     end
 
     protected

data/lib/notion_ruby_mapping/properties/formula_property.rb

@@ -41,8 +41,8 @@ module NotionRubyMapping
 
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, will_update: false, base_type: :page, json: nil, formula: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, formula: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = json || {}
       return unless database?
 
@@ -62,6 +62,13 @@ module NotionRubyMapping
       ans
     end
 
+    ## Page property only methods
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      {}
+    end
+
     protected
 
     ## Database property only methods

data/lib/notion_ruby_mapping/properties/last_edited_by_property.rb

@@ -22,8 +22,8 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [String] user_id user_id (optional)
     # @param [Hash] json json (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = if database?
                 json || {}
               else
@@ -38,5 +38,12 @@ module NotionRubyMapping
       leb = json["last_edited_by"]
       @json = database? ? leb : UserObject.new(json: leb)
     end
+
+    ## Page property only methods
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/properties/last_edited_time_property.rb

@@ -21,10 +21,17 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [String] json last_edited_time value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = json
       @json ||= {} if database?
     end
+
+    ## Page property only methods
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/properties/multi_select_property.rb

@@ -61,8 +61,8 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash] json
     # @param [Array<String>, String] multi_select
-    def initialize(name, will_update: false, base_type: :page, json: nil, multi_select: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, multi_select: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       if database?
         @json = json || {"options" => []}
       else

data/lib/notion_ruby_mapping/properties/number_property.rb

@@ -53,8 +53,8 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [Float, Integer, Hash] json Number value or format Hash
-    def initialize(name, will_update: false, base_type: :page, json: nil, format: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, format: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = json
       @json ||= {"format" => (format || "number")} if database?
     end

data/lib/notion_ruby_mapping/properties/people_property.rb

@@ -39,17 +39,21 @@ module NotionRubyMapping
 
     ## Common methods
 
+    def self.people_from_json(json)
+      List.new(json: json, property: self).select { true }
+    end
+
     # @param [String] name
     # @param [Hash] json
     # @param [Array] people ids for people
-    def initialize(name, will_update: false, base_type: :page, json: nil, people: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, people: nil, property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
       @json = if database?
                 {}
               elsif people
                 Array(people).map { |uo| UserObject.user_object(uo) }
               elsif json
-                json.map { |p| UserObject.new json: p }
+                PeopleProperty.people_from_json json
               else
                 []
               end
@@ -72,7 +76,7 @@ module NotionRubyMapping
     # @return [Hash, Array]
     def update_from_json(json)
       @will_update = false
-      @json = database? ? {} : json["people"].map { |p_json| UserObject.new json: p_json }
+      @json = database? ? {} : PeopleProperty.people_from_json(json)
     end
   end
 end

data/lib/notion_ruby_mapping/properties/phone_number_property.rb

@@ -34,13 +34,12 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = database? ? {} : json
     end
 
     ## Page property only methods
-
     # @return [Hash]
     def property_values_json
       assert_page_property __method__

data/lib/notion_ruby_mapping/properties/property.rb

@@ -1,13 +1,30 @@
 # frozen_string_literal: true
+#
+require "forwardable"
 
 module NotionRubyMapping
   # abstract class for property
   class Property
+    extend Forwardable
+
     ### Public announced methods
 
     ## Common methods
 
-    attr_reader :name, :will_update
+    attr_reader :name, :will_update, :property_id
+    attr_accessor :property_cache
+
+    def_delegators :retrieve_page_property, :<<, :[], :add_person, :add_relation, :checkbox, :checkbox=, :created_by,
+                   :created_time, :date, :each, :email, :email=, :end_date, :end_date=, :files, :files=, :filter_after,
+                   :filter_before, :filter_contains, :filter_does_not_contain, :filter_does_not_equal,
+                   :filter_ends_with, :filter_equals, :filter_greater_than, :filter_greater_than_or_equal_to,
+                   :filter_is_empty, :filter_is_not_empty, :filter_less_than, :filter_less_than_or_equal_to,
+                   :filter_next_month, :filter_next_week, :filter_next_year, :filter_on_or_after, :filter_on_or_before,
+                   :filter_past_month, :filter_past_week, :filter_past_year, :filter_starts_with, :formula, :full_text,
+                   :last_edited_by, :last_edited_time, :multi_select, :multi_select=, :multi_select_names, :number,
+                   :number=, :people, :people=, :phone_number, :phone_number=, :property_values_json, :relation=,
+                   :rollup, :start_date, :start_date=, :time_zone, :time_zone=, :select, :select=, :select_name, :url,
+                   :url=
 
     ## Database property only methods
 
@@ -32,7 +49,7 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @return [Property] generated Property object
-    def initialize(name, will_update: false, base_type: :page)
+    def initialize(name, will_update: false, base_type: :page, property_id: nil, property_cache: nil, query: nil)
       @name = name
       @will_update = will_update
       @base_type = base_type
@@ -40,39 +57,64 @@ module NotionRubyMapping
       @remove = false
       @new_name = nil
       @json = nil
+      @property_id = property_id
+      @property_cache = property_cache
+      @query = query
     end
 
     # @param [String] name
     # @param [Hash] input_json
     # @return [NotionRubyMapping::Property, nil] generated Property object
-    def self.create_from_json(name, input_json, base_type = :page)
+    # @param [Symbol] base_type :page or :database
+    # @param [String, nil] page_id
+    def self.create_from_json(name, input_json, base_type = :page, property_cache = nil, query = nil)
       raise StandardError, "Property not found: #{name}:#{input_json}" if input_json.nil?
 
       type = input_json["type"]
-      klass = {
-        "checkbox" => CheckboxProperty,
-        "created_time" => CreatedTimeProperty,
-        "date" => DateProperty,
-        "formula" => FormulaProperty,
-        "last_edited_time" => LastEditedTimeProperty,
-        "rollup" => RollupProperty,
-        "email" => EmailProperty,
-        "files" => FilesProperty,
-        "created_by" => CreatedByProperty,
-        "last_edited_by" => LastEditedByProperty,
-        "multi_select" => MultiSelectProperty,
-        "people" => PeopleProperty,
-        "relation" => RelationProperty,
-        "number" => NumberProperty,
-        "phone_number" => PhoneNumberProperty,
-        "select" => SelectProperty,
-        "title" => TitleProperty,
-        "rich_text" => RichTextProperty,
-        "url" => UrlProperty,
-      }[type]
-      raise StandardError, "Irregular property type: #{type}" unless klass
-
-      klass.new name, json: input_json[type], base_type: base_type
+      if type.nil?
+        new name, property_id: input_json["id"], base_type: base_type, property_cache: property_cache, query: query
+      elsif type == "property_item"
+        tmp = new name, property_id: input_json["property_item"]["id"], base_type: base_type,
+                  property_cache: property_cache, query: query
+        objects = List.new(json: input_json, property: tmp, query: query).select { true }
+        case input_json["property_item"]["type"]
+        when "people"
+          PeopleProperty.new name, people: objects, base_type: base_type, property_cache: property_cache, query: query
+        when "relation"
+          RelationProperty.new name, relation: objects, base_type: base_type, property_cache: property_cache, query: query
+        when "rich_text"
+          RichTextProperty.new name, text_objects: objects, base_type: base_type, property_cache: property_cache, query: query
+        when "rollup"
+          RollupProperty.new name, json: objects, base_type: base_type, property_cache: property_cache, query: query
+        when "title"
+          TitleProperty.new name, text_objects: objects, base_type: base_type, property_cache: property_cache, query: query
+        end
+      else
+        klass = {
+          "checkbox" => CheckboxProperty,
+          "created_time" => CreatedTimeProperty,
+          "date" => DateProperty,
+          "formula" => FormulaProperty,
+          "last_edited_time" => LastEditedTimeProperty,
+          "rollup" => RollupProperty,
+          "email" => EmailProperty,
+          "files" => FilesProperty,
+          "created_by" => CreatedByProperty,
+          "last_edited_by" => LastEditedByProperty,
+          "multi_select" => MultiSelectProperty,
+          "relation" => RelationProperty,
+          "number" => NumberProperty,
+          "people" => PeopleProperty,
+          "phone_number" => PhoneNumberProperty,
+          "select" => SelectProperty,
+          "title" => TitleProperty,
+          "rich_text" => RichTextProperty,
+          "url" => UrlProperty,
+        }[type]
+        raise StandardError, "Irregular property type: #{type}" unless klass
+
+        klass.new name, json: input_json[type], base_type: base_type, property_cache: property_cache
+      end
     end
 
     # @return [FalseClass]
@@ -85,6 +127,11 @@ module NotionRubyMapping
       @base_type == :database
     end
 
+    # @return [TrueClass, FalseClass] true if it has Property contents
+    def contents?
+      !instance_of? Property
+    end
+
     # @param [String] key query parameter
     # @param [Object] value query value
     # @return [NotionRubyMapping::Query] generated Query object
@@ -108,7 +155,9 @@ module NotionRubyMapping
     # @param [Hash] json
     def update_from_json(json)
       @will_update = false
-      @json = json[type]
+      return unless contents?
+
+      @json = json[type] if json[type] && json[type] != "property_item"
     end
 
     # @return [Symbol] property type
@@ -148,12 +197,16 @@ module NotionRubyMapping
       raise StandardError, "#{method} can execute only Page property." unless @base_type == :page
     end
 
-    ## Page property only methods
-
-    # @return [Hash] {} created_time cannot be updated
-    def property_values_json
+    # @return [NotionRubyMapping::Property, Array<UserObject>, nil]
+    def retrieve_page_property
       assert_page_property __method__
-      {}
+      raise StandardError, "property_cache.page_id is empty" if @property_cache.page_id.nil?
+
+      json = NotionCache.instance.page_property_request @property_cache.page_id, @property_id,
+                                                        (@query&.query_json || {})
+      new_property = self.class.create_from_json @name, json, :page, @property_cache, @query
+      @property_cache.add_property new_property
+      new_property
     end
 
     protected

data/lib/notion_ruby_mapping/properties/relation_property.rb

@@ -54,10 +54,11 @@ module NotionRubyMapping
     # @param [String] database_id
     # @param [String] synced_property_name
     # @see https://www.notion.so/hkob/RelationProperty-f608ab41a1f0476b98456620346fba03#7f5029fb7f6e4c009f22888b233e6f64
-    def replace_relation_database(database_id: nil, synced_property_name: nil)
+    def replace_relation_database(database_id: nil, type: "dual_property", synced_property_name: nil)
       assert_database_property __method__
       @will_update = true
       @json["database_id"] = database_id if database_id
+      @json["type"] = type
       @json["synced_property_name"] = synced_property_name if synced_property_name
       @json
     end
@@ -69,8 +70,8 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash, Array] json
     # @param [String, Array] relation
-    def initialize(name, will_update: false, json: nil, relation: nil, base_type: :page)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, json: nil, relation: nil, base_type: :page, property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
       @json = if database?
                 json || {}
               elsif relation

data/lib/notion_ruby_mapping/properties/rollup_property.rb

@@ -71,8 +71,8 @@ module NotionRubyMapping
 
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, will_update: false, json: nil, base_type: :page)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, json: nil, base_type: :page, property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
       @json = json || {}
     end
 
@@ -92,6 +92,13 @@ module NotionRubyMapping
       ans
     end
 
+    ## Page property only methods
+
+    def property_values_json
+      assert_page_property __method__
+      {}
+    end
+
     protected
 
     ## Database property only methods

data/lib/notion_ruby_mapping/properties/select_property.rb

@@ -74,8 +74,8 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [Hash] json
     # @param [String] select String value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, select: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, select: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = if database?
                 json || {"options" => []}
               else

data/lib/notion_ruby_mapping/properties/text_property.rb

@@ -27,10 +27,10 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash, Array] json
     # @param [Array<RichTextObject>] text_objects
-    def initialize(name, will_update: false, base_type: :page, json: nil, text_objects: nil)
+    def initialize(name, will_update: false, base_type: :page, json: nil, text_objects: nil, property_cache: nil, query: nil)
       raise StandardError, "TextObject is abstract class.  Please use RichTextProperty." if instance_of? TextProperty
 
-      super name, will_update: will_update, base_type: base_type
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
       @text_objects = if database?
                         json || {}
                       else
@@ -38,6 +38,13 @@ module NotionRubyMapping
                       end
     end
 
+    # @return [FalseClass]
+    def clear_will_update
+      super
+      @text_objects.clear_will_update
+      false
+    end
+
     # @return [TrueClass, FalseClass] will update?
     def will_update
       @will_update || page? && @text_objects.will_update

data/lib/notion_ruby_mapping/properties/title_property.rb

@@ -9,18 +9,30 @@ module NotionRubyMapping
 
     ## Common methods
 
+    def self.rich_text_array_from_json(json)
+      rich_text_objects = List.new(json: json, property: self).select { true }
+      RichTextArray.rich_text_array "title", rich_text_objects
+    end
+
     # @param [Hash] json
     def update_from_json(json)
       @will_update = false
       if database?
         @json = json || {}
       else
-        @text_objects = RichTextArray.new "rich_text", json: json["title"]
+        @text_objects = TitleProperty.rich_text_array_from_json json
       end
     end
 
     ## Page property only methods
 
+    # @return [FalseClass]
+    def clear_will_update
+      super
+      @text_objects.clear_will_update
+      false
+    end
+
     # @return [Hash] created json
     def property_values_json
       assert_page_property __method__

data/lib/notion_ruby_mapping/properties/url_property.rb

@@ -34,8 +34,8 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil)
-      super name, will_update: will_update, base_type: base_type
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
       @json = json || (database? ? {} : nil)
     end
 

data/lib/notion_ruby_mapping/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "0.5.4"
-  NOTION_VERSION = "2022-02-22"
+  VERSION = "0.6.1"
+  NOTION_VERSION = "2022-06-28"
 end

data/tools/createErDiagram.rb

@@ -0,0 +1,46 @@
+#! /usr/bin/env ruby
+
+require "notion_ruby_mapping"
+include NotionRubyMapping
+
+def append_database(text, db)
+  text << "#{db_title db} {"
+  db.properties.reject { |p| p.is_a? RelationProperty }.each_with_index do |p, i|
+    class_name = p.class.name.split("::").last.sub /Property/, ""
+    text << %Q[  #{class_name} p#{i} "#{p.name}"]
+  end
+  text << "}\n"
+end
+
+def db_title(db)
+  db.database_title.full_text.gsub " ", "_"
+end
+
+if ARGV.length < 2
+  print "Usage: createErDiagram.rb top_database_id code_block_id"
+  exit
+end
+database_id, code_block_id = ARGV
+NotionCache.instance.create_client ENV["NOTION_API_KEY"]
+block = Block.find code_block_id
+unless block.is_a? CodeBlock
+  print "#{code_block_id} is not CodeBlock's id"
+end
+dbs = [Database.find(database_id)]
+text = %w[erDiagram]
+
+finished = {}
+until dbs.empty?
+  db = dbs.shift
+  finished[db] = true
+  append_database(text, db)
+  db.properties.select { |p| p.is_a? RelationProperty }.each_with_index do |p, i|
+    new_db = Database.find p.relation_database_id
+    text << "#{db_title db} ||--o{ #{db_title new_db} : r#{i}"
+    dbs << new_db unless finished[new_db]
+  end
+  text << ""
+end
+block.rich_text_array.rich_text_objects = text.join("\n  ")
+block.language = "mermaid"
+block.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.1
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -231,6 +231,7 @@ files:
 - notion_ruby_mapping.gemspec
 - sig/notion_ruby_mapping.rbs
 - tools/an
+- tools/createErDiagram.rb
 homepage: https://github.com/hkob/notion_ruby_mapping.git
 licenses:
 - MIT