blog-generator 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8dc5db77c4a2a7f608f424d16709202a2b74c6c
-  data.tar.gz: 78333987b262250f8d2e8a35cfaa97f4b85129a9
+  metadata.gz: c4223a5c99949293121434806a6e208892610b2e
+  data.tar.gz: 11ddc6a101e1d2da88cc950fc5b22addbeed5662
 SHA512:
-  metadata.gz: bfde06a5ab223af902144ed64d8f050218c9213db6f549a584d03d91b56af1fcac2c4e71604901d04351e5589d058a88bab2c71427f9a561374d9997c6ab5bb3
-  data.tar.gz: 871ccc05a09e354864c1312c3f288bddf943da6371ec5da5894a2c59e53ced02e716ff6db6641edcc803e6d170f063cffbc6d891c4f55da72d4deb065ea80d13
+  metadata.gz: 9c96fe40d449a78473f476f3810f84908c27f7258428c1fd5df7891427be9f54e92674fefd745703c1e33bed69763ea61cf7e784c6a2bb2672e170bbfccffe59
+  data.tar.gz: 69ae7f14ae1bad2d91c380243f1c5fd4e475c165907989e82eb7b94604b98257c64043cf0e0030a0474091d75dcf1c1f95f58ac5ffdbb5ef9a9f3abde162d7fc

data/README.md

@@ -37,11 +37,11 @@ tags: ['Hello world', 'Test']
 - Metadata `draft: true` will exclude the post.
 - Any other metadata can be added and will be accessible in the resulting JSON.
 - Body has `#excerpt`.
-- Format `posts/:published_on-:slug.:format`.
+- Format `posts/:published_at-:slug.:format`.
 
 # Routes generated
 
-- `slug` and `published_on` added to metadata.
+- `slug` and `published_at` added to metadata.
 - `/metadata.json`
 - `/posts.json`
 - `/posts/:slug.json`

data/bin/blog-generator.rb

@@ -8,7 +8,7 @@ require 'ostruct'
 require 'fileutils'
 require 'blog-generator'
 
-POSTS_DIR, OUTPUT_BASE_PATH = ARGV
+POSTS_DIR, OUTPUT_BASE_PATH = ARGV.map { |i| i.chomp('/') }
 
 unless ARGV.length == 2
   abort "Usage: #{$0} [posts dir] [output base path]"
@@ -18,9 +18,21 @@ unless File.directory?(POSTS_DIR)
   abort "Posts directory #{POSTS_DIR} doesn't exist."
 end
 
+if Dir.exists?("#{OUTPUT_BASE_PATH}_prev") # If it does, the last build crashed.
+  puts "~ Last build crashed. Reusing #{OUTPUT_BASE_PATH}_prev."
+elsif (! Dir.exists?("#{OUTPUT_BASE_PATH}_prev")) && Dir.exists?(OUTPUT_BASE_PATH) # otherwise it's first run.
+  FileUtils.mv(OUTPUT_BASE_PATH, "#{OUTPUT_BASE_PATH}_prev") # So we don't get any artifacts.
+end
 
-FileUtils.rm_r(OUTPUT_BASE_PATH) if File.directory?(OUTPUT_BASE_PATH)
-Dir.mkdir(OUTPUT_BASE_PATH)
+unless Dir.exists?(OUTPUT_BASE_PATH)
+  puts "~ #{OUTPUT_BASE_PATH} doesn't exist, creating."
+  Dir.mkdir(OUTPUT_BASE_PATH)
+end
+
+OLD_POSTS = Dir.glob("#{OUTPUT_BASE_PATH}_prev/posts/*.json").reduce(Hash.new) do |posts, path|
+  post = JSON.parse(File.read(path))
+  posts.merge(post['slug'] => post)
+end
 
 path = File.expand_path(File.join(POSTS_DIR, '..', 'defaults.yml'))
 unless File.exist?(path)
@@ -30,7 +42,7 @@ end
 # Parse the posts.
 site = OpenStruct.new(File.exist?(path) ? YAML.load_file(path) : Hash.new)
 site.feed = [site.base_url, 'posts.atom'].join('/')
-generator = BlogGenerator::Generator.parse(site, POSTS_DIR)
+generator = BlogGenerator::Generator.parse(site, POSTS_DIR, OLD_POSTS)
 
 # Generate.
 
@@ -76,3 +88,5 @@ Dir.chdir(OUTPUT_BASE_PATH) do
     file "tags/#{tag[:slug]}.atom", feed.render
   end
 end
+
+FileUtils.rm_rf("#{OUTPUT_BASE_PATH}_prev") # Has to be forced, otherwise fails on the first run.

data/lib/blog-generator.rb

@@ -7,7 +7,7 @@ require 'blog-generator/feed'
 
 module BlogGenerator
   class Generator
-    def self.parse(site, posts_dir)
+    def self.parse(site, posts_dir, old_posts)
       posts = Dir.glob("#{posts_dir}/*.{html,md}").reduce(Array.new) do |posts, path|
         posts.push(Post.new(site, path))
       end
@@ -15,7 +15,20 @@ module BlogGenerator
       published_posts = posts.select { |post| ! post.metadata[:draft] }
 
       published_posts.sort! do |a, b|
-        b.published_on <=> a.published_on
+        b.published_at <=> a.published_at
+      end
+
+      published_posts.each do |post|
+        if old_post = old_posts[post.slug]
+          post.update_post_with_previous_values(OpenStruct.new(old_post))
+          p [post.published_at, post.published_on]
+          if post.published_at && post.published_on.to_date != post.published_at.to_date
+            abort "~ Published_at doesn't match published_on from the date part of #{post.slug} filename: #{[post.published_on.to_date, post.published_at.to_date].inspect}"
+          end
+
+        else
+          puts "~ New post: #{post.slug}"
+        end
       end
 
       self.new(site, PostList.new(site, published_posts))

data/lib/blog-generator/feed.rb

@@ -1,6 +1,7 @@
 require 'erb'
 require 'digest'
 require 'forwardable'
+require 'date'
 
 module BlogGenerator
   class Feed
@@ -31,7 +32,7 @@ module BlogGenerator
     end
 
     def updated_at
-      self.posts.last.updated_at
+      self.posts.last.updated_at ||  self.posts.last.published_at
     end
 
     def template
@@ -54,7 +55,7 @@ __END__
   <link href="<%= self.feed_url %>" rel="self" />
   <link href="<%= self.base_url %>" />
   <id><%= self.id %></id>
-  <updated><%= self.updated_at.iso8601 %></updated>
+  <updated><%= self.updated_at.to_date.iso8601 %></updated>
 
   <% posts.each do |post| %>
   <entry>
@@ -62,7 +63,7 @@ __END__
     <link href="<%= post.absolute_url %>" />
     <link rel="alternate" type="text/html" href="<%= post.absolute_url %>"/>
     <id><%= post.id %></id>
-    <updated><%= post.updated_at.iso8601 %></updated>
+    <updated><%= (post.updated_at || post.published_at).to_date.iso8601 %></updated>
     <!-- TODO: strip HTML from excerpt -->
     <summary><%= post.excerpt %></summary>
 <!--     <content type="xhtml">

data/lib/blog-generator/post.rb

@@ -7,7 +7,7 @@ module BlogGenerator
   class Post
     REGEXP = /^(\d{4}-\d{2}-\d{2})-(.+)\.(html|md)$/
 
-    attr_reader :site, :metadata, :format
+    attr_reader :site, :metadata, :format, :published_on, :updated_at
     def initialize(site, path)
       # TODO: metadata so we can construct url (base_url + relative) AND merge author
       @site, @path = site, File.expand_path(path)
@@ -16,13 +16,14 @@ module BlogGenerator
         buffer.merge(slug.to_sym => value)
       end
 
-      published_on, slug, format = parse_path(path)
+      @published_on, slug, format = parse_path(path)
+
       @format = format # So we can access it from excerpt without having to pass it as an argument and break everything.
 
       @body = convert_markdown(self.body) if format == :md
       self.body # cache if it wasn't called yet
 
-      @metadata.merge!(slug: slug, published_on: published_on)
+      @metadata.merge!(slug: slug, published_at: self.published_at)
       @metadata.merge!(excerpt: excerpt)
       @metadata.merge!(path: "/posts/#{slug}") ### TODO: some routing config.
 
@@ -43,8 +44,27 @@ module BlogGenerator
       @body = document.css('body').inner_html.strip
     end
 
-    def updated_at
-      File.mtime(@path).to_datetime
+    # slug cannot be updated
+    # => It has to be in Git now.
+    def update_post_with_previous_values(old_post)
+      @published_at = DateTime.parse(old_post.published_at).to_time.utc
+      @updated_at = DateTime.parse(old_post.updated_at).to_time.utc if old_post.updated_at
+      @metadata.merge!(published_at: self.published_at)
+      @metadata.merge!(updated_at: self.updated_at) if @updated_at
+      if old_post.body != self.body # TODO: some more intelligent analysis, if more than 10% changed.
+        puts "~ Post #{self.slug} has been updated."
+        self.update!
+      end
+    end
+
+    # TODO: get rid off the variable and proxy it to metadata[:published_at].
+    def published_at
+      # When it was actually generated. It is then sourced from the last generated file, so it doesn't keep updating.
+      @published_at ||= Time.now.utc
+    end
+
+    def update!
+      @updated_at = Time.now.utc
     end
 
     def author
@@ -104,7 +124,7 @@ module BlogGenerator
 
     def parse_path(path)
       match = File.basename(path).match(REGEXP)
-      [Date.parse(match[1]), match[2], match[3].to_sym]
+      [Date.parse(match[1]).to_time.utc, match[2], match[3].to_sym]
     end
 
     def convert_markdown(markup)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blog-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - James C Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri