planet 0.3.1 → 0.3.3

data/bin/planet

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
-require 'rubygems'
 require 'gli'
+require 'box'
 require 'planet'
 
 include GLI
+include Box
 
 program_desc 'Planet.rb is an awesome feed-aggregator gem that consumes RSS/Atom feeds and outputs them in a format suitable to use with Octopress or Jekyll'
 
@@ -13,7 +13,7 @@ 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.open('planet.yml', 'r').read
+    conf = YAML.load_file('planet.yml')
 
     @planet = Planet.new(config: conf.fetch('planet', {}))
 
@@ -38,29 +38,9 @@ end
 desc 'Creates basic planet.yml config file'
 command :init do |c|
   c.action do |global_options,options,args|
-    raise Exception.new('There is already a planet.yml file present') if File.exist? 'planet.yml'
+    abort 'There is already a planet.yml file present' if File.exist? 'planet.yml'
 
-    default = '## Planet.rb default config file, modify it and spawn awesomeness!
-
-planet:
-    posts_directory: source/_posts/
-    templates_directory: source/_layouts/
-
-blogs:
-  # Bare minimum to get it working
-  - author: "Cubox"
-    feed:   "http://blog.cuboxlabs.com/atom.xml"
-    image:  "http://cuboxlabs.com/img/cubox-humans/could-be-you.png"
-
-  - author: "Pablo Astigarraga"
-    feed:   "http://blog.poteland.com/atom.xml"
-    image:  "http://poteland.com/images/avatars/red_mage.png"
-    # Other fields:
-    twitter: "poteland"
-    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) }
+    File.open('planet.yml', 'w') { |f| f.write(Box::FILES['planet.yml']) }
 
     puts '=> Created default planet.yml'
   end
@@ -71,35 +51,19 @@ command :create_templates do |c|
   c.action do |global_options,options,args|
     conf = YAML.load File.open('planet.yml', 'r') { |f| f.read }
 
-    templates_dir = conf.fetch('planet').fetch('templates_directory', '_layouts/')
+    templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts/')
 
     FileUtils.mkdir_p(templates_dir)
 
-    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_url }}">{{ author }}</a> - check out <a href="{{ blog_url }}">{{ blog_name }}</a></i>
-  </span>
-</div>
-'
     if !File.exists?(templates_dir + 'author.html')
-      File.open(templates_dir + 'author.html', 'w') { |f| f.write(author) }
+      File.open(templates_dir + 'author.html', 'w') { |f| f.write(Box::FILES['author.html']) }
       puts "=> Created default #{ templates_dir }author.html"
     else
       puts "=> Template #{ templates_dir }author.html already exists, skipping"
     end
 
-    header ='---
-title: "{{ post_title }}"
-kind: article
-created_at: {{ post_date }}
-author: {{ author }}
-layout: post
----
-'
     if !File.exists?(templates_dir + 'header.md')
-      File.open(templates_dir + 'header.md', 'w') { |f| f.write(header) }
+      File.open(templates_dir + 'header.md', 'w') { |f| f.write(Box::FILES['header.md']) }
       puts "=> Created default #{ templates_dir }header.md"
     else
       puts "=> Template #{ templates_dir }header.md already exists, skipping"
@@ -111,12 +75,12 @@ pre do |global,command,options,args|
   if command.name == :generate
     conf = YAML.load File.open('planet.yml', 'r') { |f| f.read }
 
-    templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts')
+    templates_dir = conf.fetch('planet').fetch('templates_directory', 'source/_layouts/')
     FileUtils.mkdir_p(templates_dir)
 
-    FILES = [templates_dir, templates_dir + 'author.html', templates_dir + 'header.md']
+    files = [templates_dir, templates_dir + 'author.html', templates_dir + 'header.md']
 
-    FILES.each do |file|
+    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`
@@ -137,3 +101,41 @@ on_error do |exception|
 end
 
 exit GLI.run(ARGV)
+
+__END__
+@@ header.md
+---
+title: "{{ post_title }}"
+kind: article
+created_at: {{ post_date }}
+author: {{ author }}
+layout: post
+---
+
+@@ author.html
+<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_url }}">{{ author }}</a> - check out <a href="{{ blog_url }}">{{ blog_name }}</a></i>
+  </span>
+</div>
+
+@@ planet.yml
+## planet.rb default config file, modify it and spawn awesomeness!
+
+planet:
+    posts_directory: source/_posts/
+    templates_directory: source/_layouts/
+
+blogs:
+  # Bare minimum to get it working
+  - author: "Cubox"
+    feed:   "http://blog.cuboxlabs.com/atom.xml"
+    image:  "http://cuboxlabs.com/img/cubox-humans/could-be-you.png"
+
+  - author: "Pablo Astigarraga"
+    feed:   "http://blog.poteland.com/atom.xml"
+    image:  "http://poteland.com/images/avatars/red_mage.png"
+    # Other fields:
+    twitter: "poteland"
+    url: "http://blog.poteland.com"    # => only required for people that don\'t have a \'url\' field on their RSS/Atom field'

data/lib/planet/version.rb

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

data/lib/planet.rb

@@ -20,16 +20,15 @@ class Planet < Struct.new(:config, :blogs)
       blog.name ||= feed.title || 'the source'
       blog.url ||= feed.url
 
-      ## This is slightly gay.
       if blog.url.nil?
-        raise "#{ blog.author }'s blog does not have a url field on it's feed, you will need to specify it on planet.yml"
+        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: entry.content.strip.gsub('<img src="', "<img src=\"#{ blog.url }"),    ## => I don't like this that much, move it away
-          date: entry.published,                                                          ##    and check that it's needed post by post.
+          content: blog.sanitize_images(entry.content.strip),
+          date: entry.published,
           url: blog.url + entry.url,
           blog: blog
         )
@@ -61,6 +60,10 @@ class Planet < Struct.new(:config, :blogs)
       self.blog = attributes.fetch(:blog, nil)
     end
 
+    def to_s
+      "#{ header }#{ content }#{ footer }"
+    end
+
     def to_hash
       {
         post_content: self.content,
@@ -79,28 +82,25 @@ class Planet < Struct.new(:config, :blogs)
     def header
       ## TODO: We need categories/tags
       file = self.blog.planet.config.fetch('templates_directory', '_layouts/') + 'header.md'
-      file_contents = File.open(file, 'r') { |f| f.read }
+      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
-
     def footer
       file = self.blog.planet.config.fetch('templates_directory', '_layouts/') + 'author.html'
-      file_contents = File.open(file, 'r') { |f| f.read }
+      file_contents = File.read(file)
 
       Mustache.render(file_contents, self.to_hash)
     end
 
-    def to_s
-      "#{ header }#{ content }#{ footer }"
+    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
 
   class Blog < Struct.new(:url, :feed, :name, :author, :image, :twitter, :posts, :planet)
@@ -115,5 +115,19 @@ class Planet < Struct.new(:config, :blogs)
       self.posts = attributes.fetch('posts', [])
       self.planet = attributes[:planet]
     end
+
+    def sanitize_images(html)
+      ## We take all images with src not matching http refs and append
+      ## the original blog to them.
+      html.scan(/<img src="([^h"]+)"/).flatten.each do |img|
+        if img[0] == '/'
+          html.gsub!(img, "#{ self.url }#{ img }")
+        else
+          html.gsub!(img, "#{ self.url }/#{ img }")
+        end
+      end
+
+      html
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: planet
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: box
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: pote@tardis.com.uy
 executables: