notion_ruby_mapping 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b66f1eaec34561d2542a0b460490cc162820c03bb386d75fdb796f7ad89477
-  data.tar.gz: 2fc5d80b0123377c7dbbfdc59f20ad03596a9fdedbc4cf49d50ca6bdf9d428e1
+  metadata.gz: 59ade8b97253e1f77c438f1f337c55d8b642fed859e4434de98d6860610d84e7
+  data.tar.gz: 4703b38b13e146d2b7e55bbd1988ee6efc21b5ee65210cfcc8e304920969c538
 SHA512:
-  metadata.gz: af591e9e313309fb5028cec7073b28d8e0afa40e47b5f1cd2a5fd3129e7747897c451b45461bd10be40b0619f1e9e61b286feaad7cf23ce38e71b3f90afb3eab
-  data.tar.gz: 63abcef6e721e96e0219c516abfae21bb6d66d11e78ce67a495be459c9b7eba57112ae1c41b85f9de42a68c3d26aeb678c4423c4440035bed651013241b2f450
+  metadata.gz: 360025f3bec7e9d20a33c9183ade2b1695137d818119771d219eb7b6f5e0a00ad2bebd8da7fc147c41ee1445879ab1e51088bbd02abc6e91dd78658c8c5a8f16
+  data.tar.gz: c9b917ce45d44cec66c09dd278119ef3ee4848f673c07c65260628250a35a6864c9de4dfccac89e2c2dc31a3df80ec52f32ed7eccd31248b018f6116c86c67b4

data/lib/notion_ruby_mapping/blocks/base.rb

@@ -4,7 +4,6 @@ module NotionRubyMapping
   # Notion Base object (Parent of Page / Database / List)
   # The Public API method has a link to the API references.
   class Base
-
     # @param [Hash, nil] json
     # @param [String, nil] id
     # @param [Array<Property, Class, String>] assign
@@ -52,7 +51,7 @@ module NotionRubyMapping
         "  -H 'Notion-Version: 2022-02-22'",
         "  -H 'Authorization: Bearer '\"$NOTION_API_KEY\"''",
       ]
-      shell << "  -H 'Content-Type: application/json'" unless path == :get
+      shell << "  -H 'Content-Type: application/json'" if %i[post patch].include?(method)
       shell << "  --data '#{JSON.generate json}'" if json
       shell.join(" \\\n")
     end
@@ -73,8 +72,8 @@ module NotionRubyMapping
       end
     end
 
-    # @param [String] url
-    # @param [RichTextArray, String, Array<String>, RichTextObject, Array<RichTextObject>] caption
+    # @param [Array<Block>] blocks
+    # @param [Boolean] dry_run
     # @return [NotionRubyMapping::Block, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#44bbf83d852c419485c5efe9fe1558fb
     # @see https://www.notion.so/hkob/Block-689ad4cbff50404d8a1baf67b6d6d78d#2c47f7fedae543cf8566389ba1677132
@@ -86,7 +85,7 @@ module NotionRubyMapping
         "children" => Array(blocks).map do |block|
           assert_parent_children_pair block
           block.block_json
-        end
+        end,
       }
       if dry_run
         path = @nc.append_block_children_page_path(id)
@@ -112,7 +111,7 @@ module NotionRubyMapping
       raise StandardError, "Internal file block can not append." if bt == "file"
 
       raise StandardError, "Column block can only append column_list block" unless bt == "column" &&
-        block? && self.type == "columu_list"
+                                                                                   block? && type == "columu_list"
     end
 
     # @param [NotionRubyMapping::Property] klass
@@ -172,6 +171,11 @@ module NotionRubyMapping
       self["icon"]
     end
 
+    # @return [String (frozen)]
+    def inspect
+      "#{self.class.name}-#{@id}"
+    end
+
     # @return [Hash] json properties
     def json_properties
       @json && @json["properties"]
@@ -231,6 +235,7 @@ module NotionRubyMapping
       self
     end
 
+    # @param [Boolean] dry_run
     # @return [NotionRubyMapping::Base, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#277085c8439841c798a4b94eae9a7326
     def save(dry_run: false)
@@ -254,8 +259,9 @@ module NotionRubyMapping
       self
     end
 
-    def description
-      "#{self.class.name}-#{@id}"
+    # @return [FalseClass] return false except block
+    def synced_block_original?
+      false
     end
 
     # @param [Hash] json

data/lib/notion_ruby_mapping/blocks/block.rb

@@ -13,10 +13,15 @@ module NotionRubyMapping
     attr_reader :can_have_children, :can_append, :type
 
     # @see https://www.notion.so/hkob/Block-689ad4cbff50404d8a1baf67b6d6d78d#298916c7c379424682f39ff09ee38544
-    # @param [String] key
+    # @param [String] id
     # @return [NotionRubyMapping::Block]
-    def self.find(key)
-      NotionCache.instance.block key
+    def self.find(id, dry_run: false)
+      nc = NotionCache.instance
+      if dry_run
+        Base.dry_run_script :get, nc.block_path(id)
+      else
+        nc.block id
+      end
     end
 
     # @return [Hash{String (frozen)->String (frozen) | Array}, nil]
@@ -68,9 +73,11 @@ module NotionRubyMapping
       when "link_preview"
         ans[@type] = {"url" => @url}
       when "link_to_page"
-        ans[@type] = @page_id ?
-                       {"type" => "page_id", "page_id" => @page_id} :
+        ans[@type] = if @page_id
+                       {"type" => "page_id", "page_id" => @page_id}
+                     else
                        {"type" => "database_id", "database_id" => @database_id}
+                     end
       when "synced_block"
         ans[@type] = {"synced_from" => @block_id ? {"type" => "block_id", "block_id" => @block_id} : nil}
         ans[@type]["children"] = @sub_blocks.map(&:block_json) if @sub_blocks
@@ -80,13 +87,11 @@ module NotionRubyMapping
           "has_row_header" => @has_row_header,
           "table_width" => @table_width,
         }
-        if @table_rows
-          ans[@type]["children"] = @table_rows.map(&:block_json)
-        end
+        ans[@type]["children"] = @table_rows.map(&:block_json) if @table_rows
       when "table_of_contents"
         ans[@type] = {"color" => @color}
       when "table_row"
-        ans[@type] = {"cells" => @cells.map { |cell| Array(cell).map { |to| to.property_values_json } } }
+        ans[@type] = {"cells" => @cells.map { |cell| Array(cell).map(&:property_values_json) }}
       when "template"
         @rich_text_array.will_update = true
         ans[@type] = @rich_text_array.update_property_schema_json
@@ -269,6 +274,16 @@ module NotionRubyMapping
       @rich_text_array = RichTextArray.new "rich_text", json: @json[@type]["rich_text"]
     end
 
+    # @param [Boolean] dry_run
+    # @return [NotionRubyMapping::Base, String]
+    def destroy(dry_run: false)
+      if dry_run
+        Base.dry_run_script :delete, @nc.block_path(@id)
+      else
+        @nc.destroy_block id
+      end
+    end
+
     # @return [NotionRubyMapping::Block]
     # @see https://www.notion.so/hkob/Block-689ad4cbff50404d8a1baf67b6d6d78d#fe58d26468e04b38b8ae730e4f0c74ae
     def divider
@@ -415,6 +430,11 @@ module NotionRubyMapping
       self
     end
 
+    # @return [Boolean] true if synced_block & block_id is nil
+    def synced_block_original?
+      @type == "synced_block" && @block_id.nil?
+    end
+
     def table(table_width:, has_column_header: false, has_row_header: false, table_rows: nil)
       @type = __method__.to_s
       @table_width = table_width
@@ -520,7 +540,6 @@ module NotionRubyMapping
     end
 
     # @param [String] url
-    # @param [RichTextArray, String, Array<String>, RichTextObject, Array<RichTextObject>] caption
     # @see https://www.notion.so/hkob/Block-689ad4cbff50404d8a1baf67b6d6d78d#7aad77515ce14e3bbc7e0a7a5427820b
     def video(url)
       @type = __method__.to_s
@@ -536,7 +555,6 @@ module NotionRubyMapping
     end
 
     # @param [String] type
-    # @param [RichTextArray, String, Array<String>, RichTextObject, Array<RichTextObject>] caption
     # @param [String] color
     def rich_text_array_and_color(type, text_info, color = "default")
       @rich_text_array = RichTextArray.rich_text_array type, text_info

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -38,7 +38,7 @@ module NotionRubyMapping
     def append_block_children_page_path(page_id)
       "v1/blocks/#{page_id}/children"
     end
-    
+
     # @param [String] id
     # @param [Hash] payload
     # @return [Hash]
@@ -138,6 +138,16 @@ module NotionRubyMapping
       "v1/databases"
     end
 
+    # @return [NotionRubyMapping::Base]
+    def destroy_block(id)
+      Base.create_from_json destroy_block_request(id)
+    end
+
+    # @param [Hash] response
+    def destroy_block_request(id)
+      request :delete, block_path(id)
+    end
+
     def inspect
       "NotionCache"
     end

data/lib/notion_ruby_mapping/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
   NOTION_VERSION = "2022-02-22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday