notion-ruby-client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb78b4f0ea816f89e61d9da9d1280e8d4d3565e0a71b1d611c2c58a1b5b7f67
-  data.tar.gz: e21ab58acc5a8414bfaccf21071a68e3ab37b11933448faed332347f597bc89b
+  metadata.gz: 1a51902078e38a1689842f254fd2a33c05c9cf7ee7e516a0d74c79ae0cf06018
+  data.tar.gz: 74cd639ca5b12e5c58bbc6e80b31b23bb29fc858e51fff6564afb4cc8079c120
 SHA512:
-  metadata.gz: 39b6ffaf9f003c928c8eb358237419f68a0578d84f8e7ce0e3eaa548afffd5754fe721696335c6476f7a02dbf0975b1d0095496eeaa6ef01bf658234efbf9882
-  data.tar.gz: 9174977cdd22e7af3516a118d2c282f60bebaea8ef756d9cc0eef5cbcbfb5ef285cb6cadfe35e738c31b62778893257c0498d8150beae8d02ab495867c9c3610
+  metadata.gz: b44e81d8f7acdd44845dcfc785555830adf556fe74d2ad1795913b131470dce9e315ce41051c0144aeb38b6c4385f3be3da01e039cabd682521f3929351af605
+  data.tar.gz: 384c2a8dae62684800ec4af7dd52cc4c7b961f82a17e90e867e60bcdbc518e49a840b4c8707f5d76b5d7cc031f4c5c98e906913bb6e68bbaff64db409cfdf2d3

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        ruby: [2.5, 2.6, 2.7]
+        ruby: [2.6, 2.7, '3.0', 3.1, 3.2]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -12,4 +12,4 @@ jobs:
         with:
           bundler-cache: true
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle exec rake
+      - run: bundle exec rake spec

data/.github/workflows/rubocop.yml

@@ -0,0 +1,17 @@
+name: RuboCop
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run RuboCop
+      run: bundle exec rake rubocop

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 1.1.0 (2023-02-23)
+
+#### Breaking changes
+
+- Remove support for ruby 2.5
+- Remove the `activesupport` dependency. Add `gem 'activesupport'` to your Gemfile if you required ActiveSupport via this library.
+
+#### Other
+
+- Upgrade Faraday to v2 (thanks @Tao-Galasse!)
+
 ### 1.0.0 (2022-03-30)
 
 #### New

data/Gemfile.lock

@@ -1,62 +1,36 @@
 PATH
   remote: .
   specs:
-    notion-ruby-client (1.0.0)
-      activesupport (>= 6)
+    notion-ruby-client (1.1.0)
       dotenv
-      faraday (>= 1.0)
-      faraday_middleware
+      faraday (>= 2.0)
+      faraday-mashify (>= 0.1.1)
+      faraday-multipart (>= 1.0.4)
       hashie (~> 5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (6.1.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
-    dotenv (2.7.6)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    dotenv (2.8.1)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
       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-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-mashify (0.1.1)
+      faraday (~> 2.0)
+      hashie
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    minitest (5.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.3.0)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
@@ -92,15 +66,12 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     timecop (0.9.4)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     vcr (6.0.0)
     webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.5.4)
 
 PLATFORMS
   arm64-darwin-20

data/README.md

@@ -129,9 +129,9 @@ client.database_query(database_id: 'e383bcee-e0d8-4564-9c63-900d307abdb0') do |p
 end
 
 # Filter and sort the database
-sort = [
+sorts = [
   {
-    'property': 'Last ordered',
+    'timestamp': 'created_time',
     'direction': 'ascending'
   }
 ]
@@ -151,7 +151,7 @@ filter = {
     }
   ]
 }
-client.database_query(database_id: 'e383bcee-e0d8-4564-9c63-900d307abdb0', sort: sort, filter: filter)
+client.database_query(database_id: 'e383bcee-e0d8-4564-9c63-900d307abdb0', sorts: sorts, filter: filter)
 ```
 
 See [Pagination](#pagination) for details about how to iterate through the list.
@@ -273,7 +273,7 @@ See the full endpoint documentation on [Notion Developers](https://developers.no
 
 Creates a new page in the specified database or as a child of an existing page.
 
-If the parent is a database, the [property values](https://developers.notion.com/reference-link/page-property-value) of the new page in the properties parameter must conform to the parent [database](https://developers.notion.com/reference-link/database)'s property schema.
+If the parent is a database, the [property values](https://developers.notion.com/reference-link/page-property-values) of the new page in the properties parameter must conform to the parent [database](https://developers.notion.com/reference-link/database)'s property schema.
 
 If the parent is a page, the only valid property is `title`.
 
@@ -314,14 +314,14 @@ children = [
     'type': 'heading_2',
     'heading_2': {
       'rich_text': [{
-        'type": 'text',
+        'type': 'text',
         'text': { 'content': 'Lacinato kale' }
       }]
     }
   },
   {
     'object': 'block',
-    'type": 'paragraph',
+    'type': 'paragraph',
     'paragraph': {
       'rich_text': [
         {

data/lib/notion/api/endpoints/blocks.rb

@@ -28,8 +28,9 @@ module Notion
         #   updated. Currently only text (for supported block types)
         #   and checked (for to_do blocks) fields can be updated.
         def update_block(options = {})
-          throw ArgumentError.new('Required arguments :block_id missing') if options[:block_id].nil?
-          patch("blocks/#{options[:block_id]}", options.except(:block_id))
+          block_id = options.delete(:block_id)
+          throw ArgumentError.new('Required arguments :block_id missing') if block_id.nil?
+          patch("blocks/#{block_id}", options)
         end
 
         #
@@ -67,7 +68,8 @@ module Notion
               yield page
             end
           else
-            get("blocks/#{options[:block_id]}/children", options.except(:block_id))
+            block_id = options.delete(:block_id)
+            get("blocks/#{block_id}/children", options)
           end
         end
 
@@ -88,8 +90,9 @@ module Notion
         # @option options [[Object]] :children
         #   Children blocks to append
         def block_append_children(options = {})
-          throw ArgumentError.new('Required arguments :block_id missing') if options[:block_id].nil?
-          patch("blocks/#{options[:block_id]}/children", options.except(:block_id))
+          block_id = options.delete(:block_id)
+          throw ArgumentError.new('Required arguments :block_id missing') if block_id.nil?
+          patch("blocks/#{block_id}/children", options)
         end
       end
     end

data/lib/notion/api/endpoints/databases.rb

@@ -40,7 +40,8 @@ module Notion
               yield page
             end
           else
-            post("databases/#{options[:database_id]}/query", options.except(:database_id))
+            database_id = options.delete(:database_id)
+            post("databases/#{database_id}/query", options)
           end
         end
 
@@ -84,8 +85,9 @@ module Notion
         #   the name of the database property and the value is a property schema object.
         #
         def update_database(options = {})
-          throw ArgumentError.new('Required arguments :database_id missing') if options.dig(:database_id).nil?
-          patch("databases/#{options[:database_id]}", options.except(:database_id))
+          database_id = options.delete(:database_id)
+          throw ArgumentError.new('Required arguments :database_id missing') if database_id.nil?
+          patch("databases/#{database_id}", options)
         end
 
         #

data/lib/notion/api/endpoints/pages.rb

@@ -60,8 +60,9 @@ module Notion
         #   appears in Notion, or property ID. value object Object containing a value
         #   specific to the property type, e.g. {"checkbox": true}.
         def update_page(options = {})
-          throw ArgumentError.new('Required argument :page_id missing') if options[:page_id].nil?
-          patch("pages/#{options[:page_id]}", options.except(:page_id))
+          page_id = options.delete(:page_id)
+          throw ArgumentError.new('Required argument :page_id missing') if page_id.nil?
+          patch("pages/#{page_id}", options)
         end
 
         #

data/lib/notion/config.rb

@@ -24,8 +24,8 @@ module Notion
     def reset
       self.endpoint = 'https://api.notion.com/v1'
       self.user_agent = "Notion Ruby Client/#{Notion::VERSION}"
-      self.ca_path = defined?(OpenSSL) ? OpenSSL::X509::DEFAULT_CERT_DIR : nil
-      self.ca_file = defined?(OpenSSL) ? OpenSSL::X509::DEFAULT_CERT_FILE : nil
+      self.ca_path = nil
+      self.ca_file = nil
       self.token = nil
       self.proxy = nil
       self.logger = nil

data/lib/notion/faraday/connection.rb

@@ -21,11 +21,11 @@ module Notion
             options[:request] = request_options if request_options.any?
 
             ::Faraday::Connection.new(endpoint, options) do |connection|
-              connection.use ::Faraday::Request::Multipart
+              connection.use ::Faraday::Multipart::Middleware
               connection.use ::Faraday::Request::UrlEncoded
               connection.use ::Notion::Faraday::Response::RaiseError
-              connection.use ::FaradayMiddleware::Mashify, mash_class: Notion::Messages::Message
-              connection.use ::FaradayMiddleware::ParseJson
+              connection.use ::Faraday::Mashify::Middleware, mash_class: Notion::Messages::Message
+              connection.use ::Faraday::Response::Json
               connection.use ::Notion::Faraday::Response::WrapError
               connection.response :logger, logger if logger
               connection.adapter adapter
@@ -34,4 +34,4 @@ module Notion
       end
     end
   end
-end
+end

data/lib/notion/faraday/request.rb

@@ -42,4 +42,4 @@ module Notion
       end
     end
   end
-end
+end

data/lib/notion/faraday/response/raise_error.rb

@@ -2,7 +2,7 @@
 module Notion
   module Faraday
     module Response
-      class RaiseError < ::Faraday::Response::Middleware
+      class RaiseError < ::Faraday::Response::Json
         def on_complete(env)
           raise Notion::Api::Errors::TooManyRequests, env.response if env.status == 429
 
@@ -28,4 +28,4 @@ module Notion
       end
     end
   end
-end
+end

data/lib/notion/faraday/response/wrap_error.rb

@@ -2,7 +2,7 @@
 module Notion
   module Faraday
     module Response
-      class WrapError < ::Faraday::Response::Middleware
+      class WrapError < ::Faraday::Response::Json
         UNAVAILABLE_ERROR_STATUSES = (500..599).freeze
 
         def on_complete(env)
@@ -19,4 +19,4 @@ module Notion
       end
     end
   end
-end
+end

data/lib/notion/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Notion
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
   NOTION_REQUEST_VERSION = '2022-02-22'
 end

data/lib/notion-ruby-client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require 'active_support/core_ext/hash/except'
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/mashify'
+require 'faraday/multipart'
 require 'json'
 require 'logger'
 require 'hashie'

data/notion-ruby-client.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/orbit-love/notion-ruby-client'
   s.licenses = ['MIT']
   s.summary = 'Notion API client for Ruby.'
-  s.add_dependency 'activesupport', '>= 6'
   s.add_dependency 'dotenv'
-  s.add_dependency 'faraday', '>= 1.0'
-  s.add_dependency 'faraday_middleware'
+  s.add_dependency 'faraday', '>= 2.0'
+  s.add_dependency 'faraday-mashify', '>= 0.1.1'
+  s.add_dependency 'faraday-multipart', '>= 1.0.4'
   s.add_dependency 'hashie', '~> 5'
   s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'rspec'

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: notion-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nicolas Goutay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: faraday-mashify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ files:
 - ".devcontainer/boot.sh"
 - ".devcontainer/devcontainer.json"
 - ".github/workflows/ci.yml"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"