jekyll-notion 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85b870a3e8c0aa6ea64575b8ef8541f61183fa25ced6f41570384057a3a36dd
-  data.tar.gz: c66f6d831e8352f029fc1f81608f751aac1ed2b5959b6c2ee19f861eafcdb6f0
+  metadata.gz: 043b3ae753a651d756c95dc6372af86589106030dd3d41d8b886ccc95c5d5d7a
+  data.tar.gz: 5a6bf3508185e27978836cd1158ef70a080d53be183c642d7948015f6d7de215
 SHA512:
-  metadata.gz: 26fda79bcfce19d75fda17e6f3e1a90080089c05132359b50f00ec3a4d54d844e6ef583bb558c961209d5818465c6ada865413a33f22fea15fdf943ecd213d8d
-  data.tar.gz: 430aa7ef405283f1568eacf4062a90a60fc0e086ae6c7d68cd96cd1eac5f8208d57d8cdebc02b0e98c653d0bff62b119c4ec6ceb4af31777c2a4a28121e0eb55
+  metadata.gz: 74e147fe3f6f91a88bafb24f273284bb71d42f39f207c48f85577229aebb6ceb6de6cbe331b48e6f99afb6191466e9f27d436fb45bc710104a0ac3a80e016c6c
+  data.tar.gz: 2257337e331db87e4594e5117739ea7e1082739b3f497a4c63bba7f2dc79d2c173a484fc574ea20eb40d8650c14c84a607c9e17cef9f49174ff97bf79edab73e

data/README.md

@@ -40,6 +40,8 @@ notion:
     id: e42383cd-4975-4897-b967-ce453760499f
 ```
 
+After running `jekyll build` (or `serve`) command, the `posts` collection is loaded with pages of the notion database specified in the configuration. 
+
 ### Mutiple dabatases
 
 You can also define multiple databases as follows.
@@ -58,7 +60,20 @@ notion:
       collection: films
 ```
 
-When no collection is defined, the `posts` collection is used by default.
+In this example, the notion database `b0e688e1-99af-4295-ae80-b67eb52f2e2f` pages are mapped into the posts collection. `recipes` and `films` will contain the database pages `2190450d-4cb3-4739-a5c8-340c4110fe21` and  `e42383cd-4975-4897-b967-ce453760499f`, respectively.
+
+### data
+
+Instead of storing notion pages in a collection, you can also map to the data object. Declare the data property as follows.
+
+```yml
+notion:
+  database:
+    id: e42383cd-4975-4897-b967-ce453760499f
+    data: films
+```
+
+Unlike collections, only the properties of the notion page are assigned to the each data item. The body of the notion page is omitted.
 
 ### Database options
 

data/lib/jekyll-notion/abstract_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module JekyllNotion
+  class AbstractGenerator
+    def initialize(db:, site:, plugin:)
+      @db = db
+      @site = site
+      @plugin = plugin
+    end
+
+    def generate
+      raise "Do not use the AbstractGenerator class directly. Implement the generate method in a subclass."
+    end
+  end
+end

data/lib/jekyll-notion/collection_generator.rb

@@ -1,10 +1,7 @@
-module JekyllNotion
-  class CollectionGenerator
-    def initialize(db:, site:)
-      @db = db
-      @site = site
-    end
+# frozen_string_literal: true
 
+module JekyllNotion
+  class CollectionGenerator < AbstractGenerator
     def generate
       @db.pages.each do |page|
         next if file_exists?(make_path(page))
@@ -12,7 +9,8 @@ module JekyllNotion
         collection.docs << make_doc(page)
         log_new_page(page)
       end
-      collection
+      # Caching current collection
+      @plugin.collections[@db.collection] = collection
     end
 
     def collection

data/lib/jekyll-notion/data_generator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module JekyllNotion
+  class DataGenerator < AbstractGenerator
+    def generate
+      @site.data[@db.data] = data
+      # Caching current data
+      @plugin.data[@db.data] = data
+    end
+
+    private
+
+    def data
+      @data ||= @db.pages.map(&:props)
+    end
+  end
+end

data/lib/jekyll-notion/generator.rb

@@ -16,17 +16,6 @@ module JekyllNotion
       end
     end
 
-    protected
-
-    def read_notion_database
-      databases.each do |db_config|
-        db = NotionDatabase.new(:config => db_config)
-        new_collection = CollectionGenerator.new(:db => db, :site => @site).generate
-        # Caching current collection
-        collections[db.collection] = new_collection
-      end
-    end
-
     def databases
       config["databases"] || [config["database"]]
     end
@@ -35,6 +24,19 @@ module JekyllNotion
       @collections ||= {}
     end
 
+    def data
+      @data ||= {}
+    end
+
+    protected
+
+    def read_notion_database
+      databases.each do |db_config|
+        db = NotionDatabase.new(:config => db_config)
+        GeneratorFactory.for(:db => db, :site => @site, :plugin => self).generate
+      end
+    end
+
     def config
       @config ||= @site.config["notion"] || {}
     end

data/lib/jekyll-notion/generator_factory.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module JekyllNotion
+  class GeneratorFactory
+    def self.for(db:, site:, plugin:)
+      if db.data.nil?
+        CollectionGenerator.new(:db => db, :site => site, :plugin => plugin)
+      else
+        DataGenerator.new(:db => db, :site => site, :plugin => plugin)
+      end
+    end
+  end
+end

data/lib/jekyll-notion/notion_database.rb

@@ -35,6 +35,10 @@ module JekyllNotion
       config["collection"] || "posts"
     end
 
+    def data
+      config["data"]
+    end
+
     private
 
     def id?

data/lib/jekyll-notion/version.rb

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

data/lib/jekyll-notion.rb

@@ -13,7 +13,10 @@ Notion.configure do |config|
 end
 
 module JekyllNotion
+  autoload :GeneratorFactory, "jekyll-notion/generator_factory"
+  autoload :AbstractGenerator, "jekyll-notion/abstract_generator"
   autoload :CollectionGenerator, "jekyll-notion/collection_generator"
+  autoload :DataGenerator, "jekyll-notion/data_generator"
   autoload :DocumentWithoutAFile, "jekyll-notion/document_without_a_file"
   autoload :NotionDatabase, "jekyll-notion/notion_database"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-notion
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -110,9 +110,12 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/jekyll-notion.rb
+- lib/jekyll-notion/abstract_generator.rb
 - lib/jekyll-notion/collection_generator.rb
+- lib/jekyll-notion/data_generator.rb
 - lib/jekyll-notion/document_without_a_file.rb
 - lib/jekyll-notion/generator.rb
+- lib/jekyll-notion/generator_factory.rb
 - lib/jekyll-notion/notion_database.rb
 - lib/jekyll-notion/version.rb
 homepage: https://github.com/emoriarty/jekyll-notion