notion-sdk-ruby 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 264919d7cc99bb5460d6a900a69b5c4875f93e523f518f2ec30b965af04e0b7e
-  data.tar.gz: 790b82c77a361b0b04f5715d4e545c695e3f8ea11696dda5d234ff8ea74ea7e3
+  metadata.gz: b40512cee112cf660970e4dc0f41d9b2396435c0d0af1b4d360ab17d643fcce6
+  data.tar.gz: 05d7805fdafc25fc3537a4853e61f136c9fbcc49a404559c55288b157c989b0c
 SHA512:
-  metadata.gz: 525cb12a872f7e9d950f9e8c3f1faf928c5cb0e54a8dfa950895e01898c9eaaf4d40242db33d41954ef08bca139be192225cd5ea67c2da118e828f647825911f
-  data.tar.gz: 3baf444a17c65f6c859018ea6ef8d95c45b16dbfa88e9941282de746f89554102fed5c290a840abcd9f0423da65574ff725f918a6185aa2f32ac3787e6e99b63
+  metadata.gz: '08740b69d9ecdcba0c13e0401095cff74fdfa0be56993061bce45b89b9f8b5d42bbbe1d02dc04e5554b021b1b27b0bc8c183a9c425fb00ed9be6bcc4d84cc184'
+  data.tar.gz: 327b799e2eeb70ed8b1a48296853972579749baeba824f05f10ba506388b1527f1eecb6ad7f774918259bd4bf673748525bfdc56ae7da08787aa266d5b9344bf

data/Gemfile.lock

@@ -1,29 +1,55 @@
 PATH
   remote: .
   specs:
-    notion-sdk-ruby (0.4.1)
-      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.0901)
-    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)

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

@@ -1,5 +1,6 @@
 module Notion
   class Client
+    include RequestClient
     include Operations::Search
 
     def initialize(token:, notion_version: "2021-08-16")

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,49 +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}"
-      self.class.headers "Notion-Version": config.notion_version
+    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,25 +1,33 @@
 module Notion
   class Blocks
+    include RequestClient
+
     def children
       Children.new
     end
 
     def retrieve(block_id)
-      RequestClient.active_client.get("/v1/blocks/#{block_id}")
+      response = get("/v1/blocks/#{block_id}")
+      Block.new(response.body)
     end
 
     def update(block_id, body)
-      RequestClient.active_client.patch("/v1/blocks/#{block_id}", body: body.to_json)
+      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,25 +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
       warn "DEPRECATED: client.databases.list is deprecated."
-      RequestClient.active_client.get("/v1/databases")
+      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)
-      RequestClient.active_client.post("/v1/databases", body: body.to_json)
+      response = post("/v1/databases", body.to_json)
+      Database.new(response.body)
     end
 
     def update(id, body)
-      RequestClient.active_client.patch("/v1/databases/#{id}", body: body.to_json)
+      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.4.1"
+  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

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.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Graham Marlow
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-28 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
@@ -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