planet 0.3.3 → 0.3.4

data/bin/planet

@@ -73,7 +73,7 @@ end
 
 pre do |global,command,options,args|
   if command.name == :generate
-    conf = YAML.load File.open('planet.yml', 'r') { |f| f.read }
+    conf = YAML.load_file('planet.yml')
 
     templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts/')
     FileUtils.mkdir_p(templates_dir)
@@ -83,7 +83,7 @@ pre do |global,command,options,args|
     files.each do |file|
       unless File.exists?(file)
         puts "=> You are missing some files in your templates directory, planet.rb will create them for you - make sure to review them on #{ templates_dir }!"
-        response = `planet create_templates`
+        response = `#{$0} create_templates`
         puts response
       end
     end

data/lib/planet.rb

@@ -1,7 +1,9 @@
 require 'feedzirra'
 require 'mustache'
 
-class Planet < Struct.new(:config, :blogs)
+class Planet
+
+  attr_accessor :config, :blogs
 
   def initialize(attributes = {})
     self.config = attributes[:config]
@@ -15,33 +17,14 @@ class Planet < Struct.new(:config, :blogs)
   def aggregate
     self.blogs.each do |blog|
       puts "=> Parsing #{ blog.feed }"
-      feed = Feedzirra::Feed.fetch_and_parse(blog.feed)
-
-      blog.name ||= feed.title || 'the source'
-      blog.url ||= feed.url
-
-      if blog.url.nil?
-        abort "#{ blog.author }'s blog does not have a url field on it's feed, you will need to specify it on planet.yml"
-      end
-
-      feed.entries.each do |entry|
-        blog.posts << @post = Post.new(
-          title: entry.title.sanitize,
-          content: blog.sanitize_images(entry.content.strip),
-          date: entry.published,
-          url: blog.url + entry.url,
-          blog: blog
-        )
-
-        puts "=> Found post titled #{ @post.title } - by #{ @post.blog.author }"
-      end
+      blog.fetch
     end
   end
 
   def write_posts
-    posts_dir = self.config.fetch('posts_directory', '_posts')
+    posts_dir = self.config.fetch('posts_directory', 'source/_posts/')
     FileUtils.mkdir_p(posts_dir)
-    puts "=> Writing #{ self.posts.size } posts to the #{ posts_dir } directory"
+    puts "=> Writing #{ self.posts.size } posts to the #{ posts_dir } directory."
 
     self.posts.each do |post|
       file_name = posts_dir + post.file_name
@@ -50,14 +33,17 @@ class Planet < Struct.new(:config, :blogs)
     end
   end
 
-  class Post < Struct.new(:title, :content, :date, :url, :blog)
+  class Post
+
+    attr_accessor :title, :content, :date, :url, :blog, :author
 
     def initialize(attributes = {})
-      self.title = attributes.fetch(:title, nil)
-      self.content = attributes.fetch(:content, nil)
-      self.date = attributes.fetch(:date, nil)
-      self.url = attributes.fetch(:url, nil)
-      self.blog = attributes.fetch(:blog, nil)
+      self.title = attributes[:title]
+      self.content = attributes[:content]
+      self.date = attributes[:date]
+      self.url = attributes.[:url]
+      self.blog = attributes[:blog]
+      self.author = attributes[:author]
     end
 
     def to_s
@@ -70,7 +56,7 @@ class Planet < Struct.new(:config, :blogs)
         post_title: self.title,
         post_date: self.date,
         image_url: self.blog.image,
-        author: self.blog.author,
+        author: self.author,
         blog_url: self.blog.url,
         blog_name: self.blog.name,
         post_url: self.url,
@@ -103,7 +89,9 @@ class Planet < Struct.new(:config, :blogs)
 
   end
 
-  class Blog < Struct.new(:url, :feed, :name, :author, :image, :twitter, :posts, :planet)
+  class Blog
+
+    attr_accessor :url, :feed, :name, :author, :image, :twitter, :posts, :planet
 
     def initialize(attributes = {})
       self.url = attributes[:url]
@@ -112,10 +100,34 @@ class Planet < Struct.new(:config, :blogs)
       self.author = attributes[:author]
       self.image = attributes[:image]
       self.twitter = attributes[:twitter]
-      self.posts = attributes.fetch('posts', [])
+      self.posts = attributes.fetch(:posts, [])
       self.planet = attributes[:planet]
     end
 
+    def fetch
+      feed = Feedzirra::Feed.fetch_and_parse(self.feed)
+
+      self.name ||= feed.title || 'the source'
+      self.url ||= feed.url
+
+      if self.url.nil?
+        abort "#{ self.author }'s blog does not have a url field on it's feed, you will need to specify it on planet.yml"
+      end
+
+      feed.entries.each do |entry|
+        self.posts << @post = Post.new(
+          title: entry.title.sanitize,
+          author: entry.author ? entry.author : self.author,
+          content: self.sanitize_images(entry.content.strip),
+          date: entry.published,
+          url: self.url + entry.url,
+          blog: self
+        )
+
+        puts "=> Found post titled #{ @post.title } - by #{ @post.author }"
+      end
+    end
+
     def sanitize_images(html)
       ## We take all images with src not matching http refs and append
       ## the original blog to them.

data/lib/planet/version.rb

@@ -2,7 +2,7 @@ module Planet
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 3
+    PATCH = 4
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: planet
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake