jekyll-notion 2.0.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79520a9f4d598b024d2934fd68140f0f34775e2611ff601b1352ba60f67e9dd3
-  data.tar.gz: bcd325965c4eec49a498fe99c2101fa238f6c67587cb13723927abe0b8e83c1f
+  metadata.gz: ddda8e393e7ade4bf8e4ae38fd751750596bd988846071eac9626be7ac5f7e6c
+  data.tar.gz: a98cfe15172a91f360d846a6cb1f2f6761046f9abe883a2a3a2cba96f261c3ed
 SHA512:
-  metadata.gz: 17ca3742b0b48a22dd7cca185c25f9368565e7af35ccdc3e9add259faa20aa101e908aac961363c1ecf2b0d2f6822153e6b7d4a6bc53a3dc1d49697cb1199bc1
-  data.tar.gz: 0a46f5e5ce29f09bc1966ac4199a080da5eea58cedcaa37062cf5fd3bc77b35a8ad45bbf1067d01d32ca9094e53e36e21223187b8c3d94970ef092eb09ca56d0
+  metadata.gz: a184bcf01c6e03f71d237c9bb055330344ecfba45d288228bfb29f2960860fc22228aafecc9d3d234d2b9bbebacc54ab89fc7f9ba8c187978d65bf44044243c8
+  data.tar.gz: d4df4563e41dca9765cf681c10d095792b33d95afdb95b5dbfc35f569c3ff78a15a22620db60cce3e0485e7f4d115952d57db921d960fed5365d2c74f289025f

data/README.md

@@ -1,6 +1,6 @@
 # jekyll-notion
 
-Import notion pages to a jekyll collection or data.
+Import notion pages to jekyll.
 
 ## Installation
 
@@ -34,17 +34,17 @@ $ export NOTION_TOKEN=<secret_...>
 
 ### Databases
 
-Once your [notion database](https://www.notion.so/help/intro-to-databases) has been shared, specify the database `id` in your `_config.yml` as follows.
+Once the [notion database](https://www.notion.so/help/intro-to-databases) has been shared, specify the database `id` in the `_config.yml` file as follows.
 
 ```yml
 notion:
-  database:
-    id: 5cfed4de3bdc4f43ae8ba653a7a2219b
+  databases:
+    - id: 5cfed4de3bdc4f43ae8ba653a7a2219b
 ```
 
 By default, the notion pages contained in the database will be loaded into the `posts` collection.
 
-You can also define __multiple databases__ as follows.
+We can also define __multiple databases__ as follows.
 
 ```yml
 collections:
@@ -68,16 +68,16 @@ 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:
-  database:
-    id: e42383cd49754897b967ce453760499f
-    collection: posts
-    filter: { "property": "Published", "checkbox": { "equals": true } }
-    sort: { "property": "Last ordered", "direction": "ascending" }
+  databases:
+    - id: e42383cd49754897b967ce453760499f
+      collection: posts
+      filter: { "property": "Published", "checkbox": { "equals": true } }
+      sorts: [{ "timestamp": "created_time", "direction": "ascending" }]
 ```
 
 ### Pages
@@ -86,8 +86,8 @@ Individual Notion pages can also be loaded into Jekyll. Just define the `page` p
 
 ```yml
 notion:
-  page:
-    id: 5cfed4de3bdc4f43ae8ba653a7a2219b
+  pages:
+    - id: 5cfed4de3bdc4f43ae8ba653a7a2219b
 ```
 
 As databases, we can set up multiple pages.
@@ -122,7 +122,7 @@ notion:
 
 Page properties and body of the notion page are stored as a hash object.
 
-In the previous example, data objects can be accesses as follows.
+Data objects can be accessed as follows.
 
 ```html
 <ul>
@@ -149,30 +149,15 @@ Set `fetch_on_watch` to true to allow request on each rebuild.
 ```yml
 notion:
   fetch_on_watch: true
-  database:
-    id: e42383cd49754897b967ce453760499f
+  databases:
+    - id: e42383cd49754897b967ce453760499f
 ```
 
 And that's all. Each page in the notion database will be included in the selected collection.
 
 ## Notion properties
 
-Below, default properties per notion page are set for each document front matter.
-
-Notion page properties are `id`, `title`, `created_time`, `last_edited_time`, `icon`, `cover` and `archived`.
-
-```
----
-id: e42383cd-4975-4897-b967-ce453760499f
-title: An amazing post
-cover: https://img.bank.sh/an_image.jpg
-date: 2022-01-23T12:31:00.000Z
-icon: 💥
-archived: false
----
-```
-
-In addition to default properties, custom properties are also appended to front matter.
+Notion page properties are set for each document in the front matter.
 
 Please, refer to the [notion_to_md](https://github.com/emoriarty/notion_to_md/) gem to learn more.
 

data/lib/jekyll-notion/abstract_notion_resource.rb

@@ -37,5 +37,11 @@ module JekyllNotion
       end
       true
     end
+
+    def build_blocks
+      NotionToMd::Blocks.build(block_id: id) do |nested_id|
+        @notion.block_children({ :block_id => nested_id })
+      end
+    end
   end
 end

data/lib/jekyll-notion/document_without_a_file.rb

@@ -2,7 +2,7 @@
 
 module JekyllNotion
   class DocumentWithoutAFile < Jekyll::Document
-    def read_content(_new_content, **_opts)
+    def read_content(**_opts)
       if content =~ YAML_FRONT_MATTER_REGEXP
         self.content = Regexp.last_match.post_match
         data_file = SafeYAML.load(Regexp.last_match(1))

data/lib/jekyll-notion/generator.rb

@@ -20,11 +20,20 @@ module JekyllNotion
     end
 
     def config_databases
-      config["databases"] || [config["database"]]
+      if config["database"]
+        Jekyll.logger.warn("Jekyll Notion:",
+                           "database property is deprecated, use databases instead.")
+      end
+
+      config["databases"] || []
     end
 
     def config_pages
-      config["pages"] || [config["page"]]
+      if config["page"]
+        Jekyll.logger.warn("Jekyll Notion:",
+                           "page property is deprecated, use pages instead.")
+      end
+      config["pages"] || []
     end
 
     def collections
@@ -42,7 +51,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 => build_blocks)
       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 is deprecated, use sorts instead")
+      end
+      config["sorts"]
     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 => build_blocks)
     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.3.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.3.0
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-09-10 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: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
 description:
 email:
 - emoriarty81@gmail.com
@@ -142,8 +156,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