notion_ruby_mapping 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9297c2ca59117bacfab46da55e60bda063c3a08a1bfc0acdd5b8e9b7b029c52
-  data.tar.gz: fdcfc87ab82132cebedf50f99c174793c74e952cc35608b60935e2bd158a2df6
+  metadata.gz: 1372e3b57aef4a44d060751e07ba15bd224d23b974ff46426ac4e40a10c0b0b6
+  data.tar.gz: b6310155b12dcb73f022bd9415667c67b8a78246377622128fb0bcd2eccb4bd9
 SHA512:
-  metadata.gz: 0f01ba2a798cd79e608b244a6c9c0157f92b1f7e2f9bd4fd4772b38e60f708d1da5a70ffda0816b8aa136282da49d118ff04ede19a363674c3277b3095a34e91
-  data.tar.gz: 6135423f52bdc33585247ef2c144a49492b54a28d18ae7429d8f4df9791f4d4189d570c2b381b89f939d0b2e2e1914276172b603f612038dbfc7c495ea250c01
+  metadata.gz: 01a32f40c022b5916891409b823bf76efd02414520e14eb98dc1f7ec49901fcc60fd085c845fe71f0b38a5d3776e32a6c9bce4e5c2efb5edce750f2b24a66ff8
+  data.tar.gz: 06babf96d0c07ccc74c2ab24ccf55500ed8c75506c2e5c0c95837968795af8192eea3e773ca153254048a63204ed6fed4996a1a25f74ced78187d52114c4ca4a

data/README.md

@@ -92,6 +92,7 @@ NotionCache.instance.create_client ENV["NOTION_API_TOKEN"] # from environment
 
 ## 3. ChangeLog
 
+- 2022/11/13 [v0.6.8] remove error checking for start and end dates, add Users.all, and change Rollup and Formula query specification
 - 2022/9/2 [v0.6.7] add support for Status property, is_toggleable for headings block, and page property values
 - 2022/8/10 [v0.6.6] Bug fix(notionSitemap.rb): Skip if child page is empty.
 - 2022/8/10 [v0.6.5] add notionSitemap.rb, rename createErDiagram to notionErDiagram, and move them to exe directory

data/lib/notion_ruby_mapping/blocks/base.rb

@@ -60,7 +60,7 @@ module NotionRubyMapping
       end
     end
 
-    # @param [Object] method
+    # @param [Symbol] method
     # @param [Object] path
     # @param [nil] json
     def self.dry_run_script(method, path, json = nil)
@@ -82,6 +82,7 @@ module NotionRubyMapping
       end
     end
 
+    # @param [Boolean] dry_run true if dry_run
     def comments(query = nil, dry_run: false)
       return unless page? || block?
 
@@ -89,7 +90,7 @@ module NotionRubyMapping
         self.class.dry_run_script :get, @nc.retrieve_comments_path(@id)
       else
         ans = {}
-        List.new(comment_parent: self,
+        List.new(type: :comment_parent, value: self,
                  json: @nc.retrieve_comments_request(@id, query),
                  query: query).each do |comment|
           dt_id = comment.discussion_id
@@ -117,7 +118,7 @@ module NotionRubyMapping
     end
 
     # @param [Array<Block>] blocks
-    # @param [Boolean] dry_run
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Block, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#44bbf83d852c419485c5efe9fe1558fb
     # @see https://www.notion.so/hkob/Block-689ad4cbff50404d8a1baf67b6d6d78d#2c47f7fedae543cf8566389ba1677132
@@ -180,7 +181,7 @@ module NotionRubyMapping
     end
 
     # @param [NotionRubyMapping::Query] query
-    # @param [Boolean] dry_run
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::List, String]
     def children(query = Query.new, dry_run: false)
       if dry_run
@@ -190,7 +191,7 @@ module NotionRubyMapping
         @children
       else
         response = @nc.block_children_request @id, query.query_string
-        @children = List.new json: response, parent: self, query: query
+        @children = List.new json: response, type: :parent, value: self, query: query
       end
     end
 
@@ -236,6 +237,7 @@ module NotionRubyMapping
       is_a? Page
     end
 
+    # @param [Boolean] dry_run true if dry_run
     def parent(dry_run: false)
       parent_json = @json && @json["parent"]
       raise StandardError, "Unknown parent" if parent_json.nil?
@@ -298,7 +300,7 @@ module NotionRubyMapping
       self
     end
 
-    # @param [Boolean] dry_run
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Base, NotionRubyMapping::Database, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#277085c8439841c798a4b94eae9a7326
     def save(dry_run: false)

data/lib/notion_ruby_mapping/blocks/block.rb

@@ -64,6 +64,7 @@ module NotionRubyMapping
 
     # @see https://www.notion.so/hkob/Block-689ad4cbff50404d8a1baf67b6d6d78d#298916c7c379424682f39ff09ee38544
     # @param [String] id
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Block]
     def self.find(id, dry_run: false)
       nc = NotionCache.instance
@@ -104,7 +105,7 @@ module NotionRubyMapping
       @rich_text_array = RichTextArray.new "rich_text", json: @json[type]["rich_text"]
     end
 
-    # @param [Boolean] dry_run
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Base, String]
     def destroy(dry_run: false)
       if dry_run
@@ -114,6 +115,7 @@ module NotionRubyMapping
       end
     end
 
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Base, String]
     def update(dry_run: false)
       if dry_run

data/lib/notion_ruby_mapping/blocks/database.rb

@@ -6,6 +6,7 @@ module NotionRubyMapping
     ### Public announced methods
 
     # @param [String] id
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Database, String]
     # @see https://www.notion.so/hkob/Database-1462b24502424539a4231bedc07dc2f5#58ba9190fd544432a9e2a5823d6c33b7
     def self.find(id, dry_run: false)
@@ -49,6 +50,7 @@ module NotionRubyMapping
     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
     def create_child_page(*assign, dry_run: false)
@@ -97,6 +99,7 @@ module NotionRubyMapping
     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)
@@ -104,7 +107,7 @@ module NotionRubyMapping
         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, database: self, query: query
+        List.new json: response, type: :database, value: self, query: query
       end
     end
 
@@ -130,6 +133,7 @@ module NotionRubyMapping
 
     protected
 
+    # @param [Boolean] dry_run true if dry_run
     def create(dry_run: false)
       if dry_run
         dry_run_script :post, @nc.databases_path, :property_schema_json
@@ -145,6 +149,7 @@ module NotionRubyMapping
       @nc.database_request @id
     end
 
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Base, String]
     def update(dry_run: false)
       if dry_run

data/lib/notion_ruby_mapping/blocks/list.rb

@@ -5,14 +5,23 @@ module NotionRubyMapping
   class List < Base
     include Enumerable
 
-    def initialize(json: nil, id: nil, database: nil, parent: nil, property: nil, comment_parent: nil, query: nil)
+    def initialize(json: nil, id: nil, type: nil, value: nil, query: nil)
       super(json: json, id: id)
       @has_more = @json["has_more"]
       @load_all_contents = !@has_more
-      @database = database
-      @parent = parent
-      @property = property
-      @comment_parent = comment_parent
+
+      case type
+      when :comment_parent
+        @comment_parent = value
+      when :database
+        @database = value
+      when :parent
+        @parent = value
+      when :property
+        @property = value
+      when :user_object
+        @user_object = true
+      end
       @query = query
       @index = 0
       @has_content = true
@@ -60,6 +69,11 @@ module NotionRubyMapping
                  query: -> { @nc.retrieve_comments_request @comment_parent.id, @query },
                  create_object: ->(json) { CommentObject.new json: json },
                  &block
+      elsif @user_object
+        each_sub base: @user_object,
+                 query: -> { @nc.users_request @query.query_json },
+                 create_object: ->(json) { UserObject.new json: json },
+                 &block
       end
       self
     end

data/lib/notion_ruby_mapping/blocks/page.rb

@@ -6,6 +6,7 @@ module NotionRubyMapping
     ### Public announced methods
 
     # @param [String] id
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Page, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#7d868b8b81c3473082bbdc7370813a4a
     def self.find(id, dry_run: false)
@@ -24,6 +25,7 @@ module NotionRubyMapping
       get key
     end
 
+    # @param [Boolean] dry_run true if dry_run
     def append_comment(text_objects, dry_run: false)
       rto = RichTextArray.new "rich_text", text_objects: text_objects, will_update: true
       json = rto.property_schema_json.merge({"parent" => {"page_id" => @id}})
@@ -47,6 +49,7 @@ module NotionRubyMapping
 
     # @param [String] title
     # @param [Array<String, Property>] assigns
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Database, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#e3f1d21e0f724f589e48431468772eed
     def create_child_database(title, *assigns, dry_run: false)
@@ -62,6 +65,7 @@ module NotionRubyMapping
 
     protected
 
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Base, String]
     def create(dry_run: false)
       if dry_run
@@ -77,6 +81,7 @@ module NotionRubyMapping
       @nc.page_request @id
     end
 
+    # @param [Boolean] dry_run true if dry_run
     # @return [NotionRubyMapping::Base, String]
     def update(dry_run: false)
       if dry_run

data/lib/notion_ruby_mapping/controllers/discussion_thread.rb

@@ -11,7 +11,7 @@ module NotionRubyMapping
     attr_reader :discussion_id, :comments
 
     # @param [String] text_objects
-    # @param [Boolean] dry_run
+    # @param [Boolean] dry_run true if dry_run
     # @return [String, NotionRubyMapping::CommentObject]
     def append_comment(text_objects, dry_run: false)
       rto = RichTextArray.new "rich_text", text_objects: text_objects, will_update: true

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -284,5 +284,40 @@ module NotionRubyMapping
     def update_page_request(page_id, payload)
       request :patch, page_path(page_id), payload
     end
+
+    # @param [String] id user_id (with or without "-")
+    # @return [NotionRubyMapping::UserObject] UserObject object or nil
+    def user(id)
+      UserObject.new json: user_request(id)
+    end
+
+    # @param [String] user_id
+    # @return [String (frozen)] user_path
+    def user_path(user_id)
+      "v1/users/#{user_id}"
+    end
+
+    # @param [String] user_id
+    # @return [Hash] response
+    def user_request(user_id)
+      request :get, user_path(user_id)
+    end
+
+    # @return [Array<NotionRubyMapping::UserObject>] UserObject array
+    def users
+      List.new json: users_request, type: :user_object, value: true
+    end
+
+    # @return [String (frozen)] user_path
+    def users_path(option = "")
+      "v1/users#{option}"
+    end
+
+    # @param [String] user_id
+    # @param [NotionRubyMapping::Query] query query object
+    # @return [Hash] response
+    def users_request(query = Query.new)
+      request :get, users_path, query.query_json
+    end
   end
 end

data/lib/notion_ruby_mapping/objects/comment_object.rb

@@ -16,7 +16,7 @@ module NotionRubyMapping
       end
       @will_update = false
     end
-    attr_reader :will_update, :text_objects
+    attr_reader :will_update, :text_objects, :json
 
     def discussion_id
       NotionCache.instance.hex_id @json["discussion_id"]

data/lib/notion_ruby_mapping/objects/user_object.rb

@@ -6,11 +6,38 @@ module NotionRubyMapping
     # @param [String] user_id
     # @return [TextObject]
     def initialize(user_id: nil, json: {})
-      @user_id = user_id || json && json["id"]
+      @user_id = NotionCache.instance.hex_id(user_id || json && json["id"])
       @json = json
       @will_update = false
     end
-    attr_reader :will_update, :user_id
+    attr_reader :will_update, :user_id, :json
+
+    # @param [Boolean] dry_run true if dry_run
+    def self.all(dry_run: false)
+      nc = NotionCache.instance
+      if dry_run
+        Base.dry_run_script :get, nc.users_path
+      else
+        nc.users
+      end
+    end
+
+    # @param [String] user_id
+    # @param [Boolean] dry_run true if dry_run
+    # @return [NotionRubyMapping::UserObject, String]
+    def self.find(user_id, dry_run: false)
+      nc = NotionCache.instance
+      if dry_run
+        Base.dry_run_script :get, nc.user_path(user_id)
+      else
+        nc.user user_id
+      end
+    end
+
+    # @param [Boolean] dry_run true if dry_run
+    def self.find_me(dry_run: false)
+      find "me", dry_run: dry_run
+    end
 
     # @param [UserObject, String] uo
     # @return [UserObject] self or created UserObject
@@ -22,6 +49,11 @@ module NotionRubyMapping
       end
     end
 
+    # @return [String (frozen)]
+    def inspect
+      "#{self.class.name}-#{@user_id}"
+    end
+
     # @return [String]
     def name
       @json["name"]
@@ -36,7 +68,7 @@ module NotionRubyMapping
     end
 
     def user_id=(new_user_id)
-      @user_id = new_user_id
+      @user_id = NotionCache.instance.hex_id new_user_id
       @will_update = true
     end
   end

data/lib/notion_ruby_mapping/properties/checkbox_property.rb

@@ -10,7 +10,7 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @return [Boolean, Hash]
+    # @return [Boolean, Hash, nil]
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#20da1bf0cbcc4d4eb22d9125386522c2
     def checkbox
       @json

data/lib/notion_ruby_mapping/properties/date_base_property.rb

@@ -34,7 +34,7 @@ module NotionRubyMapping
     def self.start_end_time(date)
       ds = date.iso8601
       tz = Time.now.strftime "%:z"
-      %w[00:00:00 23:59:59].map {|t| [ds, "T", t, tz].join("") }
+      %w[00:00:00 23:59:59].map { |t| [ds, "T", t, tz].join("") }
     end
 
     # @param [Date, Time, DateTime, String, nil] obj
@@ -44,119 +44,121 @@ module NotionRubyMapping
       Date.parse str if str
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#5f07c4ebc4744986bfc99a43827349fc
-    def filter_equals(date, rollup = nil, rollup_type = nil)
+    def filter_equals(date, condition: nil, another_type: nil)
       if date.is_a? Date
         start_date, end_date = self.class.start_end_time date
-        if rollup
-          filter_after(start_date, rollup, rollup_type)
-            .and(filter_before(end_date, rollup, rollup_type))
+        if condition
+          filter_after(start_date, condition: condition, another_type: another_type)
+            .and(filter_before(end_date, condition: condition, another_type: another_type))
         else
-          filter_after(start_date).and(filter_before end_date)
+          filter_after(start_date, another_type: another_type)
+            .and(filter_before(end_date, another_type: another_type))
         end
       else
-        make_filter_query "equals", value_str(date), rollup, rollup_type
+        make_filter_query "equals", value_str(date), condition: condition, another_type: another_type
       end
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_does_not_equal(date, rollup = nil, rollup_type = nil)
+    def filter_does_not_equal(date, condition: nil, another_type: nil)
       if date.is_a? Date
         start_date, end_date = self.class.start_end_time date
-        if rollup
-          filter_before(start_date, rollup, rollup_type)
-            .or(filter_after(end_date, rollup, rollup_type))
+        if condition
+          filter_before(start_date, condition: condition, another_type: another_type)
+            .or(filter_after(end_date, condition: condition, another_type: another_type))
         else
-          filter_before(start_date).or(filter_after(end_date))
+          filter_before(start_date, another_type: another_type)
+            .or(filter_after(end_date, another_type: another_type))
         end
       else
-        make_filter_query "does_not_equal", value_str(date), rollup, rollup_type
+        make_filter_query "does_not_equal", value_str(date), condition: condition, another_type: another_type
       end
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#841815bfaf684964bebf3fa6712ae26c
-    def filter_before(date, rollup = nil, rollup_type = nil)
-      make_filter_query "before", value_str(date, start_time: true), rollup, rollup_type
+    def filter_before(date, condition: nil, another_type: nil)
+      make_filter_query "before", value_str(date, start_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#c0ea140866ea46f9a746b24773dc821c
-    def filter_after(date, rollup = nil, rollup_type = nil)
-      make_filter_query "after", value_str(date, end_time: true), rollup, rollup_type
+    def filter_after(date, condition: nil, another_type: nil)
+      make_filter_query "after", value_str(date, end_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#6a20ade0ee964aad81aae4c08ea29d6b
-    def filter_on_or_before(date, rollup = nil, rollup_type = nil)
-      make_filter_query "on_or_before", value_str(date, end_time: true), rollup, rollup_type
+    def filter_on_or_before(date, condition: nil, another_type: nil)
+      make_filter_query "on_or_before", value_str(date, end_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#1469e3fb3068426a8ea8492d191d1563
-    def filter_on_or_after(date, rollup = nil, rollup_type = nil)
-      make_filter_query "on_or_after", value_str(date, start_time: true), rollup, rollup_type
+    def filter_on_or_after(date, condition: nil, another_type: nil)
+      make_filter_query "on_or_after", value_str(date, start_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#707e7e848dc9417998420b65024542db
-    def filter_past_week(rollup = nil, rollup_type = nil)
-      make_filter_query "past_week", {}, rollup, rollup_type
+    def filter_past_week(condition: nil, another_type: nil)
+      make_filter_query "past_week", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#7b2d05c549204c2eb68d95020d7b97c5
-    def filter_past_month(rollup = nil, rollup_type = nil)
-      make_filter_query "past_month", {}, rollup, rollup_type
+    def filter_past_month(condition: nil, another_type: nil)
+      make_filter_query "past_month", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#9c8bf0a2398a41c8a0714a62afca3aa8
-    def filter_past_year(rollup = nil, rollup_type = nil)
-      make_filter_query "past_year", {}, rollup, rollup_type
+    def filter_past_year(condition: nil, another_type: nil)
+      make_filter_query "past_year", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#d9dc189ee8244ba8a6c863259eaa9984
-    def filter_next_week(rollup = nil, rollup_type = nil)
-      make_filter_query "next_week", {}, rollup, rollup_type
+    def filter_next_week(condition: nil, another_type: nil)
+      make_filter_query "next_week", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#0edb4dffbe6b403882255e870cc71066
-    def filter_next_month(rollup = nil, rollup_type = nil)
-      make_filter_query "next_month", {}, rollup, rollup_type
+    def filter_next_month(condition: nil, another_type: nil)
+      make_filter_query "next_month", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#b59c73dd4b1a488f95d3e8cd19853709
-    def filter_next_year(rollup = nil, rollup_type = nil)
-      make_filter_query "next_year", {}, rollup, rollup_type
+    def filter_next_year(condition: nil, another_type: nil)
+      make_filter_query "next_year", {}, condition: condition, another_type: another_type
     end
 
     # @param [Date, Time, DateTime, String, nil] obj

data/lib/notion_ruby_mapping/properties/date_property.rb

@@ -29,8 +29,8 @@ module NotionRubyMapping
     def end_date=(edt)
       assert_page_property __method__
       @will_update = true
-      sdt = start_date
-      edt = nil if sdt.class != edt.class || sdt > edt
+      # sdt = start_date
+      # edt = nil if sdt.class != edt.class || sdt > edt
       @json["end"] = edt
     end
 
@@ -46,8 +46,8 @@ module NotionRubyMapping
     def start_date=(sdt)
       assert_page_property __method__
       @will_update = true
-      edt = end_date
-      @json["end"] = nil if sdt.class != edt.class || sdt > edt
+      # edt = end_date
+      # @json["end"] = nil if sdt.class != edt.class || sdt > edt
       @json["start"] = sdt
     end
 

data/lib/notion_ruby_mapping/properties/formula_property.rb

@@ -41,7 +41,7 @@ module NotionRubyMapping
 
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, will_update: false, base_type: :page, json: nil, formula: nil, property_id: nil, 
+    def initialize(name, will_update: false, base_type: :page, json: nil, formula: 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

data/lib/notion_ruby_mapping/properties/number_property.rb

@@ -12,7 +12,7 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @return [Numeric, Hash]
+    # @return [Numeric, Hash, nil]
     # @see https://www.notion.so/hkob/NumberProperty-964ebc1948074d7ca8340187aa352d40#571b41dd33ae42039e6b982a502b7ac7
     def number
       @json

data/lib/notion_ruby_mapping/properties/people_property.rb

@@ -43,7 +43,7 @@ module NotionRubyMapping
       if json.is_a? Array
         json.map { |sub_json| UserObject.new json: sub_json }
       elsif json["object"] == "list"
-        List.new(json: json, property: self).select { true }
+        List.new(json: json, type: :property, value: self).select { true }
       else
         json["people"].map { |sub_json| UserObject.new json: sub_json }
       end

data/lib/notion_ruby_mapping/properties/property.rb

@@ -76,7 +76,7 @@ module NotionRubyMapping
       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 }
+        objects = List.new(json: input_json, type: :property, value: tmp, query: query).to_a
         case input_json["property_item"]["type"]
         when "people"
           PeopleProperty.new name, people: objects, base_type: base_type,
@@ -142,11 +142,13 @@ module NotionRubyMapping
     # @param [String] key query parameter
     # @param [Object] value query value
     # @return [NotionRubyMapping::Query] generated Query object
-    def make_filter_query(key, value, rollup = nil, rollup_type = nil)
-      if rollup
-        Query.new filter: {"property" => @name, rollup => {rollup_type => {key => value}}}
-      elsif rollup_type
-        Query.new filter: {"property" => @name, rollup_type => {key => value}}
+    def make_filter_query(key, value, condition: nil, another_type: nil)
+      if is_a? FormulaProperty
+        Query.new filter: {"property" => @name, "formula" => {another_type => {key => value}}}
+      elsif condition
+        Query.new filter: {"property" => @name, condition => {another_type => {key => value}}}
+      elsif another_type
+        Query.new filter: {"property" => @name, another_type => {key => value}}
       elsif @name == "__timestamp__"
         Query.new filter: {"timestamp" => type, type => {key => value}}
       else
@@ -235,8 +237,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#5f07c4ebc4744986bfc99a43827349fc
-    def filter_equals(value, rollup = nil, rollup_type = nil)
-      make_filter_query "equals", value, rollup, rollup_type
+    def filter_equals(value, condition: nil, another_type: nil)
+      make_filter_query "equals", value, condition: condition, another_type: another_type
     end
 
     # @param [String, Number] value Query value
@@ -244,8 +246,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#a44a1875c3ef49f2b4f817291953a1d4
-    def filter_does_not_equal(value, rollup = nil, rollup_type = nil)
-      make_filter_query "does_not_equal", value, rollup, rollup_type
+    def filter_does_not_equal(value, condition: nil, another_type: nil)
+      make_filter_query "does_not_equal", value, condition: condition, another_type: another_type
     end
   end
 
@@ -258,8 +260,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#271a2ebaa1ec48acae732ca98920feab
-    def filter_contains(value, rollup = nil, rollup_type = nil)
-      make_filter_query "contains", value, rollup, rollup_type
+    def filter_contains(value, condition: nil, another_type: nil)
+      make_filter_query "contains", value, condition: condition, another_type: another_type
     end
 
     # @param [String] value Query value
@@ -267,8 +269,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#b0328e3b146f48a4ad4c9c2ee5363486
-    def filter_does_not_contain(value, rollup = nil, rollup_type = nil)
-      make_filter_query "does_not_contain", value, rollup, rollup_type
+    def filter_does_not_contain(value, condition: nil, another_type: nil)
+      make_filter_query "does_not_contain", value, condition: condition, another_type: another_type
     end
   end
 
@@ -281,16 +283,16 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/EmailProperty-39aeb5df56ea4cc1b9380574e4fdeec0#d3e098b2f38c4c8c9d3e815516cfd953
-    def filter_starts_with(value, rollup = nil, rollup_type = nil)
-      make_filter_query "starts_with", value, rollup, rollup_type
+    def filter_starts_with(value, condition: nil, another_type: nil)
+      make_filter_query "starts_with", value, condition: condition, another_type: another_type
     end
 
     # @param [String] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_ends_with(value, rollup = nil, rollup_type = nil)
-      make_filter_query "ends_with", value, rollup, rollup_type
+    def filter_ends_with(value, condition: nil, another_type: nil)
+      make_filter_query "ends_with", value, condition: condition, another_type: another_type
     end
   end
 
@@ -302,16 +304,16 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#38749dfae0854c68b4c55095d3efbff1
-    def filter_is_empty(rollup = nil, rollup_type = nil)
-      make_filter_query "is_empty", true, rollup, rollup_type
+    def filter_is_empty(condition: nil, another_type: nil)
+      make_filter_query "is_empty", true, condition: condition, another_type: another_type
     end
 
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#515659ea52b54fb48c81b813f3b705f6
-    def filter_is_not_empty(rollup = nil, rollup_type = nil)
-      make_filter_query "is_not_empty", true, rollup, rollup_type
+    def filter_is_not_empty(condition: nil, another_type: nil)
+      make_filter_query "is_not_empty", true, condition: condition, another_type: another_type
     end
   end
 
@@ -323,32 +325,32 @@ module NotionRubyMapping
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_greater_than(value, rollup = nil, rollup_type = nil)
-      make_filter_query "greater_than", value, rollup, rollup_type
+    def filter_greater_than(value, condition: nil, another_type: nil)
+      make_filter_query "greater_than", value, condition: condition, another_type: another_type
     end
 
     # @param [Number] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_less_than(value, rollup = nil, rollup_type = nil)
-      make_filter_query "less_than", value, rollup, rollup_type
+    def filter_less_than(value, condition: nil, another_type: nil)
+      make_filter_query "less_than", value, condition: condition, another_type: another_type
     end
 
     # @param [Number] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_greater_than_or_equal_to(value, rollup = nil, rollup_type = nil)
-      make_filter_query "greater_than_or_equal_to", value, rollup, rollup_type
+    def filter_greater_than_or_equal_to(value, condition: nil, another_type: nil)
+      make_filter_query "greater_than_or_equal_to", value, condition: condition, another_type: another_type
     end
 
     # @param [Number] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_less_than_or_equal_to(value, rollup = nil, rollup_type = nil)
-      make_filter_query "less_than_or_equal_to", value, rollup, rollup_type
+    def filter_less_than_or_equal_to(value, condition: nil, another_type: nil)
+      make_filter_query "less_than_or_equal_to", value, condition: condition, another_type: another_type
     end
   end
 end

data/lib/notion_ruby_mapping/properties/relation_property.rb

@@ -9,7 +9,7 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @return [Hash, Array]
+    # @return [Hash, Array, nil]
     # @see https://www.notion.so/hkob/RelationProperty-f608ab41a1f0476b98456620346fba03#6c14207b2d1340d2bbc08d17eee2cb22
     def relation
       @json
@@ -78,10 +78,8 @@ module NotionRubyMapping
                 json || {}
               elsif relation
                 Array(relation).map { |r| {"id" => r} }
-              elsif json
-                json
               else
-                []
+                json || []
               end
     end
 

data/lib/notion_ruby_mapping/properties/title_property.rb

@@ -11,7 +11,7 @@ module NotionRubyMapping
 
     def self.rich_text_array_from_json(json)
       if json["object"] == "list"
-        rich_text_objects = List.new(json: json, property: self).select { true }
+        rich_text_objects = List.new(json: json, type: :property, value: self).select { true }
         RichTextArray.rich_text_array "title", rich_text_objects
       else
         RichTextArray.new "title", json: json["title"]

data/lib/notion_ruby_mapping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday