notion-sdk-ruby 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646301fd9a326d4b9d74cb514b948f85ff38dc0c7f001edd5c94285510029088
-  data.tar.gz: a544ddbd17c26ba618082eb04dc2e3e268da12b1b9d729fbf9109c8d642fc803
+  metadata.gz: b40512cee112cf660970e4dc0f41d9b2396435c0d0af1b4d360ab17d643fcce6
+  data.tar.gz: 05d7805fdafc25fc3537a4853e61f136c9fbcc49a404559c55288b157c989b0c
 SHA512:
-  metadata.gz: 256824b18cfead3ab2630a96906022a5d8e936c3323824c5dd72e6605592c67fc2fa94d59f71796365e3639ced885b7f3344f6f39300fa7b74211be1ee618506
-  data.tar.gz: e7ec55aea773b32cead4f0ce0a788435abdd7e45f7a7050f9541a0c3514d612786f4be6661fa1fb35ddc904ca8961d363120d02a57035e14683f3c6d7c20eb80
+  metadata.gz: '08740b69d9ecdcba0c13e0401095cff74fdfa0be56993061bce45b89b9f8b5d42bbbe1d02dc04e5554b021b1b27b0bc8c183a9c425fb00ed9be6bcc4d84cc184'
+  data.tar.gz: 327b799e2eeb70ed8b1a48296853972579749baeba824f05f10ba506388b1527f1eecb6ad7f774918259bd4bf673748525bfdc56ae7da08787aa266d5b9344bf

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,29 +1,55 @@
 PATH
   remote: .
   specs:
-    notion-sdk-ruby (0.3.0)
-      httparty (~> 0.18.1)
+    notion-sdk-ruby (0.5.0)
+      faraday (~> 1.8)
+      faraday_middleware (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     coderay (1.1.3)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
     dotenv (2.7.6)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.1.0)
+      faraday (~> 1.0)
     hashdiff (1.0.1)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    multi_xml (0.6.0)
+    minitest (5.14.4)
+    multipart-post (2.1.1)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
@@ -63,22 +89,27 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     standard (1.1.1)
       rubocop (= 1.14.0)
       rubocop-performance (= 1.11.2)
     standardrb (1.0.0)
       standard
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
     webmock (3.12.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
   x64-mingw32
 
 DEPENDENCIES
+  activesupport (~> 6.1)
   dotenv (~> 2.7)
   notion-sdk-ruby!
   pry (~> 0.14.1)
@@ -88,4 +119,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,7 +1,38 @@
 # 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:
@@ -49,31 +80,81 @@ client.databases.list
 
 ```rb
 client.databases.query("668d797c-76fa-4934-9b05-ad288df2d136", {
-  "filter": {
-    "or": [
+  filter: {
+    or: [
       {
-        "property": "In stock",
-        "checkbox": {
-          "equals": true
+        property: "In stock",
+        checkbox: {
+          equals: true
         }
       },
       {
-        "property": "Cost of next trip",
-        "number": {
-          "greater_than_or_equal_to": 2
+        property: "Cost of next trip",
+        number: {
+          greater_than_or_equal_to: 2
         }
       }
     ]
   },
-  "sorts": [
+  sorts: [
     {
-      "property": "Last ordered",
-      "direction": "ascending"
+      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
@@ -90,34 +171,34 @@ client.pages.retrieve("b55c9c91-384d-452b-81db-d1ef79372b75")
 
 ```rb
 client.pages.create({
-  "parent": { "database_id": "48f8fee9cd794180bc2fec0398253067" },
-  "properties": {
-    "Name": {
-      "title": [
+  parent: { database_id: "48f8fee9cd794180bc2fec0398253067" },
+  properties: {
+    Name: {
+      title: [
         {
-          "text": {
-            "content": "Tuscan Kale"
+          text: {
+            content: "Tuscan Kale"
           }
         }
       ]
     },
-    "Description": {
-      "rich_text": [
+    Description: {
+      rich_text: [
         {
-          "text": {
-            "content": "A dark green leafy vegetable"
+          text: {
+            content: "A dark green leafy vegetable"
           }
         }
       ]
     },
-    "Food group": {
-      "select": {
-        "name": "Vegetable"
+    Food group: {
+      select: {
+        name: "Vegetable"
       }
     },
-    "Price": { "number": 2.5 }
+    Price: { number: 2.5 }
   },
-  "children": []
+  children: []
 })
 ```
 
@@ -127,14 +208,37 @@ client.pages.create({
 
 ```rb
 client.pages.update("b55c9c91-384d-452b-81db-d1ef79372b75", {
-  "properties": {
-    "In stock": { "checkbox": true }
+  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)
@@ -151,24 +255,24 @@ client.blocks.children.list("b55c9c91-384d-452b-81db-d1ef79372b75", {
 
 ```rb
 client.blocks.children.append("b54c9c91-384d-452b-81db-d1ef79372b75", {
-  "children": [
+  children: [
     {
-      "object": "block",
-      "type": "heading_1",
-      "heading_1": {
-        "text": [{ "type": "text", "text": { "content": "Lacinato kale" } }]
+      object: "block",
+      type: "heading_1",
+      heading_1: {
+        text: [{ type: "text", text: { content: "Lacinato kale" } }]
       }
     },
     {
-      "object": "block",
-      "type": "paragraph",
-      "paragraph": {
-        "text": [
+      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" }
+            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" }
             }
           }
         ]
@@ -204,19 +308,26 @@ client.users.list
 
 ```rb
 client.search({
-  "query":"External tasks",
-  "sort":{
-    "direction":"ascending",
-    "timestamp":"last_edited_time"
-    }
+  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

data/bin/console

@@ -7,6 +7,5 @@ require 'dotenv/load'
 require "notion-sdk-ruby"
 
 $client = Notion::Client.new(token: ENV["API_SECRET"])
-$client2 = 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,9 +1,11 @@
 module Notion
   class Client
+    include RequestClient
     include Operations::Search
 
-    def initialize(token:)
+    def initialize(token:, notion_version: "2021-08-16")
       Notion.api_token = token
+      Notion.notion_version = notion_version
     end
 
     def blocks

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

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

data/lib/notion-sdk-ruby/models/block.rb

@@ -0,0 +1,4 @@
+module Notion
+  class Block < OpenStruct
+  end
+end

data/lib/notion-sdk-ruby/models/database.rb

@@ -0,0 +1,4 @@
+module Notion
+  class Database < OpenStruct
+  end
+end

data/lib/notion-sdk-ruby/models/list.rb

@@ -0,0 +1,27 @@
+module Notion
+  class List
+    attr_reader :data, :next_cursor, :has_more
+
+    def initialize(response_body)
+      @data = response_body["results"].map do |d|
+        get_model(d["object"]).new(d)
+      end
+
+      @next_cursor = response_body["next_cursor"]
+      @has_more = response_body["has_more"]
+    end
+
+    def get_model(object_name)
+      case object_name
+      when "block"
+        Block
+      when "database"
+        Database
+      when "page"
+        Page
+      when "user"
+        User
+      end
+    end
+  end
+end

data/lib/notion-sdk-ruby/models/page.rb

@@ -0,0 +1,4 @@
+module Notion
+  class Page < OpenStruct
+  end
+end

data/lib/notion-sdk-ruby/models/user.rb

@@ -0,0 +1,4 @@
+module Notion
+  class User < OpenStruct
+  end
+end

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

@@ -1,8 +1,11 @@
 module Notion
   module Operations
     module Search
+      include RequestClient
+
       def search(body)
-        RequestClient.active_client.post("/v1/search", body: body.to_json)
+        response = post("/v1/search", body.to_json)
+        List.new(response.body)
       end
     end
   end

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

@@ -1,48 +1,44 @@
 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)
+  module RequestClient
+    def get(*args)
+      handle_request(:get, *args)
     end
 
-    def initialize(config)
-      self.class.headers Authorization: "Bearer #{config.api_token}"
+    def post(*args)
+      handle_request(:post, *args)
     end
 
-    def get(*args, &block)
-      response = self.class.get(*args, &block)
-      raise_on_failure(response)
+    def patch(*args)
+      handle_request(:patch, *args)
     end
 
-    def post(*args, &block)
-      response = self.class.post(*args, &block)
-      raise_on_failure(response)
+    def delete(*args)
+      handle_request(:delete, *args)
     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
+    private
 
-    def delete(*args, &block)
-      response = self.class.delete(*args, &block)
-      raise_on_failure(response)
+    def handle_request(method, *args)
+      faraday_client.public_send(method, *args)
+    rescue Faraday::ClientError => error
+      error_details = JSON.parse(error.response[:body])
+      raise ErrorFactory.create(error_details)
+    rescue JSON::ParserError => error
+      raise NotionError.new(error.message)
     end
 
-    def raise_on_failure(response)
-      if response.success?
-        response
-      else
-        raise ErrorFactory.create(response)
+    def faraday_client
+      @faraday_client ||= Faraday.new(
+        url: "https://api.notion.com",
+        headers: {
+          "Content-Type" => "application/json",
+          "Notion-Version" => Notion.config.notion_version,
+          "Authorization" => "Bearer #{Notion.config.api_token}"
+        }
+      ) do |f|
+        f.request :json
+        f.response :json
+        f.use Faraday::Response::RaiseError
       end
     end
   end

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

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

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

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

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

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

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

@@ -1,11 +1,15 @@
 module Notion
   class Users
+    include RequestClient
+
     def list
-      RequestClient.active_client.get("/v1/users")
+      response = get("/v1/users")
+      List.new(response.body)
     end
 
     def retrieve(id)
-      RequestClient.active_client.get("/v1/users/#{id}")
+      response = get("/v1/users/#{id}")
+      User.new(response.body)
     end
   end
 end

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

@@ -1,3 +1,3 @@
 module Notion
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

data/lib/notion-sdk-ruby.rb

@@ -1,17 +1,23 @@
-require "httparty"
+require "faraday"
+require "faraday_middleware"
 require "forwardable"
+require "ostruct"
 
 require "notion-sdk-ruby/version"
-
 require "notion-sdk-ruby/config"
+require "notion-sdk-ruby/request_client"
 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"
+require "notion-sdk-ruby/models/user"
+require "notion-sdk-ruby/models/list"
+require "notion-sdk-ruby/models/block"
+require "notion-sdk-ruby/models/database"
+require "notion-sdk-ruby/models/page"
 
 module Notion
   @config = Config.new
@@ -22,5 +28,6 @@ module Notion
     attr_reader :config
 
     def_delegators :@config, :api_token, :api_token=
+    def_delegators :@config, :notion_version, :notion_version=
   end
 end

data/notion-sdk-ruby.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "httparty", "~> 0.18.1"
+  spec.add_dependency "faraday", "~> 1.8"
+  spec.add_dependency "faraday_middleware", "~> 1.1"
 
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
@@ -34,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock", "~> 3.12"
   spec.add_development_dependency "pry", "~> 0.14.1"
   spec.add_development_dependency "dotenv", "~> 2.7"
+  spec.add_development_dependency "activesupport", "~> 6.1"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: notion-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Graham Marlow
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 description: 
 email:
 - mgmarlow@hey.com
@@ -115,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -131,6 +159,11 @@ files:
 - lib/notion-sdk-ruby/client.rb
 - lib/notion-sdk-ruby/config.rb
 - lib/notion-sdk-ruby/error.rb
+- lib/notion-sdk-ruby/models/block.rb
+- lib/notion-sdk-ruby/models/database.rb
+- lib/notion-sdk-ruby/models/list.rb
+- lib/notion-sdk-ruby/models/page.rb
+- lib/notion-sdk-ruby/models/user.rb
 - lib/notion-sdk-ruby/operations/search.rb
 - lib/notion-sdk-ruby/request_client.rb
 - lib/notion-sdk-ruby/resources/blocks.rb
@@ -161,7 +194,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