jekyll-notion 0.0.0.beta.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2d58cc88c6a7012d3efc3eb431e9030f6287feec5b1307d731fb2b8a78a6e5
-  data.tar.gz: 939b5e04a4b019fd7a295dfba5c765e4f5fb5bf0f41e1b3527b01d84bf02a2cf
+  metadata.gz: 47fd2ef3b63206ceb2e5ca1933daf4eb90bf283703371c4497c73f9beafd23f4
+  data.tar.gz: e44cf9e5a3b3b44a0e02b48334375df9e8afe779b7745bdbc146baff3e8de903
 SHA512:
-  metadata.gz: bf6461f39325a08b18dfdd18ac9413e50991bc7c18032c30e59bba013ae00f77cab5b79ddcbf44100d4248cc957b98ccfd0538ddf323e3881f408e7ff5c46762
-  data.tar.gz: d451dfcbe921c165c232fa7a6195471f7da133ab6ddb46feadcc2705771cbc6092462e8ec29fa128b7d1c14db816b77ce84d07c05d2287eb53e93e4da9e7c06c
+  metadata.gz: 281ae8dca0453fb7a498a4457863b666ab7363bcca6e11d707843b35c9b81df91f5dfb6c7073a8af0c8f640560fbc9407c97e101495bef480dd8236c0f013f38
+  data.tar.gz: e915dc5d190bda6caae8b4942929fdc506ed4ae171e0a8cce126f0d2bee42d1ab5503205f970ee279f58a706c23e9684c0076a6c42e0d1eb856270e7effcad8c

data/README.md

@@ -40,13 +40,13 @@ notion:
     id: b91d5...
     collection: posts
     filter: { "property": "Published", "checkbox": { "equals": true } }
-    sort: { "propery": "Last ordered", "direction": "ascending" }
+    sort: { "property": "Last ordered", "direction": "ascending" }
     frontmatter:
       layout: post
 ```
 
 The other properties are:
-* `collection`: what collection each page belongs to,
+* `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.
@@ -65,9 +65,12 @@ id: id
 title: properties > Name > title > plain_text
 cover: cover > external > url
 date: created_time
+icon: icon > emoji
 ---
 ```
 
+Any property provided in the frontmatter config that matches a default property will be overwritten by the default value.
+
 ## Page filename
 
 There are two kinds of collections: posts and others.

data/lib/jekyll-notion/document_without_a_file.rb

@@ -6,7 +6,7 @@ module JekyllNotion
       if content =~ YAML_FRONT_MATTER_REGEXP
         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

@@ -7,25 +7,24 @@ module JekyllNotion
     def generate(site)
       @site = site
 
-      return unless notion_token?
-      return unless config?
+      return unless notion_token? && config?
 
       read_notion_database
     end
 
     def read_notion_database
-      @db = NotionDatabase.new(config: config)
-      @db.pages do |page|
+      @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}")
+        Jekyll.logger.info("Jekyll Notion:", "New notion page at #{collection.docs.last.path}")
       end
     end
 
     def make_page
       new_post = DocumentWithoutAFile.new(
         "#{Dir.pwd}/_#{collection_name}/#{make_filename}",
-        { site: @site, collection: collection }
+        { :site => @site, :collection => collection }
       )
       new_post.content = "#{make_frontmatter}\n\n#{make_md}"
       new_post.read
@@ -33,22 +32,35 @@ module JekyllNotion
     end
 
     def make_md
-      NotionToMd::Converter.new(page_id: current_page.id).convert
+      NotionToMd::Converter.new(:page_id => current_page.id).convert
     end
 
     def make_frontmatter
+      data = Jekyll::Utils.deep_merge_hashes(config_frontmatter, notion_frontmatter)
+      page_frontmatter = data.to_a.map { |k, v| "#{k}: #{v}" }.join("\n")
       <<~CONTENT
-        #{config.dig('database', 'frontmatter').to_yaml}
-        id: #{current_page.id}
-        title: #{current_page.title}
-        date: #{current_page.created_datetime}
-        cover: #{current_page.cover}
+        ---
+        #{page_frontmatter}
         ---
       CONTENT
     end
 
+    def notion_frontmatter
+      {
+        :id    => current_page.id,
+        :title => current_page.title,
+        :date  => current_page.created_datetime,
+        :cover => current_page.cover,
+        :icon  => current_page.icon,
+      }
+    end
+
+    def config_frontmatter
+      config.dig("database", "frontmatter") || {}
+    end
+
     def make_filename
-      if collection_name == 'posts'
+      if collection_name == "posts"
         "#{current_page.created_date}-#{current_page.title.downcase.parameterize}.md"
       else
         "#{current_page.title.downcase.parameterize}.md"
@@ -56,20 +68,20 @@ module JekyllNotion
     end
 
     def collection_name
-      config.dig('database', 'collection')
+      config.dig("database", "collection") || "posts"
     end
 
     def collection
-      @site.send(collection_name.to_sym)
+      @collection ||= @site.collections[collection_name]
     end
 
     def config
-      @config ||= @site.config['notion'] || {}
+      @config ||= @site.config["notion"] || {}
     end
 
     def notion_token?
-      if ENV['NOTION_TOKEN'].nil? || ENV['NOTION_TOKEN'].empty?
-        Jekyll.logger.error('Jekyll Notion:', 'NOTION_TOKEN not provided. Cannot read from Notion.')
+      if ENV["NOTION_TOKEN"].nil? || ENV["NOTION_TOKEN"].empty?
+        Jekyll.logger.warn("Jekyll Notion:", "NOTION_TOKEN not provided. Cannot read from Notion.")
         return false
       end
       true
@@ -77,7 +89,7 @@ module JekyllNotion
 
     def config?
       if config.empty?
-        Jekyll.logger.error('Jekyll Notion:', 'No config provided.')
+        Jekyll.logger.warn("Jekyll Notion:", "No config provided.")
         return false
       end
       true

data/lib/jekyll-notion/notion_database.rb

@@ -7,36 +7,43 @@ module JekyllNotion
       @config = config
     end
 
-    def pages(&block)
+    def pages
+      return [] unless id?
+
       @pages ||= @notion.database_query(query)[:results].map do |page|
-        NotionPage.new(page: page, layout: config['layout'])
+        NotionPage.new(:page => page, :layout => config["layout"])
       end
-
-      return @pages unless block_given?
-
-      @pages.each(&block)
     end
 
     private
 
     def config
-      @config['database']
+      @config["database"]
     end
 
     def filter
-      @config.dig('database', 'filter')
+      @config.dig("database", "filter")
     end
 
     def sort
-      @config.dig('database', 'sort')
+      @config.dig("database", "sort")
     end
 
     def id
-      @config.dig('database', 'id')
+      @config.dig("database", "id")
+    end
+
+    def id?
+      if id.nil? || id.empty?
+        Jekyll.logger.warn("Jekyll Notion:",
+                           "database id is not provided. Cannot read from Notion.")
+        return false
+      end
+      true
     end
 
     def query
-      { id: id, filter: filter, sort: sort }
+      { :id => id, :filter => filter, :sort => sort }
     end
   end
 end

data/lib/jekyll-notion/notion_page.rb

@@ -10,7 +10,7 @@ module JekyllNotion
     end
 
     def title
-      page.dig(:properties, :Name, :title).inject('') do |acc, slug|
+      page.dig(:properties, :Name, :title).inject("") do |acc, slug|
         acc + slug[:plain_text]
       end
     end
@@ -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.1'
+  VERSION = "0.0.2"
 end

data/lib/jekyll-notion.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'jekyll'
-require 'notion'
-require 'notion_to_md'
-require 'logger'
-require 'active_support/inflector'
-require 'jekyll-notion/generator'
+require "jekyll"
+require "notion"
+require "notion_to_md"
+require "logger"
+require "active_support/inflector"
+require "jekyll-notion/generator"
 
 NotionToMd::Logger.level = Logger::ERROR
 
 Notion.configure do |config|
-  config.token = ENV['NOTION_TOKEN']
+  config.token = ENV["NOTION_TOKEN"]
 end
 
 module JekyllNotion
-  autoload :DocumentWithoutAFile, 'jekyll-notion/document_without_a_file'
-  autoload :NotionDatabase, 'jekyll-notion/notion_database'
-  autoload :NotionPage, 'jekyll-notion/notion_page'
+  autoload :DocumentWithoutAFile, "jekyll-notion/document_without_a_file"
+  autoload :NotionDatabase, "jekyll-notion/notion_database"
+  autoload :NotionPage, "jekyll-notion/notion_page"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-notion
 version: !ruby/object:Gem::Version
-  version: 0.0.0.beta.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Enrique Arias
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,6 +86,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 description:
 email:
 - emoriarty81@gmail.com
@@ -116,9 +144,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.7.3