jekyll-notion 0.1.5 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46b38a04459bcc270b3dd99729eb34e4c7275393c3097cf92af526845e6f94e
-  data.tar.gz: 100eb193c3ee037ca004a8e6b1a3b2bd2a52e2d727484f557edc2a2a0b1edd04
+  metadata.gz: 8ec8ddd6c2aceafbf5c872bcd4861f86dde3907ffbda6ec929a26c141a14bc7e
+  data.tar.gz: bbe31e585b82abd2df50c1ef7ec3811a37b3d84b0ca99d0ed97d26d887cb1392
 SHA512:
-  metadata.gz: 25b24f800326c681fb40e28111f6b7662924679418b37d3e2113327061cddc2171a57d46abf2c3fbfaa42228a8f828106aa0ad2fa69f68df507a63c8f5d6cbbb
-  data.tar.gz: d6fdce97c3cd46102b7e493787ee90b057f7c3ee254308f6cf97b9d7fe1e2f975c6969e73b1dd8426fb0d6436aa89446eb918f4b57ffeddcc4717074c9e95926
+  metadata.gz: f4949323862e1efc8ad2901260f83388a1ad443035f8748b1a4d365720773f59c7704ae8b64fcedd167cc86619b1414e6e25519591a1064bd5c1e79c31e5b751
+  data.tar.gz: 53f3d8a98060fbd64e9395327c79023fb75df778e3f52c1e0a6399e479cea7d7be133baac85c0622ea9d943afe32353c3707465f733e5a3e3f667fde37bf8ea7

data/README.md

@@ -32,13 +32,48 @@ Export the notion secret token in an environment variable named `NOTION_TOKEN`.
 $ export NOTION_TOKEN=<secret_...>
 ```
 
-Once your notion database has been shared, specify the `id` in your `_config.yml` as follows.
+Once your notion database has been shared, specify the  database `id` in your `_config.yml` as follows.
 
 ```yml
 notion:
-  fetch_on_watch: false
   database:
-    id: b91d5...
+    id: e42383cd-4975-4897-b967-ce453760499f
+```
+
+### Mutiple dabatases
+
+You can also define multiple databases as follows.
+
+```yml
+collections:
+  - recipes
+  - films
+
+notion:
+  databases:
+    - id: b0e688e1-99af-4295-ae80-b67eb52f2e2f
+    - id: 2190450d-4cb3-4739-a5c8-340c4110fe21
+      collection: recipes
+    - id: e42383cd-4975-4897-b967-ce453760499f 
+      collection: films
+```
+
+When no collection is defined, the `posts` collection is used by default.
+
+### Database options
+
+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,
+* `frontmatter`: additional front matter to append to each page in the collection.
+
+```yml
+notion:
+  database:
+    id: e42383cd-4975-4897-b967-ce453760499f
     collection: posts
     filter: { "property": "Published", "checkbox": { "equals": true } }
     sort: { "property": "Last ordered", "direction": "ascending" }
@@ -46,47 +81,51 @@ notion:
       layout: post
 ```
 
-`fetch_on_watch` when set to `true` it allows fetching notion pages on each rebuild. By default is off, pages are only retrieved in the first build.
+Note that you can also use [front matter defaults](https://jekyllrb.com/docs/configuration/front-matter-defaults/) to declare common key value pairs per collection.
 
-`database` properties are:
-* `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,
-* `frontmatter`: additional frontmatter to append to each page in the collection.
+### Watch
 
-Note: Only one notion database is available.
+By default, databases are only requested during the first build. Subsequent builds use the results from the cache.
+
+Set `fetch_on_watch` to true to allow request on each rebuild.
+
+```yml
+notion:
+  fetch_on_watch: true
+  database:
+    id: e42383cd-4975-4897-b967-ce453760499f
+```
 
 And that's all. Each page in the notion database will be included in the selected collection.
 
 ## Notion properties
 
-Below, page notion default properties are set in each page frontmatter.
+Below, default properties per notion page are set for each document front matter.
 
-Default properties include  `title`, created_time`, `last_edited_time`, `icon` and `cover.
+Notion properties include page `id`, `title`, `created_time`, `last_edited_time`, `icon` and `cover`.
 
 ```
 ---
-id: b2998...
-title: A title
+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: \U0001F4A5
 ---
 ```
 
-Any property provided in the frontmatter config that matches a default property will be overwritten by the default value.
+Default properties prevail over custom properties declared in the front matter config.
 
 ### Custom properties
 
 In addition to default properties, custom properties are also supported.
 
-Custom properties are appended to page frontmatter by default. Every property name is snake-cased.
+Custom properties are appended to the page frontmatter by default. Every property name are downcased and snake-cased.
 For example, two properties named `Multiple Options` and `Tags` will be transformed to `multiple_options` and `tags`, respectively.
 
 ```
 ---
-id: b2998...
+id: 2190450d-4cb3-4739-a5c8-340c4110fe21
 title: A title
 cover: https://img.bank.sh/an_image.jpg
 date: 2022-01-23T12:31:00.000Z
@@ -96,7 +135,7 @@ multiple_options: option1, option2
 ---
 ```
 
-The supported properties are:
+The supported property types are:
 
 * `number`
 * `select`

data/lib/jekyll-notion/generator.rb

@@ -2,50 +2,79 @@
 
 module JekyllNotion
   class Generator < Jekyll::Generator
-    attr_reader :current_page
+    attr_reader :current_page, :current_db
 
     def generate(site)
       @site = site
 
       return unless notion_token? && config?
 
-      if fetch_on_watch? || docs.empty?
+      if fetch_on_watch? || collections.empty?
         read_notion_database
       else
-        collection.docs = docs
+        collections.each_pair { |key, val| @site.collections[key] = val }
       end
     end
 
+    protected
+
     def read_notion_database
-      @db = NotionDatabase.new(:config => config)
-      @db.pages.each do |page|
-        @current_page = page
-        collection.docs << make_page
-        Jekyll.logger.info("Jekyll Notion:", "New notion page at #{collection.docs.last.path}")
+      databases.each do |db_config|
+        @current_db = NotionDatabase.new(:config => db_config)
+        @current_db.pages.each do |page|
+          @current_page = page
+          next if file_exists?(make_path)
+
+          current_collection.docs << make_page
+          log_new_page
+        end
+        # Store current collection
+        collections[current_db.collection] = current_collection
       end
-      @docs = collection.docs
     end
 
-    def docs
-      @docs ||= []
+    def databases
+      config["databases"] || [config["database"]]
+    end
+
+    def collections
+      @collections ||= {}
+    end
+
+    # Checks if a file already exists in the site source
+    def file_exists?(file_path)
+      File.exist? @site.in_source_dir(file_path)
     end
 
     def make_page
       new_post = DocumentWithoutAFile.new(
-        "#{Dir.pwd}/_#{collection_name}/#{make_filename}",
-        { :site => @site, :collection => collection }
+        make_path,
+        { :site => @site, :collection => current_collection }
       )
       new_post.content = "#{make_frontmatter}\n\n#{make_md}"
       new_post.read
       new_post
     end
 
+    def make_path
+      "_#{current_db.collection}/#{make_filename}"
+    end
+
+    def make_filename
+      if current_db.collection == "posts"
+        "#{current_page.created_date}-#{Jekyll::Utils.slugify(current_page.title,
+                                                              :mode => "latin")}.md"
+      else
+        "#{current_page.title.downcase.parameterize}.md"
+      end
+    end
+
     def make_md
       NotionToMd::Converter.new(:page_id => current_page.id).convert
     end
 
     def make_frontmatter
-      data = Jekyll::Utils.deep_merge_hashes(config_frontmatter, page_frontmatter)
+      data = Jekyll::Utils.deep_merge_hashes(current_db.frontmatter, page_frontmatter)
       frontmatter = data.to_a.map { |k, v| "#{k}: #{v}" }.join("\n")
       <<~CONTENT
         ---
@@ -58,25 +87,8 @@ module JekyllNotion
       Jekyll::Utils.deep_merge_hashes(current_page.custom_props, current_page.default_props)
     end
 
-    def config_frontmatter
-      config.dig("database", "frontmatter") || {}
-    end
-
-    def make_filename
-      if collection_name == "posts"
-        "#{current_page.created_date}-#{Jekyll::Utils.slugify(current_page.title,
-                                                              :mode => "latin")}.md"
-      else
-        "#{current_page.title.downcase.parameterize}.md"
-      end
-    end
-
-    def collection_name
-      config.dig("database", "collection") || "posts"
-    end
-
-    def collection
-      @site.collections[collection_name]
+    def current_collection
+      @site.collections[current_db.collection]
     end
 
     def config
@@ -102,5 +114,16 @@ module JekyllNotion
       end
       true
     end
+
+    def log_new_page
+      Jekyll.logger.info("Jekyll Notion:", "Page => #{current_page.title}")
+      if @site.config.dig(
+        "collections", current_db.collection, "output"
+      )
+        Jekyll.logger.info("",
+                           "Path => #{current_collection.docs.last.path}")
+      end
+      Jekyll.logger.debug("", "Props => #{page_frontmatter.keys.inspect}")
+    end
   end
 end

data/lib/jekyll-notion/notion_database.rb

@@ -11,28 +11,40 @@ module JekyllNotion
       return [] unless id?
 
       @pages ||= @notion.database_query(query)[:results].map do |page|
-        NotionPage.new(:page => page, :layout => config["layout"])
+        NotionPage.new(:page => page, :layout => layout)
       end
     end
 
-    private
-
     def config
-      @config["database"]
+      @config || {}
     end
 
     def filter
-      @config.dig("database", "filter")
+      config["filter"]
     end
 
     def sort
-      @config.dig("database", "sort")
+      config["sort"]
     end
 
     def id
-      @config.dig("database", "id")
+      config["id"]
+    end
+
+    def frontmatter
+      config["frontmatter"] || {}
+    end
+
+    def collection
+      config["collection"] || "posts"
+    end
+
+    def layout
+      config["layout"]
     end
 
+    private
+
     def id?
       if id.nil? || id.empty?
         Jekyll.logger.warn("Jekyll Notion:",

data/lib/jekyll-notion/notion_page.rb

@@ -61,12 +61,12 @@ module JekyllNotion
 
     def default_props
       @default_props ||= {
-        :id           => id,
-        :title        => title,
-        :date         => created_datetime,
-        :cover        => cover,
-        :icon         => icon,
-        :updated_date => updated_datetime,
+        "id"           => id,
+        "title"        => title,
+        "date"         => created_datetime,
+        "cover"        => cover,
+        "icon"         => icon,
+        "updated_date" => updated_datetime,
       }
     end
 
@@ -87,7 +87,7 @@ module JekyllNotion
         end
 
         def files(prop)
-          files = prop.files.map { |f| f.file.url }.join(", ")
+          files = prop.files.map { |f| "\"#{f.file.url}\"" }.join(", ")
           "[#{files}]"
         end
 
@@ -113,6 +113,10 @@ module JekyllNotion
         def date(prop)
           prop.date.start
         end
+
+        def url(prop)
+          prop.url
+        end
       end
     end
   end

data/lib/jekyll-notion/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-notion
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.2
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport