planet 0.2.4 → 0.2.5

data/bin/planet

@@ -60,7 +60,6 @@ blogs:
     url: "http://blog.poteland.com"    # => only required for people that don\'t have a \'url\' field on their RSS/Atom field'
 
 
-
     File.open('planet.yml', 'w') { |f| f.write(default) }
 
     puts '=> Created default planet.yml'
@@ -77,10 +76,10 @@ command :create_templates do |c|
     Dir.mkdir(templates_dir) unless File.exists?(templates_dir)
 
     author = '<div class="author">
-<a href="{{ twitter }}"><img src="{{ image }}" style="width: 48px; height: 48px;"></a>
-<span style="position: absolute; padding: 12px;">
-  <i>Original post by {{ author }} - <a href="{{ blog }}">check out the original blog</a></i>
-</span>
+  <img src="{{ image }}" 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>
+  </span>
 </div>
 '
     if !File.exists?(templates_dir + 'author.html')

data/lib/planet.rb

@@ -49,8 +49,11 @@ class Planet
     @@_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
       raise "#{ blog.author }'s blog does not have a url field on it's feed, you will need to specify it on planet.yml" if blog.url.nil?
+
       feed.entries.each do |entry|
         @@_posts << @post = Post.new(
           title: entry.title,
@@ -88,16 +91,6 @@ class Planet
       self.blog = attributes.fetch(:blog, nil)
     end
 
-    def to_hash
-      {
-        title: title,
-        date: date.strftime('%Y-%m-%d %H:%M'),
-        url: url,
-        content: content,
-        author: blog.author
-      }
-    end
-
     def header
       ## TODO: We need categories/tags
       file = self.blog.planet.config.fetch('templates_directory', '_layouts/') + 'header.md'
@@ -126,7 +119,8 @@ class Planet
       data = {
         image: self.blog.image,
         author: self.blog.author,
-        blog: self.blog.url,
+        blog_url: self.blog.url,
+        blog_title: self.blog.name,
         twitter: self.blog.twitter ? "http://twitter.com/#{ self.blog.twitter }" : self.blog.url
       }
 
@@ -138,11 +132,12 @@ class Planet
     end
   end
 
-  class Blog < Struct.new(:url, :feed, :author, :image, :twitter, :posts, :planet)
+  class Blog < Struct.new(:url, :feed, :name, :author, :image, :twitter, :posts, :planet)
 
     def initialize(attributes = {})
       self.url = attributes[:url]
       self.feed = attributes[:feed]
+      self.name = attributes[:name]
       self.author = attributes[:author]
       self.image = attributes[:image]
       self.twitter = attributes[:twitter]

data/lib/planet/version.rb

@@ -2,7 +2,7 @@ module Planet
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 4
+    PATCH = 5
 
     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.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors: