planet 0.3.12 → 0.4.0

data/bin/planet

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'gli'
 require 'planet'
+require 'fileutils'
 
-include GLI
+include GLI::App
 
 TEMPLATES = {
   author:  '
@@ -48,16 +50,20 @@ desc 'Parses planet.yml file for blogs and generates their posts in Jekyll compl
 command :generate do |c|
 
   c.action do |global_options,options,args|
-    conf = YAML.load_file('planet.yml')
 
-    @planet = Planet.new(
-      config: conf.fetch('planet', {}),
-      blogs:  conf.fetch('blogs',  [])
-    )
+    Planet::Importer.import('planet.yml') do |planet|
+
+      posts_dir = planet.config.fetch('posts_directory', 'source/_posts/')
+      FileUtils.mkdir_p(posts_dir)
+      puts "=> Writing #{ planet.posts.size } posts to the #{ posts_dir } directory."
 
-    @planet.aggregate
+      planet.posts.each do |post|
+        file_name = posts_dir + post.file_name
+        File.open(file_name + '.markdown', "w+") { |f| f.write(post.to_s) }
+      end
+
+    end
 
-    @planet.write_posts
   end
 end
 
@@ -147,4 +153,4 @@ on_error do |exception|
   true
 end
 
-exit GLI.run(ARGV)
+exit run(ARGV)

data/lib/planet.rb

@@ -1,23 +1,16 @@
+require 'yaml'
 require 'planet/version'
 require 'planet/blog'
+require 'planet/importer'
 
 class Planet
 
   attr_accessor :config, :blogs
 
-  def initialize(attributes = {})
-    self.config = attributes[:config]
-    self.blogs  = attributes.fetch(:blogs, []).map do |blog|
-      Blog.new(
-        feed:    blog['feed'],
-        url:     blog['url'],
-        author:  blog['author'],
-        image:   blog['image'],
-        posts:   [],
-        planet:  self,
-        twitter: blog['twitter']
-      )
-    end
+  def initialize(config_file_path)
+    config_file = read_config_file(config_file_path)
+    self.config = config_file[:planet]
+    self.blogs  = config_file[:blogs]
   end
 
   def posts
@@ -32,14 +25,26 @@ class Planet
   end
 
   def write_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."
+    Importer.import(self)
+  end
 
-    self.posts.each do |post|
-      file_name = posts_dir + post.file_name
+  private
 
-      File.open(file_name + '.markdown', "w+") { |f| f.write(post.to_s) }
+  def read_config_file(config_file_path)
+    config = YAML.load_file(config_file_path)
+    planet = config.fetch('planet', {})
+    blogs = config.fetch('blogs', []).map do |blog|
+      Blog.new(
+        feed:    blog['feed'],
+        url:     blog['url'],
+        author:  blog['author'],
+        image:   blog['image'],
+        posts:   [],
+        planet:  self,
+        twitter: blog['twitter']
+      )
     end
+
+    { planet: planet, blogs: blogs }
   end
 end

data/lib/planet/blog.rb

@@ -36,22 +36,16 @@ class Planet
       end
 
       feed.entries.each do |entry|
-        content = if !entry.content.nil?
+        content = if entry.content
                     self.sanitize_images(entry.content.strip)
-                  elsif !entry.summary.nil?
+                  elsif entry.summary
                     self.sanitize_images(entry.summary.strip)
                   else
                     abort "=> No content found on entry"
                   end
 
-        title = if !entry.title.nil?
-                  entry.title.sanitize
-                else
-                  self.name
-                end
-
         self.posts << @post = Post.new(
-          title: title,
+          title: entry.title.nil? ? self.name : entry.title,
           content: content,
           date: entry.published,
           url: self.url + entry.url,

data/lib/planet/importer.rb

@@ -0,0 +1,9 @@
+class Planet::Importer
+
+  def self.import(config)
+    planet = Planet.new(config)
+    planet.aggregate
+
+    yield(planet)
+  end
+end

data/lib/planet/parsers.rb

@@ -1,59 +1,58 @@
 require 'feedzirra'
 require 'set'
 
-class Planet
-  # Parsers class - manager for the feed parsers
-  #
-  # parser classes inherit from Planet::Parsers::BaseParser
-  # and are added automatically to the list of available parsers.
-  # files located on planet/parsers are automatically loaded.
-  class Parsers
-    @@parsers = Set.new
+# Parsers class - manager for the feed parsers
+#
+# parser classes inherit from Planet::Parsers::BaseParser
+# and are added automatically to the list of available parsers.
+# files located on planet/parsers are automatically loaded.
 
-    def self.add_parser(parser)
-      @@parsers << parser
-    end
+class Planet::Parsers
+  @@parsers = Set.new
 
-    # Parser instances keep indexes of the available parsers and
-    # check for duplicate definitions (need to use an instance
-    # because #inherited gets called as soon as the class is seen
-    # but before it is fully defined).
-    def initialize
-      @types, @domains = {}, {}
+  def self.add_parser(parser)
+    @@parsers << parser
+  end
 
-      @@parsers.each do |parser|
-        new_type, new_domains = parser.type, parser.domains
+  # Parser instances keep indexes of the available parsers and
+  # check for duplicate definitions (need to use an instance
+  # because #inherited gets called as soon as the class is seen
+  # but before it is fully defined).
+  def initialize
+    @types, @domains = {}, {}
 
-        fail("duplicate type") if new_type and @types.has_key? new_type
-        fail("overlapping domains") unless (@domains.keys & new_domains).empty?
+    @@parsers.each do |parser|
+      new_type, new_domains = parser.type, parser.domains
 
-        @types[new_type] = parser if new_type
-        new_domains.each do |new_domain|
-          @domains[new_domain] = parser
-        end
-      end
-    end
+      fail("duplicate type") if new_type and @types.has_key? new_type
+      fail("overlapping domains") unless (@domains.keys & new_domains).empty?
 
-    # returns the appropiate parser based on the type
-    def get_parser(type)
-      begin
-        return @types.fetch(type)
-      rescue KeyError => e
-        raise(ArgumentError, "No parser for type '#{ type }'", caller)
+      @types[new_type] = parser if new_type
+      new_domains.each do |new_domain|
+        @domains[new_domain] = parser
       end
     end
+  end
 
-    # returns any parser that can handle this feeds' domain,
-    # defaults to Feedzirra if none available.
-    def get_parser_for(feed)
-      feed_domain = URI(feed).host
+  # returns the appropiate parser based on the type
+  def get_parser(type)
+    begin
+      return @types.fetch(type)
+    rescue KeyError => e
+      raise(ArgumentError, "No parser for type '#{ type }'", caller)
+    end
+  end
 
-      @domains.each do |domain, parser|
-        return parser if feed_domain.end_with? domain
-      end
+  # returns any parser that can handle this feeds' domain,
+  # defaults to Feedzirra if none available.
+  def get_parser_for(feed)
+    feed_domain = URI(feed).host
 
-      return Feedzirra::Feed # default generic parser
+    @domains.each do |domain, parser|
+      return parser if feed_domain.end_with? domain
     end
+
+    return Feedzirra::Feed # default generic parser
   end
 end
 

data/lib/planet/post.rb

@@ -1,58 +1,56 @@
 require 'mustache'
 
-class Planet
-  class Post
-
-    attr_accessor :title, :content, :date, :url, :blog
-
-    def initialize(attributes = {})
-      self.title = attributes[:title]
-      self.content = attributes[:content]
-      self.date = attributes[:date]
-      self.url = attributes[:url]
-      self.blog = attributes[:blog]
-    end
-
-    def to_s
-      "#{ header }#{ content }#{ footer }"
-    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.read(file)
-
-      Mustache.render(file_contents, self.to_hash)
-    end
-
-    def footer
-      file = self.blog.planet.config.fetch('templates_directory', '_layouts/') + 'author.html'
-      file_contents = File.read(file)
-
-      Mustache.render(file_contents, self.to_hash)
-    end
-
-    def file_name
-      name_date = date ? date.strftime('%Y-%m-%d') : nil
-      name_title = title.downcase.scan(/\w+/).join('-')
-
-      [name_date, name_title].join('-')
-    end
+class Planet::Post
 
+  attr_accessor :title, :content, :date, :url, :blog
+
+  def initialize(attributes = {})
+    self.title = attributes[:title]
+    self.content = attributes[:content]
+    self.date = attributes[:date]
+    self.url = attributes[:url]
+    self.blog = attributes[:blog]
+  end
+
+  def to_s
+    "#{ header }#{ content }#{ footer }"
+  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.read(file)
+
+    Mustache.render(file_contents, self.to_hash)
   end
+
+  def footer
+    file = self.blog.planet.config.fetch('templates_directory', '_layouts/') + 'author.html'
+    file_contents = File.read(file)
+
+    Mustache.render(file_contents, self.to_hash)
+  end
+
+  def file_name
+    name_date = date ? date.strftime('%Y-%m-%d') : nil
+    name_title = title.downcase.scan(/\w+/).join('-')
+
+    [name_date, name_title].join('-')
+  end
+
 end

data/lib/planet/version.rb

@@ -1,8 +1,8 @@
 class Planet
   module Version
     MAJOR = 0
-    MINOR = 3
-    PATCH = 12
+    MINOR = 4
+    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.3.12
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +68,7 @@ extra_rdoc_files: []
 files:
 - bin/planet
 - lib/planet/blog.rb
+- lib/planet/importer.rb
 - lib/planet/parsers/base_parser.rb
 - lib/planet/parsers.rb
 - lib/planet/post.rb
@@ -110,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An awesome rss/atom feed aggregator designed to work with Octopress/Jekyll