who-needs-wp 0.5.2 → 0.6.0

data/README.md

@@ -82,7 +82,7 @@ who-needs-wp can place a [Twitter][Twitter] stream in the side bar. This can eit
 Modifying `.who-needs-wp.yaml` and add:
 
     :twitter:
-      :user: <your twitter user>
+      :username: <your twitter user>
       :search: <your twitter search>
       
 ## Delicious

data/lib/who-needs-wp/Sidebar.rb

@@ -0,0 +1,33 @@
+module WhoNeedsWP
+  # Abstract class to be implemented by all sidebar elements
+  class Sidebar
+    # A list of Sidebar instances which will be rendered
+    @@content = []
+
+    # The HTML output of all of the sidebar instances combined
+    @@generated = nil
+    
+    # Iterate through all of the side bar instances, render them and return as HTML
+    def self.render_all
+      if @@generated == nil
+        retval = []
+        @@content.each do |content|
+          retval << content.render
+        end
+        @@generated = retval.join
+      end
+      return @@generated
+    end
+
+    # Create a new instance of this sidebar
+    def initialize
+      @logger = Logger.new(STDOUT)
+      @@content << self
+    end
+
+    # Render this peice of sidebar content. Returns HTML.
+    def render
+      # To be implemented.
+    end
+  end
+end

data/lib/who-needs-wp/pages.rb

@@ -14,13 +14,9 @@ module WhoNeedsWP
       }
     end
   end
-
-
-  def self.page_index
-    @sidebar << @template['pageindex'].render(Object.new, { 
-                                                 :pages => @pages, 
-                                                 :options => @options
-                                               })
+  
+  def self.get_pages
+    @pages
   end
 
   def self.generate_pages

data/lib/who-needs-wp/posts.rb

@@ -1,7 +1,7 @@
 
 module WhoNeedsWP
   def self.load_posts
-    @POSTS = []
+    @posts = []
     Dir.glob('posts/**/*.markdown').each do |filename|
       @logger.debug "Loading post #{filename}"
       match = filename.match(/([0-9]{4})\/([0-9]{2})\/([0-9]{2})\/([^\.]*)/)
@@ -16,37 +16,25 @@ module WhoNeedsWP
         :created_at => date
       }
       # Generate a unique post ID to be used in the Atom feed
-      post[:id] = "#{options[:url]}#{generated_filename}".gsub(/http:\/\//, 'tag:')
+      post[:id] = "#{@options[:url]}#{generated_filename}".gsub(/http:\/\//, 'tag:')
       match = post[:id].match(/([^\/]*)\/(.*)/)
       post[:id] = "#{match[1]},#{date.strftime('%Y-%m-%d')}:#{match[2]}" if match
       # Append the post to the global list of posts
-      @POSTS << post
+      @posts << post
     end
     # Sort the posts, newest first
-    @POSTS.sort! { |a, b| a[:created_at] <=> b[:created_at] }
-    @POSTS.reverse!
+    @posts.sort! { |a, b| a[:created_at] <=> b[:created_at] }
+    @posts.reverse!
   end
-
-
-  def self.recentposts
-    @sidebar << @template['recentposts'].render(Object.new, { 
-                                                 :posts => @POSTS[0..5], 
-                                                 :options => @options
-                                               })
-  end
-
-  def self.options
-    return @options
-  end
-
-  def self.POSTS
-    return @POSTS
+  
+  def self.get_posts
+    return @posts
   end
 
   def self.rss(filename, limit=10)
     file = File.open(filename, "w")
     file.write @template['rss'].render(Object.new, { 
-                                                 :posts => @POSTS[0..limit], 
+                                                 :posts => @posts[0..limit], 
                                                  :options => @options
                                                })
     file.close
@@ -55,18 +43,18 @@ module WhoNeedsWP
   def self.atom(filename, limit=10)
     file = File.open(filename, "w")
     file.write @template['atom'].render(Object.new, { 
-                                                 :posts => @POSTS[0..limit], 
+                                                 :posts => @posts[0..limit], 
                                                  :options => @options
                                                })
     file.close
   end
 
   def self.generate_posts
-    @POSTS.each_index do |index|
+    @posts.each_index do |index|
       # Calculate the previous and next posts
-      post = @POSTS[index]
-      previous_post = @POSTS[index + 1] if index + 1 < @POSTS.length
-      next_post = @POSTS[index - 1] if index > 1
+      post = @posts[index]
+      previous_post = @posts[index + 1] if index + 1 < @posts.length
+      next_post = @posts[index - 1] if index > 1
 
       # Read the contents of the file
       markdown = File.read(post[:filename][:original])

data/lib/who-needs-wp/sidebar/delicious.rb

@@ -0,0 +1,41 @@
+require 'nokogiri'
+
+module WhoNeedsWP
+  class Delicious < Sidebar
+    # Create a new Delicious sidebar
+    def initialize(username)
+      super()
+      @username = username
+      validate_options
+    end
+
+    # See Sidebar.render
+    def render
+      WhoNeedsWP::render_template("delicious", { :posts => get_bookmarks })
+    end
+
+    private
+
+    # Ensure that the Delicious username is set
+    def validate_options
+      if @username == nil or @username.empty?
+        raise "You need to provide a Delicious username"
+      end
+    end
+
+    # Return a list of bookmarks from Delicious
+    def get_bookmarks
+      @logger.debug "Fetching bookmarks from Delicious"
+      bookmarks = []
+      doc = Nokogiri::XML(open("http://feeds.delicious.com/v2/rss/#{@username}?count=5"))
+      doc.xpath('//channel/item').each do |item|
+        bookmarks << {
+          :title => (item/'title').first.content,
+          :url => (item/'link').first.content,
+          :date => Date.parse((item/'pubDate').first.content)
+        }
+      end
+      return bookmarks
+    end
+  end
+end

data/lib/who-needs-wp/sidebar/pageindex.rb

@@ -0,0 +1,9 @@
+module WhoNeedsWP
+  # A sidebar component to display a list of pages
+  class PageIndex < Sidebar
+    # See Sidebar.render
+    def render
+      WhoNeedsWP::render_template("pageindex", { :pages => WhoNeedsWP::get_pages })
+    end
+  end
+end

data/lib/who-needs-wp/sidebar/recentposts.rb

@@ -0,0 +1,9 @@
+module WhoNeedsWP
+  # A sidebar component to display a list of recent posts
+  class RecentPosts < Sidebar
+    # See Sidebar.render
+    def render
+      WhoNeedsWP::render_template("recentposts", { :posts => WhoNeedsWP::get_posts[0..5] })
+    end
+  end
+end

data/lib/who-needs-wp/sidebar/twitter.rb

@@ -0,0 +1,85 @@
+require 'twitter'
+
+module WhoNeedsWP
+  # A class combining all the common functions required by Twitter sidebar components
+  class TwitterSidebar < Sidebar
+    protected
+    # Format a Tweet so that all the links appear in HTML
+    def format_text(text)
+      text = text.gsub(/(http:\/\/[^ ]+)/, '<a href="\1">\1</a>')
+      text = text.gsub(/(@([^ :]+))/, '<a href="http://twitter.com/\2">\1</a>')
+      return text.gsub(/(#([^ :]+))/, '<a href="http://twitter.com/#search?q=%23\2">\1</a>')
+    end
+
+    # Format all the tweets in the specified list
+    def format_tweets(tweets)
+      tweets.each do |tweet|
+        tweet[:html] = format_text(tweet[:text])
+      end
+    end
+  end
+
+  # A Sidebar component which displays a list of a user's tweets
+  class TwitterFeed < TwitterSidebar
+    # Create a new Twitter sidebar based on "username"'s tweets
+    def initialize(username)
+      super()
+      @username = username
+      validate_options
+    end
+
+    # See Sidebar.render
+    def render
+      WhoNeedsWP::render_template("twitter", {
+        :tweets => tweets,
+        :feed_title => "@#{@username}"
+      })
+    end
+
+    private
+
+    # Ensure the the Twitter username is set
+    def validate_options
+      if @username == nil or @username.empty?
+        raise "You need to provide a Twitter username"
+      end
+    end
+
+    # Return a list of tweets for the specified user
+    def tweets(per_page = 5)
+      return format_tweets(Twitter::Search.new.from(@username).per_page(per_page).fetch().results)
+    end
+  end
+
+  # A Sidebar component which displays a twitter search term
+  class TwitterSearch < TwitterSidebar
+    # Create a new Twitter sidebar based on a search of "term"
+    def initialize(term)
+      super()
+      @term = term
+      validate_options
+    end
+
+    # See Sidebar.render
+    def render
+      WhoNeedsWP::render_template("twitter", {
+        :tweets => tweets,
+        :feed_title => "Tweets for \"#{@term}\""
+      })
+    end
+
+    private
+
+    # Ensure the the Twitter search term is set
+    def validate_options
+      if @term == nil or @term.empty?
+        raise "You need to provide a Twitter search term"
+      end
+    end
+
+    # Return a list of tweets for the specified user
+    def tweets(per_page = 5)
+      return format_tweets(Twitter::Search.new(@term).per_page(per_page).fetch().results)
+    end
+  end
+end

data/lib/who-needs-wp/templates/twitter.haml

@@ -7,4 +7,4 @@
     - tweets.each do |tweet|
       %li
         %span.date= Date.parse(tweet[:created_at]).strftime('%Y-%m-%d')
-        %span= WhoNeedsWP::parse_tweet tweet[:text]
+        %span= tweet[:html]

data/lib/who-needs-wp/templates.rb

@@ -1,21 +1,24 @@
-
-
 module WhoNeedsWP
+  # Render the specified template with the given options
+  def self.render_template(name, data)
+    data[:options] = @options
+    @template[name].render(Object.new, data)
+  end
 
   # Render the specified HTML contents within the layout template
   def self.render_html(filename, type, contents, title = "")
     File.open(filename, "w") do |file|
       body = @template['body'].render(Object.new, {
-                                              :content => contents, 
-                                              :options => @options, 
-                                              :sidebar => @sidebar.join,
-                                               :layout_name => type
-                                            })
+        :content => contents,
+        :options => @options,
+        :sidebar => Sidebar.render_all,
+        :layout_name => type
+      })
       file.puts @template['layout'].render(Object.new, {
-                                             :content => body,
-                                             :options => @options,
-                                             :title => title 
-                                           })
+        :content => body,
+        :options => @options,
+        :title => title
+      })
     end
   end
 

data/lib/who-needs-wp.rb

@@ -2,8 +2,8 @@
 require 'rubygems'
 require 'rdiscount'
 require 'haml'
-require 'twitter'
-require 'nokogiri'
+
+
 require 'open-uri'
 require 'sass'
 require 'makers-mark'
@@ -12,8 +12,11 @@ require 'rss/maker'
 require 'net/ssh'
 require 'net/sftp'
 require 'who-needs-wp/css.rb'
-require 'who-needs-wp/twitter.rb'
-require 'who-needs-wp/delicious.rb'
+require 'who-needs-wp/Sidebar.rb'
+require 'who-needs-wp/sidebar/twitter.rb'
+require 'who-needs-wp/sidebar/delicious.rb'
+require 'who-needs-wp/sidebar/recentposts.rb'
+require 'who-needs-wp/sidebar/pageindex.rb'
 require 'who-needs-wp/templates.rb'
 require 'who-needs-wp/posts.rb'
 require 'who-needs-wp/pages.rb'
@@ -37,10 +40,23 @@ module WhoNeedsWP
     self.load_templates
     self.load_posts
     self.load_pages
-    self.recentposts
-    self.page_index
-    self.twitter
-    self.delicious
+    if @posts.length > 0
+      RecentPosts.new
+    end 
+    if @pages.length > 0
+      PageIndex.new
+    end
+    if @options[:twitter]
+      if @options[:twitter][:username]
+        TwitterFeed.new(@options[:twitter][:username])
+      end 
+      if @options[:twitter][:search]
+        TwitterSearch.new(@options[:twitter][:search])
+      end
+    end
+    if @options[:delicious]
+      delicious = Delicious.new(@options[:delicious][:user])
+    end 
     self.generate_posts
     self.generate_pages
     self.index
@@ -56,8 +72,8 @@ module WhoNeedsWP
   # Generate the index page for the blog
   def self.index
     contents = ""
-    if @POSTS.length > 0
-      @POSTS[0..3].each do |post|
+    if @posts.length > 0
+      @posts[0..3].each do |post|
         contents << post[:html]
       end
     else
@@ -69,7 +85,7 @@ module WhoNeedsWP
   # Generate a page containing a list of all posts
   def self.all_posts
     self.render_html("posts/all.html", "post_index", @template['all_posts'].render(Object.new, { 
-                                                                              :posts => @POSTS, 
+                                                                              :posts => @posts, 
                                                                               :options => @options
                                                                             }), "All Posts")
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Owen Griffin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +00:00
+date: 2010-03-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,7 +118,6 @@ dependencies:
 description: A static web site generator.
 email: owen.griffin@gmail.com
 executables: 
-- wordpress2wnwp~
 - wordpress2wnwp
 - who-needs-wp
 extensions: []
@@ -129,10 +128,14 @@ extra_rdoc_files:
 - README.md
 files: 
 - lib/who-needs-wp.rb
+- lib/who-needs-wp/Sidebar.rb
 - lib/who-needs-wp/css.rb
-- lib/who-needs-wp/delicious.rb
 - lib/who-needs-wp/pages.rb
 - lib/who-needs-wp/posts.rb
+- lib/who-needs-wp/sidebar/delicious.rb
+- lib/who-needs-wp/sidebar/pageindex.rb
+- lib/who-needs-wp/sidebar/recentposts.rb
+- lib/who-needs-wp/sidebar/twitter.rb
 - lib/who-needs-wp/stylesheets/base.sass
 - lib/who-needs-wp/stylesheets/pygments.sass
 - lib/who-needs-wp/stylesheets/reset-fonts-grids.sass
@@ -149,7 +152,6 @@ files:
 - lib/who-needs-wp/templates/recentposts.haml
 - lib/who-needs-wp/templates/rss.haml
 - lib/who-needs-wp/templates/twitter.haml
-- lib/who-needs-wp/twitter.rb
 - LICENSE
 - README.html
 - README.md

data/bin/wordpress2wnwp~

@@ -1,6 +0,0 @@
-#!/bin/ruby
-
-prefix = ARGV[3]
-DB = Sequel.connect('postgres://localhost/#{ARGV[0]}?user=#{ARGV[1]}&password=#{ARGV[2]}')
-
-dataset = DB.from('wp_#{prefix}_posts')

data/lib/who-needs-wp/delicious.rb

@@ -1,20 +0,0 @@
-
-module WhoNeedsWP
-  def self.delicious
-    if @options[:delicious]
-      delicious = []
-      doc = Nokogiri::XML(open("http://feeds.delicious.com/v2/rss/#{@options[:delicious][:user]}?count=5"))
-      doc.xpath('//channel/item').each do |item|
-        delicious << {
-          :title => (item/'title').first.content,
-          :url => (item/'link').first.content,
-          :date => Date.parse((item/'pubDate').first.content)
-        }
-      end
-      @sidebar << @template['delicious'].render(Object.new, { 
-                                                  :posts => delicious, 
-                                                  :options => @options
-                                                })
-    end
-  end
-end

data/lib/who-needs-wp/twitter.rb

@@ -1,29 +0,0 @@
-
-module WhoNeedsWP
-  
-  def self.parse_tweet(text)
-    text = text.gsub(/(http:\/\/[^ ]+)/, '<a href="\1">\1</a>')
-    text = text.gsub(/(@([^ :]+))/, '<a href="http://twitter.com/\2">\1</a>')
-    return text.gsub(/(#([^ :]+))/, '<a href="http://twitter.com/#search?q=%23\2">\1</a>')
-  end
-  
-  def self.twitter
-    if @options[:twitter][:user] != nil and not @options[:twitter][:user].empty?
-      @logger.debug "Reading Tweets for user #{@options[:twitter][:user]}"
-      tweets = Twitter::Search.new.from(@options[:twitter][:user]).per_page(5).fetch().results
-      @sidebar << @template['twitter'].render(Object.new, { 
-                                                :tweets => tweets,  
-                                                :feed_title => "@#{@options[:twitter][:user]}",
-                                                :options => @options
-                                              })
-    end
-    if @options[:twitter][:search] != nil and not @options[:twitter][:search].empty?
-      @logger.debug "Searching Twitter for #{@options[:twitter][:search]}"
-      @sidebar << @template['twitter'].render(Object.new, { 
-                                                :tweets => Twitter::Search.new(@options[:twitter][:search]).per_page(5).fetch().results, 
-                                                :feed_title => "Tweets for \"#{@options[:twitter][:search]}\"",
-                                                :options => @options
-                                              })
-    end
-  end
-end