who-needs-wp 0.6.1 → 0.7.0

data/bin/who-needs-wp

@@ -53,11 +53,21 @@ Choice.options do
     desc 'Upload the output to an FTP address.'
   end
 
-  option :remote_addr do
-    long '--remote-addr=username'
+  option :upload_url do
+    long '--upload-url=SCP address'
     desc "Location to upload the output. To enable specify the --upload option. (Default: \"#{options[:ftp]}\")"
   end
 
+  option :use_term_extractor do
+    long '--use-term-extractor'
+    desc "Generate tags for each post / page using the Yahoo Term Extractor API."
+  end
+
+  option :index_page do
+    long '--index-page=filename'
+    desc "Override the default index page for the site. If not set then the first page in the site is used."
+  end
+
   option :help do
     long '--help'
     desc 'Show this message'

data/lib/who-needs-wp.rb

@@ -4,12 +4,17 @@ require 'rdiscount'
 require 'haml'
 require 'open-uri'
 require 'sass'
-require 'makers-mark'
+require 'kramdown'
 require 'logger'
 require 'rss/maker'
 require 'net/ssh'
 require 'net/sftp'
+require 'rexml/document'
+require 'net/http'
+
 require 'who-needs-wp/css.rb'
+require 'who-needs-wp/keywords.rb'
+require 'who-needs-wp/sitemap.rb'
 require 'who-needs-wp/Content.rb'
 require 'who-needs-wp/content/Page.rb'
 require 'who-needs-wp/content/Post.rb'
@@ -18,6 +23,7 @@ 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/sidebar/latitude.rb'
 require 'who-needs-wp/templates.rb'
 
 module WhoNeedsWP
@@ -47,6 +53,9 @@ module WhoNeedsWP
     if @options[:delicious]
       delicious = Delicious.new(@options[:delicious][:user])
     end
+    if @options[:latitude]
+      Latitude.new(@options[:latitude])
+    end
     Page.load
     Post.load
     if Post.all.length > 0
@@ -62,6 +71,7 @@ module WhoNeedsWP
     Post.index
     self.index
     self.css
+    self.sitemap
 
     if @options[:upload]
       self.upload
@@ -74,19 +84,30 @@ module WhoNeedsWP
 
   # Generate the index page for the blog
   def self.index
+    keywords = []
     contents = ""
     if Post.all.length > 0
       Post.all[0..3].each do |post|
         contents << post.html
+        keywords = keywords + post.tags
       end
     else
-      contents << Page.all.first.html
+      index_page = Page.all.first
+      if @options[:index_page]
+        Page.all.each do |page|
+          if page.filename[:original] == @options[:index_page]
+            index_page = page
+            break
+          end
+        end
+      end
+      contents = index_page.html
     end
-    self.render_html("index.html", "index", contents)
+    self.render_html("index.html", "index", contents, "", keywords, @options[:index_summary])
   end
 
   def self.upload
-    match = @options[:remote_addr].match(/(.*)@(.*):(.*)/)
+    match = @options[:upload_url].match(/(.*)@(.*):(.*)/)
     username = match[1]
     host = match[2]
     remote_path = match[3]

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

@@ -19,8 +19,9 @@ module WhoNeedsWP
     attr_accessor :summary
     # A Hash which contains the original and generated filename
     attr_accessor :filename
-    
-    
+    # An array of tags which are associated with this content
+    attr_accessor :tags
+
     def initialize(filename)
       @filename = {
         :original => filename,
@@ -30,7 +31,7 @@ module WhoNeedsWP
       @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
 
@@ -38,8 +39,10 @@ module WhoNeedsWP
     def render
       # Set the summary to be the first paragraph
       @summary = $1 if @html =~ (/(?:<p>)(.*?)(?:<\/p>)/)
+      # Append the full site URL to any links referring to the root folder
+      @html.gsub!(/(href|src)=\"\//, '\1="' + WhoNeedsWP::options[:url] + '/')
       # Render the content HTML within a page
-      WhoNeedsWP::render_html(@filename[:generated], "page", @html, @title)
+      WhoNeedsWP::render_html(@filename[:generated], "page", @html, @title, @tags, @summary)
     end
 
     private
@@ -49,7 +52,15 @@ module WhoNeedsWP
       content = File.read(@filename[:original])
       # Remove the author, if there is one from the Markdown
       content = extract_author(content)
-      @markdown = MakersMark.generate(content)
+      if WhoNeedsWP::options[:use_term_extractor]
+        @tags = YahooTermExtractor.generate_keywords(content)
+      else
+        @tags = []
+      end
+
+      @markdown = Kramdown::Document.new(content)
+      #,{:coderay => {:wrap => :div, :line_numbers => :inline,
+    #:line_number_start => 1, :tab_width => 8, :bold_every => 10, :css => :style}})
     end
 
     # Return the title of the content, based on the filename
@@ -60,18 +71,17 @@ module WhoNeedsWP
 
     # Return the filename which will be use to save rendered content
     def generate_filename(filename)
-      File.dirname(filename) + "/" + File.basename(filename, ".markdown") + ".html"
+      File.dirname(filename) + "/" + File.basename(filename, ".markdown").gsub(/[?\/]/, '') + ".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"
+      if @created_at != nil
+        # 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
-      # 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
@@ -86,4 +96,4 @@ module WhoNeedsWP
       return content
     end
   end
-end
+end

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

@@ -7,6 +7,7 @@ module WhoNeedsWP
       Dir.glob('pages/*.markdown').each do |filename|
         @@pages << Page.new(filename)
       end
+      @@pages.sort! { |a, b| a.title <=> b.title }
     end
 
     # See Content.render_content

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

@@ -6,6 +6,7 @@ module WhoNeedsWP
     def initialize(filename, created_at)
       super(filename)
       @created_at = created_at
+      generate_id
     end
 
     # A list of all the pages on the site
@@ -50,9 +51,11 @@ module WhoNeedsWP
     end
 
     def self.index(filename = "posts/index.html")
-      WhoNeedsWP::render_html(filename, "post_index", WhoNeedsWP::render_template("all_posts", {
-        :posts => @@posts
-      }), "All Posts")
+      if File.exists?(File.dirname(filename))
+        WhoNeedsWP::render_html(filename, "post_index", WhoNeedsWP::render_template("all_posts", {
+          :posts => @@posts
+        }), "All Posts")
+      end
     end
 
     # Generate an RSS feed of all the posts

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

@@ -0,0 +1,17 @@
+
+module WhoNeedsWP
+
+  class YahooTermExtractor
+    @@API_URI = URI.parse('http://api.search.yahoo.com/ContentAnalysisService/V1/termExtraction')
+    def self.generate_keywords(text)
+      return [] if text.empty? 
+      keywords = []
+      i = Net::HTTP.post_form(@@API_URI, { 'appid' => 'who-needs-wp', 'context' => text  } )
+      i = REXML::Document.new i.body
+      i.each_element("//Result") do |result| 
+        keywords << result.text
+      end
+      return keywords
+    end
+  end
+end

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

@@ -1,4 +1,3 @@
-require 'nokogiri'
 
 module WhoNeedsWP
   class Delicious < Sidebar
@@ -27,12 +26,12 @@ module WhoNeedsWP
     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|
+      doc = REXML::Document.new(open("http://feeds.delicious.com/v2/rss/#{@username}?count=5"))
+      doc.each_element('//channel/item') do |item|
         bookmarks << {
-          :title => (item/'title').first.content,
-          :url => (item/'link').first.content,
-          :date => Date.parse((item/'pubDate').first.content)
+          :title => item.get_text('title'),
+          :url => item.get_text('link'),
+          :date => Date.parse(item.get_text('pubDate').to_s)
         }
       end
       return bookmarks

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

@@ -0,0 +1,14 @@
+module WhoNeedsWP
+  class Latitude < Sidebar
+    def initialize(username)
+      super()
+      @username = username
+    end
+
+     # See Sidebar.render
+    def render
+      @logger.debug "Rendering Latitude iFrame"
+      WhoNeedsWP::render_template("latitude", { :username => @username })
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+
+module WhoNeedsWP
+  def self.sitemap
+    document = REXML::Document.new
+    urlset = document.add_element("urlset", { "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9"})
+    Post.all.each do |post|
+      url = REXML::Element.new("url")
+      urlset.add(url)
+      url.add_element("loc").text = post.url
+      url.add_element("lastmod").text = post.created_at.strftime('%Y-%m-%d')
+      url.add_element("priority").text = "0.5"
+    end
+    Page.all.each do |page|
+      url = REXML::Element.new("url")
+      urlset.add(url)
+      url.add_element("loc").text = page.url
+      url.add_element("priority").text = "0.8"
+    end
+    
+    # Generate sitemap for index page
+    url = REXML::Element.new("url")
+    
+    url.add_element("loc").text = WhoNeedsWP::options[:url] + "/index.html"
+    if Post.all.length > 0 
+      url.add_element("lastmod").text = Post.all[0].created_at.strftime('%Y-%m-%d')
+    end
+    url.add_element("priority").text = "1.0"
+    urlset.add(url)
+
+    # Write the XML document to a file
+    File.open("sitemap.xml", "w") do |file|
+      file.puts document
+    end
+
+    # Create a robots.txt which points to the sitemap.xml
+    File.open("robots.txt", "w") do |file|
+      file.puts "Sitemap: #{WhoNeedsWP::options[:url]}sitemap.xml"
+    end
+  end
+end

data/lib/who-needs-wp/stylesheets/style.sass

@@ -1,6 +1,8 @@
 @import reset-fonts-grids.sass
 @import base.sass
-@import pygments.sass
+
+iframe
+  border: 0
 
 #content.index .navigation
   display: none

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

@@ -6,7 +6,7 @@ module WhoNeedsWP
   end
 
   # Render the specified HTML contents within the layout template
-  def self.render_html(filename, type, contents, title = "")
+  def self.render_html(filename, type, contents, title = "", tags = [], summary = "")
     File.open(filename, "w") do |file|
       body = @template['body'].render(Object.new, {
         :content => contents,
@@ -17,7 +17,9 @@ module WhoNeedsWP
       file.puts @template['layout'].render(Object.new, {
         :content => body,
         :options => @options,
-        :title => title
+        :title => title,
+        :tags => tags,
+        :summary => summary
       })
     end
   end

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

@@ -1,7 +1,8 @@
-%h1 All Posts
-%ul
-  - posts.each do |post|
-    %li
-      %span.date= post.created_at.strftime('%Y-%m-%d')
-      %a.title{:href => "#{post.url}", :title => post.title}= post.title
-      %p= post.summary
+- if posts.length > 1
+  %h1 All Posts
+  %ul
+    - posts.each do |post|
+      %li
+        %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/latitude.haml

@@ -0,0 +1 @@
+%iframe{:src => "http://www.google.com/latitude/apps/badge/api?user=#{username}&type=iframe&maptype=terrain", :width => "180", :height => "300"}

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

@@ -1,10 +1,14 @@
-!!! Strict
+!!! 5
 %html
   %head
     - if options[:stylesheet] == nil or options[:stylesheet].empty?
       %link{:rel => "stylesheet", :type => "text/css", :href => "#{options[:url]}/style.css"}/
     %link{:rel => "alternate", :type => "application/atom+xml", :href => "#{options[:url]}/posts.atom", :title => "#{options[:title]} - Atom"}/
     %link{:rel => "alternate", :type => "application/rss+xml", :href => "#{options[:url]}/posts.rss", :title => "#{options[:title]} - RSS"}/
+    - if defined? tags and tags != nil and tags.length > 0
+      %meta{:name => "keywords", :content => tags.join(' ')}/
+    - if defined? summary and summary != nil and !summary.empty?
+      %meta{:name => "description", :content => summary.gsub(/<\/?[^>]*>/, "")}/
     %title
       = options[:title]
       - if defined? title and title != nil and not title.empty?
@@ -15,14 +19,16 @@
     %meta{:"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}/
   %body
     = content
+    - if options[:google_analytics] != nil and not options[:google_analytics].empty?
+      %script{:src => 'http://www.google-analytics.com/ga.js', :type => 'text/javascript'}
+        = ""
 
-  - if options[:google_analytics] != nil and not options[:google_analytics].empty?
-    %script{:src => 'http://www.google-analytics.com/ga.js', :type => 'text/javascript'}/
-    :javascript
-      try {
-      var pageTracker = _gat._getTracker("#{options[:google_analytics]}");
-      pageTracker._trackPageview();
-      } catch(err) {}
+      :javascript
+        try {
+        var pageTracker = _gat._getTracker("#{options[:google_analytics]}");
+        pageTracker._trackPageview();
+        } catch(err) {}
+  
 
 
 

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

@@ -2,8 +2,9 @@
 .page
   %h2.title
     %a{:href => "#{options[:url]}/#{page.filename[:generated]}"}= page.title
-  .author
-    by
-    = page.author
+  - if not page.author.empty?
+    .author
+      by
+      = page.author
   .content
-    ~ page.markdown
+    ~ page.markdown.to_html

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

@@ -1,4 +1,4 @@
-- if pages.length > 0
+- if pages.length > 1
   %h2 Pages
   %ul
     - pages.each do |page|

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

@@ -8,7 +8,7 @@
     by
     = post.author
   .content
-    ~ post.markdown
+    ~ post.markdown.to_html
 
 - if previous_post or next_post
   .navigation

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Owen Griffin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +01:00
+date: 2010-04-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,49 +60,49 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: choice
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 0
         - 1
         - 4
-        - 1
-        version: 1.4.1
+        version: 0.1.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: net-ssh
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
+        - 2
         - 0
-        - 1
-        version: 1.0.1
+        - 21
+        version: 2.0.21
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: makers-mark
+  name: net-sftp
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 0
-        - 1
-        - 1
-        version: 0.1.1
+        - 4
+        version: 2.0.4
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: choice
+  name: kramdown
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
@@ -110,39 +110,25 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        - 6
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: coderay
   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: 
+        - 9
         - 2
-        - 0
-        - 4
-        version: 2.0.4
+        version: 0.9.2
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 description: A static web site generator.
 email: owen.griffin@gmail.com
 executables: 
@@ -160,12 +146,14 @@ files:
 - lib/who-needs-wp/content/Page.rb
 - lib/who-needs-wp/content/Post.rb
 - lib/who-needs-wp/css.rb
+- lib/who-needs-wp/keywords.rb
 - lib/who-needs-wp/sidebar/delicious.rb
+- lib/who-needs-wp/sidebar/latitude.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/sitemap.rb
 - lib/who-needs-wp/stylesheets/base.sass
-- lib/who-needs-wp/stylesheets/pygments.sass
 - lib/who-needs-wp/stylesheets/reset-fonts-grids.sass
 - lib/who-needs-wp/stylesheets/style.sass
 - lib/who-needs-wp/templates.rb
@@ -173,6 +161,7 @@ files:
 - lib/who-needs-wp/templates/atom.haml
 - lib/who-needs-wp/templates/body.haml
 - lib/who-needs-wp/templates/delicious.haml
+- lib/who-needs-wp/templates/latitude.haml
 - lib/who-needs-wp/templates/layout.haml
 - lib/who-needs-wp/templates/page.haml
 - lib/who-needs-wp/templates/pageindex.haml

data/lib/who-needs-wp/stylesheets/pygments.sass

@@ -1,140 +0,0 @@
-.code
-  .c
-    color: #999988
-    font-style: italic 
-
-  .err
-    color: #a61717
-    background-color: #e3d2d2 
-
-  .k, .o
-    font-weight: bold 
-
-  .cm
-    color: #999988
-    font-style: italic 
-
-  .cp
-    color: #999999
-    font-weight: bold 
-
-  .c1
-    color: #999988
-    font-style: italic 
-
-  .cs
-    color: #999999
-    font-weight: bold
-    font-style: italic 
-
-  .gd
-    color: #000000
-    background-color: #ffdddd 
-
-    .x
-      color: #000000
-      background-color: #ffaaaa 
-
-  .ge
-    font-style: italic 
-
-  .gr
-    color: #aa0000 
-
-  .gh
-    color: #999999 
-
-  .gi
-    color: #000000
-    background-color: #ddffdd 
-
-    .x
-      color: #000000
-      background-color: #aaffaa 
-
-  .go
-    color: #888888 
-
-  .gp
-    color: #555555 
-
-  .gs
-    font-weight: bold 
-
-  .gu
-    color: #aaaaaa 
-
-  .gt
-    color: #aa0000 
-
-  .kc, .kd, .kp, .kr
-    font-weight: bold 
-
-  .kt
-    color: #445588
-    font-weight: bold 
-
-  .m
-    color: #009999 
-
-  .s
-    color: #d14 
-
-  .na
-    color: #008080 
-
-  .nb
-    color: #0086B3 
-
-  .nc
-    color: #445588
-    font-weight: bold 
-
-  .no
-    color: #008080 
-
-  .ni
-    color: #800080 
-
-  .ne, .nf
-    color: #990000
-    font-weight: bold 
-
-  .nn
-    color: #555555 
-
-  .nt
-    color: #000080 
-
-  .nv
-    color: #008080 
-
-  .ow
-    font-weight: bold 
-
-  .w
-    color: #bbbbbb 
-
-  .mf, .mh, .mi, .mo
-    color: #009999 
-
-  .sb, .sc, .sd, .s2, .se, .sh, .si, .sx
-    color: #d14 
-
-  .sr
-    color: #009926 
-
-  .s1
-    color: #d14 
-
-  .ss
-    color: #990073 
-
-  .bp
-    color: #999999 
-
-  .vc, .vg, .vi
-    color: #008080 
-
-  .il
-    color: #009999