notion 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04355fc0473c8f446e79ec4904105c0fb4fcb8a436032099e59d41ce6abbc9fc
-  data.tar.gz: df7cf2d629fcd8c9dcf076a3186c2d49deef0f73454c051a2ad5530ffa98501d
+  metadata.gz: 260bf00a0f7ffc3dec1cbf364c69815e5dcbf829677710e5b740bd58476ca9f7
+  data.tar.gz: 7220c9399aca9756e4773dda4b5fbdd573bd3decfe32758797ea11e309e6f0e0
 SHA512:
-  metadata.gz: 2359d17e2408b50b04a3ae1c9b4015de93b4e7d92b06a5b64d6cc8af48380e2affa7e4eb17d20e35def404116bdecef838bd9ec19c9c39867c05116de02eca40
-  data.tar.gz: febb7a95cc0bd70c59e921a6479b4e4f7c80b6ad1443366aef0658358877876a04b37f9993827e15fe6d9eb0386efb7fa082063b0e6758e8ddeead1bb9dd5aa2
+  metadata.gz: d5933ae50944a7f77e6c68410d4291935b769869b59f71817dabd98df2e5a50f86f6200c4b7bc9800249e274c4e3ecd1e5d339df66cb08e258c50c25308e3bba
+  data.tar.gz: e01f29a16242b81b586d7852062efe030a760f30620096a691be6ee47c45de3d5f1b1ef7ce0f166a6c3328e3972ca470aaffd51b235f8d9f2f6c8b6ead69c193

data/lib/notion_api/notion_types/collection_view_blocks.rb

@@ -33,7 +33,9 @@ module NotionAPI
       transaction_id = extract_id(SecureRandom.hex(16))
       space_id = extract_id(SecureRandom.hex(16))
       new_block_id = extract_id(SecureRandom.hex(16))
-      schema = extract_collection_schema(@collection_id, @view_id)
+      collection_data = extract_collection_data(collection_id, view_id)
+      last_row_id = collection_data["collection_view"][@view_id]["value"]["page_sort"][-1]
+      schema = collection_data['collection'][collection_id]['value']['schema']
       keys = schema.keys
       col_map = {}
       keys.map { |key| col_map[schema[key]["name"]] = key }
@@ -47,17 +49,24 @@ module NotionAPI
       instantiate_row = Utils::CollectionViewComponents.add_new_row(new_block_id)
       set_block_alive = Utils::CollectionViewComponents.set_collection_blocks_alive(new_block_id, @collection_id)
       new_block_edited_time = Utils::BlockComponents.last_edited_time(new_block_id)
-      parent_edited_time = Utils::BlockComponents.last_edited_time(@parent_id)
+      page_sort = Utils::BlockComponents.row_location_add(last_row_id, new_block_id, @view_id)
 
       operations = [
         instantiate_row,
         set_block_alive,
         new_block_edited_time,
-        parent_edited_time,
+        page_sort
       ]
 
       data.keys.each_with_index do |col_name, j|
         unless col_map.keys.include?(col_name.to_s); raise ArgumentError, "Column '#{col_name.to_s}' does not exist." end
+        if %q[select multi_select].include?(schema[col_map[col_name.to_s]]["type"])
+          options = schema[col_map[col_name.to_s]]["options"].map {|option| option["value"]}
+          if !options.include?(data[col_name])
+            create_new_option = Utils::CollectionViewComponents.add_new_option(col_map[col_name.to_s], data[col_name], @collection_id)
+            operations.push(create_new_option)
+          end
+        end
         child_component = Utils::CollectionViewComponents.insert_data(new_block_id, col_map[col_name.to_s], data[col_name], schema[col_map[col_name.to_s]]["type"])
         operations.push(child_component)
       end

data/lib/notion_api/utils.rb

@@ -200,14 +200,14 @@ module Utils
 
       args = if command == "listAfter"
           {
-                 after: target || block_id,
-                 id: new_block_id || block_id,
-               }
+            after: target || block_id,
+            id: new_block_id || block_id,
+          }
         else
           {
-                 before: target || block_id,
-                 id: new_block_id || block_id,
-               }
+            before: target || block_id,
+            id: new_block_id || block_id,
+          }
         end
 
       {
@@ -219,6 +219,21 @@ module Utils
       }
     end
 
+    def self.row_location_add(last_row_id, block_id, view_id)
+      {
+        "table": "collection_view",
+        "id": view_id,
+        "path": [
+            "page_sort"
+        ],
+        "command": "listAfter",
+        "args": {
+            "after": last_row_id,
+            "id": block_id
+        }
+    }
+    end
+
     def self.block_location_remove(block_parent_id, block_id)
       # ! removes a notion block
       # ! block_parent_id -> the parent ID of the block to remove : ``str``
@@ -276,9 +291,9 @@ module Utils
     def self.add_emoji_icon(block_id, icon)
       {
         id: block_id,
-        table:"block",
-        path:["format","page_icon"],
-        command:"set","args": icon
+        table: "block",
+        path: ["format", "page_icon"],
+        command: "set", "args": icon,
       }
     end
   end
@@ -383,14 +398,14 @@ module Utils
       # ! new_block_id -> id of the new block
       # ! data -> json data to insert into table.
       col_names = data[0].keys
-      data_mappings = {Integer => "number", String => "text", Array => "text", Float => "number", Date => "date"}
+      data_mappings = { Integer => "number", String => "text", Array => "text", Float => "number", Date => "date" }
       exceptions = [ArgumentError, TypeError]
       data_types = col_names.map do |name|
         # TODO: this is a little hacky... should probably think about a better way or add a requirement for user input to match a certain criteria.
-        begin 
+        begin
           DateTime.parse(data[0][name]) ? data_mappings[Date] : nil
         rescue *exceptions
-          data_mappings[data[0][name].class] 
+          data_mappings[data[0][name].class]
         end
       end
 
@@ -403,18 +418,18 @@ module Utils
         end
       end
       return {
-        id: collection_id,
-        table: "collection",
-        path: [],
-        command: "update",
-        args: {
-          id: collection_id,
-          schema: schema_conf,
-          parent_id: new_block_id,
-          parent_table: "block",
-          alive: true,
-        },
-      }, data_types
+               id: collection_id,
+               table: "collection",
+               path: [],
+               command: "update",
+               args: {
+                 id: collection_id,
+                 schema: schema_conf,
+                 parent_id: new_block_id,
+                 parent_table: "block",
+                 alive: true,
+               },
+             }, data_types
     end
 
     def self.set_collection_title(collection_title, collection_id)
@@ -440,6 +455,11 @@ module Utils
       # ! column -> the name of the column to insert data into.
       # ! value -> the value to insert into the column.
       # ! mapping -> the column data type.
+      simple_mappings = ["title", "text", "phone_number", "email", "url", "number", "checkbox", "select", "multi_select"]
+      datetime_mappings = ["date"]
+      media_mappings = ["file"]
+      person_mappings = ["person"]
+
       table = "block"
       path = [
         "properties",
@@ -447,12 +467,47 @@ module Utils
       ]
       command = "set"
 
+      if simple_mappings.include?(mapping)
+        args = [[value]]
+      elsif media_mappings.include?(mapping)
+        args = [[value, [["a", value]]]]
+      elsif datetime_mappings.include?(mapping)
+        args = [["‣", [["d", { "type": "date", "start_date": value }]]]]
+      elsif person_mappings.include?(mapping)
+        args = [["‣",
+          [["u", value]]
+        ]]
+        else 
+          raise SchemaTypeError, "Invalid property type: #{mapping}"
+      end
+
       {
-        id: block_id,
         table: table,
+        id: block_id,
+        command: command,
         path: path,
+        args: args,
+      }
+    end
+
+    def self.add_new_option(column, value, collection_id)
+      table = "collection"
+      path = ["schema", column, "options"]
+      command = "keyedObjectListAfter"
+      args = {
+        "value": {
+            "id": SecureRandom.hex(16),
+            "value": value,
+            "color": "green"
+        }
+      }
+
+      {
+        table: table,
+        id: collection_id,
         command: command,
-        args: mapping == "date" ? [["‣",[["d",{"type": "date","start_date": value}]]]] : [[value]],
+        path: path,
+        args: args,
       }
     end
 
@@ -505,45 +560,45 @@ module Utils
       args["format"] = {
         "table_properties" => [
           {
-                  "property" => "title",
-                  "visible" => true,
-                  "width" => 280,
-                },
+            "property" => "title",
+            "visible" => true,
+            "width" => 280,
+          },
           {
-                  "property" => "aliases",
-                  "visible" => true,
-                  "width" => 200,
-                },
+            "property" => "aliases",
+            "visible" => true,
+            "width" => 200,
+          },
           {
-                  "property" => "category",
-                  "visible" => true,
-                  "width" => 200,
-                },
+            "property" => "category",
+            "visible" => true,
+            "width" => 200,
+          },
           {
-                  "property" => "description",
-                  "visible" => true,
-                  "width" => 200,
-                },
+            "property" => "description",
+            "visible" => true,
+            "width" => 200,
+          },
           {
-                  "property" => "ios_version",
-                  "visible" => true,
-                  "width" => 200,
-                },
+            "property" => "ios_version",
+            "visible" => true,
+            "width" => 200,
+          },
+          {
+            "property" => "tags",
+            "visible" => true,
+            "width" => 200,
+          },
           {
-                  "property" => "tags",
-                  "visible" => true,
-                  "width" => 200,
-                },
-                {
                   "property" => "phone",
                   "visible" => true,
                   "width" => 200,
                 },
           {
-                  "property" => "unicode_version",
-                  "visible" => true,
-                  "width" => 200,
-                }
+            "property" => "unicode_version",
+            "visible" => true,
+            "width" => 200,
+          },
         ],
       }
       {
@@ -563,11 +618,11 @@ module Utils
       table = "block"
       path = [
         "properties",
-        column_name
+        column_name,
       ]
       command = "set"
       args = [[
-        new_value
+        new_value,
       ]]
 
       {
@@ -575,11 +630,18 @@ module Utils
         table: table,
         path: path,
         command: command,
-        args: args
+        args: args,
       }
     end
   end
 
+  class SchemaTypeError < StandardError
+    def initialize(msg="Custom exception that is raised when an invalid property type is passed as a mapping.", exception_type="schema_type")
+      @exception_type = exception_type
+      super(msg)
+    end
+  end
+
   def build_payload(operations, request_ids)
     # ! properly formats the payload for Notions backend.
     # ! operations -> an array of hashes that define the operations to perform : ``Array[Hash]``
@@ -600,4 +662,4 @@ module Utils
     }
     payload
   end
-end
+end

data/lib/notion_api/version.rb

@@ -1,3 +1,3 @@
 module NotionAPI
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Dan Murphy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty