planet 0.2.6 → 0.3.0

data/bin/planet

@@ -75,10 +75,11 @@ command :create_templates do |c|
 
     Dir.mkdir(templates_dir) unless File.exists?(templates_dir)
 
-    author = '<div class="author">
-  <img src="{{ image }}" style="width: 96px; height: 96;">
+    author = '
+<div class="author">
+  <img src="{{ image_url }}" style="width: 96px; height: 96;">
   <span style="position: absolute; padding: 32px 15px;">
-    <i>Original post by <a href="{{ twitter}}">{{ author }}</a> - check out <a href="{{ blog_url }}">{{ blog_title }}</a></i>
+    <i>Original post by <a href="{{ twitter_url }}">{{ author }}</a> - check out <a href="{{ blog_url }}">{{ blog_name }}</a></i>
   </span>
 </div>
 '
@@ -90,9 +91,9 @@ command :create_templates do |c|
     end
 
     header ='---
-title: "{{ title }}"
+title: "{{ post_title }}"
 kind: article
-created_at: {{ date }}
+created_at: {{ post_date }}
 author: {{ author }}
 layout: post
 ---

data/lib/planet.rb

@@ -91,18 +91,27 @@ class Planet
       self.blog = attributes.fetch(:blog, nil)
     end
 
+    def to_hash
+      {
+        post_content: self.content,
+        post_title: self.title,
+        post_date: self.date,
+        image_url: self.blog.image,
+        author: self.blog.author,
+        blog_url: self.blog.url,
+        blog_name: self.blog.name,
+        post_url: self.url,
+        twitter: self.blog.twitter,
+        twitter_url: "http://twitter.com/#{ self.blog.twitter }"
+      }
+    end
+
     def header
       ## TODO: We need categories/tags
       file = self.blog.planet.config.fetch('templates_directory', '_layouts/') + 'header.md'
       file_contents = File.open(file, 'r').read
 
-      data = {
-        title: self.title,
-        date: self.date,
-        author: self.blog.author
-      }
-
-      Mustache.render(file_contents, data)
+      Mustache.render(file_contents, self.to_hash)
     end
 
     def file_name
@@ -116,15 +125,7 @@ class Planet
       file = self.blog.planet.config.fetch('templates_directory', '_layouts/') + 'author.html'
       file_contents = File.open(file, 'r').read
 
-      data = {
-        image: self.blog.image,
-        author: self.blog.author,
-        blog_url: self.blog.url,
-        blog_title: self.blog.name,
-        twitter: self.blog.twitter ? "http://twitter.com/#{ self.blog.twitter }" : self.blog.url
-      }
-
-      Mustache.render(file_contents, data)
+      Mustache.render(file_contents, self.to_hash)
     end
 
     def to_s

data/lib/planet/version.rb

@@ -1,8 +1,8 @@
 module Planet
   module Version
     MAJOR = 0
-    MINOR = 2
-    PATCH = 6
+    MINOR = 3
+    PATCH = 0
 
     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.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake