notion_ruby_mapping 0.2.3 → 0.3.0

data/lib/notion_ruby_mapping/date_property.rb

@@ -5,64 +5,89 @@ module NotionRubyMapping
   class DateProperty < DateBaseProperty
     TYPE = "date"
 
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Hash]
+    def date
+      @json
+    end
+
+    ## Page property only methods
+
+    # @return [Date, Time, DateTime, String]
+    def end_date
+      @json["end"]
+    end
+
+    # @param [Date, Time, DateTime, String] edt
+    def end_date=(edt)
+      @will_update = true
+      sdt = start_date
+      edt = nil if sdt.class != edt.class || sdt > edt
+      @json["end"] = edt
+    end
+
+    # @return [Date, Time, DateTime, String]
+    def start_date
+      @json["start"]
+    end
+
+    # @param [Date, Time, DateTime, String] sdt
+    def start_date=(sdt)
+      @will_update = true
+      edt = end_date
+      @json["end"] = nil if sdt.class != edt.class || sdt > edt
+      @json["start"] = sdt
+    end
+
+    # @return [String]
+    def time_zone
+      @json["time_zone"]
+    end
+
+    # @param [String] tzone
+    def time_zone=(tzone)
+      @will_update = true
+      @json["time_zone"] = tzone
+    end
+
+    ### Not public announced methods
+
+    ## Common methods
+
     # @param [String] name
     # @param [Hash] json
     # @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, json: nil, start_date: nil, end_date: nil, time_zone: nil)
-      super name, will_update: will_update
-      @start_date = start_date || json && json["start"]
-      @end_date = end_date || json && json["end"]
-      @time_zone = time_zone || json && json["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
+      @json = json || {}
+      return if database?
+
+      @json = json || {}
+      @json["start"] = start_date if start_date
+      @json["end"] = end_date if end_date
+      @json["time_zone"] = time_zone if time_zone
     end
 
+    ## Page property only methods
+
     # @return [Hash] created json
     def property_values_json
+      assert_page_property __method__
       {
         @name => {
           "type" => "date",
           "date" => {
-            "start" => value_str(@start_date),
-            "end" => value_str(@end_date),
-            "time_zone" => @time_zone,
+            "start" => value_str(@json["start"]),
+            "end" => value_str(@json["end"]),
+            "time_zone" => @json["time_zone"],
           },
         },
       }
     end
-
-    # @param [Date, Time, DateTime, String] start_date
-    # @return [Date, Time, DateTime, String]
-    def start_date=(start_date)
-      @will_update = true
-      @start_date = start_date
-      @end_date = nil if @start_date.class != @end_date.class || @start_date > @end_date
-      @start_date
-    end
-
-    # @param [Date, Time, DateTime, String] end_date
-    # @return [Date, Time, DateTime, String]
-    def end_date=(end_date)
-      @will_update = true
-      @end_date = end_date
-      @end_date = nil if @start_date.class != @end_date.class || @start_date > @end_date
-      @end_date
-    end
-
-    # @param [String] time_zone
-    # @return [Array, nil] settled array
-    def time_zone=(time_zone)
-      @will_update = true
-      @time_zone = time_zone
-    end
-
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      jd = json["date"]
-      @start_date = jd["start"]
-      @end_date = jd["end"]
-      @time_zone = jd["time_zone"]
-    end
   end
 end

data/lib/notion_ruby_mapping/email_property.rb

@@ -9,28 +9,38 @@ module NotionRubyMapping
     include IsEmptyIsNotEmpty
     TYPE = "email"
 
-    # @param [String] name Property name
-    # @param [String] email email value (optional)
-    def initialize(name, will_update: false, email: nil)
-      super name, will_update: will_update
-      @email = email
-    end
-    attr_reader :email
+    ### Public announced methods
 
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @email = json["email"]
-    end
+    ## Common methods
 
-    # @return [Hash]
-    def property_values_json
-      {@name => {"email" => @email, "type" => "email"}}
+    # @return [String, Hash]
+    def email
+      @json
     end
 
+    ## Page property only methods
+
+    # @param [String] str
     def email=(email)
       @will_update = true
-      @email = email
+      @json = email
+    end
+
+    ### Not public announced methods
+
+    ## Common methods
+
+    # @param [String] name Property name
+    # @param [String] email email value (optional)
+    def initialize(name, will_update: false, base_type: :page, json: nil)
+      super name, will_update: will_update, base_type: base_type
+      @json = json || {}
+    end
+
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      {@name => {"email" => @json, "type" => "email"}}
     end
   end
 end

data/lib/notion_ruby_mapping/files_property.rb

@@ -6,13 +6,49 @@ module NotionRubyMapping
     include IsEmptyIsNotEmpty
     TYPE = "files"
 
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Hash]
+    def files
+      @json
+    end
+
+    ## Page property only methods
+
+    def files=(files = [])
+      @will_update = true
+      @json = Array(files).map { |url| url_to_hash url }
+    end
+
+    ### Not public announced methods
+
+    ## Common methods
+
     # @param [String] name Property name
     # @param [String] files files value (optional)
-    def initialize(name, will_update: false, json: nil, files: [])
-      super name, will_update: will_update
-      @files = json || Array(files).map { |url| url_to_hash url } || []
+    def initialize(name, will_update: false, base_type: :page, json: nil, files: [])
+      super name, will_update: will_update, base_type: base_type
+      if database?
+        @json = json || {}
+      else
+        @json = json || []
+        @json = Array(files).map { |url| url_to_hash url } unless files.empty?
+      end
     end
-    attr_reader :files
+
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      if @json.map { |f| f["type"] }.include? "file"
+        {}
+      else
+        {@name => {"files" => @json, "type" => "files"}}
+      end
+    end
+
+    protected
 
     # @param [String] url
     # @return [Hash]
@@ -25,25 +61,5 @@ module NotionRubyMapping
         },
       }
     end
-
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @files = json["files"]
-    end
-
-    # @return [Hash]
-    def property_values_json
-      if @files.map { |f| f["type"] }.include? "file"
-        {}
-      else
-        {@name => {"files" => @files, "type" => "files"}}
-      end
-    end
-
-    def files=(files = [])
-      @will_update = true
-      @files = Array(files).map { |url| url_to_hash url } || []
-    end
   end
 end

data/lib/notion_ruby_mapping/formula_property.rb

@@ -8,22 +8,63 @@ module NotionRubyMapping
     include GreaterThanLessThan
     TYPE = "formula"
 
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Hash]
+    def formula
+      @json
+    end
+
+    ## Database property only methods
+
+    def formula_expression
+      assert_database_property __method__
+      @json["expression"]
+    end
+
+    # @param [String] formula
+    def formula_expression=(f_e)
+      assert_database_property __method__
+      @will_update = true
+      @json["expression"] = f_e
+    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, base_type: :page, json: nil, formula: nil)
+      super name, will_update: will_update, base_type: base_type
+      @json = json || {}
+      return unless database?
+
+      @json["expression"] = formula if formula
     end
 
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @json = json["formula"]
+    ## 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]["formula"] = @json
+      ans
     end
 
-    # @return [Hash] {} created_time cannot be updated
-    def property_values_json
-      {}
+    protected
+
+    ## Database property only methods
+
+    # @return [Hash]
+    def property_schema_json_sub
+      {"expression" => formula_expression}
     end
   end
 end

data/lib/notion_ruby_mapping/last_edited_by_property.rb

@@ -5,24 +5,37 @@ module NotionRubyMapping
   class LastEditedByProperty < MultiProperty
     TYPE = "last_edited_by"
 
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [NotionRubyMapping::UserObject, Hash]
+    def last_edited_by
+      @json
+    end
+
+    ### Not public announced methods
+
+    ## Common methods
+
     # @param [String] name Property name
     # @param [String] user_id user_id (optional)
     # @param [Hash] json json (optional)
-    def initialize(name, user_id: nil, json: nil)
-      super name, will_update: false
-      @user = UserObject.new user_id: user_id, json: json
+    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil)
+      super name, will_update: will_update, base_type: base_type
+      @json = if database?
+                json || {}
+              else
+                UserObject.new user_id: user_id, json: json
+              end
     end
     attr_reader :user
 
     # @param [Hash] json
     def update_from_json(json)
       @will_update = false
-      @user = UserObject.new json: json["last_edited_by"]
-    end
-
-    # @return [Hash] {} created_time cannot be updated
-    def property_values_json
-      {}
+      leb = json["last_edited_by"]
+      @json = database? ? leb : UserObject.new(json: leb)
     end
   end
 end

data/lib/notion_ruby_mapping/last_edited_time_property.rb

@@ -5,23 +5,25 @@ module NotionRubyMapping
   class LastEditedTimeProperty < DateBaseProperty
     TYPE = "last_edited_time"
 
-    # @param [String] name Property name
-    # @param [String] last_edited_time last_edited_time value (optional)
-    def initialize(name, last_edited_time: nil)
-      super name, will_update: false
-      @last_edited_time = last_edited_time
-    end
-    attr_reader :last_edited_time
+    ### Public announced methods
+
+    ## Common methods
 
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @last_edited_time = json["last_edited_time"]
+    # @return [Date, Hash]
+    def last_edited_time
+      @json
     end
 
-    # @return [Hash] {} created_time cannot be updated
-    def property_values_json
-      {}
+    ### Not public announced methods
+
+    ## Common methods
+
+    # @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
+      @json = json
+      @json ||= {} if database?
     end
   end
 end

data/lib/notion_ruby_mapping/list.rb

@@ -16,6 +16,8 @@ module NotionRubyMapping
     end
     attr_reader :has_more
 
+    ### Public announced methods
+
     def each
       return enum_for(:each) unless block_given?
 
@@ -53,6 +55,7 @@ module NotionRubyMapping
 
     private
 
+    # @return [Hash]
     def results
       @json["results"]
     end

data/lib/notion_ruby_mapping/multi_select_property.rb

@@ -7,41 +7,103 @@ module NotionRubyMapping
     include IsEmptyIsNotEmpty
     TYPE = "multi_select"
 
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Array, Hash]
+    def multi_select
+      @json
+    end
+
+    # @return [Array]
+    def multi_select_names
+      mshs = @base_type == :page ? @json : @json["options"]
+      mshs.map { |h| h["name"] }
+    end
+
+    ## Database property only methods
+
+    # @param [String] name
+    # @param [String] color
+    # @return [Array] added array
+    def add_multi_select_options(name:, color:)
+      edit_multi_select_options << {"name" => name, "color" => color}
+    end
+
+    # @return [Array] copyed multi select options
+    def edit_multi_select_options
+      assert_database_property __method__
+      @will_update = true
+      @json["options"] ||= []
+    end
+
+    # @return [Array]
+    def multi_select_options
+      assert_database_property __method__
+      @json["options"] || []
+    end
+
+    ## Page property only methods
+
+    # @param [Hash] multi_select
+    # @return [Array, nil] settled array
+    def multi_select=(multi_select)
+      @will_update = true
+      @json = multi_select ? Array(multi_select).map { |ms| {"name" => ms} } : []
+    end
+
+    ### Not public announced methods
+
+    ## Common methods
+
     # @param [String] name
     # @param [Hash] json
-    # @param [Array] multi_select
-    def initialize(name, will_update: false, json: nil, multi_select: nil)
-      super name, will_update: will_update
-      @multi_select = if multi_select
-                        Array(multi_select)
-                      elsif json.is_a? Array
-                        json.map { |ms| ms["name"] }
-                      else
-                        []
-                      end
+    # @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
+      if database?
+        @json = json || {"options" => []}
+      else
+        @json = json || []
+        @json = Array(multi_select).map { |ms| {"name" => ms} } unless multi_select.nil?
+      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]["multi_select"] ||= {}
+      ans[@name]["multi_select"]["options"] = @json["options"]
+      ans
     end
 
+    ## Page property only methods
+
     # @return [Hash] created json
     def property_values_json
+      assert_page_property __method__
       {
         @name => {
           "type" => "multi_select",
-          "multi_select" => @multi_select.map { |v| {"name" => v} },
+          "multi_select" => @json,
         },
       }
     end
 
-    # @param [Hash] multi_select
-    # @return [Array, nil] settled array
-    def multi_select=(multi_select)
-      @will_update = true
-      @multi_select = multi_select ? Array(multi_select) : []
-    end
+    protected
 
-    # @param [Hash] json
-    def update_from_json(json)
-      @will_update = false
-      @multi_select = json["multi_select"].map { |ms| ms["name"] }
+    ## Database property only methods
+
+    # @return [Hash]
+    def property_schema_json_sub
+      {"options" => edit_multi_select_options}
     end
   end
 end

data/lib/notion_ruby_mapping/notion_cache.rb

@@ -36,6 +36,18 @@ module NotionRubyMapping
 
     ### create path methods
 
+    # @param [String] database_id
+    # @return [String (frozen)] page_path
+    def database_path(database_id)
+      "v1/databases/#{database_id}"
+    end
+
+    # @param [String] database_id
+    # @return [String (frozen)] page_path
+    def databases_path
+      "v1/databases"
+    end
+
     # @param [String] page_id
     # @return [String (frozen)] page_path
     def page_path(page_id)
@@ -47,12 +59,6 @@ module NotionRubyMapping
       "v1/pages"
     end
 
-    # @param [String] database_id
-    # @return [String (frozen)] page_path
-    def database_path(database_id)
-      "v1/databases/#{database_id}"
-    end
-
     # @param [String] block_id
     # @return [String (frozen)] page_path
     def block_path(block_id)
@@ -135,6 +141,10 @@ module NotionRubyMapping
       request :post, "v1/pages", payload
     end
 
+    def create_database_request(payload)
+      request :post, databases_path, payload
+    end
+
     # @param [String] id id string with "-"
     # @return [String] id without "-"
     def hex_id(id)
@@ -184,13 +194,7 @@ module NotionRubyMapping
     # @param [NotionRubyMapping::Query] query query object
     # @return [NotionRubyMapping::Base] List object
     def database_query(id, query)
-      parameters = {}
-      parameters[:filter] = query.filter unless query.filter.empty?
-      parameters[:sorts] = query.sort unless query.sort.empty?
-      parameters[:start_cursor] = query.start_cursor if query.start_cursor
-      parameters[:page_size] = query.page_size if query.page_size
-
-      Base.create_from_json database_query_request(id, parameters)
+      Base.create_from_json database_query_request(id, query.query_json)
     end
 
     # @param [String] id page_id (with or without "-")