notion_ruby_mapping 1.0.0 → 2.0.0

data/lib/notion_ruby_mapping/blocks/url_caption_base_block.rb

@@ -12,11 +12,11 @@ module NotionRubyMapping
 
       super(json: json, id: id, parent: parent)
       if @json
-        @url = @json[type][:url]
+        @url = @json[type]["url"]
         decode_block_caption
       else
         @url = url
-        @caption = RichTextArray.rich_text_array :caption, caption
+        @caption = RichTextArray.rich_text_array "caption", caption
       end
     end
 
@@ -31,7 +31,7 @@ module NotionRubyMapping
     def block_json(not_update: true)
       ans = super
       ans[type] = @caption.update_property_schema_json not_update
-      ans[type][:url] = @url
+      ans[type]["url"] = @url
       ans
     end
 
@@ -40,7 +40,7 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/EmbedBlock-57c31e7d8e1d41669eb30f27e1c41035#25ece6bfce0749f8b4bbecc6ba7feedc
     def url=(str)
       @url = str
-      @payload.add_update_block_key :url
+      @payload.add_update_block_key "url"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/video_block.rb

@@ -3,9 +3,9 @@
 module NotionRubyMapping
   # Notion block
   class VideoBlock < FileBaseBlock
-    # @return [Symbol]
+    # @return [String]
     def type
-      :video
+      "video"
     end
   end
 end

data/lib/notion_ruby_mapping/controllers/mermaid.rb

@@ -16,11 +16,10 @@ module NotionRubyMapping
       until @lines.empty?
         case @lines.shift
         when / *(\w+) *[|}][|o]--[o|][|{] *(\w+) *: *"(.*)" */
-          db_or_create(Regexp.last_match(1)).append_relation_queue db_or_create(Regexp.last_match(2)), Regexp.last_match(3)
+          db_or_create(Regexp.last_match(1)).append_relation_queue db_or_create(Regexp.last_match(2)),
+                                                                   Regexp.last_match(3)
         when / *(\w+) *{ */
           append_db_with_attributes Regexp.last_match(1)
-        else
-          nil
         end
       end
     end
@@ -41,8 +40,6 @@ module NotionRubyMapping
           db.add_property Regexp.last_match(1), Regexp.last_match(2)
         when /^ *([^ ]+) +([^ ]+) *$/
           db.add_property Regexp.last_match(1), Regexp.last_match(2)
-        else
-          nil
         end
       end
     end

data/lib/notion_ruby_mapping/controllers/mermaid_database.rb

@@ -16,11 +16,10 @@ module NotionRubyMapping
     attr_accessor :name
 
     def add_property(key, value)
-      key_sym = key.to_sym
-      if key_sym == :title
+      if key == "title"
         @title = value
       else
-        @properties[value] = key_sym
+        @properties[value] = key
       end
     end
 
@@ -44,7 +43,7 @@ module NotionRubyMapping
     end
 
     def blocked?(name)
-      @finish_flag[name.to_sym].nil?
+      @finish_flag[name].nil?
     end
 
     def count
@@ -66,12 +65,10 @@ module NotionRubyMapping
       ps = @real_db.properties
       @properties.each do |(value, key)|
         name, *options = value.split("|")
-        name_sym = name.to_sym
-        key_sym = key.to_sym
-        next if @finish_flag[name_sym]
+        next if @finish_flag[name]
 
-        property = ps.values_at(name_sym).first
-        case key_sym
+        property = ps.values_at(name).first
+        case key
         when /checkbox|created_by|created_time|date|email|files|last_edited_by|last_edited_time|people|phone_number|text|url|status/
           klass = {
             checkbox: CheckboxProperty, created_by: CreatedByProperty, created_time: CreatedTimeProperty,
@@ -79,9 +76,9 @@ module NotionRubyMapping
             last_edited_time: LastEditedTimeProperty, people: PeopleProperty, phone_number: PhoneNumberProperty,
             rich_text: RichTextProperty, url: UrlProperty, status: StatusProperty
           }[key.to_sym]
-          @real_db.add_property klass, name_sym unless property
-          @working << name_sym
-        when :formula
+          @real_db.add_property klass, name unless property
+          @working << name
+        when "formula"
           f_e = options.first&.gsub "@", '"'
           dependencies = f_e&.scan(/prop\("([^"]+)"\)/) || []
           blocked_key = dependencies.select { |k| blocked? k.first }
@@ -89,37 +86,37 @@ module NotionRubyMapping
             if property
               property.formula_expression = f_e unless property.formula_expression == f_e
             else
-              @real_db.add_property(FormulaProperty, name_sym) { |dp| dp.formula_expression = f_e }
+              @real_db.add_property(FormulaProperty, name) { |dp| dp.formula_expression = f_e }
             end
-            @working << name_sym
+            @working << name
           else
-            print("#{name_sym} blocked by #{blocked_key.flatten}\n")
+            print("#{name} blocked by #{blocked_key.flatten}\n")
             next
           end
 
-        when :multi_select
+        when "multi_select"
           if property
-            (options - (property.multi_select_options.map { |h| h[:name] })).each do |select_name|
+            (options - (property.multi_select_options.map { |h| h["name"] })).each do |select_name|
               property.add_multi_select_option name: select_name, color: "default"
             end
           else
-            @real_db.add_property(MultiSelectProperty, name_sym) do |dp|
+            @real_db.add_property(MultiSelectProperty, name) do |dp|
               options.each do |select_name|
                 dp.add_multi_select_option name: select_name, color: "default"
               end
             end
           end
-          @working << name_sym
-        when :number
+          @working << name
+        when "number"
           format_value = options.empty? ? "number" : options.first
           if property
             property.format = format_value unless property.format == format_value
           else
-            @real_db.add_property(NumberProperty, name_sym) { |p| p.format = format_value }
+            @real_db.add_property(NumberProperty, name) { |p| p.format = format_value }
           end
-          @working << name_sym
-        when :rollup
-          name, *options = value.split("|").map(&:to_sym)
+          @working << name
+        when "rollup"
+          name, *options = value.split("|")
           relation_name, rollup_name, function = options
           if blocked? relation_name
             print("#{name} blocked by #{relation_name}\n")
@@ -146,9 +143,9 @@ module NotionRubyMapping
               @working << name
             end
           end
-        when :select
+        when "select"
           if property
-            (options - (property.select_options.map { |h| h[:name] })).each do |select_name|
+            (options - (property.select_options.map { |h| h["name"] })).each do |select_name|
               property.add_select_option name: select_name, color: "default"
             end
           else
@@ -164,12 +161,12 @@ module NotionRubyMapping
       while (array = @relation_queue.shift)
         value, relation_db = array
         db_id = relation_db.real_db.id
-        forward, reverse = value.split("|").map(&:to_sym)
+        forward, reverse = value.split("|").map(&:to_s)
         property = ps.values_at(forward).first
         if property
           if reverse
             if property.database_id == db_id && property.synced_property_name == reverse
-              relation_db.add_property :relation, reverse
+              relation_db.add_property "relation", reverse
               relation_db.finish_flag[reverse] = true
             else
               unless @finish_flag[forward]
@@ -177,14 +174,14 @@ module NotionRubyMapping
                 relation_db.append_reverse_name_queue self, forward, reverse
               end
               @working << forward
-              add_property :relation, forward
+              add_property "relation", forward
             end
             relation_db.relations[reverse] = self
           else
             unless property.database_id == db_id
               property.replace_relation_database database_id: db_id, type: "single_property"
               @working << forward
-              add_property :relation, forward
+              add_property "relation", forward
             end
           end
           @relations[forward] = relation_db
@@ -200,7 +197,7 @@ module NotionRubyMapping
           end
           @relations[forward] = relation_db
           @working << forward
-          add_property :relation, forward
+          add_property "relation", forward
         end
       end
       @real_db.property_schema_json
@@ -208,7 +205,7 @@ module NotionRubyMapping
 
     def append_reverse_name_queue(other_db, forward, reverse)
       @reverse_name_queue[reverse] = [other_db, forward]
-      add_property :relation, reverse
+      add_property "relation", reverse
     end
 
     def update_database

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -2,6 +2,8 @@
 
 require "singleton"
 require "faraday"
+require "faraday/multipart"
+require "mime/types"
 
 module NotionRubyMapping
   # singleton class of caching Notion objects
@@ -15,7 +17,7 @@ module NotionRubyMapping
       @object_hash = {}
       @client = Faraday.new "https://api.notion.com" do |conn|
         conn.request :json
-        conn.response :json, parser_options: {symbolize_names: true}
+        conn.response :json
         conn.headers["Notion-Version"] = NotionRubyMapping::NOTION_VERSION
       end
       @notion_token = nil
@@ -27,6 +29,14 @@ module NotionRubyMapping
     attr_writer :client # for test only
     attr_accessor :notion_token, :wait, :debug, :use_cache
 
+    def multipart_client
+      @multipart_client ||= Faraday.new "https://api.notion.com" do |conn|
+        conn.request :multipart, flat_encode: true
+        conn.response :json
+        conn.headers["Notion-Version"] = NotionRubyMapping::NOTION_VERSION
+      end
+    end
+
     # @param [String] block_id
     # @return [String (frozen)] block_path
     def append_block_children_block_path(block_id)
@@ -91,6 +101,14 @@ module NotionRubyMapping
       "v1/comments"
     end
 
+    def complete_a_file_upload_path(file_id)
+      "v1/file_uploads/#{file_id}/complete"
+    end
+
+    def complete_a_file_upload_request(file_id)
+      request :post, complete_a_file_upload_path(file_id)
+    end
+
     # @param [String] notion_token
     # @return [NotionRubyMapping::NotionCache] self (NotionCache.instance)
     def create_client(notion_token, wait: 0.3333, debug: false)
@@ -106,6 +124,12 @@ module NotionRubyMapping
       request :post, databases_path, payload
     end
 
+    # @param [Hash] payload
+    # @return [Hash] response
+    def create_file_upload_request(payload = {})
+      request :post, file_uploads_path, payload
+    end
+
     # @param [Hash] payload
     # @return [Hash] response
     def create_page_request(payload)
@@ -160,6 +184,25 @@ module NotionRubyMapping
       request :delete, block_path(id)
     end
 
+    # @param [String] fname
+    # @param [String] id
+    # @param [Hash] options
+    # @return [Hash]
+    def file_upload_request(fname, id, options = {})
+      multipart_request(file_upload_path(id), fname, options)
+    end
+
+    # @param [String] id
+    # @return [String]
+    def file_upload_path(id)
+      "v1/file_uploads/#{id}/send"
+    end
+
+    # @return [String]
+    def file_uploads_path
+      "v1/file_uploads"
+    end
+
     # @param [String] id id string with "-"
     # @return [String] id without "-"
     # @see https://www.notion.so/hkob/NotionCache-65e1599864d6425686d495a5a4b3a623#a2d70a2e019c4c17898aaa1a36580f1d
@@ -171,6 +214,28 @@ module NotionRubyMapping
       "NotionCache"
     end
 
+    # @param [String] path
+    # @param [String] fname
+    # @param [Hash] options
+    # @return [Hash] response hash
+    def multipart_request(path, fname, options = {})
+      raise "Please call `NotionRubyMapping.configure' before using other methods" unless @notion_token
+
+      content_type = MIME::Types.type_for(fname).first.to_s
+
+      sleep @wait
+      body = options.map { |k, v| [k, Faraday::Multipart::ParamPart.new(v, "text/plain")] }.to_h
+      file_part = Faraday::Multipart::FilePart.new(fname, content_type, File.basename(fname))
+      response = multipart_client.send(:post) do |request|
+        request.headers["Authorization"] = "Bearer #{@notion_token}"
+        request.headers["content-Type"] = "multipart/form-data"
+        request.path = path
+        request.body = {file: file_part}.merge body
+      end
+      p response.body if @debug
+      response.body
+    end
+
     # @param [String] id id (with or without "-")
     # @return [NotionRubyMapping::Base]
     def object_for_key(id)
@@ -206,6 +271,7 @@ module NotionRubyMapping
     # @param [String] property_id
     # @return [Hash] response
     def page_property_request(page_id, property_id, query = {})
+      p "page_id = #{page_id}, property_id = #{property_id}, query = #{query}" if @debug
       request :get, page_property_path(page_id, property_id), query
     end
 
@@ -320,7 +386,7 @@ module NotionRubyMapping
 
     # @return [Array<NotionRubyMapping::UserObject>] UserObject array
     def users
-      List.new json: users_request, type: :user_object, value: true
+      List.new json: users_request, type: "user_object", value: true
     end
 
     # @return [String (frozen)] user_path

data/lib/notion_ruby_mapping/controllers/payload.rb

@@ -8,7 +8,7 @@ module NotionRubyMapping
       @update_block_key = []
     end
 
-    # @param [Symbol] key
+    # @param [String] key
     def add_update_block_key(key)
       @update_block_key << key
     end
@@ -20,19 +20,19 @@ module NotionRubyMapping
     end
 
     def description=(text_objects)
-      rta = RichTextArray.rich_text_array :description, text_objects
+      rta = RichTextArray.rich_text_array "description", text_objects
       @json.merge!(rta.update_property_schema_json(true))
     end
 
     # @param [Boolean] flag
     def is_inline=(flag)
-      @json[:is_inline] = flag
+      @json["is_inline"] = flag
     end
 
     # @param [Hash] json
     def merge_property(json)
-      @json[:properties] ||= {}
-      @json[:properties].merge!(json)
+      @json["properties"] ||= {}
+      @json["properties"].merge!(json)
     end
 
     # @return [Hash] created json
@@ -47,26 +47,44 @@ module NotionRubyMapping
       others.compact.reduce({}) { |hash, o| hash.merge o.property_schema_json }.merge @json
     end
 
+    # @param [String, nil] url
+    # @param [String, nil] file_upload_object
+    # @return [NotionRubyMapping::Payload]
+    def set_cover(url: nil, file_upload_object: nil)
+      payload = if url
+                  {"type" => "external", "external" => {"url" => url}}
+                elsif file_upload_object
+                  {"type" => "file_upload", "file_upload" => {"id" => file_upload_object.id}}
+                else
+                  {}
+                end
+      @json["cover"] = payload
+      self
+    end
+
     # @param [String] emoji
     # @param [String] url
+    # @param [FileUploadObject] file_upload_object
     # @return [NotionRubyMapping::Payload] updated Payload
-    def set_icon(emoji: nil, url: nil)
+    def set_icon(emoji: nil, url: nil, file_upload_object: nil)
       payload = if emoji
-                  {type: "emoji", emoji: emoji}
+                  {"type" => "emoji", "emoji" => emoji}
                 elsif url
-                  {type: "external", external: {url: url}}
+                  {"type" => "external", "external" => {"url" => url}}
+                elsif file_upload_object
+                  {"type" => "file_upload", "file_upload" => {"id" => file_upload_object.id}}
                 else
                   {}
                 end
-      @json[:icon] = payload
+      @json["icon"] = payload
       self
     end
 
     def update_block_json(type, json)
       sub_json = json[type]
       ans = {type => sub_json.slice(*@update_block_key)}
-      ans[type][:caption] = sub_json[:caption] if sub_json[:caption]
-      ans[type][:rich_text] = sub_json[:rich_text] if sub_json[:rich_text]
+      ans[type]["caption"] = sub_json["caption"] if sub_json["caption"]
+      ans[type]["rich_text"] = sub_json["rich_text"] if sub_json["rich_text"]
       ans
     end
 

data/lib/notion_ruby_mapping/controllers/property_cache.rb

@@ -4,7 +4,7 @@ module NotionRubyMapping
   # PropertyCache class
   class PropertyCache
     include Enumerable
-    def initialize(json = {}, base_type: :page, page_id: nil)
+    def initialize(json = {}, base_type: "page", page_id: nil)
       @properties = {}
       @json = json
       @base_type = base_type
@@ -17,8 +17,7 @@ module NotionRubyMapping
     # @return [Property] Property for key
     # @see https://www.notion.so/hkob/PropertyCache-2451fa64a814432db4809831cc77ba25#9709e2b2a7a0479f9951291a501f65c8
     def [](key)
-      key_sym = key.to_sym
-      @properties[key_sym] ||= Property.create_from_json key_sym, @json[key_sym], @base_type, self
+      @properties[key] ||= Property.create_from_json key, @json[key], @base_type, self
     end
 
     # @param [Property] property added Property
@@ -57,8 +56,8 @@ module NotionRubyMapping
     def property_values_json
       @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
-          ans[:properties] ||= {}
-          ans[:properties].merge! property.property_values_json
+          ans["properties"] ||= {}
+          ans["properties"].merge! property.property_values_json
         end
       end
     end
@@ -67,8 +66,8 @@ module NotionRubyMapping
     def property_schema_json
       @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
-          ans[:properties] ||= {}
-          ans[:properties].merge! property.property_schema_json
+          ans["properties"] ||= {}
+          ans["properties"].merge! property.property_schema_json
         end
       end
     end
@@ -77,8 +76,8 @@ module NotionRubyMapping
     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
+          ans["properties"] ||= {}
+          ans["properties"].merge! property.update_property_schema_json
         end
       end
     end

data/lib/notion_ruby_mapping/controllers/query.rb

@@ -16,10 +16,10 @@ module NotionRubyMapping
     # @param [Query] another_query other query
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def and(another_query)
-      if @filter.key? :and
-        @filter[:and] << another_query.filter
+      if @filter.key? "and"
+        @filter["and"] << another_query.filter
       else
-        @filter = {and: [@filter, another_query.filter]}
+        @filter = {"and" => [@filter, another_query.filter]}
       end
       self
     end
@@ -27,26 +27,26 @@ module NotionRubyMapping
     # @param [NotionRubyMapping::Property] property
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def ascending(property)
-      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? :timestamp : :property
-      @sort << {key => property.name, direction: "ascending"}
+      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? "timestamp" : "property"
+      @sort << {key => property.name, "direction" => "ascending"}
       self
     end
 
     # @param [NotionRubyMapping::Property] property
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def descending(property)
-      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? :timestamp : :property
-      @sort << {key => property.name, direction: "descending"}
+      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? "timestamp" : "property"
+      @sort << {key => property.name, "direction" => "descending"}
       self
     end
 
     # @param [Query] other_query other query
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def or(other_query)
-      if @filter.key? :or
-        @filter[:or] << other_query.filter
+      if @filter.key? "or"
+        @filter["or"] << other_query.filter
       else
-        @filter = {or: [@filter, other_query.filter]}
+        @filter = {"or" => [@filter, other_query.filter]}
       end
       self
     end
@@ -54,10 +54,10 @@ module NotionRubyMapping
     # @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["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
 

data/lib/notion_ruby_mapping/controllers/search.rb

@@ -12,16 +12,16 @@ module NotionRubyMapping
         Base.dry_run_script :post, NotionCache.instance.search_path, payload
       else
         response = NotionCache.instance.search payload
-        List.new json: response, type: :search, value: self, query: Query.new
+        List.new json: response, type: "search", value: self, query: Query.new
       end
     end
 
     def payload
       ans = {}
-      ans[:sort] = {direction: "ascending", timestamp: "last_edited_time"} if @ascending
-      ans[:filter] = {value: "database", property: "object"} if @database_only
-      ans[:filter] = {value: "page", property: "object"} if @page_only
-      ans[:query] = @query if @query
+      ans["sort"] = {"direction" => "ascending", "timestamp" => "last_edited_time"} if @ascending
+      ans["filter"] = {"value" => "database", "property" => "object"} if @database_only
+      ans["filter"] = {"value" => "page", "property" => "object"} if @page_only
+      ans["query"] = @query if @query
       ans
     end
   end

data/lib/notion_ruby_mapping/objects/comment_object.rb

@@ -10,7 +10,7 @@ module NotionRubyMapping
         @json = {}
       elsif json
         @json = json
-        @text_objects = RichTextArray.new "rich_text", json: json[:rich_text]
+        @text_objects = RichTextArray.new "rich_text", json: json["rich_text"]
       else
         raise StandardError, "Either text_objects or json is required CommentObject"
       end
@@ -19,7 +19,7 @@ module NotionRubyMapping
     attr_reader :will_update, :text_objects, :json
 
     def discussion_id
-      NotionCache.instance.hex_id @json[:discussion_id]
+      NotionCache.instance.hex_id @json["discussion_id"]
     end
 
     # @return [String] full_text

data/lib/notion_ruby_mapping/objects/emoji_object.rb

@@ -6,7 +6,7 @@ module NotionRubyMapping
     # @param [String] emoji
     # @return [TextObject]
     def initialize(emoji: nil, json: {})
-      @emoji = emoji || json && json[:emoji]
+      @emoji = emoji || json && json["emoji"]
       @will_update = false
     end
     attr_reader :will_update, :emoji
@@ -32,8 +32,8 @@ module NotionRubyMapping
     # @return [Hash]
     def property_values_json
       {
-        type: "emoji",
-        emoji: @emoji,
+        "type" => "emoji",
+        "emoji" => @emoji,
       }
     end
   end

data/lib/notion_ruby_mapping/objects/equation_object.rb

@@ -6,7 +6,7 @@ module NotionRubyMapping
     # @param [String] expression
     # @return [TextObject]
     def initialize(expression, options = {})
-      super :equation, {plain_text: expression}.merge(options)
+      super "equation", {"plain_text" => expression}.merge(options)
       @expression = expression
       @will_update = false
     end
@@ -27,7 +27,7 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/EquationObject-cd50126fce544ad5bb76463a4269859b#155800e2c69d4676a2d74572ed8f0de8
     def expression=(expression)
       @expression = expression
-      @options[:plain_text] = expression
+      @options["plain_text"] = expression
       @will_update = true
     end
 
@@ -41,7 +41,7 @@ module NotionRubyMapping
     # @return [Hash{String (frozen)->String}]
     def partial_property_values_json
       {
-        expression: @expression,
+        "expression" => @expression,
       }
     end
   end