notion_ruby_mapping 0.2.1 → 0.3.0

data/lib/notion_ruby_mapping/property_cache.rb

@@ -4,16 +4,17 @@ module NotionRubyMapping
   # PropertyCache class
   class PropertyCache
     include Enumerable
-    def initialize(json = {})
+    def initialize(json = {}, base_type: :page)
       @properties = {}
       @json = json
+      @base_type = base_type
     end
     attr_writer :json
 
     # @param [String] key
     # @return [Property] Property for key
     def [](key)
-      @properties[key] ||= Property.create_from_json key, @json[key]
+      @properties[key] ||= Property.create_from_json key, @json[key], @base_type
     end
 
     # @param [Array] key
@@ -44,7 +45,14 @@ module NotionRubyMapping
       self
     end
 
-    # @return [Hash] created json
+
+    def clear_will_update
+      @properties.each do |_, property|
+        property.clear_will_update
+      end
+    end
+
+    # @return [Hash] created property values json
     def property_values_json
       @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
@@ -53,5 +61,25 @@ module NotionRubyMapping
         end
       end
     end
+
+    # @return [Hash] created property schema json
+    def property_schema_json
+      @properties.each_with_object({}) do |(_, property), ans|
+        if property.will_update
+          ans["properties"] ||= {}
+          ans["properties"].merge! property.property_schema_json
+        end
+      end
+    end
+
+    # @return [Hash] created update property schema json
+    def update_property_schema_json
+      @properties.each_with_object({}) do |(_, property), ans|
+        if property.will_update
+          ans["properties"] ||= {}
+          ans["properties"].merge! property.update_property_schema_json
+        end
+      end
+    end
   end
 end

data/lib/notion_ruby_mapping/query.rb

@@ -49,5 +49,15 @@ module NotionRubyMapping
       @sort << {key => property.name, "direction" => "descending"}
       self
     end
+
+    # @return [Hash]
+    def query_json
+      parameters = {}
+      parameters[:filter] = filter unless filter.empty?
+      parameters[:sorts] = sort unless sort.empty?
+      parameters[:start_cursor] = start_cursor if start_cursor
+      parameters[:page_size] = page_size if page_size
+      parameters
+    end
   end
 end

data/lib/notion_ruby_mapping/relation_property.rb

@@ -5,41 +5,94 @@ module NotionRubyMapping
   class RelationProperty < MultiProperty
     TYPE = "relation"
 
-    # @param [String] name
-    # @param [Hash] json
-    # @param [String, Array<String>] relation
-    def initialize(name, will_update: false, json: nil, relation: nil)
-      super name, will_update: will_update
-      @relation = if relation
-                    Array(relation)
-                  elsif json
-                    json.map { |r| r["id"] }
-                  else
-                    []
-                  end
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Hash, Array]
+    def relation
+      @json
     end
 
-    # @param [String, Array<String>] relation a id or Array of id
-    # @return [Array<String>] settled relation Array
-    def relation=(relation)
+    ## Database property only methods
+
+    # @return [String] relation database_id
+    def relation_database_id
+      assert_database_property __method__
+      @json["database_id"]
+    end
+
+    # @param [String] database_id
+    # @param [String] synced_property_name
+    def replace_relation_database(database_id: nil, synced_property_name: nil)
+      assert_database_property __method__
       @will_update = true
-      @relation = Array(relation)
+      @json["database_id"] = database_id if database_id
+      @json["synced_property_name"] = synced_property_name if synced_property_name
+      @json
     end
 
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @relation = json["relation"].map { |r| r["id"] }
+    ### Not public announced methods
+
+    ## Common methods
+
+    # @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
+      @json = if database?
+                json || {}
+              elsif relation
+                Array(relation).map { |r| {"id" => r} }
+              elsif json
+                json
+              else
+                []
+              end
+    end
+
+    ## Database property only methods
+
+    # @return [Hash]
+    def update_property_schema_json
+      assert_database_property __method__
+      ans = super
+      return ans if ans != {} || !@will_update
+
+      ans[@name] ||= {}
+      ans[@name]["relation"] = @json
+      ans
+    end
+
+    ## Page property only methods
+
+    # @param [String, Array<String>] relation a id or Array of id
+    # @return [Array] settled relation Array
+    def relation=(page_ids)
+      assert_page_property __method__
+      @will_update = true
+      @json = Array(page_ids).map { |r| {"id" => r} }
     end
 
     # @return [Hash] created json
     def property_values_json
+      assert_page_property __method__
       {
         @name => {
           "type" => "relation",
-          "relation" => @relation.map { |rid| {"id" => rid} },
+          "relation" => @json,
         },
       }
     end
+
+    protected
+
+    ## Database property only methods
+
+    # @return [Hash]
+    def property_schema_json_sub
+      {"database_id" => relation_database_id}
+    end
   end
 end

data/lib/notion_ruby_mapping/rich_text_array.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module NotionRubyMapping
+  # RichTextObject
+  class RichTextArray
+    include Enumerable
+
+    # @param [Array] json
+    def initialize(key, json: nil, text_objects: nil, will_update: false)
+      @key = key
+      @rich_text_objects = if json
+                             create_from_json(json)
+                           elsif text_objects
+                             Array(text_objects).map do |to|
+                               RichTextObject.text_object to
+                             end
+                           else
+                             []
+                           end
+      @will_update = will_update
+    end
+
+    # @param [Array] json
+    # @return [Array] RichTextArray
+    def create_from_json(json = [])
+      json.map { |rt_json| RichTextObject.create_from_json rt_json }
+    end
+
+    # @param [Numeric] index
+    # @return [NotionRubyMapping::RichTextObject] removed RichTextObject
+    def delete_at(index)
+      @will_update = true
+      @rich_text_objects.delete_at index
+    end
+
+    # @param [Proc] block
+    # @return [Enumerator]
+    def each(&block)
+      return enum_for(:each) unless block
+
+      @rich_text_objects.each(&block)
+    end
+
+    # @return [String]
+    def full_text
+      map(&:text).join ""
+    end
+
+    def property_values_json
+      will_update ? @rich_text_objects.map(&:property_values_json) : []
+    end
+
+    def property_schema_json
+      will_update ? {@key => @rich_text_objects.map(&:property_values_json)} : {}
+    end
+
+    def update_property_schema_json
+      will_update ? {@key => @rich_text_objects.map(&:property_values_json)} : {}
+    end
+
+    # @return [TrueClass, FalseClass] true if it will update
+    def will_update
+      @will_update || @rich_text_objects.map(&:will_update).any?
+    end
+
+    # @param [String, RichTextObject] to
+    # @return [NotionRubyMapping::RichTextObject] added RichTextObject
+    def <<(to)
+      @will_update = true
+      rto = RichTextObject.text_object(to)
+      @rich_text_objects << rto
+      rto
+    end
+
+    # @param [Numeric] index index number
+    # @return [RichTextObject] selected RichTextObject
+    def [](index)
+      @rich_text_objects[index]
+    end
+  end
+end

data/lib/notion_ruby_mapping/rich_text_object.rb

@@ -14,6 +14,7 @@ module NotionRubyMapping
       @type = type
       @options = options
     end
+    attr_reader :will_update
 
     def self.create_from_json(json)
       type = json["type"]
@@ -32,8 +33,16 @@ module NotionRubyMapping
           MentionObject.new options.merge({"database_id" => mention["database"]["id"]})
         when "date"
           MentionObject.new options.merge(mention["date"].slice("start", "end", "time_zone"))
+        when "template_mention"
+          template_mention = mention["template_mention"]
+          case template_mention["type"]
+          when "template_mention_date"
+            MentionObject.new options.merge({"template_mention" => template_mention["template_mention_date"]})
+          else
+            MentionObject.new options.merge({"template_mention" => template_mention["template_mention_user"]})
+          end
         else
-          raise StandardError, json
+          raise StandardError, "Unknown mention type: #{mention["type"]}"
         end
       else
         raise StandardError, json
@@ -60,6 +69,54 @@ module NotionRubyMapping
       }.merge annotations_json
     end
 
+    # @param [String, RichTextObject] value
+    # @return [String] input text
+    def plain_text=(value)
+      text(value)
+    end
+
+    # @param [Boolean] flag
+    # @return [Boolean] input flag
+    def bold=(flag)
+      @will_update = true
+      @options["bold"] = flag
+    end
+
+    # @param [Boolean] flag
+    # @return [Boolean] input flag
+    def italic=(flag)
+      @will_update = true
+      @options["italic"] = flag
+    end
+
+    # @param [Boolean] flag
+    # @return [Boolean] input flag
+    def strikethrough=(flag)
+      @will_update = true
+      @options["strikethrough"] = flag
+    end
+
+    # @param [Boolean] flag
+    # @return [Boolean] input flag
+    def underline=(flag)
+      @will_update = true
+      @options["underline"] = flag
+    end
+
+    # @param [Boolean] flag
+    # @return [Boolean] input flag
+    def code=(flag)
+      @will_update = true
+      @options["code"] = flag
+    end
+
+    # @param [String] color
+    # @return [String] input color
+    def color=(color)
+      @will_update = true
+      @options["color"] = color
+    end
+
     protected
 
     # @return [Hash] options

data/lib/notion_ruby_mapping/rich_text_property.rb

@@ -5,14 +5,25 @@ module NotionRubyMapping
   class RichTextProperty < TextProperty
     TYPE = "rich_text"
 
+    ### Not public announced methods
+
+    ## Common methods
+
     # @param [Hash] json
     def update_from_json(json)
       @will_update = false
-      @text_objects = json["rich_text"].map { |to| RichTextObject.create_from_json to }
+      if database?
+        @json = json["rich_text"] || {}
+      else
+        @text_objects = RichTextArray.new "rich_text", json: json["rich_text"]
+      end
     end
 
+    ## Page property only methods
+
     # @return [Hash] created json
     def property_values_json
+      assert_page_property __method__
       text_json = @text_objects.map(&:property_values_json)
       {
         @name => {

data/lib/notion_ruby_mapping/rollup_property.rb

@@ -8,22 +8,94 @@ module NotionRubyMapping
     include GreaterThanLessThan
     TYPE = "rollup"
 
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Hash]
+    def rollup
+      @json
+    end
+
+    ## Database property only methods
+
+    # @return [String] new or settled function
+    def function
+      assert_database_property __method__
+      @json["function"]
+    end
+
+    # @param [String] func
+    def function=(func)
+      assert_database_property __method__
+      @will_update = true
+      @json["function"] = func
+    end
+
+    # @return [String] new or settled relation_property_name
+    def relation_property_name
+      assert_database_property __method__
+      @json["relation_property_name"]
+    end
+
+    # @param [String] rpn
+    def relation_property_name=(rpn)
+      assert_database_property __method__
+      @will_update = true
+      @json["relation_property_name"] = rpn
+    end
+
+    # @return [String] new or settled rollup_property_name
+    def rollup_property_name
+      assert_database_property __method__
+      @json["rollup_property_name"]
+    end
+
+    # @param [String] rpn
+    def rollup_property_name=(rpn)
+      assert_database_property __method__
+      @will_update = true
+      @json["rollup_property_name"] = rpn
+    end
+
+    ### Not public announced methods
+
+    ## Common methods
+
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, json: nil)
-      super name, will_update: false
-      @json = json
+    def initialize(name, will_update: false, json: nil, base_type: :page)
+      super name, will_update: will_update, base_type: base_type
+      @json = json || {}
     end
 
-    # @return [Hash] {} created_time cannot be updated
-    def property_values_json
-      {}
+    ## Database property only methods
+
+    # @return [Hash]
+    def update_property_schema_json
+      assert_database_property __method__
+      ans = super
+      return ans if ans != {} || !@will_update
+
+      ans[@name] ||= {}
+      ans[@name]["rollup"] ||= {}
+      ans[@name]["rollup"]["function"] = function
+      ans[@name]["rollup"]["relation_property_name"] = relation_property_name
+      ans[@name]["rollup"]["rollup_property_name"] = rollup_property_name
+      ans
     end
 
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @json = json["rollup"]
+    protected
+
+    ## Database property only methods
+
+    # @return [Hash]
+    def property_schema_json_sub
+      {
+        "function" => function,
+        "relation_property_name" => relation_property_name,
+        "rollup_property_name" => rollup_property_name,
+      }
     end
   end
 end

data/lib/notion_ruby_mapping/select_property.rb

@@ -7,30 +7,105 @@ module NotionRubyMapping
     include IsEmptyIsNotEmpty
     TYPE = "select"
 
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Hash]
+    def select
+      @json
+    end
+
+    ## Page property only methods
+
+    # @return [String]
+    def select_name
+      assert_page_property __method__
+      @json["name"]
+    end
+
+    ## Database property only methods
+
+    # @param [String] name
+    # @param [String] color
+    # @return [Array] added array
+    def add_select_options(name:, color:)
+      edit_select_options << {"name" => name, "color" => color}
+    end
+
+    # @return [Array] copyed multi select options
+    def edit_select_options
+      assert_database_property __method__
+      @will_update = true
+      @json["options"] ||= []
+    end
+
+    # @return [Array]
+    def select_options
+      assert_database_property __method__
+      @json["options"] || []
+    end
+
+    # @return [String]
+    def select_names
+      assert_database_property __method__
+      @json["options"].map { |s| s["name"] }
+    end
+
+    ## Page property only methods
+
+    # @param [String] select
+    # @return [Hash] settled value
+    def select=(select)
+      @will_update = true
+      @json = {"name" => select}
+    end
+
+    ### Not public announced methods
+
+    ## Common methods
+
     # @param [String] name Property name
     # @param [Hash] json
     # @param [String] select String value (optional)
-    def initialize(name, will_update: false, json: nil, select: nil)
-      super name, will_update: will_update
-      @select = select || json && json["name"]
+    def initialize(name, will_update: false, base_type: :page, json: nil, select: nil)
+      super name, will_update: will_update, base_type: base_type
+      @json = if database?
+                json || {"options" => []}
+              else
+                json || {"name" => select}
+              end
     end
 
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @select = json["select"]["name"]
+    ## Database property only methods
+
+    # @return [Hash]
+    def update_property_schema_json
+      assert_database_property __method__
+      ans = super
+      return ans if ans != {} || !@will_update
+
+      ans[@name] ||= {}
+      ans[@name]["select"] ||= {}
+      ans[@name]["select"]["options"] = @json["options"]
+      ans
     end
 
+    ## Page property only methods
+
     # @return [Hash]
     def property_values_json
-      {@name => {"type" => "select", "select" => (@select ? {"name" => @select} : @json)}}
+      assert_page_property __method__
+      {@name => {"type" => "select", "select" => @json}}
     end
 
-    # @param [String] select
-    # @return [String] settled value
-    def select=(select)
-      @will_update = true
-      @select = select
+    protected
+
+    ## Database property only methods
+
+    # @return [Hash]
+    def property_schema_json_sub
+      {"options" => edit_select_options}
     end
   end
 end

data/lib/notion_ruby_mapping/text_object.rb

@@ -14,66 +14,15 @@ module NotionRubyMapping
     attr_reader :text, :will_update
 
     # @param [String, RichTextObject] value
-    # @return [RichTextObject] self
     def text=(value)
       @will_update = true
       if value.is_a? RichTextObject
         @options = value.options
         @text = value.text
       else
-        p value
         @text = value
         @options["plain_text"] = value
       end
-      self
-    end
-
-    # @param [String, RichTextObject] value
-    # @return [String] input text
-    def plain_text=(value)
-      text(value)
-    end
-
-    # @param [Boolean] flag
-    # @return [Boolean] input flag
-    def bold=(flag)
-      @will_update = true
-      @options["bold"] = flag
-    end
-
-    # @param [Boolean] flag
-    # @return [Boolean] input flag
-    def italic=(flag)
-      @will_update = true
-      @options["italic"] = flag
-    end
-
-    # @param [Boolean] flag
-    # @return [Boolean] input flag
-    def strikethrough=(flag)
-      @will_update = true
-      @options["strikethrough"] = flag
-    end
-
-    # @param [Boolean] flag
-    # @return [Boolean] input flag
-    def underline=(flag)
-      @will_update = true
-      @options["underline"] = flag
-    end
-
-    # @param [Boolean] flag
-    # @return [Boolean] input flag
-    def code=(flag)
-      @will_update = true
-      @options["code"] = flag
-    end
-
-    # @param [String] color
-    # @return [String] input color
-    def color=(color)
-      @will_update = true
-      @options["color"] = color
     end
 
     protected