sawsge 0.2.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e97f4efdfda6c24333e69d1e5a213ff5cf838886620b6a66253e4b15a270bec7
-  data.tar.gz: 9e3d40a49c624280265c5189a20bb95bdab602227e9161925b737f42d0fcd701
+  metadata.gz: 7a24e5324f67a6309a03ea07a5ab5eebae04a659fa02e98630318ca969fef453
+  data.tar.gz: ea77f1a1783d721e5f0ba179082f4c0fb8a1c19b85a0920a5fc66b46ec0d0613
 SHA512:
-  metadata.gz: 25633584a07e77f02536dfbe23cba4e91ad68c72b3c55d7def67e48775cb14db57e1d9459d26514bdc7f42261d129fe017b6432e1fc9de54909907dbf74c2e4c
-  data.tar.gz: 2aa82092c2e6a97afb34a639f02dd93f4f342c8491232812c6ea0da99782d9092cbb777642b4da0a0d2e495d204da80785395abc87cbf76760b8c8a0959efc6f
+  metadata.gz: 0a274f48701502b7378a7559af7f087835f3ffdbccb649ab8e9e4f6dd5d6a3027ae1170f58290a1412eceb1e4d826522c29943aa38db649dcc9dd6c0d1c4e902
+  data.tar.gz: bf5a0c3298253361bf7101df64fed299d8508ad0fe23c4253bd7a7cc13227e696162ecfc818c9c120799f383cf2f4b8335260eaef810a1ac66af7869dd897aab

data/lib/sawsge/blog.rb

@@ -10,13 +10,24 @@ class Sawsge
     post_paths = @resource_paths.select do |path|
       top_parent_dir(path) == @config.posts_dirname && File.extname(path) == '.md'
     end
-    # So posts are added to Home in chronological order
-    post_paths.reverse!
 
     @resource_paths -= post_paths
     @resource_paths.delete home_path
 
     post_objects = post_paths.map { |path| Post.new(path, @config) }
+
+    post_objects.sort_by! { |x| x.date }
+    # Posts are now in reverse chronological order
+
+    i_last_nil_date = 0
+    while post_objects[i_last_nil_date].date.empty?
+      i_last_nil_date += 1
+    end
+
+    post_objects.rotate!(i_last_nil_date).reverse!
+    # Posts are now in chronological order with dateless
+    # posts being first
+
     home_object = Home.new(home_path, post_objects, @config)
     @all_objects = post_objects + [home_object]
   end

data/lib/sawsge/config.rb

@@ -24,9 +24,10 @@ class Sawsge
       @header_path = File.expand_path(File.join(@src_dir, @header_filename))
       @footer_path = File.expand_path(File.join(@src_dir, @footer_filename))
 
-      @reserved_filenames = config[:general][:ignore] + [CONFIG_FILENAME, @header_filename, @footer_filename]
+      ignored_files = config[:general][:ignore] || []
+      @reserved_filenames = ignored_files + [CONFIG_FILENAME, @header_filename, @footer_filename]
 
-      @external_links_target_blank = config[:general][:external_links_target_blank]
+      @external_links_target_blank = config[:general][:external_links_target_blank] || true
 
       @posts_dirname = config[:blog][:posts_dirname]
     end

data/lib/sawsge/home.rb

@@ -5,6 +5,7 @@ class Sawsge
   class Home < Page
     def initialize(path, posts, config)
       super(path, config)
+
       posts.each_with_index do |post, _i|
         # Adds collapseable summary of each post on the front
         # page
@@ -19,6 +20,7 @@ class Sawsge
         HTML
         @document.at_css('footer').add_previous_sibling summary_fragment
       end
+
     end
   end
 end

data/lib/sawsge/page.rb

@@ -7,7 +7,13 @@ class Sawsge
 
     def initialize(path, config)
       super(path)
-      html_body_fragment = PandocRuby.convert(File.new(@path, 'r').read, from: :markdown, to: :html)
+
+      markdown = File.read(@path)
+      options = {
+        :from => :markdown,
+        :to   => :html
+      }
+      html_body_fragment = PandocRuby.convert(markdown, options)
 
       header = File.read config.header_path
       footer = File.read config.footer_path

data/lib/sawsge/post.rb

@@ -8,17 +8,15 @@ class Sawsge
     def initialize(path, config)
       super(path, config)
 
-      # There's got to be a more idiomatic way to do this! The
-      # current implementation is disguisting.
-      # Also doesn't work if POSTS_DIRNAME is more than 2
-      # directories
-      parts = Pathname.new(@path).each_filename.to_a[1..]
-      parts.delete(config.posts_dirname)
-      @date = "#{parts[0]}-#{parts[1]}-#{parts[2]}"
-      @document.css('h1').first.add_next_sibling "<date>#{@date}</date>"
-
-      # Look what's in <summary></summary>
+      # Get the summary and date of the post
       @summary = @document.css('summary').first.content
+      # If a date is specified within the <time> tag on the
+      # page, use that, otherwise use an empty string
+      @date = begin
+          date = @document.css('time').first
+          date ? date.content : ''
+      end
     end
+
   end
 end

data/lib/sawsge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Sawsge
-  VERSION = '0.2.1'
+  VERSION = '1.0.1'
 end

data/lib/sawsge.rb

@@ -3,11 +3,11 @@
 require 'fileutils'
 require 'nokogiri'
 require 'pandoc-ruby'
+require 'parallel'
 require 'pathname'
 require 'set'
 require 'tomlrb'
 require 'uri'
-require 'parallel'
 
 require 'sawsge/resource'
 require 'sawsge/page'
@@ -45,12 +45,14 @@ class Sawsge
     @resource_paths = Dir.glob('**/*').select do |path|
       File.file?(path) &&
         top_parent_dir(path) != @config.out_dirname &&
+        # Exclude explicitly ignored files
         !@config.reserved_filenames.include?(path)
     end
 
     @resource_objects = Set.new
     @all_objects = Set.new
 
+    # Execute blog or project specific code.
     send @config.mode
 
     resources = @resource_paths.map { |path| Resource.new(path) }
@@ -61,7 +63,6 @@ class Sawsge
     FileUtils.mkpath @config.out_dirname
 
     # Write each file
-    @all_objects.each { |x| x.build @config.out_dirname }
-    Parallel.each(@all_object) { |x| x.build @config.out_dirname }
+    Parallel.each(@all_objects) { |x| x.build @config.out_dirname }
   end
 end

data/sawsge.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage    = 'https://github.com/sawshep/sawsge'
   s.license     = 'GPL-3.0'
-  s.required_ruby_version = '>= 3.0'
+  s.required_ruby_version = '>= 2.7'
   s.add_runtime_dependency 'pandoc-ruby', '~> 2.1'
   s.add_runtime_dependency 'tomlrb', '~> 2.0', '>= 2.0.1'
   s.add_runtime_dependency 'nokogiri', '~> 1.12', '>= 1.12.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sawsge
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Sawyer Shepherd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pandoc-ruby
@@ -119,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Simple Markdown static site generator for blogs or projects