notion 1.0.7 → 1.1.4

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

@@ -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"].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)
@@ -144,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)
@@ -180,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) }
@@ -214,6 +210,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,22 +220,24 @@ 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
-        cleaned_column = column_hash[column].split(" ").join("_").downcase.to_sym
+        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
-          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(" ")
@@ -255,12 +254,23 @@ 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, schema[column_hash.key(parsed_method)]["type"])
 
           operations = [
-            update_property_value,
+            update_property_value_hash,
           ]
 
+          if %q[select multi_select].include?(schema[column_hash.key(parsed_method)]["type"])
+            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,14 +280,31 @@ 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
         end
       end
     end
+
+    def clean_property_names(prop_hash, prop_notion_name)
+      # ! standardize property names by splitting the words in the property name into an array, removing non-alphanumeric
+      # ! characters, downcasing, and then re-joining the array with underscores.
+      # ! prop_hash -> hash of property notion names  and property textual names: ``str``
+      # ! prop_notion_name -> the four-character long name of the notion property: ``str``
+
+      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

data/lib/notion_api/notion_types/column_list_block.rb

@@ -1,16 +1,16 @@
 module NotionAPI
 
-    # no use case for this yet.
-    class ColumnListBlock < BlockTemplate
-      @notion_type = 'column_list'
-      @type = 'column_list'
-  
-      def type
-        NotionAPI::ColumnListBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
-      end
+  # no use case for this yet.
+  class ColumnListBlock < BlockTemplate
+    @notion_type = "column_list"
+    @type = "column_list"
+
+    def type
+      NotionAPI::ColumnListBlock.notion_type
+    end
+
+    class << self
+      attr_reader :notion_type, :type
     end
-end
+  end
+end

data/lib/notion_api/notion_types/divider_block.rb

@@ -1,15 +1,15 @@
 module NotionAPI
-    # divider block: ---------
-    class DividerBlock < BlockTemplate
-      @notion_type = 'divider'
-      @type = 'divider'
-  
-      def type
-        NotionAPI::DividerBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
-      end
+  # divider block: ---------
+  class DividerBlock < BlockTemplate
+    @notion_type = "divider"
+    @type = "divider"
+
+    def type
+      NotionAPI::DividerBlock.notion_type
     end
-end
+
+    class << self
+      attr_reader :notion_type, :type
+    end
+  end
+end

data/lib/notion_api/notion_types/header_block.rb

@@ -1,16 +1,16 @@
 module NotionAPI
 
-    # Header block: H1
-    class HeaderBlock < BlockTemplate
-      @notion_type = 'header'
-      @type = 'header'
-  
-      def type
-        NotionAPI::HeaderBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
-      end
+  # Header block: H1
+  class HeaderBlock < BlockTemplate
+    @notion_type = "header"
+    @type = "header"
+
+    def type
+      NotionAPI::HeaderBlock.notion_type
+    end
+
+    class << self
+      attr_reader :notion_type, :type
     end
-end
+  end
+end

data/lib/notion_api/notion_types/image_block.rb

@@ -1,16 +1,63 @@
 module NotionAPI
 
-    # good for visual information
-    class ImageBlock < BlockTemplate
-      @notion_type = 'image'
-      @type = 'image'
-  
-      def type
-        NotionAPI::ImageBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
+  # good for visual information
+  class ImageBlock < BlockTemplate
+    @notion_type = "image"
+    @type = "image"
+
+    def type
+      NotionAPI::ImageBlock.notion_type
+    end
+
+    class << self
+      attr_reader :notion_type, :type
+    end
+
+    private
+
+    def self.create(block_id, new_block_id, block_title, target, position_command, request_ids, options)
+      if !(options[:image])
+        raise ArgumentError, "Must specify image as an option. For example: .create(\"block type\", \"block title\", options: {image: \"https://image-domain.com\"})"
+      else
+        cookies = Core.options["cookies"]
+        headers = Core.options["headers"]
+        if options[:image].match(/^http:\/\/|^https:\/\//)
+          create_hash = Utils::BlockComponents.create(new_block_id, self.notion_type)
+          set_parent_alive_hash = Utils::BlockComponents.set_parent_to_alive(block_id, new_block_id)
+          block_location_hash = Utils::BlockComponents.block_location_add(block_id, block_id, new_block_id, target, position_command)
+          last_edited_time_parent_hash = Utils::BlockComponents.last_edited_time(block_id)
+          last_edited_time_child_hash = Utils::BlockComponents.last_edited_time(block_id)
+          title_hash = Utils::BlockComponents.title(new_block_id, block_title)
+          source_url_hash = Utils::BlockComponents.source(new_block_id, options[:image])
+          display_source_url_hash = Utils::BlockComponents.display_source(new_block_id, options[:image])
+
+          operations = [
+            create_hash,
+            set_parent_alive_hash,
+            block_location_hash,
+            last_edited_time_parent_hash,
+            last_edited_time_child_hash,
+            title_hash,
+            source_url_hash,
+            display_source_url_hash,
+          ]
+
+          request_url = URLS[:UPDATE_BLOCK]
+          request_body = Utils::BlockComponents.build_payload(operations, request_ids)
+          response = HTTParty.post(
+            request_url,
+            body: request_body.to_json,
+            cookies: cookies,
+            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
+
+          self.new(new_block_id, block_title, block_id)
+        else
+          raise ArgumentError, "Currently, images can only be created through a public image URL."
+        end
       end
     end
-end
+  end
+end

data/lib/notion_api/notion_types/latex_block.rb

@@ -1,16 +1,16 @@
 module NotionAPI
 
-    # simiilar to code block but for mathematical functions.
-    class LatexBlock < BlockTemplate
-      @notion_type = 'equation'
-      @type = 'equation'
-  
-      def type
-        NotionAPI::LatexBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
-      end
+  # simiilar to code block but for mathematical functions.
+  class LatexBlock < BlockTemplate
+    @notion_type = "equation"
+    @type = "equation"
+
+    def type
+      NotionAPI::LatexBlock.notion_type
+    end
+
+    class << self
+      attr_reader :notion_type, :type
     end
-end
+  end
+end

data/lib/notion_api/notion_types/link_block.rb

@@ -0,0 +1,51 @@
+module NotionAPI
+
+    # simiilar to code block but for mathematical functions.
+    class LinkBlock < BlockTemplate
+      @notion_type = "link_to_page"
+      @type = "link_to_page"
+  
+      def type
+        NotionAPI::LinkBlock.notion_type
+      end
+  
+      class << self
+        attr_reader :notion_type, :type
+      end
+
+      def self.create(block_id, new_block_id, block_title, target, position_command, request_ids, options)
+        block_title = super.extract_id(block_title)
+
+        cookies = Core.options["cookies"]
+        headers = Core.options["headers"]
+  
+        create_block_hash = Utils::BlockComponents.create(new_block_id, self.notion_type)
+        block_location_hash = Utils::BlockComponents.block_location_add(block_id, block_id, block_title, new_block_id, position_command)
+        last_edited_time_hash = Utils::BlockComponents.last_edited_time(block_id)
+        remove_item_hash = Utils::BlockComponents.block_location_remove( super.parent_id, new_block_id)
+  
+        operations = [
+          create_block_hash,
+          block_location_hash,
+          last_edited_time_hash,
+          remove_item_hash
+        ]
+  
+        request_url = URLS[:UPDATE_BLOCK]
+        request_body = Utils::BlockComponents.build_payload(operations, request_ids)
+        
+        response = HTTParty.post(
+          request_url,
+          body: request_body.to_json,
+          cookies: cookies,
+          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
+  
+        self.new(new_block_id, block_title, block_id)
+      end
+    end
+  end
+