jekyll-notion 0.0.0.beta → 0.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc64ea093044b7a8b5f0f1059e175d439b8b70fc1b4b08a30ea39438b4dc6d46
-  data.tar.gz: 608c37287a98f0ce89184616c27392048c9fdc725ab77f327e0cffb35fa4020b
+  metadata.gz: 1a2d58cc88c6a7012d3efc3eb431e9030f6287feec5b1307d731fb2b8a78a6e5
+  data.tar.gz: 939b5e04a4b019fd7a295dfba5c765e4f5fb5bf0f41e1b3527b01d84bf02a2cf
 SHA512:
-  metadata.gz: 6c1b27117aee99b01dd988d243d1419b054447aa5afb02e5cffc5ed9120a8acd2e3a0b11759cccf6bd28a8657bc65e147307be501b2140421e961d48920c0f4d
-  data.tar.gz: cb1fbc6a9edb4069fd8019e5a29837bdf80a551c119a9371d7678f48ca10a32e58c5a5da2edbe4c4bff0c41d6d560041db0fbf9a26fdeb0bcf9101cd88d3cabd
+  metadata.gz: bf6461f39325a08b18dfdd18ac9413e50991bc7c18032c30e59bba013ae00f77cab5b79ddcbf44100d4248cc957b98ccfd0538ddf323e3881f408e7ff5c46762
+  data.tar.gz: d451dfcbe921c165c232fa7a6195471f7da133ab6ddb46feadcc2705771cbc6092462e8ec29fa128b7d1c14db816b77ce84d07c05d2287eb53e93e4da9e7c06c

data/README.md

@@ -39,21 +39,43 @@ notion:
   database:
     id: b91d5...
     collection: posts
-    layout: post
     filter: { "property": "Published", "checkbox": { "equals": true } }
     sort: { "propery": "Last ordered", "direction": "ascending" }
     frontmatter:
-      prop_1: blabla
-      prop_2: albalb
+      layout: post
 ```
 
 The other properties are:
 * `collection`: what collection each page belongs to,
-* `layout`: the collection layout,
 * `filter`: the database query filter,
 * `sort`: the database query sort,
-* `frontmatter`: additonal frontmatter to append to each page in the collection.
+* `frontmatter`: additional frontmatter to append to each page in the collection.
 
 Note: Only one database is available.
 
 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.
+
+```
+---
+id: id
+title: properties > Name > title > plain_text
+cover: cover > external > url
+date: created_time
+---
+```
+
+## Page filename
+
+There are two kinds of collections: posts and others.
+
+When the collection is posts, the filename format contains the `created_time` property plus the page title as specified in [jekyll docs](https://jekyllrb.com/docs/posts/#creating-posts).
+
+```
+YEAR-MONTH-DAY-title.MARKUP
+```
+
+Any other collection, the filename is the page title.

data/lib/jekyll-notion/document_without_a_file.rb

@@ -2,11 +2,11 @@
 
 module JekyllNotion
   class DocumentWithoutAFile < Jekyll::Document
-    def read_content(new_content, **opts)
+    def read_content(_new_content, **_opts)
       if content =~ YAML_FRONT_MATTER_REGEXP
-        self.content = $POSTMATCH
+        self.content = Regexp.last_match.post_match
         data_file = SafeYAML.load(Regexp.last_match(1))
-        merge_data!(data_file, :source => "YAML front matter") if data_file
+        merge_data!(data_file, source: 'YAML front matter') if data_file
       end
     end
   end

data/lib/jekyll-notion/generator.rb

@@ -4,10 +4,6 @@ module JekyllNotion
   class Generator < Jekyll::Generator
     attr_reader :current_page
 
-    def initialize(plugin)
-      super(plugin)
-    end
-
     def generate(site)
       @site = site
 
@@ -28,7 +24,7 @@ module JekyllNotion
 
     def make_page
       new_post = DocumentWithoutAFile.new(
-        "#{Dir.pwd}/_#{config.dig('database', 'collection')}/#{make_filename}",
+        "#{Dir.pwd}/_#{collection_name}/#{make_filename}",
         { site: @site, collection: collection }
       )
       new_post.content = "#{make_frontmatter}\n\n#{make_md}"
@@ -41,27 +37,34 @@ module JekyllNotion
     end
 
     def make_frontmatter
-      <<-CONTENT
-#{config.dig('database', 'frontmatter').to_yaml}
-id: #{current_page.id}
-layout: #{current_page.layout}
-title: #{current_page.title}
-date: #{current_page.created_datetime.to_s}
-cover: #{current_page.cover}
----
+      <<~CONTENT
+        #{config.dig('database', 'frontmatter').to_yaml}
+        id: #{current_page.id}
+        title: #{current_page.title}
+        date: #{current_page.created_datetime}
+        cover: #{current_page.cover}
+        ---
       CONTENT
     end
 
     def make_filename
-      "#{current_page.created_date.to_s}-#{current_page.title.downcase.parameterize}.md"
+      if collection_name == 'posts'
+        "#{current_page.created_date}-#{current_page.title.downcase.parameterize}.md"
+      else
+        "#{current_page.title.downcase.parameterize}.md"
+      end
+    end
+
+    def collection_name
+      config.dig('database', 'collection')
     end
 
     def collection
-      @site.send(config.dig('database', 'collection').to_sym)
+      @site.send(collection_name.to_sym)
     end
 
     def config
-      @config ||= @site.config["notion"] || {}
+      @config ||= @site.config['notion'] || {}
     end
 
     def notion_token?

data/lib/jekyll-notion/notion_database.rb

@@ -7,14 +7,14 @@ module JekyllNotion
       @config = config
     end
 
-    def pages
+    def pages(&block)
       @pages ||= @notion.database_query(query)[:results].map do |page|
         NotionPage.new(page: page, layout: config['layout'])
       end
-      
+
       return @pages unless block_given?
 
-      @pages.each { |page| yield page }
+      @pages.each(&block)
     end
 
     private
@@ -35,7 +35,7 @@ module JekyllNotion
       @config.dig('database', 'id')
     end
 
-    def query 
+    def query
       { id: id, filter: filter, sort: sort }
     end
   end

data/lib/jekyll-notion/notion_page.rb

@@ -32,7 +32,7 @@ module JekyllNotion
     end
 
     def created_datetime
-      DateTime.parse(page["created_time"])
+      DateTime.parse(page['created_time'])
     end
 
     def updated_date
@@ -40,7 +40,7 @@ module JekyllNotion
     end
 
     def updated_datetime
-      DateTime.parse(page["last_edited_time"])
+      DateTime.parse(page['last_edited_time'])
     end
 
     def url

data/lib/jekyll-notion/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllNotion
-  VERSION = '0.0.0.beta'
+  VERSION = '0.0.0.beta.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-notion
 version: !ruby/object:Gem::Version
-  version: 0.0.0.beta
+  version: 0.0.0.beta.1
 platform: ruby
 authors:
 - Enrique Arias
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: notion_to_md
+  name: notion-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: notion-ruby-client
+  name: notion_to_md
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"