notion-sdk-ruby 0.2.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7e21c20b56990d0f42d1df0130e4e3f3d7835727d4802cd230b7bb5daaa4109
-  data.tar.gz: 1ad409bdc5168dac0f604e62efda59ca5b1d343a353b6492f42f9daaf650fe57
+  metadata.gz: 264919d7cc99bb5460d6a900a69b5c4875f93e523f518f2ec30b965af04e0b7e
+  data.tar.gz: 790b82c77a361b0b04f5715d4e545c695e3f8ea11696dda5d234ff8ea74ea7e3
 SHA512:
-  metadata.gz: cd38bbbb96dd0c1fbf80bf419032a9e00be069de0c5e74ed921f1d6fb06846064d773fe0ad046cd2b8f7d38b9496247a307f48ac485c720e4877d20b52b9b1b0
-  data.tar.gz: 3beaf308945c7e566a74a63068f078bc211e07a74e0d677beb0788c2073c3d360f583204648bb522f54f012fad877e4dd92e2c0ebf585afda878bc2fd2071d9f
+  metadata.gz: 525cb12a872f7e9d950f9e8c3f1faf928c5cb0e54a8dfa950895e01898c9eaaf4d40242db33d41954ef08bca139be192225cd5ea67c2da118e828f647825911f
+  data.tar.gz: 3baf444a17c65f6c859018ea6ef8d95c45b16dbfa88e9941282de746f89554102fed5c290a840abcd9f0423da65574ff725f918a6185aa2f32ac3787e6e99b63

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: ci
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+        # change this to (see https://github.com/ruby/setup-ruby#versioning):
+        # uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -1,13 +1,13 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-
-.env
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status
+
+.env

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -1,6 +1,6 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.5
-before_install: gem install bundler -v 2.1.4
+---
+language: ruby
+cache: bundler
+rvm:
+  - 2.6.5
+before_install: gem install bundler -v 2.1.4

data/.vscode/settings.json

@@ -1,4 +1,4 @@
-{
-  "editor.formatOnSave": true,
-  "editor.tabSize": 2
+{
+  "editor.formatOnSave": true,
+  "editor.tabSize": 2
 }

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    notion-sdk-ruby (0.2.3)
+    notion-sdk-ruby (0.4.1)
       httparty (~> 0.18.1)
 
 GEM
@@ -22,7 +22,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.0901)
     multi_xml (0.6.0)
     parallel (1.20.1)
     parser (3.0.1.1)
@@ -88,4 +88,4 @@ DEPENDENCIES
   webmock (~> 3.12)
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Graham Marlow
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2021 Graham Marlow
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,211 +1,339 @@
-# Notion Ruby SDK
-
-Unofficial Ruby client for the [Notion APIs](https://developers.notion.com/).
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'notion-sdk-ruby'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install notion-sdk-ruby
-
-## Usage
-
-Initialize `Notion::Client` with your app's [integration secret](https://developers.notion.com/docs/getting-started#create-a-new-integration).
-
-```rb
-require "notion-sdk-ruby"
-client = Notion::Client.new(token: ENV["NOTION_API_SECRET"])
-
-# get users
-client.get_users
-```
-
-### Databases
-
-#### #get_database
-
-```rb
-client.get_database("668d797c-76fa-4934-9b05-ad288df2d136")
-```
-
-#### #get_databases
-
-```rb
-client.get_databases
-```
-
-#### #query_database
-
-```rb
-client.query_database("668d797c-76fa-4934-9b05-ad288df2d136", {
-  "filter": {
-    "or": [
-      {
-        "property": "In stock",
-        "checkbox": {
-          "equals": true
-        }
-      },
-      {
-        "property": "Cost of next trip",
-        "number": {
-          "greater_than_or_equal_to": 2
-        }
-      }
-    ]
-  },
-  "sorts": [
-    {
-      "property": "Last ordered",
-      "direction": "ascending"
-    }
-  ]
-})
-```
-
-### Pages
-
-#### #get_page
-
-```rb
-client.get_page("b55c9c91-384d-452b-81db-d1ef79372b75")
-```
-
-#### #create_page
-
-```rb
-client.create_page({
-  "parent": { "database_id": "48f8fee9cd794180bc2fec0398253067" },
-  "properties": {
-    "Name": {
-      "title": [
-        {
-          "text": {
-            "content": "Tuscan Kale"
-          }
-        }
-      ]
-    },
-    "Description": {
-      "rich_text": [
-        {
-          "text": {
-            "content": "A dark green leafy vegetable"
-          }
-        }
-      ]
-    },
-    "Food group": {
-      "select": {
-        "name": "Vegetable"
-      }
-    },
-    "Price": { "number": 2.5 }
-  },
-  "children": []
-})
-```
-
-#### #update_page
-
-```rb
-client.update_page("b55c9c91-384d-452b-81db-d1ef79372b75", {
-  "properties": {
-    "In stock": { "checkbox": true }
-  }
-})
-```
-
-### Blocks
-
-#### #get_block_children
-
-```rb
-client.get_block_children("b55c9c91-384d-452b-81db-d1ef79372b75", {
-  page_size: 100
-})
-```
-
-#### #append_block_children
-
-```rb
-client.append_block_children("b54c9c91-384d-452b-81db-d1ef79372b75", {
-  "children": [
-    {
-      "object": "block",
-      "type": "heading_1",
-      "heading_1": {
-        "text": [{ "type": "text", "text": { "content": "Lacinato kale" } }]
-      }
-    },
-    {
-      "object": "block",
-      "type": "paragraph",
-      "paragraph": {
-        "text": [
-          {
-            "type": "text",
-            "text": {
-              "content": "Lacinato kale is a variety of kale with a long tradition in Italian cuisine, especially that of Tuscany. It is also known as Tuscan kale, Italian kale, dinosaur kale, kale, flat back kale, palm tree kale, or black Tuscan palm.",
-              "link": { "url": "https://en.wikipedia.org/wiki/Lacinato_kale" }
-            }
-          }
-        ]
-      }
-    }
-  ]
-})
-```
-
-### Users
-
-#### #get_user
-
-```rb
-client.get_user("d40e767c-d7af-4b18-a86d-55c61f1e39a4")
-```
-
-#### #get_users
-
-```rb
-client.get_users
-```
-
-### Search
-
-#### #search
-
-```rb
-client.search({
-  "query":"External tasks",
-  "sort":{
-    "direction":"ascending",
-    "timestamp":"last_edited_time"
-    }
-  }
-)
-```
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/mgmarlow/notion-sdk-ruby.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# Notion Ruby SDK
+
+[![ci](https://github.com/mgmarlow/notion-sdk-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/mgmarlow/notion-sdk-ruby/actions/workflows/ci.yml)
+[![Gem Version](https://badge.fury.io/rb/notion-sdk-ruby.svg)](https://badge.fury.io/rb/notion-sdk-ruby)
+
+Unofficial Ruby client for the [Notion APIs](https://developers.notion.com/).
+
+- [Notion Ruby SDK](#notion-ruby-sdk)
+  - [Installation](#installation)
+  - [Usage](#usage)
+  - [API reference](#api-reference)
+    - [Databases](#databases)
+      - [databases#retrieve](#databasesretrieve)
+      - [databases#list](#databaseslist)
+      - [databases#query](#databasesquery)
+      - [databases#create](#databasescreate)
+      - [databases#update](#databasesupdate)
+    - [Pages](#pages)
+      - [pages#retrieve](#pagesretrieve)
+      - [pages#create](#pagescreate)
+      - [pages#update](#pagesupdate)
+    - [Blocks](#blocks)
+      - [blocks#retrieve](#blocksretrieve)
+      - [blocks#update](#blocksupdate)
+      - [blocks#children#list](#blockschildrenlist)
+      - [blocks#children#append](#blockschildrenappend)
+    - [Users](#users)
+      - [users#retrieve](#usersretrieve)
+      - [users#list](#userslist)
+    - [Search](#search)
+      - [#search](#search-1)
+  - [Development](#development)
+  - [Contributing](#contributing)
+  - [License](#license)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'notion-sdk-ruby'
+```
+
+And then execute:
+
+    $ bundle install
+
+## Usage
+
+Initialize `Notion::Client` with your app's [integration secret](https://developers.notion.com/docs/getting-started#create-a-new-integration).
+
+```rb
+require "notion-sdk-ruby"
+client = Notion::Client.new(token: ENV["NOTION_API_SECRET"])
+```
+
+## API reference
+
+### Databases
+
+#### databases#retrieve
+
+[API reference](https://developers.notion.com/reference/get-database)
+
+```rb
+client.databases.retrieve("668d797c-76fa-4934-9b05-ad288df2d136")
+```
+
+#### databases#list
+
+[API reference](https://developers.notion.com/reference/get-databases)
+
+```rb
+client.databases.list
+```
+
+#### databases#query
+
+[API reference](https://developers.notion.com/reference/post-database-query)
+
+```rb
+client.databases.query("668d797c-76fa-4934-9b05-ad288df2d136", {
+  filter: {
+    or: [
+      {
+        property: "In stock",
+        checkbox: {
+          equals: true
+        }
+      },
+      {
+        property: "Cost of next trip",
+        number: {
+          greater_than_or_equal_to: 2
+        }
+      }
+    ]
+  },
+  sorts: [
+    {
+      property: "Last ordered",
+      direction: "ascending"
+    }
+  ]
+})
+```
+
+#### databases#create
+
+[API reference](https://developers.notion.com/reference/create-a-database)
+
+```rb
+client.databases.create({
+  parent: {
+    type: "page_id",
+    page_id: "98ad959b-2b6a-4774-80ee-00246fb0ea9b"
+  },
+  title: [
+    {
+        type: "text",
+        text: {
+            content: "Grocery List",
+            link: null
+        }
+    }
+  ],
+  properties: {
+    Name: {
+      title: {}
+    }
+  }
+})
+```
+
+#### databases#update
+
+[API reference](https://developers.notion.com/reference/update-a-database)
+
+```rb
+client.databases.update("668d797c-76fa-4934-9b05-ad288df2d136", {
+  title: [
+    {
+        type: "text",
+        text: {
+            content: "Grocery List",
+            link: null
+        }
+    }
+  ],
+  properties: {
+    Name: {
+      title: {}
+    }
+  }
+})
+```
+
+### Pages
+
+#### pages#retrieve
+
+[API reference](https://developers.notion.com/reference/get-page)
+
+```rb
+client.pages.retrieve("b55c9c91-384d-452b-81db-d1ef79372b75")
+```
+
+#### pages#create
+
+[API reference](https://developers.notion.com/reference/post-page)
+
+```rb
+client.pages.create({
+  parent: { database_id: "48f8fee9cd794180bc2fec0398253067" },
+  properties: {
+    Name: {
+      title: [
+        {
+          text: {
+            content: "Tuscan Kale"
+          }
+        }
+      ]
+    },
+    Description: {
+      rich_text: [
+        {
+          text: {
+            content: "A dark green leafy vegetable"
+          }
+        }
+      ]
+    },
+    Food group: {
+      select: {
+        name: "Vegetable"
+      }
+    },
+    Price: { number: 2.5 }
+  },
+  children: []
+})
+```
+
+#### pages#update
+
+[API reference](https://developers.notion.com/reference/patch-page)
+
+```rb
+client.pages.update("b55c9c91-384d-452b-81db-d1ef79372b75", {
+  properties: {
+    "In stock": { checkbox: true }
+  }
+})
+```
+
+### Blocks
+
+#### blocks#retrieve
+
+[API reference](https://developers.notion.com/reference/retrieve-a-block)
+
+```rb
+client.blocks.retrieve("b55c9c91-384d-452b-81db-d1ef79372b75")
+```
+
+#### blocks#update
+
+[API reference](https://developers.notion.com/reference/update-a-block)
+
+```rb
+client.blocks.update("b55c9c91-384d-452b-81db-d1ef79372b75", {
+  to_do: {
+    text: [{ 
+      text: { content: "Lacinato kale" } 
+    }],
+    checked: false
+  }
+})
+```
+
+#### blocks#children#list
+
+[API reference](https://developers.notion.com/reference/get-block-children)
+
+```rb
+client.blocks.children.list("b55c9c91-384d-452b-81db-d1ef79372b75", {
+  page_size: 100
+})
+```
+
+#### blocks#children#append
+
+[API reference](https://developers.notion.com/reference/patch-block-children)
+
+```rb
+client.blocks.children.append("b54c9c91-384d-452b-81db-d1ef79372b75", {
+  children: [
+    {
+      object: "block",
+      type: "heading_1",
+      heading_1: {
+        text: [{ type: "text", text: { content: "Lacinato kale" } }]
+      }
+    },
+    {
+      object: "block",
+      type: "paragraph",
+      paragraph: {
+        text: [
+          {
+            type: "text",
+            text: {
+              content: "Lacinato kale is a variety of kale with a long tradition in Italian cuisine, especially that of Tuscany. It is also known as Tuscan kale, Italian kale, dinosaur kale, kale, flat back kale, palm tree kale, or black Tuscan palm.",
+              link: { url: "https://en.wikipedia.org/wiki/Lacinato_kale" }
+            }
+          }
+        ]
+      }
+    }
+  ]
+})
+```
+
+### Users
+
+#### users#retrieve
+
+[API reference](https://developers.notion.com/reference/get-user)
+
+```rb
+client.users.retrieve("d40e767c-d7af-4b18-a86d-55c61f1e39a4")
+```
+
+#### users#list
+
+[API reference](https://developers.notion.com/reference/get-users)
+
+```rb
+client.users.list
+```
+
+### Search
+
+[API reference](https://developers.notion.com/reference/post-search)
+
+#### #search
+
+```rb
+client.search({
+  query: "External tasks",
+  sort: {
+    direction: "ascending",
+    timestamp: "last_edited_time"
+  }
+})
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+Before using `bin/console` you need to create a new file, `.env`, at the root project directory. This will enable you to run commands directly against your [Notion integration](https://developers.notion.com/docs/getting-started).
+
+```
+cat > .env <<EOF
+API_SECRET=<YOUR NOTION API SECRET HERE>
+EOF
+```
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/mgmarlow/notion-sdk-ruby.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/bin/console

@@ -1,11 +1,11 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "pry"
-require 'dotenv/load'
-
-require "notion"
-
-$client = Notion::Client.new(token: ENV["API_SECRET"])
-
-Pry.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "pry"
+require 'dotenv/load'
+
+require "notion-sdk-ruby"
+
+$client = Notion::Client.new(token: ENV["API_SECRET"])
+
+Pry.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/notion-sdk-ruby/client.rb

@@ -1,12 +1,26 @@
 module Notion
   class Client
-    include Endpoints
-    include HTTParty
-    headers 'Content-Type': "application/json"
-    base_uri "https://api.notion.com"
+    include Operations::Search
 
-    def initialize(token:)
-      self.class.headers({Authorization: "Bearer #{token}"})
+    def initialize(token:, notion_version: "2021-08-16")
+      Notion.api_token = token
+      Notion.notion_version = notion_version
+    end
+
+    def blocks
+      Blocks.new
+    end
+
+    def databases
+      Databases.new
+    end
+
+    def pages
+      Pages.new
+    end
+
+    def users
+      Users.new
     end
   end
 end

data/lib/notion-sdk-ruby/config.rb

@@ -0,0 +1,5 @@
+module Notion
+  class Config
+    attr_accessor :api_token, :notion_version
+  end
+end

data/lib/notion-sdk-ruby/error.rb

@@ -0,0 +1,52 @@
+# Sourced from notion-sdk-js:
+# https://github.com/makenotion/notion-sdk-js/blob/main/src/errors.ts
+module Notion
+  API_ERROR_CODE = {
+    unauthorized: "unauthorized",
+    restricted_resource: "restricted_resource",
+    object_not_found: "object_not_found",
+    rate_limited: "rate_limited",
+    invalid_json: "invalid_json",
+    invalid_request_url: "invalid_request_url",
+    invalid_request: "invalid_request",
+    validation_error: "validation_error",
+    conflict_error: "conflict_error",
+    internal_server_error: "internal_server_error",
+    service_unavailable: "service_unavailable"
+  }
+
+  class ErrorFactory
+    def self.create(error = {})
+      return NotionError.new("Unknown error.") if error["message"].nil?
+
+      if API_ERROR_CODE.value?(error["code"])
+        APIResponseError.new(error["message"], body: error)
+      elsif error["request"] && error["response"] && error["timings"]
+        HTTPResponseError.new(error["message"], body: error)
+      elsif error["request"] && error["timings"]
+        RequestTimeoutError.new(error["message"], body: error)
+      else
+        NotionError.new(error["message"])
+      end
+    end
+  end
+
+  class NotionError < StandardError
+    attr_reader :message, :body
+
+    def initialize(message = nil, body: nil)
+      @message = message
+      @body = body
+    end
+  end
+
+  class RequestTimeoutError < NotionError; end
+
+  class HTTPResponseError < NotionError; end
+
+  class APIResponseError < NotionError
+    def code
+      body["code"]
+    end
+  end
+end

data/lib/notion-sdk-ruby/operations/search.rb

@@ -0,0 +1,9 @@
+module Notion
+  module Operations
+    module Search
+      def search(body)
+        RequestClient.active_client.post("/v1/search", body: body.to_json)
+      end
+    end
+  end
+end

data/lib/notion-sdk-ruby/request_client.rb

@@ -0,0 +1,50 @@
+module Notion
+  class RequestClient
+    include HTTParty
+
+    base_uri "https://api.notion.com"
+    headers "Content-Type": "application/json"
+
+    def self.active_client
+      RequestClient.new(Notion.config)
+    end
+
+    def initialize(config)
+      self.class.headers Authorization: "Bearer #{config.api_token}"
+      self.class.headers "Notion-Version": config.notion_version
+    end
+
+    def get(*args, &block)
+      response = self.class.get(*args, &block)
+      raise_on_failure(response)
+    end
+
+    def post(*args, &block)
+      response = self.class.post(*args, &block)
+      raise_on_failure(response)
+    end
+
+    def patch(*args, &block)
+      response = self.class.patch(*args, &block)
+      raise_on_failure(response)
+    end
+
+    def put(*args, &block)
+      response = self.class.put(*args, &block)
+      raise_on_failure(response)
+    end
+
+    def delete(*args, &block)
+      response = self.class.delete(*args, &block)
+      raise_on_failure(response)
+    end
+
+    def raise_on_failure(response)
+      if response.success?
+        response
+      else
+        raise ErrorFactory.create(response)
+      end
+    end
+  end
+end

data/lib/notion-sdk-ruby/resources/blocks.rb

@@ -0,0 +1,25 @@
+module Notion
+  class Blocks
+    def children
+      Children.new
+    end
+
+    def retrieve(block_id)
+      RequestClient.active_client.get("/v1/blocks/#{block_id}")
+    end
+
+    def update(block_id, body)
+      RequestClient.active_client.patch("/v1/blocks/#{block_id}", body: body.to_json)
+    end
+  end
+
+  class Children
+    def list(block_id, query: {})
+      RequestClient.active_client.get("/v1/blocks/#{block_id}/children", query: query)
+    end
+
+    def append(block_id, body)
+      RequestClient.active_client.patch("/v1/blocks/#{block_id}/children", body: body.to_json)
+    end
+  end
+end

data/lib/notion-sdk-ruby/resources/databases.rb

@@ -0,0 +1,25 @@
+module Notion
+  class Databases
+    def retrieve(id)
+      RequestClient.active_client.get("/v1/databases/#{id}")
+    end
+
+    # DEPRECATED
+    def list
+      warn "DEPRECATED: client.databases.list is deprecated."
+      RequestClient.active_client.get("/v1/databases")
+    end
+
+    def query(id, body)
+      RequestClient.active_client.post("/v1/databases/#{id}/query", body: body.to_json)
+    end
+
+    def create(body)
+      RequestClient.active_client.post("/v1/databases", body: body.to_json)
+    end
+
+    def update(id, body)
+      RequestClient.active_client.patch("/v1/databases/#{id}", body: body.to_json)
+    end
+  end
+end

data/lib/notion-sdk-ruby/resources/pages.rb

@@ -0,0 +1,15 @@
+module Notion
+  class Pages
+    def retrieve(id)
+      RequestClient.active_client.get("/v1/pages/#{id}")
+    end
+
+    def create(body)
+      RequestClient.active_client.post("/v1/pages", body: body.to_json)
+    end
+
+    def update(id, body)
+      RequestClient.active_client.patch("/v1/pages/#{id}", body: body.to_json)
+    end
+  end
+end

data/lib/notion-sdk-ruby/resources/users.rb

@@ -0,0 +1,11 @@
+module Notion
+  class Users
+    def list
+      RequestClient.active_client.get("/v1/users")
+    end
+
+    def retrieve(id)
+      RequestClient.active_client.get("/v1/users/#{id}")
+    end
+  end
+end

data/lib/notion-sdk-ruby/version.rb

@@ -1,3 +1,3 @@
 module Notion
-  VERSION = "0.2.3"
+  VERSION = "0.4.1"
 end

data/lib/notion-sdk-ruby.rb

@@ -1,13 +1,27 @@
 require "httparty"
+require "forwardable"
+
 require "notion-sdk-ruby/version"
-require "notion-sdk-ruby/endpoints/blocks"
-require "notion-sdk-ruby/endpoints/databases"
-require "notion-sdk-ruby/endpoints/pages"
-require "notion-sdk-ruby/endpoints/search"
-require "notion-sdk-ruby/endpoints/users"
-require "notion-sdk-ruby/endpoints"
+
+require "notion-sdk-ruby/config"
+require "notion-sdk-ruby/resources/blocks"
+require "notion-sdk-ruby/resources/databases"
+require "notion-sdk-ruby/resources/pages"
+require "notion-sdk-ruby/resources/users"
+require "notion-sdk-ruby/operations/search"
+require "notion-sdk-ruby/error"
+require "notion-sdk-ruby/request_client"
 require "notion-sdk-ruby/client"
 
 module Notion
-  class Error < StandardError; end
+  @config = Config.new
+
+  class << self
+    extend Forwardable
+
+    attr_reader :config
+
+    def_delegators :@config, :api_token, :api_token=
+    def_delegators :@config, :notion_version, :notion_version=
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Graham Marlow
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -115,7 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -129,12 +129,14 @@ files:
 - bin/setup
 - lib/notion-sdk-ruby.rb
 - lib/notion-sdk-ruby/client.rb
-- lib/notion-sdk-ruby/endpoints.rb
-- lib/notion-sdk-ruby/endpoints/blocks.rb
-- lib/notion-sdk-ruby/endpoints/databases.rb
-- lib/notion-sdk-ruby/endpoints/pages.rb
-- lib/notion-sdk-ruby/endpoints/search.rb
-- lib/notion-sdk-ruby/endpoints/users.rb
+- lib/notion-sdk-ruby/config.rb
+- lib/notion-sdk-ruby/error.rb
+- lib/notion-sdk-ruby/operations/search.rb
+- lib/notion-sdk-ruby/request_client.rb
+- lib/notion-sdk-ruby/resources/blocks.rb
+- lib/notion-sdk-ruby/resources/databases.rb
+- lib/notion-sdk-ruby/resources/pages.rb
+- lib/notion-sdk-ruby/resources/users.rb
 - lib/notion-sdk-ruby/version.rb
 - notion-sdk-ruby.gemspec
 homepage: https://github.com/mgmarlow/notion-sdk-ruby
@@ -159,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Notion SDK

data/.github/workflows/ruby.yml

@@ -1,35 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rake

data/lib/notion-sdk-ruby/endpoints/blocks.rb

@@ -1,13 +0,0 @@
-module Notion
-  module Endpoints
-    module Blocks
-      def get_block_children(id, params: {})
-        self.class.get("/v1/blocks/#{id}/children", query: params)
-      end
-
-      def append_block_children(id, body)
-        self.class.patch("/v1/blocks/#{id}/children", body: body.to_json)
-      end
-    end
-  end
-end

data/lib/notion-sdk-ruby/endpoints/databases.rb

@@ -1,17 +0,0 @@
-module Notion
-  module Endpoints
-    module Databases
-      def get_database(id)
-        self.class.get("/v1/databases/#{id}")
-      end
-
-      def get_databases
-        self.class.get("/v1/databases")
-      end
-
-      def query_database(id, body)
-        self.class.post("/v1/databases/#{id}/query", body: body.to_json)
-      end
-    end
-  end
-end

data/lib/notion-sdk-ruby/endpoints/pages.rb

@@ -1,17 +0,0 @@
-module Notion
-  module Endpoints
-    module Pages
-      def get_page(id)
-        self.class.get("/v1/pages/#{id}")
-      end
-
-      def create_page(body)
-        self.class.post("/v1/pages", body: body.to_json)
-      end
-
-      def update_page(id, body)
-        self.class.patch("/v1/pages/#{id}", body: body.to_json)
-      end
-    end
-  end
-end

data/lib/notion-sdk-ruby/endpoints/search.rb

@@ -1,9 +0,0 @@
-module Notion
-  module Endpoints
-    module Search
-      def search(body)
-        self.class.post("/v1/search", body: body.to_json)
-      end
-    end
-  end
-end

data/lib/notion-sdk-ruby/endpoints/users.rb

@@ -1,13 +0,0 @@
-module Notion
-  module Endpoints
-    module Users
-      def get_users
-        self.class.get("/v1/users")
-      end
-
-      def get_user(id)
-        self.class.get("/v1/users/#{id}")
-      end
-    end
-  end
-end

data/lib/notion-sdk-ruby/endpoints.rb

@@ -1,9 +0,0 @@
-module Notion
-  module Endpoints
-    include Databases
-    include Pages
-    include Blocks
-    include Users
-    include Search
-  end
-end