jekyll-notion 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79520a9f4d598b024d2934fd68140f0f34775e2611ff601b1352ba60f67e9dd3
-  data.tar.gz: bcd325965c4eec49a498fe99c2101fa238f6c67587cb13723927abe0b8e83c1f
+  metadata.gz: d730d8b3c38a4857f9a506b6219aeba97b31f9257fb6c6ecfefe5fe2c30e921c
+  data.tar.gz: 7ce7ce2738857027a3b2f48fc5b237b1e4725963d9a2a5273a12c92ba41477f0
 SHA512:
-  metadata.gz: 17ca3742b0b48a22dd7cca185c25f9368565e7af35ccdc3e9add259faa20aa101e908aac961363c1ecf2b0d2f6822153e6b7d4a6bc53a3dc1d49697cb1199bc1
-  data.tar.gz: 0a46f5e5ce29f09bc1966ac4199a080da5eea58cedcaa37062cf5fd3bc77b35a8ad45bbf1067d01d32ca9094e53e36e21223187b8c3d94970ef092eb09ca56d0
+  metadata.gz: cc4d474362dd91a1308a917654d725151877f81f348c768211aa272a265233e3af82119d47e75209e3aaeb205207a15a325a8795e18d2a4fd8c27ead79f947d8
+  data.tar.gz: bcf4276e64b3d2176a015b8ab81ced2d4f4e3cc2e8a2755f4a54502d1b0b28c6d43ca234b55d55765572d7c36ee69986f132475c4c200a052c2b0171538cf72a

data/README.md

@@ -1,6 +1,6 @@
 # jekyll-notion
 
-Import notion pages to a jekyll collection or data.
+Import notion pages to jekyll.
 
 ## Installation
 
@@ -68,8 +68,8 @@ Each dabatase support the following options.
 
 * `id`: the notion database unique identifier,
 * `collection`: the collection each page belongs to (posts by default),
-* `filter`: the database query filter,
-* `sort`: the database query sort,
+* `filter`: the database [filter property](https://developers.notion.com/reference/post-database-query-filter),
+* `sorts`: the database [sorts criteria](https://developers.notion.com/reference/post-database-query-sort),
 
 ```yml
 notion:
@@ -77,7 +77,7 @@ notion:
     id: e42383cd49754897b967ce453760499f
     collection: posts
     filter: { "property": "Published", "checkbox": { "equals": true } }
-    sort: { "property": "Last ordered", "direction": "ascending" }
+    sorts: [{ "timestamp": "created_time", "direction": "ascending" }]
 ```
 
 ### Pages

data/lib/jekyll-notion/generator.rb

@@ -42,7 +42,7 @@ module JekyllNotion
     protected
 
     def cache_empty?
-      collections.empty? && pages.empty? && data.empty? 
+      collections.empty? && pages.empty? && data.empty?
     end
 
     def read_notion_databases

data/lib/jekyll-notion/notion_database.rb

@@ -7,7 +7,7 @@ module JekyllNotion
       return [] unless id?
 
       @fetch ||= @notion.database_query(query)[:results].map do |page|
-        NotionToMd::Page.new(:page => page, :blocks => @notion.block_children(:id => page.id))
+        NotionToMd::Page.new(:page => page, :blocks => @notion.block_children(:block_id => page.id))
       end
     end
 
@@ -15,8 +15,11 @@ module JekyllNotion
       config["filter"]
     end
 
-    def sort
-      config["sort"]
+    def sorts
+      if config["sort"]
+        Jekyll.logger.warn("Jekyll Notion:", "sort property will be deprecated, use sorts instead")
+      end
+      config["sorts"] || config["sort"]
     end
 
     def collection_name
@@ -30,7 +33,7 @@ module JekyllNotion
     private
 
     def query
-      { :id => id, :filter => filter, :sort => sort }.compact
+      { :database_id => id, :filter => filter, :sorts => sorts }.compact
     end
   end
 end

data/lib/jekyll-notion/notion_page.rb

@@ -6,8 +6,8 @@ module JekyllNotion
     def fetch
       return nil unless id?
 
-      @fetch ||= NotionToMd::Page.new(:page   => @notion.page(query),
-                                      :blocks => @notion.block_children(query))
+      @fetch ||= NotionToMd::Page.new(:page   => @notion.page({ :page_id => id }),
+                                      :blocks => @notion.block_children({ :block_id => id }))
     end
 
     def data_name
@@ -17,11 +17,5 @@ module JekyllNotion
     def collection_name
       nil
     end
-
-    private
-
-    def query
-      { :id => id }
-    end
   end
 end

data/lib/jekyll-notion/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllNotion
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-notion
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: notion_to_md
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A Jekyll plugin to generate pages from Notion