who-needs-wp 0.6.0 → 0.6.1

data/bin/who-needs-wp

@@ -48,7 +48,7 @@ Choice.options do
   end
 
   option :upload do
-    short '-u'
+    short '-p'
     long '--upload'
     desc 'Upload the output to an FTP address.'
   end

data/lib/who-needs-wp.rb

@@ -2,8 +2,6 @@
 require 'rubygems'
 require 'rdiscount'
 require 'haml'
-
-
 require 'open-uri'
 require 'sass'
 require 'makers-mark'
@@ -12,25 +10,23 @@ require 'rss/maker'
 require 'net/ssh'
 require 'net/sftp'
 require 'who-needs-wp/css.rb'
+require 'who-needs-wp/Content.rb'
+require 'who-needs-wp/content/Page.rb'
+require 'who-needs-wp/content/Post.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'
 
 module WhoNeedsWP
-  # A list of HTML strings which will be the sidebar
-  @sidebar = []
 
   # Map of templates which are used to render content
   @template = []
 
   # Logger
   @logger = Logger.new(STDOUT)
-
   # Generate the site with the specified options
   def self.generate(options)
     @options = options
@@ -38,58 +34,57 @@ module WhoNeedsWP
       @options[:url] = ''
     end
     self.load_templates
-    self.load_posts
-    self.load_pages
-    if @posts.length > 0
-      RecentPosts.new
-    end 
-    if @pages.length > 0
-      PageIndex.new
-    end
+    #self.load_posts
+
     if @options[:twitter]
       if @options[:twitter][:username]
         TwitterFeed.new(@options[:twitter][:username])
-      end 
+      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
+    end
+    Page.load
+    Post.load
+    if Post.all.length > 0
+      RecentPosts.new
+    end
+    if Page.all.length > 0
+      PageIndex.new
+    end
+    Page.render_all
+    Post.render_all
+    Post.atom
+    Post.rss
+    Post.index
     self.index
-    self.all_posts
     self.css
-    self.rss("posts.rss")
-    self.atom("posts.atom")
-    if @options[:upload] 
+
+    if @options[:upload]
       self.upload
     end
   end
 
+  def self.options
+    @options
+  end
+
   # Generate the index page for the blog
   def self.index
     contents = ""
-    if @posts.length > 0
-      @posts[0..3].each do |post|
-        contents << post[:html]
+    if Post.all.length > 0
+      Post.all[0..3].each do |post|
+        contents << post.html
       end
     else
-      contents << @pages.first[:html]
+      contents << Page.all.first.html
     end
     self.render_html("index.html", "index", contents)
   end
 
-  # 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, 
-                                                                              :options => @options
-                                                                            }), "All Posts")
-  end
-
   def self.upload
     match = @options[:remote_addr].match(/(.*)@(.*):(.*)/)
     username = match[1]
@@ -105,15 +100,15 @@ module WhoNeedsWP
     Net::SFTP.start(host, username) do |sftp|
       Dir.glob("**/*") do |filename|
         basename = File.basename(filename)
-        if basename =~ /^\..*$/ or 
-            basename =~ /.*\.markdown$/ or 
-            basename =~ /^.*~$/ or 
-            basename =~ /^\#.*\#$/
+        if basename =~ /^\..*$/ or
+        basename =~ /.*\.markdown$/ or
+        basename =~ /^.*~$/ or
+        basename =~ /^\#.*\#$/
           @logger.debug "Skipping #{filename}"
         else
           remote_filename = remote_path + filename.sub(local_path, '')
           @logger.debug "Remote filename = #{remote_filename}"
-          
+
           # If the directory does not exist then create it
           begin
             if File.directory? filename
@@ -128,23 +123,23 @@ module WhoNeedsWP
           end
 
           if not File.directory? filename
-          # If the file does not exist then create it
-          begin
-            status = sftp.stat!(remote_filename)
-          rescue Net::SFTP::StatusException
-            @logger.debug "#{remote_filename} does not exist"
-            sftp.upload!(filename, remote_filename)
-            sftp.setstat(remote_filename, :permissions => permissions[:file])
-            next
-          end
+            # If the file does not exist then create it
+            begin
+              status = sftp.stat!(remote_filename)
+            rescue Net::SFTP::StatusException
+              @logger.debug "#{remote_filename} does not exist"
+              sftp.upload!(filename, remote_filename)
+              sftp.setstat(remote_filename, :permissions => permissions[:file])
+              next
+            end
 
-          # If the local file has changed then upload it
-          if File.stat(filename).mtime > Time.at(status.mtime)
-            @logger.debug "Copying #{filename} to #{remote_filename}"
-            sftp.upload!(filename, remote_filename)
-          else
-            @logger.debug "Skipping #{filename}"
-          end
+            # If the local file has changed then upload it
+            if File.stat(filename).mtime > Time.at(status.mtime)
+              @logger.debug "Copying #{filename} to #{remote_filename}"
+              sftp.upload!(filename, remote_filename)
+            else
+              @logger.debug "Skipping #{filename}"
+            end
           end
         end
       end

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

@@ -0,0 +1,89 @@
+module WhoNeedsWP
+  # Class for storing content which is rendered on the site
+  class Content
+    # Unique identifier of the content, can be used in RSS & Atom feeds
+    attr_accessor :id
+    # HTML content of the content
+    attr_accessor :html
+    # Original Markdown content
+    attr_accessor :markdown
+    # Title of the content derived from the filename
+    attr_accessor :title
+    # Author of the content
+    attr_accessor :author
+    # The full URL of this peice of content
+    attr_accessor :url
+    # A tiny URL which can be used when referring to this content
+    attr_accessor :tiny_url
+    # A short summary of this content, normally first paragraph
+    attr_accessor :summary
+    # A Hash which contains the original and generated filename
+    attr_accessor :filename
+    
+    
+    def initialize(filename)
+      @filename = {
+        :original => filename,
+        :generated => generate_filename(filename)
+      }
+      @title = generate_title(filename)
+      @url = WhoNeedsWP::options[:url] + '/' + @filename[:generated]
+      # Set the default author of the content to be the site author
+      @author = WhoNeedsWP::options[:author]
+
+      read_file
+    end
+
+    # Render this peice of content
+    def render
+      # Set the summary to be the first paragraph
+      @summary = $1 if @html =~ (/(?:<p>)(.*?)(?:<\/p>)/)
+      # Render the content HTML within a page
+      WhoNeedsWP::render_html(@filename[:generated], "page", @html, @title)
+    end
+
+    private
+
+    # Read the content from the filename
+    def read_file
+      content = File.read(@filename[:original])
+      # Remove the author, if there is one from the Markdown
+      content = extract_author(content)
+      @markdown = MakersMark.generate(content)
+    end
+
+    # Return the title of the content, based on the filename
+    def generate_title(filename)
+      match = filename.match(/.*\/([^\.]*)/)
+      return match[1].gsub(/_/, ' ')
+    end
+
+    # Return the filename which will be use to save rendered content
+    def generate_filename(filename)
+      File.dirname(filename) + "/" + File.basename(filename, ".markdown") + ".html"
+    end
+
+    # Generate a unique ID for this content
+    def generate_id
+      if self.created_at == nil
+        raise "Content must have a timestamp before a unique ID can be generated"
+      end
+      # Replace the HTTP from the URL with tag:
+      @id = (WhoNeedsWP::options[:url] + @filename[:generated]).gsub(/http:\/\//, 'tag:')
+      match = @id.match(/([^\/]*)\/(.*)/)
+      @id = "#{match[1]},#{self.created_at.strftime('%Y-%m-%d')}:#{match[2]}" if match
+    end
+
+    # Read the author from the Markdown content. If none exists
+    # then set the default author.
+    def extract_author(content)
+      match = content.match(/^[aA]uthor: (.*)$/o)
+      if match
+        @author = match[1]
+        # Remove the author from the post text
+        content.gsub! /^[aA]uthor: .*$/, ''
+      end
+      return content
+    end
+  end
+end

data/lib/who-needs-wp/content/Page.rb

@@ -0,0 +1,33 @@
+module WhoNeedsWP
+  class Page < Content
+    # A list of all the pages on the site
+    @@pages = []
+    # Load all pages
+    def self.load
+      Dir.glob('pages/*.markdown').each do |filename|
+        @@pages << Page.new(filename)
+      end
+    end
+
+    # See Content.render_content
+    def render
+      @html = WhoNeedsWP::render_template("page", {
+        :page => self,
+        :title => @title
+      })
+      super()
+    end
+
+    # Render all the pages loaded
+    def self.render_all
+      @@pages.each do |page|
+        page.render
+      end
+    end
+
+    # Return all the pages created
+    def self.all
+      return @@pages
+    end
+  end
+end

data/lib/who-needs-wp/content/Post.rb

@@ -0,0 +1,76 @@
+module WhoNeedsWP
+  class Post < Content
+    # Date at which content was created, or specified in filing structure
+    attr_accessor :created_at
+    # Create a new Post object
+    def initialize(filename, created_at)
+      super(filename)
+      @created_at = created_at
+    end
+
+    # A list of all the pages on the site
+    @@posts = []
+
+    # Load all pages
+    def self.load
+      Dir.glob('posts/**/*.markdown').each do |filename|
+        match = filename.match(/([0-9]{4})\/([0-9]{2})\/([0-9]{2})\/([^\.]*)/)
+        date = DateTime.new(match[1].to_i, match[2].to_i, match[3].to_i)
+        @@posts << Post.new(filename, date)
+      end
+      # Sort the posts
+      @@posts.sort! { |a, b| a.created_at <=> b.created_at }
+      @@posts.reverse!
+    end
+
+    # See Content.render_content
+    def render(previous_post, next_post)
+      @html = WhoNeedsWP::render_template("post", {
+        :post => self,
+        :title => @title,
+        :previous_post => previous_post,
+        :next_post => next_post
+      })
+      super()
+    end
+
+    # Render all the posts loaded
+    def self.render_all
+      @@posts.each_index do |index|
+        post = @@posts[index]
+        previous_post = @@posts[index + 1] if index + 1 < @@posts.length
+        next_post = @@posts[index - 1] if index > 1
+        post.render(previous_post, next_post)
+      end
+    end
+
+    # Return all the posts created
+    def self.all
+      return @@posts
+    end
+
+    def self.index(filename = "posts/index.html")
+      WhoNeedsWP::render_html(filename, "post_index", WhoNeedsWP::render_template("all_posts", {
+        :posts => @@posts
+      }), "All Posts")
+    end
+
+    # Generate an RSS feed of all the posts
+    def self.rss(filename = "posts.rss")
+      File.open(filename, "w") do |file|
+        file.write WhoNeedsWP::render_template("rss", {
+          :posts => @@posts
+        })
+      end
+    end
+
+    # Generate an ATOM feed of all the posts
+    def self.atom(filename = "posts.atom")
+      File.open(filename, "w") do |file|
+        file.write WhoNeedsWP::render_template("atom", {
+          :posts => @@posts
+        })
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module WhoNeedsWP
   class PageIndex < Sidebar
     # See Sidebar.render
     def render
-      WhoNeedsWP::render_template("pageindex", { :pages => WhoNeedsWP::get_pages })
+      WhoNeedsWP::render_template("pageindex", { :pages => WhoNeedsWP::Page.all })
     end
   end
 end

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

@@ -3,7 +3,7 @@ module WhoNeedsWP
   class RecentPosts < Sidebar
     # See Sidebar.render
     def render
-      WhoNeedsWP::render_template("recentposts", { :posts => WhoNeedsWP::get_posts[0..5] })
+      WhoNeedsWP::render_template("recentposts", { :posts => WhoNeedsWP::Post.all[0..5] })
     end
   end
 end

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

@@ -2,5 +2,6 @@
 %ul
   - posts.each do |post|
     %li
-      %span.date= post[:created_at].strftime('%Y-%m-%d')
-      %a.title{:href => "#{options[:url]}/#{post[:filename][:generated]}", :title => post[:title]}= post[:title]
+      %span.date= post.created_at.strftime('%Y-%m-%d')
+      %a.title{:href => "#{post.url}", :title => post.title}= post.title
+      %p= post.summary

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

@@ -1,19 +1,19 @@
 !!! XML utf-8
 %feed{:xmlns => "http://www.w3.org/2005/Atom"}
   %title= options[:title]
-  %id= "#{options[:url]}posts.atom"
+  %id= "#{options[:url]}/posts.atom"
   %updated= "#{Time.now.xmlschema}"
   %author
     %name= options[:author]
   %link{:href => "#{options[:url]}"}/
   - posts.each do |post|
     %entry
-      %title= post[:title]
-      %id= post[:id]
-      %updated= Time.parse(post[:created_at].to_s).xmlschema
-      %link{:href => "#{options[:url]}/#{post[:filename][:generated]}"}/
-      %content{:type => "text/html", :src => "#{options[:url]}/#{post[:filename][:generated]}"}/
+      %title= post.title
+      %id= post.id
+      %updated= Time.parse(post.created_at.to_s).xmlschema
+      %link{:href => "#{options[:url]}/#{post.filename[:generated]}"}/
+      %content{:type => "text/html", :src => "#{options[:url]}/#{post.filename[:generated]}"}/
       %summary{:type => "html"}
         :cdata
-          #{post[:summary]}
+          #{post.summary}
         

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

@@ -20,7 +20,7 @@
     %script{:src => 'http://www.google-analytics.com/ga.js', :type => 'text/javascript'}/
     :javascript
       try {
-      var pageTracker = _gat._getTracker("#{options[:google_analytics]}_");
+      var pageTracker = _gat._getTracker("#{options[:google_analytics]}");
       pageTracker._trackPageview();
       } catch(err) {}
 

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

@@ -1,9 +1,9 @@
 
 .page
   %h2.title
-    %a{:href => "#{options[:url]}/#{page[:filename][:generated]}"}= page[:title]
+    %a{:href => "#{options[:url]}/#{page.filename[:generated]}"}= page.title
   .author
     by
-    = page[:author]
+    = page.author
   .content
-    ~ page[:markdown]
+    ~ page.markdown

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

@@ -3,4 +3,4 @@
   %ul
     - pages.each do |page|
       %li
-        %a.title{:href => "#{options[:url]}/#{page[:filename][:generated]}", :title => page[:title]}= page[:title]
+        %a.title{:href => "#{options[:url]}/#{page.filename[:generated]}", :title => page.title}= page.title

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

@@ -1,14 +1,14 @@
 
 .post
   %h2.title
-    %a{:href => "#{options[:url]}/#{post[:filename][:generated]}"}= post[:title]
+    %a{:href => "#{post.url}"}= post.title
   .date
-    = post[:created_at].strftime("%B %d, %Y") 
+    = post.created_at.strftime("%B %d, %Y") 
   .author
     by
-    = post[:author]
+    = post.author
   .content
-    ~ post[:markdown]
+    ~ post.markdown
 
 - if previous_post or next_post
   .navigation
@@ -17,9 +17,9 @@
       - if previous_post
         %li
           Previous:
-          %a.next{:href => "#{options[:url]}/#{previous_post[:filename][:generated]}", :title => "#{previous_post[:title]}"}= "#{previous_post[:title]}"
+          %a.next{:href => "#{previous_post.url}", :title => "#{previous_post.title}"}= "#{previous_post.title}"
 
       - if next_post
         %li
           Next:
-          %a.next{:href => "#{options[:url]}/#{next_post[:filename][:generated]}", :title => "#{next_post[:title]}"}= "#{next_post[:title]}"
+          %a.next{:href => "#{next_post.url}", :title => "#{next_post.title}"}= "#{next_post.title}"

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

@@ -3,7 +3,7 @@
   %ul
     - posts.each do |post|
       %li
-        %span.date= post[:created_at].strftime('%Y-%m-%d')
-        %a.title{:href => "#{options[:url]}/#{post[:filename][:generated]}", :title => post[:title]}= post[:title]
+        %span.date= post.created_at.strftime('%Y-%m-%d')
+        %a.title{:href => "#{options[:url]}/#{post.filename[:generated]}", :title => post.title}= post.title
     %li
-      %a{:href => "#{options[:url]}/posts/all.html", :title => "All posts"} more
+      %a{:href => "#{options[:url]}/posts/index.html", :title => "All posts"} more

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

@@ -6,10 +6,10 @@
     %link= options[:url]
     - posts.each do |post|
       %item
-        %title= post[:title]
-        %link= "#{options[:url]}/#{post[:filename][:generated]}"
-        %guid= "#{options[:url]}/#{post[:filename][:generated]}"
-        %pubDate= Time.parse(post[:created_at].to_s).rfc822
+        %title= post.title
+        %link= "#{options[:url]}/#{post.filename[:generated]}"
+        %guid= "#{options[:url]}/#{post.filename[:generated]}"
+        %pubDate= Time.parse(post.created_at.to_s).rfc822
         %description
           :cdata
-            #{post[:summary]}
+            #{post.summary}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Owen Griffin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-28 00:00:00 +00:00
+date: 2010-03-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,34 @@ dependencies:
         version: 0.1.4
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 21
+        version: 2.0.21
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: net-sftp
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :runtime
+  version_requirements: *id009
 description: A static web site generator.
 email: owen.griffin@gmail.com
 executables: 
@@ -124,14 +152,14 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.html
 - README.md
 files: 
 - lib/who-needs-wp.rb
+- lib/who-needs-wp/Content.rb
 - lib/who-needs-wp/Sidebar.rb
+- lib/who-needs-wp/content/Page.rb
+- lib/who-needs-wp/content/Post.rb
 - lib/who-needs-wp/css.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
@@ -153,7 +181,6 @@ files:
 - lib/who-needs-wp/templates/rss.haml
 - lib/who-needs-wp/templates/twitter.haml
 - LICENSE
-- README.html
 - README.md
 has_rdoc: true
 homepage: http://github.com/owengriffin/who-needs-wp

data/README.html

@@ -1,132 +0,0 @@
-<h1>who-needs-wp</h1>
-
-<p><em>Who needs Wordpress?</em></p>
-
-<p>The majority of web sites are consumed. Visitors will stumble upon the site, read a few pages (if you're lucky) and then disappear. Normally for every visitor to the site each webpage is generated dynamically. Each visitor has their own version of the web page for that particular moment of time. Is this really necessary? How often does the content on the web site you are visiting change?</p>
-
-<p>Take blogs for example. I have a blog written using the excellent Wordpress software. I'm able to write posts within Wordpress and see them appear on the web site without leaving my web browser. My posts are held in a database, when a user requests to view my blog multiple requests are made to the database to build a dynamic page on which contents rarely changes. I create a new blog post every 3 weeks, it seems a bit unnecessary to generate a web page when the content hasn't changed.</p>
-
-<p>There is another option. Instead of generating the web site dynamically when the page is requested I can generate the web page whenever the content changes. So whenever I create a new post - I regenerate the site. </p>
-
-<p>This has the advantage of serving web pages faster; I use less hosting space; and I cut any unnecessary features which Wordpress provides.</p>
-
-<p>The main disadvantage is that user's aren't able to comment on my posts - but this don't matter too much - nobody ever did! ;-)</p>
-
-<h2>Getting Started</h2>
-
-<p>who-needs-wp is a small Ruby program which helps generate static web sites. To start using who-needs-wp you need to install Ruby. On Ubuntu enter the following into a command prompt:</p>
-
-<pre><code>sudo apt-get install ruby ruby-dev rubygems
-</code></pre>
-
-<p>You then need to install who-needs-wp by running the following:</p>
-
-<pre><code>sudo gem install who-needs-wp
-</code></pre>
-
-<p>Ensure that Ruby gems is in your <code>PATH</code> variable by opening <code>~/.bashrc</code> and entering:</p>
-
-<pre><code>export PATH=/var/lib/gems/1.8/bin:$PATH
-</code></pre>
-
-<p>You'll need to re-load the <code>.bashrc</code> file by using the following command:</p>
-
-<pre><code>. ~/.bashrc
-</code></pre>
-
-<p>Now create a folder which will host your web site</p>
-
-<pre><code>mkdir /var/www/website/
-</code></pre>
-
-<p>who-needs-wp stores posts in the <code>posts/</code> folder followed by a folder representing the date of the post. i.e. <code>posts/year/month/day</code>.</p>
-
-<p>Create an example post by creating a folder and creating a Markdown file.</p>
-
-<pre><code>mkdir /var/www/website/posts/2010/03/15/ --parents
-gedit /var/www/website/posts/2010/03/15/An_example_post.markdown
-</code></pre>
-
-<p>The filename will be used as the title for the page - all the underscores will be replaced with spaces.</p>
-
-<p>Along with <a href="http://daringfireball.net/projects/markdown/syntax">Markdown Syntax</a> you can also specify the author of the blog post within the file:</p>
-
-<pre><code>Author: Your Name
-</code></pre>
-
-<p>Before it can generate the site who-needs-wp needs to be configured. Copy the following into <code>/var/www/website/.who-needs-wp.yaml</code></p>
-
-<pre><code>--- 
-:url: /website/test
-:title: An example blog
-:author: Your Name
-</code></pre>
-
-<p>These are the properties which are used to generate the website:</p>
-
-<ul>
-<li><code>url</code> - The base URL of the website</li>
-<li><code>title</code> - A title for the index of your site</li>
-<li><code>author</code> - When a author is not specified within the post this author is displayed</li>
-</ul>
-
-<p>Now you can generate your site:</p>
-
-<pre><code>who-needs-wp .
-</code></pre>
-
-<p>And view the blog at the following URL:</p>
-
-<pre><code>http://localhost/website/
-</code></pre>
-
-<h2>Overriding Templates</h2>
-
-<p>You will probably find that the templates used by who-needs-wp don't quite match your requirements. You can override any of the templates by creating a <code>templates</code> folder. You can copy the existing templates from the gem as a starting point. The templates are stored within the <code>/var/lib/gems/1.8/gems/who-needs-wp-0.1.0/lib/who-needs-wp/templates/</code>. </p>
-
-<h2>Applying alternative styles</h2>
-
-<p>You can specify an additional stylesheet by using the <code>-s</code> or <code>--stylesheet</code> option to the who-needs-wp command.</p>
-
-<h2>Twitter</h2>
-
-<p>who-needs-wp can place a <a href="http://twitter.com/">Twitter</a> stream in the side bar. This can either be a search or an individual user's feed.</p>
-
-<p>Modifying <code>.who-needs-wp.yaml</code> and add:</p>
-
-<pre><code>:twitter:
-  :user: &lt;your twitter user&gt;
-  :search: &lt;your twitter search&gt;
-</code></pre>
-
-<h2>Delicious</h2>
-
-<p>who-needs-wp can also display a list of bookmarks from <a href="http://del.icio.us/">Delicious</a>. Modify <code>.who-needs-wp.yaml</code> and add:</p>
-
-<pre><code>:delicious:
-  :user: &lt;your delicious username&gt;
-</code></pre>
-
-<h2>Google Analytics</h2>
-
-<p>To enable Google Analytics you need to specify your web property ID in <code>.who-needs-wp.yaml</code>. For example:</p>
-
-<pre><code>:google_analytics: UA-XXXXXXXX
-</code></pre>
-
-<h2>Syntax Highlighting</h2>
-
-<p>who-needs-wp will syntax highlight your code snippets using <a href="http://github.com/nakajima/makers-mark">Makers-Mark</a> and <a href="http://pygments.org/">Pygments</a></p>
-
-<h2>Migration from Wordpress</h2>
-
-<p>Packaged with who-needs-wp is a simple script called wordpress2wnwp which aids migrating from Wordpress. wordpress2wnwp exports posts from a MySQL database and outputs them in the who-needs-wp filing structure. It also generates Apache2 <code>RewriteRule</code>s which rewrite any Wordpress URLs to who-needs-wp.</p>
-
-<p>To find more information on wordpress2wnwp enter the following command:</p>
-
-<pre><code>wordpress2wnwp -h
-</code></pre>
-
-<h3>Copyright</h3>
-
-<p>Copyright (c) 2010 Owen Griffin. See LICENSE for details.</p>

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

@@ -1,47 +0,0 @@
-
-module WhoNeedsWP
-  def self.load_pages
-    @pages = []
-    Dir.glob('pages/*.markdown').each do |filename|
-      @logger.debug "Loading page #{filename}"
-      match = filename.match(/.*\/([^\.]*)/)
-      @pages << {
-        :filename => { 
-          :original => filename,
-          :generated => File.dirname(filename) + "/" + File.basename(filename, ".markdown") + ".html"
-        },
-        :title => match[1].gsub(/_/, ' ')
-      }
-    end
-  end
-  
-  def self.get_pages
-    @pages
-  end
-
-  def self.generate_pages
-    @pages.each do |page|
-
-      markdown = File.read(page[:filename][:original])
-
-      page[:author] = @options[:author]
-
-      match = markdown.match(/^[aA]uthor: (.*)$/o)
-      if match
-        page[:author] = match[1]
-        # Remove the author from the post text
-        markdown.gsub! /^[aA]uthor: .*$/, ''
-      end
-
-      # post[:markdown] = RDiscount.new(markdown, :smart, :generate_toc).to_html
-      page[:markdown] = MakersMark.generate(markdown)
-      page[:html] = @template['page'].render(Object.new, {
-                                               :page => page, 
-                                               :title => page[:title],
-                                               :options => @options
-                                             })
-      # Render the page as HTML
-      self.render_html(page[:filename][:generated], "page", page[:html], page[:title])
-    end
-  end
-end

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

@@ -1,89 +0,0 @@
-
-module WhoNeedsWP
-  def self.load_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})\/([^\.]*)/)
-      date = DateTime.new(match[1].to_i, match[2].to_i, match[3].to_i)
-      generated_filename = File.dirname(filename) + "/" + File.basename(filename, ".markdown") + ".html" 
-      post = {
-        :filename => { 
-          :original => filename,
-          :generated => generated_filename,
-        },
-        :title => match[4].gsub(/_/, ' '),
-        :created_at => date
-      }
-      # Generate a unique post ID to be used in the Atom feed
-      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
-    end
-    # Sort the posts, newest first
-    @posts.sort! { |a, b| a[:created_at] <=> b[:created_at] }
-    @posts.reverse!
-  end
-  
-  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], 
-                                                 :options => @options
-                                               })
-    file.close
-  end
-
-  def self.atom(filename, limit=10)
-    file = File.open(filename, "w")
-    file.write @template['atom'].render(Object.new, { 
-                                                 :posts => @posts[0..limit], 
-                                                 :options => @options
-                                               })
-    file.close
-  end
-
-  def self.generate_posts
-    @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
-
-      # Read the contents of the file
-      markdown = File.read(post[:filename][:original])
-      
-      # Specify the default author
-      post[:author] = @options[:author]
-
-      # Check to see if the author of the document is specified with "Author:"
-      match = markdown.match(/^[aA]uthor: (.*)$/o)
-      if match
-        post[:author] = match[1]
-        # Remove the author from the post text
-        markdown.gsub! /^[aA]uthor: .*$/, ''
-      end
-
-      # post[:markdown] = RDiscount.new(markdown, :smart, :generate_toc).to_html
-      post[:markdown] = MakersMark.generate(markdown)
-      post[:html] = @template['post'].render(Object.new, {
-                                               :post => post, 
-                                               :title => post[:title],
-                                               :options => @options,
-                                               :next_post => next_post,
-                                               :previous_post => previous_post
-                                             })
-      # Set the summary of the post to be the first paragraph
-      post[:summary] = $1 if post[:html] =~ (/(?:<p>)(.*?)(?:<\/p>)/)
-      
-      # Render the post as HTML
-      self.render_html(post[:filename][:generated], "post", post[:html], post[:title])
-    end
-  end
-end