jekyll-notion 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99d9e0d1e2b47634401803cdd361f608540db56b02d8599a1723da1d8be635d
-  data.tar.gz: eb0c99a5c4d9f90e54c2b1c5111d3ae916cc92775c550760e82f87765e31011f
+  metadata.gz: '088ab1c8e851aa22893826c0ad7c23b54bf6272595b58371b341d9073e3c8808'
+  data.tar.gz: 712a657a2093e556dffdada517ddcb6374254e191e9be84582d4393a69359268
 SHA512:
-  metadata.gz: 06f5e378e96a41cf66bdf21e751165be504fdec9d3263b6a1db6a6a30e7c082d3988310d74bab49b35f2f330a1db244e42ce9fc31308fa42ee4c41a88e09a023
-  data.tar.gz: 7c4c1f8f39d728d3a830d6b3aa7ebfb96483a4823f14756ec40b388d0b2e79b7aba68371c1f5ae9feea3070f8d1e8a8265ef526045b315d17370e7bbd2686237
+  metadata.gz: 776ff09d46941bc596613d3968bd940d5be6d0f2a3d523d3825a055a8ffa92206c87e1a3e44ba7e4f541fae137e62a0f1e786b8a727bba3cc12936511747111c
+  data.tar.gz: 0fe8e951359b66becc5515f4c9f30e3060ba60b8d7e4d328f7af3aeed9484bbd9921dccce105c420509511fee486b6484b05533b56840706c905aaf63811d6ba

data/README.md

@@ -42,7 +42,7 @@ notion:
     - id: 5cfed4de3bdc4f43ae8ba653a7a2219b
 ```
 
-By default, the notion pages contained in the database will be loaded into the `posts` collection.
+By default, the notion pages in the database will be loaded into the `posts` collection.
 
 We can also define __multiple databases__ as follows.
 
@@ -80,6 +80,12 @@ notion:
       sorts: [{ "timestamp": "created_time", "direction": "ascending" }]
 ```
 
+#### Posts date
+
+The `created_time` property of a notion page is used to set the date in the post filename. This is the date used for the `date` variable of the [predefined variables for posts](https://jekyllrb.com/docs/front-matter/#predefined-variables-for-posts).
+
+It's important to note that the `created_time` cannot be modifed. However, if you wish to change the date of a post, you can create a new page property named "date" (or "Date"). This way, the posts collection will use the `date` property for the post date variable instead of the `created_time`.
+
 ### Pages
 
 Individual Notion pages can also be loaded into Jekyll. Just define the `page` property as follows.

data/lib/jekyll-notion/cacheable.rb

@@ -26,16 +26,8 @@ module JekyllNotion
       end
     end
 
-    def database_query(*args)
-      VCR.use_cassette((args[0][:database_id]).to_s) { super(*args) }
-    end
-
-    def block_children(*args)
-      VCR.use_cassette((args[0][:block_id]).to_s) { super(*args) }
-    end
-
-    def page(*args)
-      VCR.use_cassette((args[0][:page_id]).to_s) { super(*args) }
+    def generate(*args)
+      VCR.use_cassette(resource_id) { super(*args) }
     end
   end
 end

data/lib/jekyll-notion/generator.rb

@@ -99,7 +99,9 @@ module JekyllNotion
       # Cache Notion API responses
       if ENV["JEKYLL_ENV"] != "test" && cache?
         JekyllNotion::Cacheable.setup(config["cache_dir"])
-        Notion::Client.prepend JekyllNotion::Cacheable
+        JekyllNotion::CollectionGenerator.prepend(JekyllNotion::Cacheable)
+        JekyllNotion::PageGenerator.prepend(JekyllNotion::Cacheable)
+        JekyllNotion::DataGenerator.prepend(JekyllNotion::Cacheable)
       end
     end
 

data/lib/jekyll-notion/generators/abstract_generator.rb

@@ -11,5 +11,9 @@ module JekyllNotion
     def generate
       raise "Do not use the AbstractGenerator class. Implement the generate method in a subclass."
     end
+
+    def resource_id
+      @notion_resource.id
+    end
   end
 end

data/lib/jekyll-notion/generators/collection_generator.rb

@@ -40,10 +40,9 @@ module JekyllNotion
 
     def make_filename(page)
       if @notion_resource.collection_name == "posts"
-        "#{page.created_time.to_date}-#{Jekyll::Utils.slugify(page.title,
-                                                              :mode => "latin")}.md"
+        "#{date_for(page)}-#{Jekyll::Utils.slugify(page.title, :mode => "latin")}.md"
       else
-        "#{page.title.downcase.parameterize}.md"
+        "#{Jekyll::Utils.slugify(page.title, :mode => "latin")}.md"
       end
     end
 
@@ -61,5 +60,15 @@ module JekyllNotion
       end
       Jekyll.logger.debug("", "Props => #{collection.docs.last.data.keys.inspect}")
     end
+
+    def date_for(page)
+      # The "date" property overwrites the Jekyll::Document#data["date"] key
+      # which is the date used by Jekyll to set the post date.
+      DateTime.parse(page.props["date"]).to_date
+    rescue TypeError, NoMethodError
+      # Because the "date" property is not required,
+      # it fallbacks to the created_time which is always present.
+      page.created_time.to_date
+    end
   end
 end

data/lib/jekyll-notion/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-notion
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -36,42 +36,48 @@ dependencies:
     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: notion_to_md
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement