aardi 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa1b2e25b4f21cc8961e9677c0e08b49490f8dc38f2c8c7f13095c748388b00d
-  data.tar.gz: 8b5dcc3d043e7a320b3b35af8916ba0ce285aa0534ac2634d1595be67499d5b7
+  metadata.gz: c9340db9893eccb7d2baf3feec16d6f6a83b9cac636148e9d61bcdcb1985d35a
+  data.tar.gz: 60cbb069a0fe969cec7995bebea986ab2b746b41e540cf7c72a8fa2d427cf769
 SHA512:
-  metadata.gz: dd3e5059afbe608673632bf68c254b532101a9709ad53da590dc096e687c042ea498121f8ce79ff6edb3ac59147dd6797814a02c80ecde77266e609c240e53ff
-  data.tar.gz: 3c301c61ca4a8e5690be344e547a4fc859afa639cc172c06ab251941691b4b838675771ed4b5d76226c2589f3dba773fd50f75a05ced0ad2557d27a1715130e4
+  metadata.gz: 2ca27e334665f953031f784dd006fc91c9609d323ebd80f59d2336760450df87ffd5a5591fbf0bc06783e4df45db07d97b77c3d50540dca920208da713550ddf
+  data.tar.gz: ea187d4cc70feb39ae2b72aef0a3d66ccf641184c6eba393aa4fbfe236fb71824e27f528c58a0d18851f25ca233b1c959d48f62391b465742cf41ad89c358b59

data/lib/aardi/abstract_blog.rb

@@ -20,6 +20,8 @@ module Aardi
 
     private
 
+    def base_title = Config[:site_title]
+
     def children
       []
     end

data/lib/aardi/abstract_feed.rb

@@ -24,8 +24,6 @@ module Aardi
 
     private
 
-    def base_title = Config[:site_title]
-
     def children
       @posts
     end

data/lib/aardi/atom_feed.rb

@@ -2,6 +2,8 @@
 
 module Aardi
   class ATOMFeed < AbstractFeed
+    FEED_FILE = 'index.xml'
+
     def content
       atom_feed = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do
         feed('xmlns' => 'http://www.w3.org/2005/Atom') do |feed|
@@ -34,9 +36,7 @@ module Aardi
 
     private
 
-    def feed_file
-      'index.xml'
-    end
+    def feed_file = FEED_FILE
 
     # :reek:FeatureEnvy
     # :reek:TooManyStatements

data/lib/aardi/blog.rb

@@ -1,36 +1,46 @@
 # frozen_string_literal: true
 
 module Aardi
+  # :reek:TooManyInstanceVariables
   class Blog < AbstractBlog
     def initialize
       @posts = []
+      @draft_posts = []
       @blog_path = nil
       @archive_path = Config[:blog_archive_path]
       @tags = Tags.new
     end
 
     def <<(post)
+      return @draft_posts << post if post.draft?
+
       @posts << post
       archive << post
       @tags << post
     end
 
+    def report_drafts
+      report_posts @draft_posts
+    end
+
     def report_recent
-      recent_posts(:blog_recent_posts).each(&:report_field_summary)
+      report_posts recent_posts(:blog_recent_posts)
     end
 
+    def tag_blogs = @tags.tag_blogs
+
     private
 
     def archive
       @archive ||= Archive.new(@archive_path, tag, @tags)
     end
 
-    def atom_feed
-      ATOMFeed.new(feed_posts, @blog_path, tag)
+    def children
+      [archive, home, feed(ATOMFeed), feed(JSONFeed), *@tags, *@draft_posts]
     end
 
-    def children
-      [archive, home, atom_feed, json_feed, *@tags]
+    def feed(feed_klass)
+      feed_klass.new(feed_posts, @blog_path, tag)
     end
 
     def feed_posts
@@ -41,14 +51,14 @@ module Aardi
       Home.new(recent_posts(:blog_home_posts), @archive_path, @blog_path, tag)
     end
 
-    def json_feed
-      JSONFeed.new(feed_posts, @blog_path, tag)
-    end
-
     def recent_posts(conf_key)
       @posts.max_by(Config[conf_key], &:creation)
     end
 
+    def report_posts(posts)
+      posts.each(&:report_field_summary)
+    end
+
     def tag = nil
 
     def write_target = {}

data/lib/aardi/feed_menu.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Aardi
+  class FeedMenu
+    def initialize(blog)
+      @blog = blog
+    end
+
+    def content
+      JSON.pretty_generate(menu_data)
+    end
+
+    def render
+      source = Content.new(content)
+      FileTarget.new(source, target_path).write
+    end
+
+    def target_path = './.well-known/feed-menu.json'
+
+    private
+
+    def items = [site_item, *tag_items]
+
+    def menu_data = { 'feed-menu' => site_title, 'items' => items }
+
+    def site_item
+      { 'feed-title' => site_title,
+        'rss' => "/#{ATOMFeed::FEED_FILE}",
+        'json' => "/#{JSONFeed::FEED_FILE}" }
+    end
+
+    def site_title = Config[:site_title]
+
+    def tag_items = @blog.tag_blogs.map(&:feed_menu_item)
+  end
+end

data/lib/aardi/home_footer_links.rb

@@ -15,7 +15,7 @@ module Aardi
     def archive_url  = "#{base_url}/#{Config[:blog_archive_path]}/"
     def base_url     = "#{Config[:site_url]}#{feed_base}"
     def feed_base    = @blog_path ? "/#{@blog_path}" : ''
-    def json_url     = "#{base_url}/index.json"
-    def rss_url      = "#{base_url}/index.xml"
+    def json_url     = "#{base_url}/#{JSONFeed::FEED_FILE}"
+    def rss_url      = "#{base_url}/#{ATOMFeed::FEED_FILE}"
   end
 end

data/lib/aardi/json_feed.rb

@@ -2,6 +2,8 @@
 
 module Aardi
   class JSONFeed < AbstractFeed
+    FEED_FILE = 'index.json'
+
     def content
       feed_content = { version: 'https://jsonfeed.org/version/1.1', title:,
                        home_page_url: Config[:site_url], feed_url: }
@@ -12,9 +14,7 @@ module Aardi
 
     private
 
-    def feed_file
-      'index.json'
-    end
+    def feed_file = FEED_FILE
 
     def post_details(post)
       post_updated = post.updated

data/lib/aardi/metadata.rb

@@ -4,17 +4,20 @@ module Aardi
   class Metadata
     KNOWN_KEYS = %w[Title Description Creation Updated Tags HomePriority TagPriority Draft].freeze
 
+    attr_reader :tags
+
     def initialize(yaml_str = '', source = nil)
       yaml = YAML.safe_load(yaml_str, permitted_classes: [Time])
       @yaml = {}
       @yaml = yaml if yaml.is_a? Hash
+      @tags = @yaml['Tags']&.split&.sort
       confirm_keys(source)
     end
 
     def creation    = @yaml['Creation']
     def description = @yaml['Description']
+    def draft?      = @yaml.key?('Draft')
     def empty?      = @yaml.empty?
-    def tags        = @yaml['Tags']&.split&.sort
     def title       = @yaml['Title']
     def updated     = @yaml['Updated']
 

data/lib/aardi/post.rb

@@ -16,6 +16,7 @@ module Aardi
     end
 
     def creation = metadata.creation
+    def draft?   = metadata.draft?
 
     def feed_snippet
       @feed_snippet ||= Aardi.renderer.markup_feed_snippet(@src_content)

data/lib/aardi/site.rb

@@ -19,7 +19,7 @@ module Aardi
     private
 
     def children
-      [Folder.new('.'), blog, Aardi.renderer.sitemap]
+      [Folder.new('.'), blog, Aardi.renderer.sitemap, FeedMenu.new(blog)]
     end
 
     def post_paths

data/lib/aardi/tag_blog.rb

@@ -19,6 +19,12 @@ module Aardi
       @posts.count
     end
 
+    def feed_menu_item
+      { 'feed-title' => title,
+        'rss' => "/#{@blog_path}/#{ATOMFeed::FEED_FILE}",
+        'json' => "/#{@blog_path}/#{JSONFeed::FEED_FILE}" }
+    end
+
     def index_line
       "- #{inline_link_text}"
     end
@@ -36,7 +42,7 @@ module Aardi
     attr_reader :tag
 
     def children
-      [archive, home, atom_feed, json_feed]
+      [archive, home, feed(ATOMFeed), feed(JSONFeed)]
     end
   end
 end

data/lib/aardi/tags.rb

@@ -24,6 +24,8 @@ module Aardi
       counts.map { |_tag, tag_blog| tag_blog.inline_link_text }.join(', ')
     end
 
+    def tag_blogs = @index.values
+
     def target_path
       "./#{tags_base_path}/index.html"
     end

data/lib/aardi/tasks/drafts.rake

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+desc('View draft posts')
+task drafts: [:load_config] do
+  Aardi::Site.new.blog.report_drafts
+end

data/lib/aardi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aardi
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/lib/aardi.rb

@@ -41,6 +41,7 @@
   json_feed
   blog
   tag_blog
+  feed_menu
   folder
   sitemap
   orphanage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aardi
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Faisal N Jawdat
@@ -97,6 +97,7 @@ files:
 - lib/aardi/custom_renderer.rb
 - lib/aardi/day.rb
 - lib/aardi/errors.rb
+- lib/aardi/feed_menu.rb
 - lib/aardi/file_target.rb
 - lib/aardi/folder.rb
 - lib/aardi/home.rb
@@ -118,6 +119,7 @@ files:
 - lib/aardi/tag_blog.rb
 - lib/aardi/tags.rb
 - lib/aardi/tasks.rb
+- lib/aardi/tasks/drafts.rake
 - lib/aardi/tasks/fixtimes.rake
 - lib/aardi/tasks/homepage.rake
 - lib/aardi/tasks/init.rake
@@ -154,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 4.0.18
 specification_version: 4
 summary: A static site generator.
 test_files: []