planet 0.1.3 → 0.2.1

data/bin/planet

@@ -19,11 +19,12 @@ command :generate do |c|
 
     conf['blogs'].each do |blog|
       @planet.blogs << Planet::Blog.new(
-        blog['feed'],
-        blog['author'],
-        blog['image'],
-        [],
-        @planet
+        feed: blog['feed'],
+        author: blog['author'],
+        image: blog['image'],
+        posts: [],
+        planet: @planet,
+        twitter: blog['twitter']
       )
     end
 
@@ -48,10 +49,12 @@ blogs:
   - author: "Pablo Astigarraga"
     feed:   "http://blog.poteland.com/atom.xml"
     image:  "http://poteland.com/images/avatars/red_mage.png"
+    twitter: "poteland"
 
   - author: "Cubox"
     feed:   "http://blog.cuboxlabs.com/atom.xml"
-    image:  "http://cuboxlabs.com/img/cubox-humans/could-be-you.png"'
+    image:  "http://cuboxlabs.com/img/cubox-humans/could-be-you.png"
+    twitter: "cubox"'
 
     File.open('planet.yml', 'w') { |f| f.write(default) }
 
@@ -69,9 +72,9 @@ command :create_templates do |c|
     Dir.mkdir(templates_dir) unless File.exists?(templates_dir)
 
     author = '<div class="author">
-<img src="{{ image }}" style="width: 48px; height: 48px;">
+<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="{{ link }}">read it from the source</a></i>
+  <i>Original post by {{ author }} - <a href="{{ blog }}">check out the original blog</a></i>
 </span>
 </div>
 '

data/lib/planet.rb

@@ -1,5 +1,4 @@
-require 'simple-rss'
-require 'open-uri'
+require 'feedzirra'
 require 'mustache'
 
 class Planet
@@ -49,14 +48,15 @@ class Planet
   def aggregate
     @@_blogs.each do |blog|
       puts "=> Parsing #{ blog.feed }"
-      rss = SimpleRSS.parse open(blog.feed)
-      rss.entries.each do |entry|
+      feed = Feedzirra::Feed.fetch_and_parse(blog.feed)
+      blog.url = feed.url
+      feed.entries.each do |entry|
         @@_posts << @post = Post.new(
-          entry.fetch(:title),
-          entry.fetch(:content).strip,
-          entry.fetch(:updated, nil),           # Yeah, I know, Im following the default octopress value for the date parameter.
-          entry.fetch(:id, nil),                # Er, this is the full link to the article
-          blog
+          title: entry.title,
+          content: entry.content.strip.gsub('<img src="', "<img src=\"#{ blog.url }"),
+          date: entry.published,
+          url: blog.url + entry.url,
+          blog: blog
         )
 
         blog.posts << @post
@@ -77,13 +77,21 @@ class Planet
     end
   end
 
-  class Post < Struct.new(:title, :content, :date, :link, :blog)
+  class Post < Struct.new(:title, :content, :date, :url, :blog)
+
+    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)
+    end
 
     def to_hash
       {
         title: title,
         date: date.strftime('%Y-%m-%d %H:%M'),
-        link: link,
+        url: url,
         content: content,
         author: blog.author
       }
@@ -117,7 +125,8 @@ class Planet
       data = {
         image: self.blog.image,
         author: self.blog.author,
-        link: self.link
+        blog: self.blog.url,
+        twitter: self.blog.twitter ? "http://twitter.com/#{ self.blog.twitter }" : self.blog.url
       }
 
       Mustache.render(file_contents, data)
@@ -128,6 +137,16 @@ class Planet
     end
   end
 
-  class Blog < Struct.new(:feed, :author, :image, :posts, :planet)
+  class Blog < Struct.new(:url, :feed, :author, :image, :twitter, :posts, :planet)
+
+    def initialize(attributes = {})
+      self.url = attributes[:url]
+      self.feed = attributes[:feed]
+      self.author = attributes[:author]
+      self.image = attributes[:image]
+      self.twitter = attributes[:twitter]
+      self.posts = attributes.fetch('posts', [])
+      self.planet = attributes[:planet]
+    end
   end
 end

data/lib/planet/version.rb

@@ -1,8 +1,8 @@
 module Planet
   module Version
     MAJOR = 0
-    MINOR = 1
-    PATCH = 3
+    MINOR = 2
+    PATCH = 1
 
     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.1.3
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152604220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152604220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2152603380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152603380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple-rss
-  requirement: &2152596320 !ruby/object:Gem::Requirement
+  name: feedzirra
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152596320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &2152595740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152595740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: pote@tardis.com.uy
 executables:
@@ -86,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: An awesome rss/atom feed aggregator designed to work with Octopress/Jekyll