notion_ruby_mapping 0.1.4 → 0.2.0

data/env.yml.sample

@@ -1,6 +1,13 @@
 ---
 notion_token: "secret_XXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 top_page: "c01166c613ae45cbb96818b4ef2f5a77"
+unpermitted_page: "4a6eb31244204fecb488da11f3caf871"
 database: "c37a2c66e3aa4a0da44773de3b80c253"
+unpermitted_database: "668d797c76fa49349b05ad288df2d136"
 h1block: "0250fb6d600142eca4c74efb8794fc6b"
+unpermitted_block: "0c940186ab704351bb342d16f0635d49"
 db_first_page: "dcdc805c85fa4155a55c20fc28771af7"
+db_second_page: "6601e719a39a460c908e8909467fcccf"
+db_update_page: "206ffaa277744a99baf593e28730240c"
+user_hkob: "2200a911-6a96-44bb-bd38-6bfb1e01b9f6"
+parent1_page: "860753bb6d1f48de96211fa6e0e31f82"

data/lib/notion_ruby_mapping/base.rb

@@ -3,12 +3,18 @@
 module NotionRubyMapping
   # Notion Base object (Parent of Page / Database / List)
   class Base
-    def initialize(json: nil, id: nil)
+    # @param [Hash, nil] json
+    # @param [String, nil] id
+    # @param [Array<Property, Class, String>] assign
+    def initialize(json: nil, id: nil, assign: [])
       @nc = NotionCache.instance
       @json = json
-      @id = @nc.hex_id(id || @json["id"])
+      @id = @nc.hex_id(id || json && @json["id"])
+      raise StandardError, "Unknown id" if !is_a?(List) && @id.nil?
+
       @payload = nil
       @property_cache = nil
+      assign.each_slice(2) { |(klass, key)| assign_property(klass, key) }
     end
     attr_reader :json, :id
 
@@ -25,7 +31,7 @@ module NotionRubyMapping
       when "block"
         Block.new json: json
       else
-        throw Notion::Api::Errors::ObjectNotFound
+        raise StandardError, json.inspect
       end
     end
 
@@ -38,7 +44,7 @@ module NotionRubyMapping
     def properties
       unless @property_cache
         unless @json
-          return nil if @id.nil?
+          raise StandardError, "Unknown id" if @id.nil?
 
           reload
         end
@@ -47,6 +53,11 @@ module NotionRubyMapping
       @property_cache
     end
 
+    # @return [String] title
+    def title
+      properties.select { |p| p.is_a? TitleProperty }.map(&:full_text).join ""
+    end
+
     # @return [NotionRubyMapping::Base] reloaded self
     def reload
       update_json reload_json
@@ -66,26 +77,31 @@ module NotionRubyMapping
     # @param [Hash] json
     # @return [NotionRubyMapping::Base]
     def update_json(json)
-      if @json.nil? || @json["type"] == json["type"]
-        @json = json
-        @id = @nc.hex_id(@json["id"])
-        clear_object
-      end
+      raise StandardError, json.inspect unless json["object"] != "error" && @json.nil? || @json["type"] == json["type"]
+
+      @json = json
+      @id = @nc.hex_id(@json["id"])
+      restore_from_json
       self
     end
 
-    # @return [NotionRubyMapping::Base]
-    def clear_object
-      @payload = nil
-      @property_cache = nil
-      self
+    def restore_from_json
+      payload.clear
+      return if (ps = @json["properties"]).nil?
+
+      properties.json = json_properties
+      return unless is_a? Page
+
+      ps.each do |key, json|
+        properties[key].update_from_json json
+      end
     end
 
     # @param [String] emoji
     # @param [String] url
     # @return [NotionRubyMapping::Base]
     def set_icon(emoji: nil, url: nil)
-      if self.is_a?(Page) || self.is_a?(Database)
+      if is_a?(Page) || is_a?(Database)
         payload.set_icon(emoji: emoji, url: url)
         update
       end
@@ -96,9 +112,9 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::PropertyCache, Hash] obtained Page value or PropertyCache
     def [](key)
       unless @json
-        return nil if @id.nil?
+        raise StandardError, "Unknown id" if @id.nil?
 
-        update_json reload
+        reload
       end
       case key
       when "properties"
@@ -113,29 +129,20 @@ module NotionRubyMapping
       self["icon"]
     end
 
-    # @param [Property] property Property object for udpate or create
-    # @return [NotionRubyMapping::Base]
-    def add_property_for_update(property)
-      @property_cache ||= PropertyCache.new {}
-      @property_cache.add_property property, will_update: true
-      self
-    end
-
-    # @param [Class] klass
+    # @param [Property, Class] klass
     # @param [String] title
     # @return [Property] generated property
     def assign_property(klass, title)
       @property_cache ||= PropertyCache.new {}
 
-      property = klass.new(title)
-      property.will_update = true
+      property = klass.new(title, will_update: true)
       @property_cache.add_property property
       property
     end
 
     # @return [Hash] created json
-    def create_json
-      payload.create_json @property_cache&.create_json
+    def property_values_json
+      payload.property_values_json @property_cache&.property_values_json
     end
   end
 end

data/lib/notion_ruby_mapping/checkbox_property.rb

@@ -5,5 +5,31 @@ module NotionRubyMapping
   class CheckboxProperty < Property
     include EqualsDoesNotEqual
     TYPE = "checkbox"
+
+    # @param [String] name Property name
+    # @param [Boolean] checkbox Number value (optional)
+    def initialize(name, will_update: false, checkbox: false)
+      super name, will_update: will_update
+      @checkbox = checkbox
+    end
+    attr_reader :checkbox
+
+    # @param [Boolean] flag
+    # @return [TrueClass, FalseClass] settled value
+    def checkbox=(flag)
+      @will_update = true
+      @checkbox = flag
+    end
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @checkbox = json["checkbox"]
+    end
+
+    # @return [Hash]
+    def property_values_json
+      {@name => {"checkbox" => @checkbox, "type" => "checkbox"}}
+    end
   end
 end

data/lib/notion_ruby_mapping/created_by_property.rb

@@ -1,7 +1,28 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
+  # CreatedByProperty
   class CreatedByProperty < MultiProperty
     TYPE = "created_by"
+
+    # @param [String] name Property name
+    # @param [String] user_id user_id (optional)
+    # @param [Hash] json json (optional)
+    def initialize(name, json: nil, user_id: nil)
+      super name, will_update: false
+      @user = UserObject.new user_id: user_id, json: json
+    end
+    attr_reader :user
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @user = UserObject.new json: json["created_by"]
+    end
+
+    # @return [Hash] {} created_time cannot be updated
+    def property_values_json
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/created_time_property.rb

@@ -1,7 +1,27 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
+  # CreatedTimeProperty
   class CreatedTimeProperty < DateBaseProperty
     TYPE = "created_time"
+
+    # @param [String] name Property name
+    # @param [String] created_time created_time value (optional)
+    def initialize(name, created_time: nil)
+      super name, will_update: false
+      @created_time = created_time
+    end
+    attr_reader :created_time
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @created_time = json["created_time"]
+    end
+
+    # @return [Hash] {} created_time cannot be updated
+    def property_values_json
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/database.rb

@@ -7,22 +7,22 @@ module NotionRubyMapping
       NotionCache.instance.database id
     end
 
-    # @param [String] id database_id (with or without "-")
     # @param [NotionRubyMapping::Query] query object
-    def self.query(id, query = nil)
-      query ||= Query.new
-      NotionCache.instance.database_query(id, query)
+    def query_database(query = Query.new)
+      response = @nc.database_query @id, query
+      List.new json: response, database: self, query: query
     end
 
-    # @param [String] id database_id (with or without "-")
-    # @param [Payload] payload
+    # @return [NotionRubyMapping::Base]
     def update
-      update_json @nc.update_database(@id, create_json)
+      update_json @nc.update_database_request(@id, property_values_json)
     end
 
+    protected
+
     # @return [Hash]
     def reload_json
-      @nc.database_json @id
+      @nc.database_request @id
     end
   end
 end

data/lib/notion_ruby_mapping/date_base_property.rb

@@ -3,71 +3,73 @@
 require "date"
 
 module NotionRubyMapping
-  # Date base property (date, created_time, last_edited_time)
+  # Date base property (date, created_time, last_edited_time, formula)
   class DateBaseProperty < Property
     include IsEmptyIsNotEmpty
 
-    # @param [Date, Time, DateTime, String, nil] obj
-    # @return [String] iso8601 format string
-    def value_str(obj)
-      case obj
-      when Date
-        obj.iso8601
-      when Time
-        obj.strftime("%Y-%m-%dT%H:%M:%S%:z")
-      when DateTime
-        obj.iso8601
-      else
-        obj
-      end
+    def filter_equals(date, rollup = nil, rollup_type = nil)
+      make_filter_query "equals", value_str(date), rollup, rollup_type
     end
 
-    def filter_equals(value)
-      make_filter_query "equals", value_str(value)
+    def filter_does_not_equal(date, rollup = nil, rollup_type = nil)
+      make_filter_query "does_not_equal", value_str(date), rollup, rollup_type
     end
 
-    def filter_does_not_equal(value)
-      make_filter_query "does_not_equal", value_str(value)
+    def filter_before(date, rollup = nil, rollup_type = nil)
+      make_filter_query "before", value_str(date), rollup, rollup_type
     end
 
-    def filter_before(value)
-      make_filter_query "before", value_str(value)
+    def filter_after(date, rollup = nil, rollup_type = nil)
+      make_filter_query "after", value_str(date), rollup, rollup_type
     end
 
-    def filter_after(value)
-      make_filter_query "after", value_str(value)
+    def filter_on_or_before(date, rollup = nil, rollup_type = nil)
+      make_filter_query "on_or_before", value_str(date), rollup, rollup_type
     end
 
-    def filter_on_or_before(value)
-      make_filter_query "on_or_before", value_str(value)
+    def filter_on_or_after(date, rollup = nil, rollup_type = nil)
+      make_filter_query "on_or_after", value_str(date), rollup, rollup_type
     end
 
-    def filter_on_or_after(value)
-      make_filter_query "on_or_after", value_str(value)
+    def filter_past_week(rollup = nil, rollup_type = nil)
+      make_filter_query "past_week", {}, rollup, rollup_type
     end
 
-    def filter_past_week
-      make_filter_query "past_week", {}
+    def filter_past_month(rollup = nil, rollup_type = nil)
+      make_filter_query "past_month", {}, rollup, rollup_type
     end
 
-    def filter_past_month
-      make_filter_query "past_month", {}
+    def filter_past_year(rollup = nil, rollup_type = nil)
+      make_filter_query "past_year", {}, rollup, rollup_type
     end
 
-    def filter_past_year
-      make_filter_query "past_year", {}
+    def filter_next_week(rollup = nil, rollup_type = nil)
+      make_filter_query "next_week", {}, rollup, rollup_type
     end
 
-    def filter_next_week
-      make_filter_query "next_week", {}
+    def filter_next_month(rollup = nil, rollup_type = nil)
+      make_filter_query "next_month", {}, rollup, rollup_type
     end
 
-    def filter_next_month
-      make_filter_query "next_month", {}
+    def filter_next_year(rollup = nil, rollup_type = nil)
+      make_filter_query "next_year", {}, rollup, rollup_type
     end
 
-    def filter_next_year
-      make_filter_query "next_year", {}
+    protected
+
+    # @param [Date, Time, DateTime, String, nil] obj
+    # @return [String] iso8601 format string
+    def value_str(obj)
+      case obj
+      when Date
+        obj.iso8601
+      when Time
+        obj.strftime("%Y-%m-%dT%H:%M:%S%:z")
+      when DateTime
+        obj.iso8601
+      else
+        obj
+      end
     end
   end
 end

data/lib/notion_ruby_mapping/date_property.rb

@@ -1,44 +1,68 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
+  # DateProperty
   class DateProperty < DateBaseProperty
     TYPE = "date"
 
     # @param [String] name
     # @param [Hash] json
-    # @param [Array] multi_select
-    def initialize(name, json: nil, start_date: nil, end_date: nil, time_zone: nil)
-      super(name, json: json)
-      @end_date = end_date
-      @start_date = start_date || end_date
-      @time_zone = time_zone
+    # @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"]
     end
 
     # @return [Hash] created json
-    def create_json
-      if @end_date
-        {"date" => {"start" => value_str(@start_date || @end_date), "end" => value_str(@end_date)}}
-      elsif @start_date
-        {"date" => {"start" => value_str(@start_date)}}
-      else
-        {"date" => @json || {}}
-      end
+    def property_values_json
+      {
+        @name => {
+          "type" => "date",
+          "date" => {
+            "start" => value_str(@start_date),
+            "end" => value_str(@end_date),
+            "time_zone" => @time_zone,
+          },
+        },
+      }
     end
 
-    # @param [Hash] multi_select
-    # @return [Array, nil] settled array
+    # @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 [Hash] multi_select
-    # @return [Array, nil] settled array
+    # @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

@@ -1,7 +1,36 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  class EmailProperty < TextProperty
+  # EmailProperty
+  class EmailProperty < Property
+    include EqualsDoesNotEqual
+    include ContainsDoesNotContain
+    include StartsWithEndsWith
+    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
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @email = json["email"]
+    end
+
+    # @return [Hash]
+    def property_values_json
+      {@name => {"email" => @email, "type" => "email"}}
+    end
+
+    def email=(email)
+      @will_update = true
+      @email = email
+    end
   end
 end

data/lib/notion_ruby_mapping/files_property.rb

@@ -5,5 +5,45 @@ module NotionRubyMapping
   class FilesProperty < Property
     include IsEmptyIsNotEmpty
     TYPE = "files"
+
+    # @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 } || []
+    end
+    attr_reader :files
+
+    # @param [String] url
+    # @return [Hash]
+    def url_to_hash(url)
+      {
+        "name" => url,
+        "type" => "external",
+        "external" => {
+          "url" => url,
+        },
+      }
+    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

@@ -7,5 +7,23 @@ module NotionRubyMapping
     include StartsWithEndsWith
     include GreaterThanLessThan
     TYPE = "formula"
+
+    # @param [String] name
+    # @param [Hash] json
+    def initialize(name, json: nil)
+      super name, will_update: false
+      @json = json
+    end
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @json = json["formula"]
+    end
+
+    # @return [Hash] {} created_time cannot be updated
+    def property_values_json
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/last_edited_by_property.rb

@@ -1,7 +1,28 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
+  # LastEditedByProperty
   class LastEditedByProperty < MultiProperty
     TYPE = "last_edited_by"
+
+    # @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
+    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
+      {}
+    end
   end
 end

data/lib/notion_ruby_mapping/last_edited_time_property.rb

@@ -1,7 +1,27 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
+  # LastEditedTimeProperty
   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
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @last_edited_time = json["last_edited_time"]
+    end
+
+    # @return [Hash] {} created_time cannot be updated
+    def property_values_json
+      {}
+    end
   end
 end