notion 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3114ccf59f80a17322c559fce61050e7e7f1908a279e8786c4a8fe87e6fa79d8
-  data.tar.gz: a7c6fea5eb18a4d962117a4a5120bc357e0bf038640ba39db821d5bc3de230e6
+  metadata.gz: a6dfa3bb58bd4850c061ed6cf0efbb11ad3548f9dbcfb773b04fdb36d99cf356
+  data.tar.gz: 1be5e4c8dc4975fc2de62bc802b296b283cff406a943d3f5fa88980ecfa07b65
 SHA512:
-  metadata.gz: '06202342711853b35c0d694b4de7c89aec269f226d5ceda2c6b4e086f61f6e8f3e7381ca1d0389d85c2b3814d849dd980d9d6b3492a9d2a3d9c8bf9fbad71939'
-  data.tar.gz: 7561a58fff0a26b4190a79c713a4f89c3f85c1c5cca4bca21e2c9013ea3fa981f32e8779e9b771b243fe41a65c5b717f9a09e675e9c9590c3a09cf1f344ca02b
+  metadata.gz: 6291929f81e39755067265260f3ff94d4e691f420713af7cb7a1b7505a9ab097bdd78720bcc2d344df555cc20b106203aae0bd09eea52a041e8c4a8057b9b4a8
+  data.tar.gz: de33fa730ee063bb6e54877ce959e1ca7f8bde1345ae90db9c1a368e8c08ad37dec54f473d99c38c6bc26f3e97e17741bba92e3b09cd1d6cb64b5fdce629723b

data/README.md

@@ -317,5 +317,5 @@ Then, it can be retrieved with the following code:
 >>> @client = NotionAPI::Client.new(
   "<insert_v2_token_here>"
 )
->>> @client.get_page(https://www.notion.so/danmurphy/[page-id]?v=[view-id])
+>>> @client.get_page("https://www.notion.so/danmurphy/[page-id]?v=[view-id]")
 ```

data/lib/notion_api/core.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'utils'
-require 'httparty'
+require_relative "utils"
+require "httparty"
 
 module NotionAPI
   # the initial methods available to an instantiated Cloent object are defined
   class Core
     include Utils
-    @options = { 'cookies' => { :token_v2 => nil, 'x-active-user-header' => nil }, 'headers' => { 'Content-Type' => 'application/json' } }
-    @type_whitelist = 'divider'
+    @options = { "cookies" => { :token_v2 => nil, "x-active-user-header" => nil }, "headers" => { "Content-Type" => "application/json" } }
+    @type_whitelist = "divider"
 
     class << self
       attr_reader :options, :type_whitelist, :token_v2, :active_user_header
@@ -30,39 +30,16 @@ module NotionAPI
         pageId: clean_id,
         chunkNumber: 0,
         limit: 100,
-        verticalColumns: false
+        verticalColumns: false,
       }
-      jsonified_record_response = get_all_block_info(clean_id, request_body)
-      i = 0
-      while jsonified_record_response.empty? || jsonified_record_response['block'].empty?
-        return {} if i >= 10
+      jsonified_record_response = get_all_block_info(request_body)
 
-        jsonified_record_response = get_all_block_info(clean_id, request_body)
-        i += 1
-      end
-
-      block_id = clean_id
       block_type = extract_type(clean_id, jsonified_record_response)
       block_parent_id = extract_parent_id(clean_id, jsonified_record_response)
 
-      raise 'the URL or ID passed to the get_page method must be that of a Page Block.' if !['collection_view_page', 'page'].include?(block_type)
-
-      if block_type == "page"
-        block_title = extract_title(clean_id, jsonified_record_response)
-        PageBlock.new(block_id, block_title, block_parent_id)
-      elsif block_type == "collection_view_page"
-        collection_id = extract_collection_id(block_id, jsonified_record_response)
-        block_title = extract_collection_title(clean_id, collection_id, jsonified_record_response)
-        view_id = extract_view_ids(block_id, jsonified_record_response)[0]
-        schema = extract_collection_schema(collection_id, view_id, jsonified_record_response)
-        column_mappings = schema.keys
-        column_names = column_mappings.map { |mapping| schema[mapping]['name']}
-
-        collection_view_page = CollectionViewPage.new(block_id, block_title, block_parent_id, collection_id, view_id)
-        collection_view_page.instance_variable_set(:@column_names, column_names)
-        CollectionView.class_eval{attr_reader :column_names}
-        collection_view_page
-      end
+      raise ArgumentError, "the URL or ID passed to the get_page method must be that of a Page Block." if !["collection_view_page", "page"].include?(block_type)
+
+      get_instantiated_instance_for(block_type, clean_id, block_parent_id, jsonified_record_response)
     end
 
     def children(url_or_id = @id)
@@ -87,18 +64,12 @@ module NotionAPI
         pageId: clean_id,
         chunkNumber: 0,
         limit: 100,
-        verticalColumns: false
+        verticalColumns: false,
       }
-      jsonified_record_response = get_all_block_info(clean_id, request_body)
-      i = 0
-      while jsonified_record_response.empty?
-        return {} if i >= 10
+      jsonified_record_response = get_all_block_info(request_body)
 
-        jsonified_record_response = get_all_block_info(clean_id, request_body)
-        i += 1
-      end
-
-      jsonified_record_response['block'][clean_id]['value']['content'] || []
+      # if no content, returns empty list
+      jsonified_record_response["block"][clean_id]["value"]["content"] || []
     end
 
     private
@@ -106,19 +77,19 @@ module NotionAPI
     def get_notion_id(body)
       # ! retrieves a users ID from the headers of a Notion response object.
       # ! body -> the body to send in the request : ``Hash``
-      Core.options['cookies'][:token_v2] = @@token_v2
-      Core.options['headers']['x-notion-active-user-header'] = @@active_user_header
-      cookies = Core.options['cookies']
-      headers = Core.options['headers']
+      Core.options["cookies"][:token_v2] = @@token_v2
+      Core.options["headers"]["x-notion-active-user-header"] = @@active_user_header
+      cookies = Core.options["cookies"]
+      headers = Core.options["headers"]
       request_url = URLS[:GET_BLOCK]
 
       response = HTTParty.post(
         request_url,
         body: body.to_json,
         cookies: cookies,
-        headers: headers
+        headers: headers,
       )
-      response.headers['x-notion-user-id']
+      response.headers["x-notion-user-id"]
     end
 
     def get_last_page_block_id(url_or_id)
@@ -132,48 +103,53 @@ module NotionAPI
         pageId: clean_id,
         chunkNumber: 0,
         limit: 100,
-        verticalColumns: false
+        verticalColumns: false,
       }
-      jsonified_record_response = get_all_block_info(clean_id, request_body)
-      i = 0
-      while jsonified_record_response.empty?
-        return {:properties => {title: [[block_title]]}, :format => {}} if i >= 10
+      jsonified_record_response = get_all_block_info(request_body)
 
-        jsonified_record_response = get_all_block_info(clean_id, request_body)
-        i += 1
-      end
-      properties = jsonified_record_response['block'][clean_id]['value']['properties']
-      formats = jsonified_record_response['block'][clean_id]['value']['format']
+      properties = jsonified_record_response["block"][clean_id]["value"]["properties"]
+      formats = jsonified_record_response["block"][clean_id]["value"]["format"]
       return {
-        :properties => properties,
-        :format => formats
-      }
+               :properties => properties,
+               :format => formats,
+             }
     end
 
-    def get_all_block_info(_clean_id, body)
+    def get_all_block_info(body, i = 0)
       # ! retrieves all info pertaining to a block Id.
       # ! clean_id -> the block ID or URL cleaned : ``str``
-      Core.options['cookies'][:token_v2] = @@token_v2
-      Core.options['headers']['x-notion-active-user-header'] = @@active_user_header
-      cookies = Core.options['cookies']
-      headers = Core.options['headers']
-
+      Core.options["cookies"][:token_v2] = @@token_v2
+      Core.options["headers"]["x-notion-active-user-header"] = @@active_user_header
+      cookies = Core.options["cookies"]
+      headers = Core.options["headers"]
       request_url = URLS[:GET_BLOCK]
 
       response = HTTParty.post(
         request_url,
         body: body.to_json,
         cookies: cookies,
-        headers: headers
+        headers: headers,
       )
 
-      JSON.parse(response.body)['recordMap']
+      jsonified_record_response = JSON.parse(response.body)["recordMap"]
+      response_invalid = (!jsonified_record_response || jsonified_record_response.empty? || jsonified_record_response["block"].empty?)
+
+      if i < 10 && response_invalid
+        i = i + 1
+        return get_all_block_info(body, i)
+      else
+        if i == 10 && response_invalid
+          raise InvalidClientInstantiationError, "Attempted to retrieve block 10 times and received an empty response each time. Please make sure you have a valid token_v2 value set. If you do, then try setting the 'active_user_header' variable as well."
+        else
+          return jsonified_record_response
+        end
+      end
     end
 
     def filter_nil_blocks(jsonified_record_response)
       # ! removes any blocks that are empty [i.e. have no title / content]
       # ! jsonified_record_responses -> parsed JSON representation of a notion response object : ``Json``
-      jsonified_record_response.empty? || jsonified_record_response['block'].empty? ? nil : jsonified_record_response['block']
+      jsonified_record_response.empty? || jsonified_record_response["block"].empty? ? nil : jsonified_record_response["block"]
     end
 
     def extract_title(clean_id, jsonified_record_response)
@@ -181,14 +157,13 @@ module NotionAPI
       # ! clean_id -> the cleaned block ID: ``str``
       # ! jsonified_record_response -> parsed JSON representation of a notion response object : ``Json``
       filter_nil_blocks = filter_nil_blocks(jsonified_record_response)
-      if filter_nil_blocks.nil? || filter_nil_blocks[clean_id].nil? || filter_nil_blocks[clean_id]['value']['properties'].nil?
+      if filter_nil_blocks.nil? || filter_nil_blocks[clean_id].nil? || filter_nil_blocks[clean_id]["value"]["properties"].nil?
         nil
       else
         # titles for images are called source, while titles for text-based blocks are called title, so lets dynamically grab it
         # https://stackoverflow.com/questions/23765996/get-all-keys-from-ruby-hash/23766007
-        title_value = filter_nil_blocks[clean_id]['value']['properties'].keys[0]
-        Core.type_whitelist.include?(filter_nil_blocks[clean_id]['value']['type']) ? nil : jsonified_record_response['block'][clean_id]['value']['properties'][title_value].flatten[0] 
-
+        title_value = filter_nil_blocks[clean_id]["value"]["properties"].keys[0]
+        Core.type_whitelist.include?(filter_nil_blocks[clean_id]["value"]["type"]) ? nil : jsonified_record_response["block"][clean_id]["value"]["properties"][title_value].flatten[0]
       end
     end
 
@@ -197,7 +172,7 @@ module NotionAPI
       # ! clean_id -> the cleaned block ID: ``str``
       # ! collection_id -> the collection ID: ``str``
       # ! jsonified_record_response -> parsed JSON representation of a notion response object : ``Json``
-      jsonified_record_response['collection'][collection_id]['value']['name'].flatten.join if jsonified_record_response['collection'] and jsonified_record_response['collection'][collection_id]['value']['name']
+      jsonified_record_response["collection"][collection_id]["value"]["name"].flatten.join if jsonified_record_response["collection"] and jsonified_record_response["collection"][collection_id]["value"]["name"]
     end
 
     def extract_type(clean_id, jsonified_record_response)
@@ -208,8 +183,7 @@ module NotionAPI
       if filter_nil_blocks.nil?
         nil
       else
-        filter_nil_blocks[clean_id]['value']['type']
-
+        filter_nil_blocks[clean_id]["value"]["type"]
       end
     end
 
@@ -217,46 +191,46 @@ module NotionAPI
       # ! extract parent ID from core JSON response object.
       # ! clean_id -> the block ID or URL cleaned : ``str``
       # ! jsonified_record_response -> parsed JSON representation of a notion response object : ``Json``
-      jsonified_record_response.empty? || jsonified_record_response['block'].empty? ? {} : jsonified_record_response['block'][clean_id]['value']['parent_id']
+      jsonified_record_response.empty? || jsonified_record_response["block"].empty? ? {} : jsonified_record_response["block"][clean_id]["value"]["parent_id"]
     end
 
     def extract_collection_id(clean_id, jsonified_record_response)
       # ! extract the collection ID
       # ! clean_id -> the block ID or URL cleaned : ``str``
       # ! jsonified_record_response -> parsed JSON representation of a notion response object : ``Json``
-      jsonified_record_response['block'][clean_id]['value']['collection_id']
+      jsonified_record_response["block"][clean_id]["value"]["collection_id"]
     end
 
     def extract_view_ids(clean_id, jsonified_record_response)
-      jsonified_record_response['block'][clean_id]['value']['view_ids'] || []
+      jsonified_record_response["block"][clean_id]["value"]["view_ids"] || []
     end
-    
+
     def extract_id(url_or_id)
       # ! 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)
+      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)) || (collection_view_match)
+      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]
         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, '-') }
+          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 = 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.'
+        raise ArgumentError, "Expected a Notion page URL or a page ID. Please consult the documentation for further information."
       end
     end
 
@@ -264,42 +238,88 @@ module NotionAPI
       # ! retrieve the collection scehma. Useful for 'building' the backbone for a table.
       # ! collection_id -> the collection ID : ``str``
       # ! view_id -> the view ID : ``str``
-      cookies = Core.options['cookies']
-      headers = Core.options['headers']
+      cookies = Core.options["cookies"]
+      headers = Core.options["headers"]
 
       if response.empty?
-        query_collection_hash = Utils::CollectionViewComponents.query_collection(collection_id, view_id, '')
+        query_collection_hash = Utils::CollectionViewComponents.query_collection(collection_id, view_id, "")
 
         request_url = URLS[:GET_COLLECTION]
         response = HTTParty.post(
           request_url,
           body: query_collection_hash.to_json,
           cookies: cookies,
-          headers: headers
+          headers: headers,
         )
-        response['recordMap']['collection'][collection_id]['value']['schema']
+        response["recordMap"]["collection"][collection_id]["value"]["schema"]
       else
-        response['collection'][collection_id]['value']['schema']
+        response["collection"][collection_id]["value"]["schema"]
       end
     end
-    
+
     def extract_collection_data(collection_id, view_id)
       # ! retrieve the collection scehma. Useful for 'building' the backbone for a table.
       # ! collection_id -> the collection ID : ``str``
       # ! view_id -> the view ID : ``str``
-      cookies = Core.options['cookies']
-      headers = Core.options['headers']
+      cookies = Core.options["cookies"]
+      headers = Core.options["headers"]
 
-      query_collection_hash = Utils::CollectionViewComponents.query_collection(collection_id, view_id, '')
+      query_collection_hash = Utils::CollectionViewComponents.query_collection(collection_id, view_id, "")
 
       request_url = URLS[:GET_COLLECTION]
       response = HTTParty.post(
         request_url,
         body: query_collection_hash.to_json,
         cookies: cookies,
-        headers: headers
+        headers: headers,
       )
-      response['recordMap']
+      response["recordMap"]
+    end
+
+    def extract_page_information(page_meta = {})
+      # ! helper method for extracting information about a page block
+      # ! page_meta -> hash containing data points useful for the extraction of a page blocks information.
+      # !           This should include clean_id, jsonified_record_response, and parent_id
+      clean_id = page_meta.fetch(:clean_id)
+      jsonified_record_response = page_meta.fetch(:jsonified_record_response)
+      block_parent_id = page_meta.fetch(:parent_id)
+
+      block_title = extract_title(clean_id, jsonified_record_response)
+      PageBlock.new(clean_id, block_title, block_parent_id)
+    end
+
+    def extract_collection_view_page_information(page_meta = {})
+      # ! helper method for extracting information about a Collection View page block
+      # ! page_meta -> hash containing data points useful for the extraction of a page blocks information.
+      # !           This should include clean_id, jsonified_record_response, and parent_id
+      clean_id = page_meta.fetch(:clean_id)
+      jsonified_record_response = page_meta.fetch(:jsonified_record_response)
+      block_parent_id = page_meta.fetch(:parent_id)
+
+      collection_id = extract_collection_id(clean_id, jsonified_record_response)
+      block_title = extract_collection_title(clean_id, collection_id, jsonified_record_response)
+      view_id = extract_view_ids(clean_id, jsonified_record_response)[0]
+      schema = extract_collection_schema(collection_id, view_id, jsonified_record_response)
+      column_names = NotionAPI::CollectionView.extract_collection_view_column_names(schema)
+
+      collection_view_page = CollectionViewPage.new(clean_id, block_title, block_parent_id, collection_id, view_id)
+      collection_view_page.instance_variable_set(:@column_names, column_names)
+      CollectionView.class_eval { attr_reader :column_names }
+      collection_view_page
+    end
+
+    def get_instantiated_instance_for(block_type, clean_id, parent_id, jsonified_record_response)
+      case block_type
+      when "page" then extract_page_information(clean_id: clean_id, parent_id: parent_id, jsonified_record_response: jsonified_record_response)
+      when "collection_view_page" then extract_collection_view_page_information(clean_id: clean_id, parent_id: parent_id, jsonified_record_response: jsonified_record_response)
+      end
+    end
+
+    class InvalidClientInstantiationError < StandardError
+      def initialize(msg = "Custom exception that is raised when an invalid property type is passed as a mapping.", exception_type = "instantiation_type")
+        @exception_type = exception_type
+        super(msg)
+      end
     end
   end
 end

data/lib/notion_api/notion_types/code_block.rb

@@ -1,16 +1,16 @@
 module NotionAPI
 
-    # Code block: used to store code, should be assigned a coding language.
-    class CodeBlock < BlockTemplate
-      @notion_type = 'code'
-      @type = 'code'
-  
-      def type
-        NotionAPI::CodeBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
-      end
+  # Code block: used to store code, should be assigned a coding language.
+  class CodeBlock < BlockTemplate
+    @notion_type = "code"
+    @type = "code"
+
+    def type
+      NotionAPI::CodeBlock.notion_type
+    end
+
+    class << self
+      attr_reader :notion_type, :type
     end
-end
+  end
+end

data/lib/notion_api/notion_types/collection_view_blocks.rb

@@ -158,20 +158,11 @@ module NotionAPI
         limit: 100,
         verticalColumns: false,
       }
-      jsonified_record_response = get_all_block_info(clean_id, request_body)
-
-      i = 0
-      while jsonified_record_response.empty? || jsonified_record_response["block"].empty?
-        return {} if i >= 10
-
-        jsonified_record_response = get_all_block_info(clean_id, request_body)
-        i += 1
-      end
+      jsonified_record_response = get_all_block_info(request_body)
 
       collection_data = extract_collection_data(@collection_id, @view_id)
       schema = collection_data["collection"][collection_id]["value"]["schema"]
-      column_mappings = schema.keys
-      column_names = column_mappings.map { |mapping| schema[mapping]["name"] }
+      column_names = NotionAPI::CollectionView.extract_collection_view_column_names(schema)
 
       collection_row = CollectionViewRow.new(row_id, @parent_id, @collection_id, @view_id)
       collection_row.instance_variable_set(:@column_names, column_names)
@@ -194,29 +185,20 @@ module NotionAPI
         verticalColumns: false,
       }
 
-      jsonified_record_response = get_all_block_info(clean_id, request_body)
-      i = 0
-      while jsonified_record_response.empty? || jsonified_record_response["block"].empty?
-        return {} if i >= 10
-
-        jsonified_record_response = get_all_block_info(clean_id, request_body)
-        i += 1
-      end
+      jsonified_record_response = get_all_block_info(request_body)
 
       jsonified_record_response["collection_view"][@view_id]["value"]["page_sort"]
     end
 
     def rows
       # ! returns all rows as instantiated class instances.
-      row_id_array = row_ids
+      row_id_array = row_ids()
       parent_id = @parent_id
       collection_id = @collection_id
       view_id = @view_id
       collection_data = extract_collection_data(@collection_id, @view_id)
       schema = collection_data["collection"][collection_id]["value"]["schema"]
-      column_mappings = schema.keys
-      column_names = column_mappings.map { |mapping| schema[mapping]["name"] }
-
+      column_names = NotionAPI::CollectionView.extract_collection_view_column_names(schema)
       row_instances = row_id_array.map { |row_id| NotionAPI::CollectionViewRow.new(row_id, parent_id, collection_id, view_id) }
       clean_row_instances = row_instances.filter { |row| collection_data["block"][row.id] }
       clean_row_instances.each { |row| row.instance_variable_set(:@column_names, column_names) }
@@ -244,7 +226,6 @@ module NotionAPI
         # set instance variables for each column, allowing the dev to 'read' the column value
         cleaned_column = clean_property_names(column_hash, column)
 
-        # p row_data["value"]["properties"][column_mappings[i]], !(row_data["value"]["properties"][column] or row_data["value"]["properties"][column_mappings[i]])
         if row_data["value"]["properties"].nil? or row_data["value"]["properties"][column].nil?
           value = ""
         else
@@ -273,7 +254,7 @@ module NotionAPI
             space_id: space_id,
           }
 
-          update_property_value_hash = 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, schema[column_hash.key(parsed_method)]["type"])
 
           operations = [
             update_property_value_hash,
@@ -316,6 +297,14 @@ module NotionAPI
 
       prop_hash[prop_notion_name].split(" ").map { |word| word.gsub(/[^a-z0-9]/i, "").downcase }.join("_").to_sym
     end
+
+    def self.extract_collection_view_column_names(schema)
+      # ! extract the column names of a Collection View
+      # ! schema: the schema of the collection view
+      column_mappings = column_mappings = schema.keys
+      column_names = column_mappings.map { |mapping| schema[mapping]["name"] }
+      column_names
+    end
   end
 
   # class that represents each row in a CollectionView