notion_ruby_mapping 0.1.4 → 0.2.2

data/lib/notion_ruby_mapping/list.rb

@@ -5,12 +5,56 @@ module NotionRubyMapping
   class List < Base
     include Enumerable
 
+    def initialize(json: nil, id: nil, database: nil, query: nil)
+      super(json: json, id: id)
+      @has_more = @json["has_more"]
+      @load_all_contents = !@has_more
+      @database = database
+      @query = query
+      @index = 0
+      @has_content = true
+    end
+    attr_reader :has_more
+
     def each
       return enum_for(:each) unless block_given?
 
-      json["results"].each do |block_json|
-        yield Base.create_from_json(block_json)
+      if @database
+        unless @has_content # re-exec
+          unless @load_all_contents
+            @query.start_cursor = nil
+            @json = @database.query_database @query
+            @has_more = @json["has_more"]
+          end
+          @index = 0
+          @has_content = true
+        end
+
+        while @has_content
+          if @index < results.length
+            object = Base.create_from_json(results[@index])
+            @index += 1
+            yield object
+          elsif @has_more
+            if @database
+              @query.start_cursor = @json["next_cursor"]
+              @json = @database.query_database @query
+              @index = 0
+              @has_more = @json["has_more"]
+            else
+              @has_content = false
+            end
+          else
+            @has_content = false
+          end
+        end
       end
     end
+
+    private
+
+    def results
+      @json["results"]
+    end
   end
 end

data/lib/notion_ruby_mapping/mention_object.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module NotionRubyMapping
+  # TextObject
+  class MentionObject < RichTextObject
+    # @return [MentionObject]
+    def initialize(options = {})
+      super "mention", options
+    end
+
+    # @return [String (frozen)]
+    def text
+      ""
+    end
+
+    def partial_property_values_json
+      if @options.key? "user_id"
+        {
+          "type" => "user",
+          "user" => {
+            "object" => "user",
+            "id" => @options["user_id"],
+          },
+        }
+      elsif @options.key? "page_id"
+        {
+          "type" => "page",
+          "page" => {
+            "id" => @options["page_id"],
+          },
+        }
+      elsif @options.key? "database_id"
+        {
+          "type" => "database",
+          "database" => {
+            "id" => @options["database_id"],
+          },
+        }
+      elsif @options.key? "start"
+        {
+          "type" => "date",
+          "date" => @options.slice("start", "end", "time_zone"),
+        }
+      else
+        raise StandardError, "Irregular mention type"
+      end
+    end
+  end
+end

data/lib/notion_ruby_mapping/multi_select_property.rb

@@ -3,26 +3,45 @@
 module NotionRubyMapping
   # MultiSelect property
   class MultiSelectProperty < MultiProperty
+    include ContainsDoesNotContain
+    include IsEmptyIsNotEmpty
     TYPE = "multi_select"
 
     # @param [String] name
     # @param [Hash] json
     # @param [Array] multi_select
-    def initialize(name, json: nil, multi_select: nil)
-      super(name, json: json)
-      @multi_select = multi_select ? Array(multi_select) : nil
+    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
     end
 
     # @return [Hash] created json
-    def create_json
-      {"multi_select" => @multi_select ? (@multi_select.map { |v| {"name" => v} }) : @json} || {}
+    def property_values_json
+      {
+        @name => {
+          "type" => "multi_select",
+          "multi_select" => @multi_select.map { |v| {"name" => v} },
+        },
+      }
     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) : nil
+      @multi_select = multi_select ? Array(multi_select) : []
+    end
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @multi_select = json["multi_select"].map { |ms| ms["name"] }
     end
   end
 end

data/lib/notion_ruby_mapping/notion_cache.rb

@@ -1,28 +1,140 @@
 # frozen_string_literal: true
 
 require "singleton"
-require "notion"
+require "faraday"
+require "faraday_middleware"
 
 module NotionRubyMapping
   # singleton class of caching Notion objects
   class NotionCache
     include Singleton
 
+    ### initialize
+
     def initialize
       @object_hash = {}
-      @client = nil
+      @client = Faraday::Connection.new "https://api.notion.com" do |builder|
+        builder.use FaradayMiddleware::EncodeJson
+        builder.use FaradayMiddleware::ParseJson
+        builder.adapter Faraday.default_adapter
+      end
+      @notion_token = nil
       @wait = 0
+      @debug = false
     end
-    attr_reader :object_hash, :client
+    attr_reader :object_hash
+    attr_writer :client # for test only
 
     # @param [String] notion_token
     # @return [NotionRubyMapping::NotionCache] self (NotionCache.instance)
-    def create_client(notion_token, wait = 0.3333)
-      @client ||= Notion::Client.new token: notion_token
+    def create_client(notion_token, wait: 0.3333, debug: false)
+      @notion_token = notion_token
       @wait = wait
+      @debug = debug
       self
     end
 
+    ### create path methods
+
+    # @param [String] page_id
+    # @return [String (frozen)] page_path
+    def page_path(page_id)
+      "v1/pages/#{page_id}"
+    end
+
+    # @return [String (frozen)] page_path
+    def pages_path
+      "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)
+      "v1/blocks/#{block_id}"
+    end
+
+    # @param [String] database_id
+    # @return [String (frozen)] page_path
+    def query_database_path(database_id)
+      "v1/databases/#{database_id}/query"
+    end
+
+    ### Notion API call
+
+    # @param [Symbol] method
+    # @param [String] path
+    # @param [Hash] options
+    # @return [Hash] response hash
+    def request(method, path, options = {})
+      raise "Please call `NotionCache.create_client' before using other methods" unless @notion_token
+
+      sleep @wait
+      response = @client.send(method) do |request|
+        request.headers["Authorization"] = "Bearer #{@notion_token}"
+        request.headers["Notion-Version"] = NotionRubyMapping::NOTION_VERSION
+        case method
+        when :get, :delete
+          request.url path, options
+        when :post, :put, :patch
+          request.headers["Content-Type"] = "application/json"
+          request.path = path
+          request.body = options.to_json unless options.empty?
+        else
+          raise StandardError, "Unknown method: #{method}"
+        end
+        request.options.merge!(options.delete(:request)) if options.key? :request
+      end
+      p response.body if @debug
+      response.body
+    end
+
+    # @param [String] page_id
+    # @return [Hash] response
+    def page_request(page_id)
+      request :get, page_path(page_id)
+    end
+
+    # @param [String] database_id
+    # @return [Hash] response
+    def database_request(database_id)
+      request :get, database_path(database_id)
+    end
+
+    def database_query_request(database_id, payload)
+      request :post, "v1/databases/#{database_id}/query", payload
+    end
+
+    # @param [String] block_id
+    # @return [Hash] response
+    def block_request(block_id)
+      request :get, block_path(block_id)
+    end
+
+    # @param [String] database_id
+    # @return [Hash] response
+    def update_database_request(database_id, payload)
+      request :patch, "v1/databases/#{database_id}", payload
+    end
+
+    # @param [String] page_id
+    # @param [Hash] payload
+    # @return [Hash] response
+    def update_page_request(page_id, payload)
+      request :patch, "v1/pages/#{page_id}", payload
+    end
+
+    # @param [Hash] payload
+    # @return [Hash] response
+    def create_page_request(payload)
+      request :post, "v1/pages", payload
+    end
+
     # @param [String] id id string with "-"
     # @return [String] id without "-"
     def hex_id(id)
@@ -30,59 +142,35 @@ module NotionRubyMapping
     end
 
     # @param [String] id id (with or without "-")
-    # @return [NotionRubyMapping::Block, NotionRubyMapping::List, NotionRubyMapping::Database, NotionRubyMapping::Page, nil]
+    # @return [NotionRubyMapping::Base]
     def object_for_key(id)
       key = hex_id(id)
       return @object_hash[key] if @object_hash.key? key
 
-      begin
-        json = yield(@client)
-        @object_hash[key] = Base.create_from_json json
-      rescue StandardError
-        nil
-      end
+      json = yield(@client)
+      @object_hash[key] = Base.create_from_json json
     end
 
     # @param [String] id page_id (with or without "-")
-    # @return [Hash] obtained json
-    def page_json(id)
-      sleep @wait
-      @client.page page_id: id
-    end
-
-    # @param [String] id page_id (with or without "-")
-    # @return [NotionRubyMapping::Page, nil] Page object or nil
+    # @return [NotionRubyMapping::Base] Page object or nil
     def page(id)
-      object_for_key(id) { page_json id }
+      object_for_key(id) { page_request id }
     end
 
     # @param [String] id database_id (with or without "-")
-    # @return [Hash] obtained json
-    def database_json(id)
-      sleep @wait
-      @client.database database_id: id
-    end
-
-    # @param [String] id database_id (with or without "-")
-    # @return [NotionRubyMapping::Database, nil] Database object or nil
+    # @return [NotionRubyMapping::Base] Database object or nil
     def database(id)
-      object_for_key(id) { database_json id }
+      object_for_key(id) { database_request id }
     end
 
     # @param [String] id block_id (with or without "-")
-    # @return [Hash] obtained json
-    def block_json(id)
-      sleep @wait
-      @client.block block_id: id
-    end
-    # @param [String] id block_id (with or without "-")
-    # @return [NotionRubyMapping::Block, nil] Block object or nil
+    # @return [NotionRubyMapping::Base] Block object or nil
     def block(id)
-      object_for_key(id) { block_json id }
+      object_for_key(id) { block_request id }
     end
 
     # @param [String] id page_id / block_id (with or without "-")
-    # @return [NotionRubyMapping::List] List object
+    # @return [NotionRubyMapping::Base] List object
     def block_children(id)
       array = []
       sleep @wait
@@ -94,24 +182,15 @@ module NotionRubyMapping
 
     # @param [String] id page_id / block_id (with or without "-")
     # @param [NotionRubyMapping::Query] query query object
-    # @return [NotionRubyMapping::List] List object
+    # @return [NotionRubyMapping::Base] List object
     def database_query(id, query)
-      array = []
-      parameters = {database_id: id, sleep_interval: @wait, max_retries: 20}
+      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
 
-      @client.database_query(parameters) do |page|
-        array.concat page.results
-      end
-      Base.create_from_json({"object" => "list", "results" => array})
-    end
-
-    # @param [String] id page_id (with or without "-")
-    # @param [Hash] payload
-    def update_page(id, payload)
-      sleep @wait
-      @client.update_page payload.merge({page_id: id})
+      Base.create_from_json database_query_request(id, parameters)
     end
 
     # @param [String] id page_id (with or without "-")
@@ -120,5 +199,10 @@ module NotionRubyMapping
       sleep @wait
       @client.update_database payload.merge({database_id: id})
     end
+
+    # @return [Hash]
+    def clear_object_hash
+      @object_hash = {}
+    end
   end
 end

data/lib/notion_ruby_mapping/number_property.rb

@@ -9,22 +9,27 @@ module NotionRubyMapping
     TYPE = "number"
 
     # @param [String] name Property name
-    # @param [Hash] json
-    # @param [Float] number Number value (optional)
-    def initialize(name, json: nil, number: nil)
-      super(name, json: json)
+    # @param [Float, Integer] number Number value (optional)
+    def initialize(name, will_update: false, number: nil)
+      super name, will_update: will_update
       @number = number
     end
     attr_reader :number
 
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @number = json["number"]
+    end
+
     # @return [Hash]
-    def create_json
-      {"number" => @number || @json}
+    def property_values_json
+      {@name => {"number" => @number, "type" => "number"}}
     end
 
-    def number=(n)
+    def number=(num)
       @will_update = true
-      @number = n
+      @number = num
     end
   end
 end

data/lib/notion_ruby_mapping/page.rb

@@ -7,13 +7,22 @@ module NotionRubyMapping
       NotionCache.instance.page id
     end
 
+    # @return [NotionRubyMapping::Base]46G
     def update
-      update_json @nc.update_page(@id, create_json)
+      update_json @nc.update_page_request(@id, property_values_json)
     end
 
+    # @return [NotionRubyMapping::Base]
+    def create
+      @new_record = false
+      update_json @nc.create_page_request(property_values_json)
+    end
+
+    protected
+
     # @return [Hash]
     def reload_json
-      @nc.page_json @id
+      @nc.page_request @id
     end
   end
 end

data/lib/notion_ruby_mapping/payload.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module NotionRubyMapping
+  # Payload class
   class Payload
-    def initialize
-      @json = {}
+    def initialize(json)
+      @json = json || {}
     end
 
     # @param [String] emoji
@@ -20,9 +23,14 @@ module NotionRubyMapping
     end
 
     # @return [Hash] created json
-    # @param optional [Hash] optional_json
-    def create_json(optional_json = nil)
+    # @param [Hash] optional_json
+    def property_values_json(optional_json = nil)
       @json.merge(optional_json || {})
     end
+
+    # @return [Hash] {}
+    def clear
+      @json = {}
+    end
   end
 end

data/lib/notion_ruby_mapping/people_property.rb

@@ -1,7 +1,45 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
+  # PeopleProperty class
   class PeopleProperty < MultiProperty
     TYPE = "people"
+
+    # @param [String] name
+    # @param [Hash] json
+    # @param [Array] people ids for people
+    def initialize(name, will_update: false, json: nil, people: nil)
+      super name, will_update: will_update
+      @people = if people
+                  Array(people).map { |uo| UserObject.user_object(uo) }
+                elsif json
+                  json.map { |p| UserObject.new json: p }
+                else
+                  []
+                end
+    end
+
+    # @return [Hash] created json
+    def property_values_json
+      {
+        @name => {
+          "type" => "people",
+          "people" => @people.map(&:property_values_json),
+        },
+      }
+    end
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @people = json["people"].map { |pjson| UserObject.new json: pjson }
+    end
+
+    # @param [Hash] people
+    # @return [Array, nil] settled array
+    def people=(people)
+      @will_update = true
+      @people = people ? Array(people).map { |uo| UserObject.user_object(uo) } : []
+    end
   end
 end

data/lib/notion_ruby_mapping/phone_number_property.rb

@@ -1,7 +1,36 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  class PhoneNumberProperty < TextProperty
+  # PhoneNumberProperty
+  class PhoneNumberProperty < Property
+    include EqualsDoesNotEqual
+    include ContainsDoesNotContain
+    include StartsWithEndsWith
+    include IsEmptyIsNotEmpty
     TYPE = "phone_number"
+
+    # @param [String] name Property name
+    # @param [String] phone_number phone_number value (optional)
+    def initialize(name, will_update: false, phone_number: nil)
+      super name, will_update: will_update
+      @phone_number = phone_number
+    end
+    attr_reader :phone_number
+
+    # @param [Hash] json
+    def update_from_json(json)
+      @will_update = false
+      @phone_number = json["phone_number"]
+    end
+
+    # @return [Hash]
+    def property_values_json
+      {@name => {"phone_number" => @phone_number, "type" => "phone_number"}}
+    end
+
+    def phone_number=(phone_number)
+      @will_update = true
+      @phone_number = phone_number
+    end
   end
 end