notion 1.1.2 → 1.1.3

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/numbered_block.rb

@@ -1,15 +1,15 @@
 module NotionAPI
-    # Numbered list Block: best for an ordered list
-    class NumberedBlock < BlockTemplate
-      @notion_type = 'numbered_list'
-      @type = 'numbered_list'
-  
-      def type
-        NotionAPI::NumberedBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
-      end
+  # Numbered list Block: best for an ordered list
+  class NumberedBlock < BlockTemplate
+    @notion_type = "numbered_list"
+    @type = "numbered_list"
+
+    def type
+      NotionAPI::NumberedBlock.notion_type
     end
-end
+
+    class << self
+      attr_reader :notion_type, :type
+    end
+  end
+end

data/lib/notion_api/notion_types/page_block.rb

@@ -1,130 +1,123 @@
-
 module NotionAPI
 
-    # Page Block, entrypoint for the application
-    class PageBlock < BlockTemplate
-      @notion_type = 'page'
-      @type = 'page'
-  
-      def type
-        NotionAPI::PageBlock.notion_type
-      end
-  
-      class << self
-        attr_reader :notion_type, :type
-      end
-  
-      def get_block(url_or_id)
-        # ! retrieve a Notion Block and return its instantiated class object.
-        # ! url_or_id -> the block ID or URL : ``str``
-        get(url_or_id)
-      end
-  
-      def get_collection(url_or_id)
-        # ! retrieve a Notion Collection and return its instantiated class object.
-        # ! url_or_id -> the block ID or URL : ``str``
-        clean_id = extract_id(url_or_id)
-  
-        request_body = {
-          pageId: clean_id,
-          chunkNumber: 0,
-          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
-        block_parent_id = extract_parent_id(clean_id, jsonified_record_response)
-        block_collection_id = extract_collection_id(clean_id, jsonified_record_response)
-        block_view_id = extract_view_ids(clean_id, jsonified_record_response).join
-        block_title = extract_collection_title(clean_id, block_collection_id, jsonified_record_response)
-  
-        CollectionView.new(clean_id, block_title, block_parent_id, block_collection_id, block_view_id)
+  # Page Block, entrypoint for the application
+  class PageBlock < BlockTemplate
+    @notion_type = "page"
+    @type = "page"
+
+    def type
+      NotionAPI::PageBlock.notion_type
+    end
+
+    class << self
+      attr_reader :notion_type, :type
+    end
+
+    def get_block(url_or_id)
+      # ! retrieve a Notion Block and return its instantiated class object.
+      # ! url_or_id -> the block ID or URL : ``str``
+      get(url_or_id)
+    end
+
+    def get_collection(url_or_id)
+      # ! retrieve a Notion Collection and return its instantiated class object.
+      # ! url_or_id -> the block ID or URL : ``str``
+      clean_id = extract_id(url_or_id)
+
+      request_body = {
+        pageId: clean_id,
+        chunkNumber: 0,
+        limit: 100,
+        verticalColumns: false,
+      }
+      jsonified_record_response = get_all_block_info(request_body)
+
+      block_parent_id = extract_parent_id(clean_id, jsonified_record_response)
+      block_collection_id = extract_collection_id(clean_id, jsonified_record_response)
+      block_view_id = extract_view_ids(clean_id, jsonified_record_response).join
+      block_title = extract_collection_title(clean_id, block_collection_id, jsonified_record_response)
+
+      CollectionView.new(clean_id, block_title, block_parent_id, block_collection_id, block_view_id)
+    end
+
+    def create_collection(collection_type, collection_title, data)
+      # ! create a Notion Collection View and return its instantiated class object.
+      # ! _collection_type -> the type of collection to create : ``str``
+      # ! collection_title -> the title of the collection view : ``str``
+      # ! data -> JSON data to add to the table : ``str``
+
+      valid_types = %w[table board list timeline calendar gallery]
+      unless valid_types.include?(collection_type); raise ArgumentError, "That collection type is not yet supported. Try: #{valid_types.join}."; end
+      cookies = Core.options["cookies"]
+      headers = Core.options["headers"]
+
+      new_block_id = extract_id(SecureRandom.hex(16))
+      parent_id = extract_id(SecureRandom.hex(16))
+      collection_id = extract_id(SecureRandom.hex(16))
+      view_id = extract_id(SecureRandom.hex(16))
+
+      children = []
+      alive_blocks = []
+      data.each do |_row|
+        child = extract_id(SecureRandom.hex(16))
+        children.push(child)
+        alive_blocks.push(Utils::CollectionViewComponents.set_collection_blocks_alive(child, collection_id))
       end
-  
-      def create_collection(collection_type, collection_title, data)
-        # ! create a Notion Collection View and return its instantiated class object.
-        # ! _collection_type -> the type of collection to create : ``str``
-        # ! collection_title -> the title of the collection view : ``str``
-        # ! data -> JSON data to add to the table : ``str``
-  
-        valid_types = %w[table board list timeline calendar gallery]
-        unless valid_types.include?(collection_type) ; raise ArgumentError, "That collection type is not yet supported. Try: #{valid_types.join}."; end
-        cookies = Core.options['cookies']
-        headers = Core.options['headers']
-  
-        new_block_id = extract_id(SecureRandom.hex(16))
-        parent_id = extract_id(SecureRandom.hex(16))
-        collection_id = extract_id(SecureRandom.hex(16))
-        view_id = extract_id(SecureRandom.hex(16))
-  
-        children = []
-        alive_blocks = []
-        data.each do |_row|
-          child = extract_id(SecureRandom.hex(16))
-          children.push(child)
-          alive_blocks.push(Utils::CollectionViewComponents.set_collection_blocks_alive(child, collection_id))
-        end
-  
-        request_id = extract_id(SecureRandom.hex(16))
-        transaction_id = extract_id(SecureRandom.hex(16))
-        space_id = extract_id(SecureRandom.hex(16))
-  
-        request_ids = {
-          request_id: request_id,
-          transaction_id: transaction_id,
-          space_id: space_id
-        }
-  
-        create_collection_view = Utils::CollectionViewComponents.create_collection_view(new_block_id, collection_id, view_id)
-        configure_view = Utils::CollectionViewComponents.set_view_config(collection_type, new_block_id, view_id, children)
-        
-        # returns the JSON and some useful column mappings...
-        column_data = Utils::CollectionViewComponents.set_collection_columns(collection_id, new_block_id, data)
-        configure_columns_hash = column_data[0]
-        column_mappings = column_data[1]
-        set_parent_alive_hash = Utils::BlockComponents.set_parent_to_alive(@id, new_block_id)
-        add_block_hash = Utils::BlockComponents.block_location_add(@id, @id, new_block_id, nil, 'listAfter')
-        new_block_edited_time = Utils::BlockComponents.last_edited_time(new_block_id)
-        collection_title_hash = Utils::CollectionViewComponents.set_collection_title(collection_title, collection_id)
-  
-        operations = [
-          create_collection_view,
-          configure_view,
-          configure_columns_hash,
-          set_parent_alive_hash,
-          add_block_hash,
-          new_block_edited_time,
-          collection_title_hash
-        ]
-        operations << alive_blocks
-        all_ops = operations.flatten
-        data.each_with_index do |row, i|
-          child = children[i]
-          row.keys.each_with_index do |col_name, j|
-            child_component = Utils::CollectionViewComponents.insert_data(child, j.zero? ? 'title' : col_name, row[col_name], column_mappings[j])
-            all_ops.push(child_component)
-          end
+
+      request_id = extract_id(SecureRandom.hex(16))
+      transaction_id = extract_id(SecureRandom.hex(16))
+      space_id = extract_id(SecureRandom.hex(16))
+
+      request_ids = {
+        request_id: request_id,
+        transaction_id: transaction_id,
+        space_id: space_id,
+      }
+
+      create_collection_view = Utils::CollectionViewComponents.create_collection_view(new_block_id, collection_id, view_id)
+      configure_view = Utils::CollectionViewComponents.set_view_config(collection_type, new_block_id, view_id, children)
+
+      # returns the JSON and some useful column mappings...
+      column_data = Utils::CollectionViewComponents.set_collection_columns(collection_id, new_block_id, data)
+      configure_columns_hash = column_data[0]
+      column_mappings = column_data[1]
+      set_parent_alive_hash = Utils::BlockComponents.set_parent_to_alive(@id, new_block_id)
+      add_block_hash = Utils::BlockComponents.block_location_add(@id, @id, new_block_id, nil, "listAfter")
+      new_block_edited_time = Utils::BlockComponents.last_edited_time(new_block_id)
+      collection_title_hash = Utils::CollectionViewComponents.set_collection_title(collection_title, collection_id)
+
+      operations = [
+        create_collection_view,
+        configure_view,
+        configure_columns_hash,
+        set_parent_alive_hash,
+        add_block_hash,
+        new_block_edited_time,
+        collection_title_hash,
+      ]
+      operations << alive_blocks
+      all_ops = operations.flatten
+      data.each_with_index do |row, i|
+        child = children[i]
+        row.keys.each_with_index do |col_name, j|
+          child_component = Utils::CollectionViewComponents.insert_data(child, j.zero? ? "title" : col_name, row[col_name], column_mappings[j])
+          all_ops.push(child_component)
         end
-  
-        request_url = URLS[:UPDATE_BLOCK]
-        request_body = build_payload(all_ops, 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
-  
-        CollectionView.new(new_block_id, collection_title, parent_id, collection_id, view_id)
       end
+
+      request_url = URLS[:UPDATE_BLOCK]
+      request_body = build_payload(all_ops, 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
+
+      CollectionView.new(new_block_id, collection_title, parent_id, collection_id, view_id)
     end
-end
+  end
+end