blog-generator 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be671ad043de1d364e12bb8515a5f040a054687b
-  data.tar.gz: 425ef4f0111617c8df5ab6778a9303ac67d9724f
+  metadata.gz: ed3c23b9ad0f82dde254a9d03d078a9531485b59
+  data.tar.gz: b826167d4a93e7e559c98a493680572fb85f76e8
 SHA512:
-  metadata.gz: 9516667ffd5f5f35576f1322ce7ce79281395e9b9030595ca6990f96fa1725fe1fe14ae3293e8ea0e92a8b93b797d8589fa18d488df1986fe6261099f4ca25f8
-  data.tar.gz: d03fb84a1276c3621f8c3c531b6d86985d23b48550323553706d29317c756d61394f0e1861ae22f0b502106112482e2f12b444cbd90c538536d1a32a8a2625a1
+  metadata.gz: b1f7b6d0caf385190f2d95bd8c680486cffff05a99f8e6cdf3de66f5b9e91466583908ff7a473cc0c39855158a81f3816cf32638f0d1a70dc53c12d07220fe53
+  data.tar.gz: 4298605c3a49269f119d3f3ccecea54e38e74a2970f429087f94628d3ae75ac0d35ddd660dcfa4bec4197a0fda9f8eb191a8a74a2e9affad8cef738f9f9ca5ff

data/bin/blog-generator.rb

@@ -29,57 +29,48 @@ 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)
 
 # Generate.
 
-Dir.chdir(OUTPUT_BASE_PATH) do
-  # GET /metadata.json
-  File.open('metadata.json', 'w') do |file|
-    # TODO: Refactor this, it's evil.
-    file.puts(site.instance_variable_get(:@table).to_json)
+def file(path, content)
+  puts "~ #{path}"
+  File.open(path, 'w') do |file|
+    file.puts(content)
   end
+end
 
-  # GET /api/posts.json
-  File.open('posts.json', 'w') do |file|
-    # This calls PostList#to_json
-    file.puts(JSON.pretty_generate(generator.posts))
-  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
-  File.open('posts.atom', 'w') do |file|
-    feed = BlogGenerator::Feed.new(site, generator.posts, 'posts.atom')
-    file.puts(feed.render)
-  end
+  feed = BlogGenerator::Feed.new(site, generator.posts, 'posts.atom')
+  file 'posts.atom', feed.render
+
+  # 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.open("posts/#{post.slug}.json", 'w') do |file|
-      file.puts(JSON.pretty_generate(post))
-    end
+    file "posts/#{post.slug}.json", JSON.pretty_generate(post)
   end
 
   # GET /api/tags.json
-  File.open('tags.json', 'w') do |file|
-    # [{title: x, slug: y}]
-    tags = generator.tags.map do |tag, _|
-      tag.merge(path: "/tags/#{tag[:slug]}") ### TODO: some routing config.
-    end
-    file.puts(JSON.pretty_generate(tags))
-  end
+  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
-    File.open("tags/#{tag[:slug]}.json", 'w') do |file|
-      file.puts(JSON.pretty_generate(posts))
-    end
+    body = {tag: tag, posts: posts}
+    file "tags/#{tag[:slug]}.json", JSON.pretty_generate(body)
 
     # GET /api/tags/doxxu.atom
-    File.open("tags/#{tag[:slug]}.atom", 'w') do |file|
-      feed = BlogGenerator::Feed.new(site, posts, "#{tag[:slug]}.atom")
-      file.puts(feed.render)
-    end
+    feed = BlogGenerator::Feed.new(site, posts, "#{tag[:slug]}.atom")
+    file "tags/#{tag[:slug]}.atom", feed.render
   end
 end

data/lib/blog-generator.rb

@@ -8,13 +8,15 @@ require 'blog-generator/feed'
 module BlogGenerator
   class Generator
     def self.parse(site, posts_dir)
-      posts = Dir.glob("#{posts_dir}/*.{html,md}").reduce(PostList.new(site)) do |posts, path|
-        post = Post.new(site, path)
-        puts "~ Parsing #{post.inspect}"
-        posts.push(post)
+      posts = Dir.glob("#{posts_dir}/*.{html,md}").reduce(Array.new) do |posts, path|
+        posts.push(Post.new(site, path))
       end
 
-      self.new(site, posts)
+      posts = posts.sort do |a, b|
+        b.published_on <=> a.published_on
+      end
+
+      self.new(site, PostList.new(site, posts))
     end
 
     attr_reader :site, :posts

data/lib/blog-generator/feed.rb

@@ -17,6 +17,14 @@ module BlogGenerator
       [@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}"

data/lib/blog-generator/post.rb

@@ -7,16 +7,17 @@ module BlogGenerator
   class Post
     REGEXP = /^(\d{4}-\d{2}-\d{2})-(.+)\.(html|md)$/
 
-    attr_reader :site, :metadata
+    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, (key, value)|
-        buffer.merge(key.to_sym => value)
+      @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
@@ -26,9 +27,17 @@ module BlogGenerator
       @metadata.merge!(path: "/posts/#{slug}") ### TODO: some routing config.
 
       @metadata[:tags].map! do |tag|
-        {title: tag, slug: generate_slug(tag)}
+        slug = generate_slug(tag)
+        feed = "#{site.base_url}/#{slug}.atom"
+        {title: tag, slug: slug, feed: feed}
       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
@@ -68,9 +77,15 @@ module BlogGenerator
       @body ||= File.read(@path).match(/\n---\n(.+)$/m)[1].strip
     end
 
-    # 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>.
     def excerpt
-      @excerpt ||= Nokogiri::HTML(convert_markdown(Nokogiri::HTML(self.body).css('#excerpt').inner_html.strip)).css('p').inner_html
+      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
 
     def as_json

data/lib/blog-generator/post_list.rb

@@ -6,11 +6,11 @@ module BlogGenerator
     extend Forwardable
 
     attr_reader :site, :posts
-    def initialize(site)
-      @site, @posts = site, Array.new
+    def initialize(site, posts = Array.new)
+      @site, @posts = site, posts
     end
 
-    def_delegators :@posts, :reduce, :each, :first, :last, :[]
+    def_delegators :@posts, :reduce, :each, :sort, :first, :last, :[]
 
     def as_json
       self.posts.map do |post|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blog-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - James C Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri