notion_ruby_mapping 1.0.0 → 2.0.0

data/lib/notion_ruby_mapping/blocks/file_base_block.rb

@@ -15,13 +15,13 @@ module NotionRubyMapping
         @can_append = @file_object.external?
       else
         @file_object = FileObject.file_object url
-        @caption = RichTextArray.rich_text_array :caption, caption
+        @caption = RichTextArray.rich_text_array "caption", caption
       end
     end
 
     # @see https://www.notion.so/hkob/FileBlock-08f2aa6948364d00b92beacaac9a619c#158487a7e1644fae8778dcff59869356
     # @see https://www.notion.so/hkob/ImageBlock-806b3d2a9a2c4bf5a5aca6e3fbc8a7e2#19a4aa3e06514bbe84be9d3b8a45a20f
-    attr_reader :caption
+    attr_reader :caption, :file_object
 
     # @param [Boolean] not_update false when update
     # @return [Hash{String (frozen)->Hash}]
@@ -44,7 +44,19 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/ImageBlock-806b3d2a9a2c4bf5a5aca6e3fbc8a7e2#61598d260b6140f2a359f7d22ea2548a
     def url=(url)
       @file_object.url = url
-      @payload.add_update_block_key :external
+      @payload.add_update_block_key "external"
+    end
+
+    # @param [FileUploadObject] fuo
+    def file_upload_object=(fuo)
+      @file_object.file_upload_object = fuo
+      @payload.add_update_block_key "file_upload"
+    end
+
+    def update_file_object_from_json(json)
+      @file_object = FileObject.new json: json[type]
+      decode_block_caption
+      @can_append = @file_object.external?
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/file_block.rb

@@ -3,9 +3,9 @@
 module NotionRubyMapping
   # Notion block
   class FileBlock < FileBaseBlock
-    # @return [String (frozen)]
+    # @return [String]
     def type
-      :file
+      "file"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/heading1_block.rb

@@ -10,16 +10,16 @@ module NotionRubyMapping
       @can_have_children = false
     end
 
-    # @return [Symbol]
+    # @return [String]
     def type
-      :heading_1
+      "heading_1"
     end
 
     # @param [Boolean] not_update false when update
     # @return [Hash{Symbol->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type][:is_toggleable] = false
+      ans[type]["is_toggleable"] = false
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/heading2_block.rb

@@ -12,14 +12,14 @@ module NotionRubyMapping
 
     # @return [String (frozen)]
     def type
-      :heading_2
+      "heading_2"
     end
 
     # @param [Boolean] not_update false when update
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type][:is_toggleable] = false
+      ans[type]["is_toggleable"] = false
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/heading3_block.rb

@@ -10,16 +10,16 @@ module NotionRubyMapping
       @can_have_children = false
     end
 
-    # @return [Symbol]
+    # @return [String]
     def type
-      :heading_3
+      "heading_3"
     end
 
     # @param [Boolean] not_update false when update
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type][:is_toggleable] = false
+      ans[type]["is_toggleable"] = false
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/image_block.rb

@@ -3,9 +3,9 @@
 module NotionRubyMapping
   # Notion block
   class ImageBlock < FileBaseBlock
-    # @return [String (frozen)]
+    # @return [String]
     def type
-      :image
+      "image"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/link_preview_block.rb

@@ -8,9 +8,9 @@ module NotionRubyMapping
       @can_append = false
     end
 
-    # @return [Symbol]
+    # @return [String]
     def type
-      :link_preview
+      "link_preview"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/link_to_page_block.rb

@@ -9,7 +9,7 @@ module NotionRubyMapping
     def initialize(page_id: nil, database_id: nil, json: nil, id: nil, parent: nil)
       super(json: json, id: id, parent: parent)
       if @json
-        @page_id, @database_id = @json[type].values_at(*%i[page_id database_id])
+        @page_id, @database_id = @json[type].values_at(*%w[page_id database_id])
       else
         @page_id = page_id
         @database_id = database_id
@@ -25,16 +25,16 @@ module NotionRubyMapping
     def block_json(not_update: true)
       ans = super
       ans[type] = if @page_id
-                    {type: :page_id, page_id: Base.page_id(@page_id)}
+                    {"type" => "page_id", "page_id" => Base.page_id(@page_id)}
                   else
-                    {type: :database_id, database_id: Base.database_id(@database_id)}
+                    {"type" => "database_id", "database_id" => Base.database_id(@database_id)}
                   end
       ans
     end
 
-    # @return [Symbol]
+    # @return [String]
     def type
-      :link_to_page
+      "link_to_page"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/list.rb

@@ -7,21 +7,21 @@ module NotionRubyMapping
 
     def initialize(json: nil, id: nil, type: nil, value: nil, query: nil)
       super(json: json, id: id)
-      @has_more = @json[:has_more]
+      @has_more = @json["has_more"]
       @load_all_contents = !@has_more
 
-      case type.to_sym
-      when :comment_parent
+      case type
+      when "comment_parent"
         @comment_parent = value
-      when :database
+      when "database"
         @database = value
-      when :parent
+      when "parent"
         @parent = value
-      when :property
+      when "property"
         @property = value
-      when :user_object
+      when "user_object"
         @user_object = value
-      when :search
+      when "search"
         @search = value
       end
       @query = query
@@ -53,15 +53,15 @@ module NotionRubyMapping
                                              @query.query_json
                  },
                  create_object: lambda { |json|
-                   case json[:type]&.to_sym
-                   when :people
-                     UserObject.new json: json[:people]
-                   when :relation
-                     json[:relation][:id]
-                   when :rich_text
-                     RichTextObject.create_from_json json[:rich_text]
-                   when :title
-                     RichTextObject.create_from_json json[:title]
+                   case json["type"]
+                   when "people"
+                     UserObject.new json: json["people"]
+                   when "relation"
+                     json["relation"]["id"]
+                   when "rich_text"
+                     RichTextObject.create_from_json json["rich_text"]
+                   when "title"
+                     RichTextObject.create_from_json json["title"]
                    else
                      json
                    end
@@ -97,7 +97,7 @@ module NotionRubyMapping
         unless @load_all_contents
           @query.start_cursor = nil
           @json = query.call
-          @has_more = @json[:has_more]
+          @has_more = @json["has_more"]
         end
         @index = 0
         @has_content = true
@@ -110,10 +110,10 @@ module NotionRubyMapping
           block.call object
         elsif @has_more
           if base
-            @query.start_cursor = @json[:next_cursor]
+            @query.start_cursor = @json["next_cursor"]
             @json = query.call
             @index = 0
-            @has_more = @json[:has_more]
+            @has_more = @json["has_more"]
           else
             @has_content = false
           end
@@ -125,7 +125,7 @@ module NotionRubyMapping
 
     # @return [Hash]
     def results
-      @json[:results]
+      @json["results"]
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/numbered_list_item_block.rb

@@ -3,9 +3,9 @@
 module NotionRubyMapping
   # Notion block
   class NumberedListItemBlock < TextSubBlockColorBaseBlock
-    # @return [Symbol]
+    # @return [String]
     def type
-      :numbered_list_item
+      "numbered_list_item"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/page.rb

@@ -27,8 +27,8 @@ module NotionRubyMapping
 
     # @param [Boolean] dry_run true if dry_run
     def append_comment(text_objects, dry_run: false)
-      rto = RichTextArray.new :rich_text, text_objects: text_objects, will_update: true
-      json = rto.property_schema_json.merge({parent: {page_id: @id}})
+      rto = RichTextArray.new "rich_text", text_objects: text_objects, will_update: true
+      json = rto.property_schema_json.merge({"parent" => {"page_id" => @id}})
       if dry_run
         self.class.dry_run_script :post, @nc.comments_path, json
       else
@@ -41,8 +41,8 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Database]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#71f680d59b874930bf9f488a7cd6a49e
     def build_child_database(title, *assigns)
-      db = Database.new json: {title: [TextObject.new(title).property_values_json]},
-                        assign: assigns, parent: {type: "page_id", page_id: @id}
+      db = Database.new json: {"title" => [TextObject.new(title).property_values_json]},
+                        assign: assigns, parent: {"type" => "page_id", "page_id" => @id}
       yield db, db.properties if block_given?
       db
     end
@@ -53,15 +53,15 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Database, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#e3f1d21e0f724f589e48431468772eed
     def create_child_database(title, *assigns, dry_run: false)
-      db = Database.new json: {title: [TextObject.new(title).property_values_json]},
-                        assign: assigns, parent: {type: :page_id, page_id: @id}
+      db = Database.new json: {"title" => [TextObject.new(title).property_values_json]},
+                        assign: assigns, parent: {"type" => "page_id", "page_id" => @id}
       yield db, db.properties if block_given?
       db.save dry_run: dry_run
     end
 
     # @return [String] 公開URL
     def public_url
-      @json[:public_url]
+      @json["public_url"]
     end
 
     # @return [String] title
@@ -73,7 +73,7 @@ module NotionRubyMapping
 
     # @return [String] URL
     def url
-      @json[:url]
+      @json["url"]
     end
 
     protected

data/lib/notion_ruby_mapping/blocks/paragraph_block.rb

@@ -3,9 +3,9 @@
 module NotionRubyMapping
   # Notion block
   class ParagraphBlock < TextSubBlockColorBaseBlock
-    # @return [Symbol]
+    # @return [String]
     def type
-      :paragraph
+      "paragraph"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/pdf_block.rb

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

data/lib/notion_ruby_mapping/blocks/quote_block.rb

@@ -5,7 +5,7 @@ module NotionRubyMapping
   class QuoteBlock < TextSubBlockColorBaseBlock
     # @return [String (frozen)]
     def type
-      :quote
+      "quote"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/synced_block.rb

@@ -8,8 +8,8 @@ module NotionRubyMapping
     def initialize(block_id: nil, sub_blocks: nil, json: nil, id: nil, parent: nil)
       super json: json, id: id, parent: parent
       if @json
-        synced_from = @json[type][:synced_from]
-        @block_id = synced_from && @nc.hex_id(synced_from[:block_id])
+        synced_from = @json[type]["synced_from"]
+        @block_id = synced_from && @nc.hex_id(synced_from["block_id"])
       else
         @block_id = Base.block_id block_id
         add_sub_blocks sub_blocks
@@ -21,8 +21,8 @@ module NotionRubyMapping
 
     def block_json(not_update: true)
       ans = super
-      ans[type] = {synced_from: @block_id ? {type: :block_id, block_id: @nc.hex_id(@block_id)} : nil}
-      ans[type][:children] = @sub_blocks.map(&:block_json) if @sub_blocks
+      ans[type] = {"synced_from" => @block_id ? {"type" => "block_id", "block_id" => @nc.hex_id(@block_id)} : nil}
+      ans[type]["children"] = @sub_blocks.map(&:block_json) if @sub_blocks
       ans
     end
 
@@ -43,7 +43,7 @@ module NotionRubyMapping
 
     # @return [String (frozen)]
     def type
-      :synced_block
+      "synced_block"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/table_block.rb

@@ -15,9 +15,9 @@ module NotionRubyMapping
       super json: json, id: id, parent: parent
       if @json
         sub_json = @json[type]
-        @has_column_header = sub_json[:has_column_header]
-        @has_row_header = sub_json[:has_row_header]
-        @table_width = sub_json[:table_width]
+        @has_column_header = sub_json["has_column_header"]
+        @has_row_header = sub_json["has_row_header"]
+        @table_width = sub_json["table_width"]
       else
         @table_width = table_width
         @has_column_header = has_column_header
@@ -34,17 +34,17 @@ module NotionRubyMapping
     def block_json(not_update: true)
       ans = super
       ans[type] = {
-        has_column_header: @has_column_header,
-        has_row_header: @has_row_header,
-        table_width: @table_width,
+        "has_column_header" => @has_column_header,
+        "has_row_header" => @has_row_header,
+        "table_width" => @table_width,
       }
-      ans[type][:children] = @table_rows.map(&:block_json) if @table_rows
+      ans[type]["children"] = @table_rows.map(&:block_json) if @table_rows
       ans
     end
 
     # @return [String (frozen)]
     def type
-      :table
+      "table"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/table_of_contents_block.rb

@@ -15,19 +15,19 @@ module NotionRubyMapping
 
     def color=(new_color)
       @color = new_color
-      @payload.add_update_block_key :color
+      @payload.add_update_block_key "color"
     end
 
     # @return [String (frozen)]
     def type
-      :table_of_contents
+      "table_of_contents"
     end
 
     # @param [Boolean] not_update false when update
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type] = {color: @color}
+      ans[type] = {"color" => @color}
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/table_row_block.rb

@@ -8,7 +8,7 @@ module NotionRubyMapping
     def initialize(array_array_of_text_objects = [], table_width = 3, json: nil, id: nil, parent: nil)
       super json: json, id: id, parent: parent
       if @json
-        @cells = @json[type][:cells].map { |cell| cell.map { |to| RichTextObject.create_from_json to } }
+        @cells = @json[type]["cells"].map { |cell| cell.map { |to| RichTextObject.create_from_json to } }
       else
         cc = array_array_of_text_objects.count
         raise StandardError, "table width must be #{table_width} (given array size is #{cc}" unless table_width == cc
@@ -22,13 +22,13 @@ module NotionRubyMapping
 
     def block_json(not_update: true)
       ans = super
-      ans[type] = {cells: @cells.map { |cell| Array(cell).map(&:property_values_json) }}
+      ans[type] = {"cells" => @cells.map { |cell| Array(cell).map(&:property_values_json) }}
       ans
     end
 
     # @return [String (frozen)]
     def type
-      :table_row
+      "table_row"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/template_block.rb

@@ -10,7 +10,7 @@ module NotionRubyMapping
       if @json
         decode_block_rich_text_array
       else
-        rich_text_array_and_color :rich_text, text_info, nil
+        rich_text_array_and_color "rich_text", text_info, nil
         add_sub_blocks sub_blocks
       end
       @can_have_children = true
@@ -23,12 +23,12 @@ module NotionRubyMapping
     def block_json(not_update: true)
       ans = super
       ans[type] = @rich_text_array.update_property_schema_json not_update
-      ans[type][:children] = @sub_blocks.map(&:block_json) if @sub_blocks
+      ans[type]["children"] = @sub_blocks.map(&:block_json) if @sub_blocks
       ans
     end
 
     def type
-      :template
+      "template"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/text_sub_block_color_base_block.rb

@@ -14,7 +14,7 @@ module NotionRubyMapping
         decode_block_rich_text_array
         decode_color
       else
-        rich_text_array_and_color :rich_text, text_info, color
+        rich_text_array_and_color "rich_text", text_info, color
         add_sub_blocks sub_blocks
       end
       @can_have_children = true
@@ -28,7 +28,7 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/BulletedListItemBlock-ac4978f4efbb40109f0fb3bd00f43476#2d59111c9e434dfa99d294cc9a74e468
     def color=(new_color)
       @color = new_color
-      @payload.add_update_block_key :color
+      @payload.add_update_block_key "color"
       @rich_text_array.will_update = true
     end
 
@@ -37,8 +37,8 @@ module NotionRubyMapping
     def block_json(not_update: true)
       ans = super
       ans[type] = @rich_text_array.update_property_schema_json not_update
-      ans[type][:color] = @color
-      ans[type][:children] = @sub_blocks.map(&:block_json) if @sub_blocks
+      ans[type]["color"] = @color
+      ans[type]["children"] = @sub_blocks.map(&:block_json) if @sub_blocks
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/to_do_block.rb

@@ -10,7 +10,7 @@ module NotionRubyMapping
     def initialize(text_info = nil, checked = false, sub_blocks: nil, color: "default", json: nil, id: nil, parent: nil)
       super(text_info, sub_blocks: sub_blocks, color: color, json: json, id: id, parent: parent)
       @checked = if @json
-                   @json[type][:checked]
+                   @json[type]["checked"]
                  else
                    checked
                  end
@@ -23,7 +23,7 @@ module NotionRubyMapping
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type][:checked] = @checked
+      ans[type]["checked"] = @checked
       ans
     end
 
@@ -31,12 +31,12 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/ToDoBlock-9e4d863244b541869d91c84620e190d4#8ef8b12721914cccb17790879bdc2fbf
     def checked=(new_checked)
       @checked = new_checked
-      @payload.add_update_block_key :checked
+      @payload.add_update_block_key "checked"
     end
 
     # @return [String (frozen)]
     def type
-      :to_do
+      "to_do"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/toggle_block.rb

@@ -3,9 +3,9 @@
 module NotionRubyMapping
   # Notion block
   class ToggleBlock < TextSubBlockColorBaseBlock
-    # @return [Symbol]
+    # @return [String]
     def type
-      :toggle
+      "toggle"
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/toggle_heading1_block.rb

@@ -5,14 +5,14 @@ module NotionRubyMapping
   class ToggleHeading1Block < TextSubBlockColorBaseBlock
     # @return [String (frozen)]
     def type
-      :heading_1
+      "heading_1"
     end
 
     # @param [Boolean] not_update false when update
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type][:is_toggleable] = true
+      ans[type]["is_toggleable"] = true
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/toggle_heading2_block.rb

@@ -5,14 +5,14 @@ module NotionRubyMapping
   class ToggleHeading2Block < TextSubBlockColorBaseBlock
     # @return [String (frozen)]
     def type
-      :heading_2
+      "heading_2"
     end
 
     # @param [Boolean] not_update false when update
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type][:is_toggleable] = true
+      ans[type]["is_toggleable"] = true
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/toggle_heading3_block.rb

@@ -3,16 +3,16 @@
 module NotionRubyMapping
   # Notion block
   class ToggleHeading3Block < TextSubBlockColorBaseBlock
-    # @return [Symbol]
+    # @return [String]
     def type
-      :heading_3
+      "heading_3"
     end
 
     # @param [Boolean] not_update false when update
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type][:is_toggleable] = true
+      ans[type]["is_toggleable"] = true
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/url_base_block.rb

@@ -9,7 +9,7 @@ module NotionRubyMapping
 
       super(json: json, id: id, parent: parent)
       @url = if @json
-               @json[type][:url]
+               @json[type]["url"]
              else
                url
              end
@@ -21,14 +21,14 @@ module NotionRubyMapping
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type] = {url: @url}
+      ans[type] = {"url" => @url}
       ans
     end
 
     # @param [String] str
     def url=(str)
       @url = str
-      @payload.add_update_block_key :url
+      @payload.add_update_block_key "url"
     end
   end
 end