notion 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c99389e680f113f6288c7809f95c3c4b86b894c7c0b741dd774d5738b398b241
-  data.tar.gz: 1f995b8c4d27874a248bf99023efe02a96198231e0a7cfb51d139bbae45f6cac
+  metadata.gz: 761cf6b775c714eb4b8eb65710baf3407eaa6061d717b18e59510a048c0edf7f
+  data.tar.gz: 7f3ba657e798d7e9a24b0aa77ee098462fdb164f958309fdc12ca39d54b78231
 SHA512:
-  metadata.gz: 65d7e7713162c1ca4e694972715d904b927dada01eb3c679f9470119bb7c35afa801ffc2894cba5485348a6ae1beb4b6df931af3fada0f74317d0ae1bd27d94d
-  data.tar.gz: 375a2c1357cd5a56064a86fe650e523ddaee2834d7d0e3039b6a73d17b5157e418a4f2fa298562748e1bee350fcf5221efe1880db8b60970f2462556c4bc8468
+  metadata.gz: 281bc33e957a074c02bf2866e526aa866d2f75945f7c9dbf9ec0a41a5ac7b5795fe2cedf429e8b2e6220b16550d2bf8c9c7107832672bf4915124fb8c9dae167
+  data.tar.gz: f02fde242ad8ebfeef9edc3c1850270a8d1459a93b1fafd83ec88eae323ca4dba0ae07bacfc9ef38e053012e81c71b2690c7fe6b68d88e31ca7898e3a4592df7

data/README.md

@@ -310,8 +310,12 @@ From here, you can instantiate the Notion Client with the following code:
 )
 ```
 ### Retrieve a full-page Collection View
-Currently, either a "normal" Page URL or the Page Block ID is accepted to the `get_page` method. Therefore, if you pass the full URL to the CV Table, it will raise an error:
-```text
-the URL or ID passed to the get_page method must be that of a Page Block.
+A full-page collection view must have a URL that follows the below pattern:
+https://www.notion.so/danmurphy/[page-id]?v=[view-id]
+Then, it can be retrieved with the following code:
+```ruby
+>>> @client = NotionAPI::Client.new(
+  "<insert_v2_token_here>"
+)
+>>> @client.get_page(https://www.notion.so/danmurphy/[page-id]?v=[view-id])
 ```
-To avoid this, you must pass only the ID of the full-page collection-view to the `get_page` method. This is next up on the features list, so passing the full URL will be supported soon:smile:

data/lib/notion_api/core.rb

@@ -235,17 +235,26 @@ module NotionAPI
       # ! parse and clean the URL or ID object provided.
       # ! url_or_id -> the block ID or URL : ``str``
       http_or_https = url_or_id.match(/^(http|https)/) # true if http or https in url_or_id...
+      collection_view_match = url_or_id.match(/(\?v=)/)
+
       if (url_or_id.length == 36) && ((url_or_id.split('-').length == 5) && !http_or_https)
         # passes if url_or_id is perfectly formatted already...
         url_or_id
-      elsif (http_or_https && (url_or_id.split('-').last.length == 32)) || (!http_or_https && (url_or_id.length == 32))
+      elsif (http_or_https && (url_or_id.split('-').last.length == 32)) || (!http_or_https && (url_or_id.length == 32)) || (collection_view_match)
         # passes if either:
         # 1. a URL is passed as url_or_id and the ID at the end is 32 characters long or
         # 2. a URL is not passed and the ID length is 32 [aka unformatted]
         pattern = [8, 13, 18, 23]
-        id = url_or_id.split('-').last
-        pattern.each { |index| id.insert(index, '-') }
-        id
+        if collection_view_match
+          id_without_view = url_or_id.split('?')[0]
+          clean_id = id_without_view.split('/').last
+          pattern.each { |index| clean_id.insert(index, '-') }
+          clean_id
+        else
+          id = url_or_id.split('-').last
+          pattern.each { |index| id.insert(index, '-') }
+          id
+        end
       else
         raise ArgumentError, 'Expected a Notion page URL or a page ID. Please consult the documentation for further information.'
       end

data/lib/notion_api/notion_types/collection_view_blocks.rb

@@ -35,7 +35,7 @@ module NotionAPI
       new_block_id = extract_id(SecureRandom.hex(16))
       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']
+      schema = collection_data["collection"][collection_id]["value"]["schema"]
       keys = schema.keys
       col_map = {}
       keys.map { |key| col_map[schema[key]["name"]] = key }
@@ -55,16 +55,19 @@ module NotionAPI
         instantiate_row,
         set_block_alive,
         new_block_edited_time,
-        page_sort
+        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"].nil? ? [] : 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)
+          options = schema[col_map[col_name.to_s]]["options"].nil? ? [] : schema[col_map[col_name.to_s]]["options"].map { |option| option["value"] }
+          multi_select_multi_options = data[col_name].split(",")
+          multi_select_multi_options.each do |option|
+            if !options.include?(option.strip)
+              create_new_option = Utils::CollectionViewComponents.add_new_option(col_map[col_name.to_s], option.strip, @collection_id)
+              operations.push(create_new_option)
+            end
           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"])
@@ -83,7 +86,18 @@ module NotionAPI
       unless response.code == 200; raise "There was an issue completing your request. Here is the response from Notion: #{response.body}, and here is the payload that was sent: #{operations}.
            Please try again, and if issues persist open an issue in GitHub.";       end
 
-      NotionAPI::CollectionViewRow.new(new_block_id, @parent_id, @collection_id, @view_id)
+      collection_row = NotionAPI::CollectionViewRow.new(new_block_id, @parent_id, @collection_id, @view_id)
+
+      properties = {}
+      data.keys.each do |col|
+        properties[col_map[col.to_s]] = [[data[col]]]
+      end
+
+      collection_data["block"][collection_row.id] = {"role"=>"editor", "value"=>{"id"=> collection_row.id, "version"=>12, "type"=>"page", "properties"=> properties, "created_time"=>1607253360000, "last_edited_time"=>1607253360000, "parent_id"=>"dde513c6-2428-4a5d-a830-7a67fdbf6b48", "parent_table"=>"collection", "alive"=>true, "created_by_table"=>"notion_user", "created_by_id"=>"0c5f02f3-495d-4b73-b1c5-9f6fe03a8c26", "last_edited_by_table"=>"notion_user", "last_edited_by_id"=>"0c5f02f3-495d-4b73-b1c5-9f6fe03a8c26", "shard_id"=>955090, "space_id"=>"f687f7de-7f4c-4a86-b109-941a8dae92d2"}}
+      row_data = collection_data["block"][collection_row.id]
+      create_singleton_methods_and_instance_variables(collection_row, row_data)
+
+      collection_row
     end
 
     def add_property(name, type)
@@ -214,6 +228,7 @@ module NotionAPI
       end
       clean_row_instances
     end
+
     def create_singleton_methods_and_instance_variables(row, row_data)
       # ! creates singleton methods for each property in a CollectionView.
       # ! row -> the block ID of the 'row' to retrieve: ``str``
@@ -223,7 +238,7 @@ module NotionAPI
       column_mappings = schema.keys
       column_hash = {}
       column_names = column_mappings.map { |mapping| column_hash[mapping] = schema[mapping]["name"].downcase }
-      
+
       column_hash.keys.each_with_index do |column, i|
         # loop over the column names...
         # set instance variables for each column, allowing the dev to 'read' the column value
@@ -233,18 +248,23 @@ module NotionAPI
         if row_data["value"]["properties"].nil? or row_data["value"]["properties"][column].nil?
           value = ""
         else
-          value = row_data["value"]["properties"][column][0][0]  
+          value = row_data["value"]["properties"][column][0][0]
+          if ["‣"].include?(value.to_s)
+            value = row_data["value"]["properties"][column][0][1].flatten[-1]
+          end
         end
 
         row.instance_variable_set("@#{cleaned_column}", value)
         CollectionViewRow.class_eval { attr_reader cleaned_column }
-        # then, define singleton methods for each column that are used to update the table cell 
+        # then, define singleton methods for each column that are used to update the table cell
         row.define_singleton_method("#{cleaned_column}=") do |new_value|
           # neat way to get the name of the currently invoked method...
           parsed_method = __method__.to_s[0...-1].split("_").join(" ")
           cookies = Core.options["cookies"]
           headers = Core.options["headers"]
-
+          
+          p new_value, column_hash.key(parsed_method), column_names, schema
+          
           request_id = extract_id(SecureRandom.hex(16))
           transaction_id = extract_id(SecureRandom.hex(16))
           space_id = extract_id(SecureRandom.hex(16))
@@ -255,12 +275,24 @@ module NotionAPI
             space_id: space_id,
           }
 
-          update_property_value = Utils::CollectionViewComponents.update_property_value(@id, column_hash.key(parsed_method), new_value)
+          update_property_value_hash = Utils::CollectionViewComponents.update_property_value(@id, column_hash.key(parsed_method), new_value)
 
           operations = [
-            update_property_value,
+            update_property_value_hash,
           ]
 
+          if %q[select multi_select].include?(schema[column_hash.key(parsed_method)]["type"])
+            p "ENTERED THE ABYSS"
+            options = schema[column_hash.key(parsed_method)]["options"].nil? ? [] : schema[column_hash.key(parsed_method)]["options"].map { |option| option["value"] }
+            multi_select_multi_options = new_value.split(",")
+            multi_select_multi_options.each do |option|
+              if !options.include?(option.strip)
+                create_new_option = Utils::CollectionViewComponents.add_new_option(column_hash.key(parsed_method), option.strip, @collection_id)
+                operations.push(create_new_option)
+              end
+            end
+          end
+
           request_url = URLS[:UPDATE_BLOCK]
           request_body = build_payload(operations, request_ids)
           response = HTTParty.post(
@@ -270,8 +302,8 @@ module NotionAPI
             headers: headers,
           )
           unless response.code == 200; raise "There was an issue completing your request. Here is the response from Notion: #{response.body}, and here is the payload that was sent: #{operations}.
-               Please try again, and if issues persist open an issue in GitHub.";end
-          
+               Please try again, and if issues persist open an issue in GitHub.";           end
+
           # set the instance variable to the updated value!
           _ = row.instance_variable_set("@#{__method__.to_s[0...-1]}", new_value)
           row

data/lib/notion_api/utils.rb

@@ -491,11 +491,12 @@ module Utils
     end
 
     def self.add_new_option(column, value, collection_id)
-      colors = ["default", "gray", "brown", "orange", "yellow", "green", "blue", "purple", "pink", "red"]
-      random_color = colors[rand(0...colors.length)]
       table = "collection"
       path = ["schema", column, "options"]
       command = "keyedObjectListAfter"
+      colors = ["default", "gray", "brown", "orange", "yellow", "green", "blue", "purple", "pink", "red"]
+      random_color = colors[rand(0...colors.length)]
+
       args = {
         "value": {
             "id": SecureRandom.hex(16),

data/lib/notion_api/version.rb

@@ -1,3 +1,3 @@
 module NotionAPI
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
 end

metadata

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