blog-generator 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4223a5c99949293121434806a6e208892610b2e
-  data.tar.gz: 11ddc6a101e1d2da88cc950fc5b22addbeed5662
+  metadata.gz: 0f258b5e260b6477100127d77278a8b97ea9ce8c
+  data.tar.gz: aa4775b05d306ef5788e22f430ff89ba6d998019
 SHA512:
-  metadata.gz: 9c96fe40d449a78473f476f3810f84908c27f7258428c1fd5df7891427be9f54e92674fefd745703c1e33bed69763ea61cf7e784c6a2bb2672e170bbfccffe59
-  data.tar.gz: 69ae7f14ae1bad2d91c380243f1c5fd4e475c165907989e82eb7b94604b98257c64043cf0e0030a0474091d75dcf1c1f95f58ac5ffdbb5ef9a9f3abde162d7fc
+  metadata.gz: e33b8e4920fd2e9fbd4f2962bfba99992b42c05daf605bfc62117334cf2c4010ded613a24ebe547e3f0779fddb4e4fd278089feadcf5f1993ccdbee27cceae63
+  data.tar.gz: 9f3ea4463fcf75272be1b5aff24d34434f8139b5260bba931635dcbe16449b9cab8ce6edd3ee082975de5015972883a40f9929fa15b03f26c2239894b0970881

data/README.md

@@ -1,17 +1,33 @@
 # About
 
-Few years back we used to use all the fancy static site generators for building a blog, so the blog could have layouts, tags, pagination and other features. With the arrival of frontend frameworks such as AngularJS, this is no longer necessary.
+[![Build Status](https://travis-ci.org/botanicus/blog-generator.svg?branch=master)](https://travis-ci.org/botanicus/blog-generator)
 
-We can generate a static JSON API and let AngularJS handle the rest.
+Blog-generator is a static site generator that generates only JSON files that can
+be consumed from a framework such as React.js. Think Nanoc but for fake APIs.
 
 # Usage
 
 gem install blog-generator
 gem install redcarpet # If you are going to use markdown.
-mkdir botanicus.me
-cd botanicus.me
-mkdir posts
-blog-generator.rb posts api
+mkdir myblog.com
+cd myblog.com
+blog-generator.rb draft hello-world # Optionally hello-world.md, otherwise defaults to .html.
+blog-generator.rb publish hello-world
+blog-generator.rb generate api.myblog.com
+
+## Development
+
+To include drafts in your output JSON:
+
+```
+blog-generator.rb draft my-draft
+blog-generator.rb generate api.myblog.com --include-drafts
+```
+
+## Updating posts
+
+If you updated either excerpt or body of a post, the digest will no longer match
+and you will get a warning upon running generate. You can either run `blog-generator.rb update my-post` to add `updated_at` timestamp and update the digest or `blog-generator.rb ignore_update my-post` to dismiss the update and only regenerate the digest.
 
 # Post structure
 
@@ -20,10 +36,9 @@ title: 'Hello world!'
 tags: ['Hello world', 'Test']
 ---
 
-<div id="excerpt">
+<p id="excerpt">
   Excerpt
-</div>
-
+</p>
 
 <h1>Hello world!</h1>
 <p>
@@ -47,22 +62,3 @@ tags: ['Hello world', 'Test']
 - `/posts/:slug.json`
 - `/tags.json`
 - `/tags/:slug.json`
-
-# Feeds
-
-```html
-<!-- Global feed. -->
-<link href="{{blog.feed_url}}" type="application/atom+xml" rel="alternate" title="{{blog.title}}" />
-
-<!-- Per-tag feeds. -->
-<link href="{{tag.feed_url}}" type="application/atom+xml" rel="alternate" title="{{tag.title}}" />
-```
-
-# Status
-
-It works, but it needs polishing.
-
-# TODO
-
-- Generate assets by parsing the document, no explicit spec.
-- GH markdown including source code support.

data/bin/blog-generator.rb

@@ -1,92 +1,23 @@
 #!/usr/bin/env ruby
 
-# [Usage]
-#
-# blog-generator.rb [posts dir] [output base path]
-
-require 'ostruct'
-require 'fileutils'
-require 'blog-generator'
-
-POSTS_DIR, OUTPUT_BASE_PATH = ARGV.map { |i| i.chomp('/') }
-
-unless ARGV.length == 2
-  abort "Usage: #{$0} [posts dir] [output base path]"
-end
-
-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
-
-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)
-  puts "~ Feed configuration file #{path} not found."
+command  = ARGV.shift
+commands = %w{draft generate ignore_update publish update}
+if commands.include?(command)
+  require "blog-generator/cli/#{command}"
+else
+  abort <<-EOF
+[Usage]
+
+#{$0} generate [output base path]
+#{$0} generate [output base path] --include-drafts
+#{$0} draft [slug].[extension]
+#{$0} publish [slug]
+#{$0} update [slug]
+#{$0} ignore_update [slug]
+
+[Defaults]
+
+Posts dir is assumed to be posts/ in the same directory as the output base path.
+Drafts dir is assumed to be drafts/ in the same directory as the output base path.
+  EOF
 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, OLD_POSTS)
-
-# Generate.
-
-def file(path, content)
-  puts "~ #{path}"
-  File.open(path, 'w') do |file|
-    file.puts(content)
-  end
-end
-
-Dir.chdir(OUTPUT_BASE_PATH) do
-  # GET /metadata.json
-  # TODO: Refactor this, it's evil.
-  file 'metadata.json', JSON.pretty_generate(site.instance_variable_get(:@table))
-
-  # GET /posts.atom
-  if generator.posts.any?
-    feed = BlogGenerator::Feed.new(site, generator.posts, 'posts.atom')
-    file 'posts.atom', feed.render
-  end
-
-  # GET /api/posts.json
-  # This calls PostList#to_json
-  file 'posts.json', JSON.pretty_generate(generator.posts)
-
-  # GET /api/posts/hello-world.json
-  Dir.mkdir('posts') unless Dir.exist?('posts')
-  generator.posts.each do |post|
-    file "posts/#{post.slug}.json", JSON.pretty_generate(post)
-  end
-
-  # GET /api/tags.json
-  file 'tags.json', JSON.pretty_generate(generator.tags.keys)
-
-  Dir.mkdir('tags') unless Dir.exist?('tags')
-  generator.tags.each do |tag, posts|
-    # GET /api/tags/doxxu.json
-    body = {tag: tag, posts: posts}
-    file "tags/#{tag[:slug]}.json", JSON.pretty_generate(body)
-
-    # GET /api/tags/doxxu.atom
-    feed = BlogGenerator::Feed.new(site, posts, "#{tag[:slug]}.atom")
-    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

@@ -1,37 +1,28 @@
-require 'json'
-
+require 'digest'
 require 'blog-generator/post'
 require 'blog-generator/post_list'
 
-require 'blog-generator/feed'
-
 module BlogGenerator
   class Generator
-    def self.parse(site, posts_dir, old_posts)
+    def self.parse(site, posts_dir, drafts_dir = false)
       posts = Dir.glob("#{posts_dir}/*.{html,md}").reduce(Array.new) do |posts, path|
         posts.push(Post.new(site, path))
       end
 
-      published_posts = posts.select { |post| ! post.metadata[:draft] }
-
-      published_posts.sort! do |a, b|
-        b.published_at <=> a.published_at
+      if drafts_dir
+        Dir.glob("#{drafts_dir}/*.{html,md}").each do |path|
+          draft = Post.new(site, path)
+          draft.metadata[:draft] = true
+          draft.metadata[:published_at] = Time.now.utc.strftime('%d/%m/%Y %H:%M') # Let's emulate it so we get expected attributes in development.
+          posts.push(draft)
+        end
       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
+      posts.sort! do |a, b|
+        DateTime.parse(b.published_at) <=> DateTime.parse(a.published_at)
       end
 
-      self.new(site, PostList.new(site, published_posts))
+      self.new(site, PostList.new(site, posts))
     end
 
     attr_reader :site, :posts
@@ -49,5 +40,33 @@ module BlogGenerator
         buffer
       end
     end
+
+    def validate!
+      self.validate_digest!
+      self.validate_linked_posts!
+    end
+
+    def validate_digest!
+      @posts.each do |post|
+        next if post.metadata[:draft]
+
+        # copied from cli/update.rb
+        body_digest = Digest::MD5.hexdigest(post.raw_body) # Raw body, so it's with the excerpt as well.
+
+        if body_digest != post.metadata[:digest]
+          warn "WARNING: The MD5 digest of the body of #{post.slug} changed. You should either acknowledge so by running the update command or dismiss it by running the ignore_update command."
+        end
+      end
+    end
+
+    def validate_linked_posts!
+      @posts.each do |post|
+        post.links.each do |link|
+          unless @posts.any? { |post| post.metadata[:path] == link }
+            raise "Post #{post.slug} links #{link}, but there is no such post."
+          end
+        end
+      end
+    end
   end
 end

data/lib/blog-generator/adapters/markdown.rb

@@ -0,0 +1,31 @@
+def convert_markdown(markup)
+  require 'redcarpet'
+
+  renderer = Redcarpet::Render::HTML.new(no_links: true, hard_wrap: true)
+  markdown = Redcarpet::Markdown.new(renderer, extensions = {})
+  markdown.render(markup)
+end
+
+def excerpt
+  if self.format == :html
+    @excerpt ||= Nokogiri::HTML(Nokogiri::HTML(self.body).css('#excerpt').inner_html.strip).css('p').inner_html
+  elsif self.format == :md
+    # We're converting it to MD, apparently it's necessary even though we
+    # converted the whole text initially, but it seems like MD ignores whatever
+    # is in <div id="excerpt">...</div>.
+    @excerpt ||= Nokogiri::HTML(convert_markdown(Nokogiri::HTML(self.body).css('#excerpt').inner_html.strip)).css('p').inner_html
+  end
+end
+
+  # Maybe rename body -> raw_body and to_html -> body.
+  # This is being rewritten from initialize!
+  def body(format = @format)
+    case format
+    when :md
+      @body ||= convert_markdown(self.body(:html)) # I don't think this would work with ||= (which we're using so we can rewrite @body = in initialize.)
+    when :html
+      @body ||= File.read(@path).match(/\n---\n(.+)$/m)[1].strip
+    else
+      raise TypeError.new("Format #{@format} isn't supported.")
+    end
+  end

data/lib/blog-generator/cli/draft.rb

@@ -0,0 +1,46 @@
+# Variables.
+drafts_dir = 'drafts'
+posts_dir  = 'posts'
+
+# Main.
+unless ARGV.length == 1
+  abort 'The draft command needs only slug or slug.extension as an argument.'
+end
+
+if ARGV.first.split('.').length == 2
+  slug, format = ARGV.shift.split('.')
+else
+  slug, format = ARGV.shift, 'html'
+end
+
+unless %w{html md}.include?(format)
+  abort("BlogGenerator doesn't support #{format}.")
+end
+
+draft_path = "#{drafts_dir}/#{slug}.#{format}"
+
+if File.exist?(draft_path)
+  abort "ERROR: Draft #{draft_path} already exists."
+elsif post = Dir.glob("#{posts_dir}/*-#{slug}.*").first
+  abort "ERROR: Slug #{slug} is already being used by #{post}."
+end
+
+# The template is actually the same for both HTML and MD.
+template = <<-EOF
+title: #{slug.tr('-', ' ').capitalize}
+tags: []
+---
+
+<p id="excerpt">
+</p>
+
+<!-- Headings start from h2, since h1 is the title of the article. -->
+EOF
+
+Dir.mkdir(drafts_dir) unless Dir.exists?(drafts_dir)
+
+File.open(draft_path, 'w') do |file|
+  file.puts(template)
+end
+
+puts "~ Draft #{draft_path} has been created."

data/lib/blog-generator/cli/generate.rb

@@ -0,0 +1,71 @@
+require 'ostruct'
+require 'fileutils'
+require 'blog-generator'
+
+# Variables.
+drafts_dir = 'drafts'
+posts_dir  = 'posts'
+
+# Main.
+unless (1..2).include?(ARGV.length)
+  abort 'The generate command needs only output directory as an argument with --include-drafts being optional.'
+end
+
+output_dir = ARGV.shift.chomp('/')
+include_drafts = true if ARGV.shift == '--include-drafts'
+
+unless File.directory?(posts_dir)
+  abort "Posts directory #{posts_dir} doesn't exist."
+end
+
+unless Dir.exists?(output_dir)
+  puts "~ #{output_dir} doesn't exist, creating."
+  Dir.mkdir(output_dir)
+else
+  FileUtils.rm_rf("#{output_dir}/*")
+end
+
+site_defaults_path = File.expand_path(File.join(posts_dir, '..', 'defaults.yml'))
+unless File.exist?(site_defaults_path)
+  puts "~ Feed configuration file #{site_defaults_path} not found." # Do we still need it?
+end
+
+# Parse the posts.
+site = OpenStruct.new(File.exist?(site_defaults_path) ? YAML.load_file(site_defaults_path) : Hash.new)
+generator = BlogGenerator::Generator.parse(site, posts_dir, include_drafts ? drafts_dir : false)
+
+# Generate.
+generator.validate!
+
+def file(path, content)
+  puts "~ #{path}"
+  File.open(path, 'w') do |file|
+    file.puts(content)
+  end
+end
+
+Dir.chdir(output_dir) do
+  # GET /metadata.json
+  # TODO: Refactor this, it's evil.
+  file 'metadata.json', JSON.pretty_generate(site.instance_variable_get(:@table))
+
+  # GET /api/posts.json
+  # This calls PostList#to_json
+  file 'posts.json', JSON.pretty_generate(generator.posts)
+
+  # GET /api/posts/hello-world.json
+  Dir.mkdir('posts') unless Dir.exist?('posts')
+  generator.posts.each do |post|
+    file "posts/#{post.slug}.json", JSON.pretty_generate(post)
+  end
+
+  # GET /api/tags.json
+  file 'tags.json', JSON.pretty_generate(generator.tags.keys)
+
+  Dir.mkdir('tags') unless Dir.exist?('tags')
+  generator.tags.each do |tag, posts|
+    # GET /api/tags/doxxu.json
+    body = {tag: tag, posts: posts}
+    file "tags/#{tag[:slug]}.json", JSON.pretty_generate(body)
+  end
+end

data/lib/blog-generator/cli/ignore_update.rb

@@ -0,0 +1,34 @@
+# This is exactly the same as update.rb, except we don't write updated_at,
+# we only update the digest.
+
+require 'digest'
+require 'blog-generator/post'
+
+# Variables.
+posts_dir  = 'posts'
+
+# Main.
+unless ARGV.length == 1
+  abort 'ERROR: The update command needs only slug as an argument.'
+end
+
+slug = ARGV.shift
+post_path = Dir.glob("#{posts_dir}/*-#{slug}.{html,md}").first
+
+unless post_path
+  abort "ERROR: There is no #{slug} with extension html or md in #{posts_dir}."
+end
+
+site = OpenStruct.new # mock
+post = BlogGenerator::Post.new(site, post_path)
+
+updated_at  = Time.now.utc.strftime('%d/%m/%Y %H:%M')
+body_digest = Digest::MD5.hexdigest(post.raw_body) # Raw body, so it's with the excerpt as well.
+
+if body_digest == post.metadata[:digest]
+  abort 'ERROR: The MD5 digest of the body is the same, which means the post has not been updated.'
+end
+
+File.open(post_path, 'w') do |file|
+  file.puts(post.save(digest: body_digest))
+end

data/lib/blog-generator/cli/publish.rb

@@ -0,0 +1,41 @@
+require 'ostruct'
+require 'digest'
+require 'blog-generator/post'
+
+# Variables.
+drafts_dir = 'drafts'
+posts_dir  = 'posts'
+
+# Main.
+unless ARGV.length == 1
+  abort 'ERROR: The draft command needs only slug as an argument.'
+end
+
+slug = ARGV.shift
+draft_path = Dir.glob("#{drafts_dir}/#{slug}.{html,md}").first
+
+if post = Dir.glob("#{posts_dir}/*-#{slug}.{html,md}").first
+  abort "ERROR: Post #{post} has already been published."
+end
+
+unless draft_path
+  abort "ERROR: There is no #{slug} with extension html or md in #{drafts_dir}."
+end
+
+Dir.mkdir(posts_dir) unless Dir.exists?(posts_dir)
+
+date_slug = Time.now.strftime('%Y-%m-%d')
+format    = File.extname(draft_path)[1..-1]
+post_path = File.join(posts_dir, "#{date_slug}-#{slug}.#{format}")
+
+site = OpenStruct.new # mock
+post = BlogGenerator::Post.new(site, draft_path)
+
+published_at = Time.now.utc.strftime('%d/%m/%Y %H:%M')
+body_digest  = Digest::MD5.hexdigest(post.raw_body) # Raw body, so it's with the excerpt as well.
+
+File.open(post_path, 'w') do |file|
+  file.puts(post.save(digest: body_digest, published_at: published_at))
+end
+
+File.unlink(draft_path)

data/lib/blog-generator/cli/update.rb

@@ -0,0 +1,31 @@
+require 'digest'
+require 'blog-generator/post'
+
+# Variables.
+posts_dir  = 'posts'
+
+# Main.
+unless ARGV.length == 1
+  abort 'ERROR: The update command needs only slug as an argument.'
+end
+
+slug = ARGV.shift
+post_path = Dir.glob("#{posts_dir}/*-#{slug}.{html,md}").first
+
+unless post_path
+  abort "ERROR: There is no #{slug} with extension html or md in #{posts_dir}."
+end
+
+site = OpenStruct.new # mock
+post = BlogGenerator::Post.new(site, post_path)
+
+updated_at  = Time.now.utc.strftime('%d/%m/%Y %H:%M')
+body_digest = Digest::MD5.hexdigest(post.raw_body) # Raw body, so it's with the excerpt as well.
+
+if body_digest == post.metadata[:digest]
+  abort 'ERROR: The MD5 digest of the body is the same, which means the post has not been updated.'
+end
+
+File.open(post_path, 'w') do |file|
+  file.puts(post.save(digest: body_digest, updated_at: updated_at))
+end

data/lib/blog-generator/post.rb

@@ -5,66 +5,44 @@ require 'nokogiri'
 
 module BlogGenerator
   class Post
-    REGEXP = /^(\d{4}-\d{2}-\d{2})-(.+)\.(html|md)$/
+    REGEXP = /^((\d{4}-\d{2}-\d{2})-)?(.+)\.(html|md)$/
 
-    attr_reader :site, :metadata, :format, :published_on, :updated_at
+    [:slug, :tags, :published_at, :updated_at].each do |attribute|
+      define_method(attribute) do
+        @metadata[attribute]
+      end
+    end
+
+    attr_reader :site, :metadata, :format
     def initialize(site, path)
       # TODO: metadata so we can construct url (base_url + relative) AND merge author
       @site, @path = site, File.expand_path(path)
 
-      @metadata = YAML.load_file(path).reduce(Hash.new) do |buffer, (slug, value)|
-        buffer.merge(slug.to_sym => value)
-      end
-
-      @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
+      # TODO: Bring back .md from adapters/markdown.rb
+      published_on, slug, format = parse_path(path)
 
-      @metadata.merge!(slug: slug, published_at: self.published_at)
+      @metadata = self.load_metadata
+      @metadata.merge!(slug: slug)
       @metadata.merge!(excerpt: excerpt)
       @metadata.merge!(path: "/posts/#{slug}") ### TODO: some routing config.
+      @metadata.merge!(links: self.links)
 
       @metadata[:tags].map! do |tag|
         slug = generate_slug(tag)
-        feed = "#{site.base_url}/#{slug}.atom"
-        {title: tag, slug: slug, path: "/tags/#{slug}", feed: feed}
+        {title: tag, slug: slug, path: "/tags/#{slug}"}
       end
-
-      tag_feeds = @metadata[:tags].map do |tag|
-        tag[:feed]
-      end
-
-      # @metadata.merge!(feeds: atom.feeds + tag_feeds) ### TODO: some routing config.
-
-      document = Nokogiri::HTML(self.body)
-      document.css('#excerpt').remove
-      @body = document.css('body').inner_html.strip
     end
 
-    # 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!
+    def raw_metadata
+      @raw_metadata ||= begin
+        YAML.load_file(@path) || raise("Metadata in #{@path} are not valid YAML.")
       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
+    def load_metadata
+      self.raw_metadata.reduce(Hash.new) do |buffer, (slug, value)|
+        buffer.merge(slug.to_sym => value.dup)
+      end
     end
 
     def author
@@ -75,7 +53,7 @@ module BlogGenerator
       self.metadata[:email] || site.email
     end
 
-    def generate_slug(name)
+    def generate_slug(name) # for tags, should go to utils or something.
       name.downcase.tr(' /', '-').delete('!?')
     end
 
@@ -87,24 +65,22 @@ module BlogGenerator
       [site.base_url, self.relative_url].join('')
     end
 
-    def id
-      digest = Digest::MD5.hexdigest(self.metadata[:slug])
-      "urn:uuid:#{digest}"
+    def raw_body
+      File.read(@path).match(/\n---\n(.+)$/m)[1].strip
     end
 
-    # Maybe rename body -> raw_body and to_html -> body.
     def body
-      @body ||= File.read(@path).match(/\n---\n(.+)$/m)[1].strip
+      @body ||= begin
+        document = nokogiri_raw_document.dup
+        document.css('#excerpt').remove
+        document.css('body').inner_html.strip
+      end
     end
 
     def excerpt
-      if self.format == :html
-        @excerpt ||= Nokogiri::HTML(Nokogiri::HTML(self.body).css('#excerpt').inner_html.strip).css('p').inner_html
-      elsif self.format == :md
-        # We're converting it to MD, apparently it's necessary even though we
-        # converted the whole text initially, but it seems like MD ignores whatever
-        # is in <div id="excerpt">...</div>.
-        @excerpt ||= Nokogiri::HTML(convert_markdown(Nokogiri::HTML(self.body).css('#excerpt').inner_html.strip)).css('p').inner_html
+      @excerpt ||= begin
+        document = nokogiri_raw_document.dup
+        document.css('#excerpt').inner_html.sub(/^\s*(.*)\s*$/, '\1').chomp
       end
     end
 
@@ -116,23 +92,38 @@ module BlogGenerator
       self.as_json.to_json(*args)
     end
 
-    private
-    def method_missing(method, *args, &block)
-      return super if (! args.empty?) || block
-      @metadata[method]
+    def save(extra_metadata = Hash.new)
+      extra_metadata = extra_metadata.reduce(Hash.new) do |buffer, (key, value)|
+        buffer.merge(key.to_s => value)
+      end
+
+      excerpt = self.excerpt.empty? ? %Q{<p id="excerpt">\n</p>} : %Q{<p id="excerpt">\n  #{self.excerpt}\n</p>}
+      metadata = self.raw_metadata.merge(extra_metadata)
+      <<-EOF
+#{metadata.map { |key, value| "#{key}: #{value}"}.join("\n")}
+---
+
+#{excerpt}
+
+#{self.body}
+      EOF
     end
 
-    def parse_path(path)
-      match = File.basename(path).match(REGEXP)
-      [Date.parse(match[1]).to_time.utc, match[2], match[3].to_sym]
+    def links
+      nokogiri_raw_document.css('a').map do |anchor|
+        anchor.attribute('href').value
+      end.uniq
     end
 
-    def convert_markdown(markup)
-      require 'redcarpet'
+    private
+    def nokogiri_raw_document
+      @nokogiri_raw_document ||= Nokogiri::HTML(self.raw_body)
+    end
 
-      renderer = Redcarpet::Render::HTML.new(no_links: true, hard_wrap: true)
-      markdown = Redcarpet::Markdown.new(renderer, extensions = {})
-      markdown.render(markup)
+    def parse_path(path)
+      match = File.basename(path).match(REGEXP)
+      published_on = match[1] ? Date.parse(match[1]).to_time.utc : nil
+      [published_on, match[3], match[4].to_sym]
     end
   end
 end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: blog-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - James C Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-description: '...'
+        version: '1.7'
+description: "..."
 email: james@101ideas.cz
 executables:
 - blog-generator.rb
@@ -34,7 +34,12 @@ files:
 - README.md
 - bin/blog-generator.rb
 - lib/blog-generator.rb
-- lib/blog-generator/feed.rb
+- lib/blog-generator/adapters/markdown.rb
+- lib/blog-generator/cli/draft.rb
+- lib/blog-generator/cli/generate.rb
+- lib/blog-generator/cli/ignore_update.rb
+- lib/blog-generator/cli/publish.rb
+- lib/blog-generator/cli/update.rb
 - lib/blog-generator/post.rb
 - lib/blog-generator/post_list.rb
 homepage: http://github.com/botanicus/blog-generator
@@ -47,17 +52,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple generator of blog APIs.

data/lib/blog-generator/feed.rb

@@ -1,78 +0,0 @@
-require 'erb'
-require 'digest'
-require 'forwardable'
-require 'date'
-
-module BlogGenerator
-  class Feed
-    extend Forwardable
-    def_delegators :@site, :base_url, :title, :subtitle, :author, :email
-
-    attr_reader :site, :posts
-    def initialize(site, posts, relative_url)
-      @site, @posts = site, posts
-      @relative_url = relative_url
-    end
-
-    def feed_url
-      [@site.base_url, @relative_url].join('/')
-    end
-
-    def as_json
-      {title: self.title, url: self.feed_url}
-    end
-
-    def to_json(*args)
-      self.as_json.to_json(*args)
-    end
-
-    def id
-      digest = Digest::MD5.hexdigest(posts.each.map(&:title).join(","))
-      "urn:uuid:#{digest}"
-    end
-
-    def updated_at
-      self.posts.last.updated_at ||  self.posts.last.published_at
-    end
-
-    def template
-      # @template ||= DATA.read # Why can't I use DATA?
-      @template ||= File.read(__FILE__).sub(/\A.*\n__END__\n/m, '')
-    end
-
-    def render
-      ERB.new(self.template).result(binding)
-    end
-  end
-end
-
-__END__
-<?xml version="1.0" encoding="utf-8"?>
-
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title><%= self.title %></title>
-  <subtitle><%= self.subtitle %></subtitle>
-  <link href="<%= self.feed_url %>" rel="self" />
-  <link href="<%= self.base_url %>" />
-  <id><%= self.id %></id>
-  <updated><%= self.updated_at.to_date.iso8601 %></updated>
-
-  <% posts.each do |post| %>
-  <entry>
-    <title><%= post.title %></title>
-    <link href="<%= post.absolute_url %>" />
-    <link rel="alternate" type="text/html" href="<%= post.absolute_url %>"/>
-    <id><%= post.id %></id>
-    <updated><%= (post.updated_at || post.published_at).to_date.iso8601 %></updated>
-    <!-- TODO: strip HTML from excerpt -->
-    <summary><%= post.excerpt %></summary>
-<!--     <content type="xhtml">
-      <%= post.body %>
-    </content> -->
-    <author>
-      <name><%= post.author %></name>
-      <email><%= post.email %></email>
-    </author>
-  </entry>
-  <% end %>
-</feed>