shinmun 0.2 → 0.5

data/lib/shinmun/helpers.rb

@@ -2,85 +2,6 @@ module Shinmun
 
   module Helpers
 
-    # Render a hash as attributes for a HTML tag. 
-    def attributes(attributes)
-      attributes.map { |k, v| %Q{#{k}="#{v}"} }.join(' ')
-    end
-
-    # Render a HTML tag with given name. 
-    # The last argument specifies the attributes of the tag.
-    # The second argument may be the content of the tag.
-    def tag(name, *args)
-      text, attributes = args.first.is_a?(Hash) ? [nil, args.first] : args
-      "<#{name} #{attributes(attributes)}>#{text}</#{name}>"
-    end
-
-    # Render stylesheet link tag
-    def stylesheet_link_tag(*names)
-      options = names.last.is_a?(Hash) ? names.pop : {}
-      options[:media] ||= 'screen'
-      names.map { |name|
-        mtime = File.mtime("assets/#{blog.stylesheets_path}/#{name}.css").to_i
-        path = "/#{blog.stylesheets_path}/#{name}.css?#{mtime}"
-        tag :link, :href => path, :rel => 'stylesheet', :media => options[:media]
-      }.join("\n")
-    end
-
-    # Render javascript tag
-    def javascript_tag(*names)
-      names.map { |name|
-        mtime = File.mtime("assets/#{blog.javascripts_path}/#{name}.js").to_i
-        path = "/#{blog.javascripts_path}/#{name}.js?#{mtime}"
-        tag :script, :src => path, :type => 'text/javascript'
-      }.join("\n")
-    end
-
-    # Render an image tag
-    def image_tag(file, options = {})
-      mtime = File.mtime("assets/#{blog.images_path}/#{file}").to_i
-      path = "/#{blog.images_path}/#{file}?#{mtime}"
-      tag :img, options.merge(:src => path)
-    end
-
-    # Render a link
-    def link_to(text, path, options = {})
-      tag :a, text, options.merge(:href => path)
-    end
-
-    # Render a link to a post
-    def post_link(post)
-      link_to post.title, "#{blog.base_path}/#{post.path}.html"
-    end
-
-    # Render a link to an archive page.
-    def archive_link(year, month)
-      link_to "#{Date::MONTHNAMES[month]} #{year}", "#{blog.base_path}/#{year}/#{month}/index.html"
-    end
-
-    # Render a date or time in a nice human readable format.
-    def date(time)
-      "%s %d, %d" % [Date::MONTHNAMES[time.month], time.day, time.year]
-    end
-
-    # Render a date or time in rfc822 format. This will be used for rss rendering.
-    def rfc822(time)
-      time.strftime("%a, %d %b %Y %H:%M:%S %z")
-    end
-
-    def markdown(text, *args)
-      BlueCloth.new(text, *args).to_html
-    rescue => e      
-      "#{text}<br/><br/><strong style='color:red'>#{e.message}</strong>"
-    end
-
-    def strip_tags(str)
-      str.gsub(/<\/?[^>]*>/, "")
-    end
-
-    def urlify(string)
-      string.downcase.gsub(/[ -]+/, '-').gsub(/[^-a-z0-9_]+/, '')
-    end
-
     # taken form ActionView::Helpers
     def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
       from_time = from_time.to_time if from_time.respond_to?(:to_time)
@@ -111,6 +32,51 @@ module Shinmun
       else                      "over #{(distance_in_minutes / 525600).round} years"
       end
     end
+
+    def post_path(post)
+      "#{base_path}/#{post.year}/#{post.month}/#{post.name}"
+    end    
+
+    def archive_path(year, month)
+      "#{base_path}/#{year}/#{month}"
+    end
+
+    # Render a link to a post
+    def post_link(post)
+      link_to post.title, post_path(post)
+    end
+
+    # Render a link to an archive page.
+    def archive_link(year, month)
+      link_to "#{Date::MONTHNAMES[month]} #{year}", archive_path(year, month)
+    end
+
+    # Render a date or time in a nice human readable format.
+    def human_date(time)
+      "%s %d, %d" % [Date::MONTHNAMES[time.month], time.day, time.year]
+    end
+
+    # Render a date or time in rfc822 format.
+    def rfc822(time)
+      time.strftime("%a, %d %b %Y %H:%M:%S %z")
+    end
+    
+    # Render a link for the navigation bar. If the text of the link
+    # matches the @header variable, the css class will be set to acitve.
+    def navi_link(text, path)
+      link_to text, path, :class => (request.path_info == path) ? 'active' : nil
+    end
+
+    def html_escape(s)
+      s.to_s.gsub(/>/, '&gt;').gsub(/</n, '&lt;')
+    end
+
+    def diff_line_class(line)
+      case line[0, 1]
+      when '+' then 'added'
+      when '-' then 'deleted'
+      end
+    end
+
   end
-  
 end

data/lib/shinmun/post.rb

@@ -7,35 +7,50 @@ module Shinmun
   #     --- 
   #     category: Ruby
   #     date: 2008-09-05
-  #      
-  #     BlueCloth, a Markdown library
-  #     =============================
-  #
+  #     title: BlueCloth, a Markdown library
+  #     ---
   #     This is the summary, which is by definition the first paragraph of the
   #     article. The summary shows up in list views and rss feeds.  
   #
   class Post
 
-    # Define accessor methods for head variable.
-    def self.head_accessor(*names)
-      names.each do |name|
-        name = name.to_s
-        define_method(name) { @head[name] }
-        define_method("#{name}=") {|v| @head[name] = v }
-      end
+    %w[title author date category tags].each do |name|
+      define_method(name) { head[name] }
+      define_method("#{name}=") {|v| head[name] = v }
     end
 
-    attr_accessor :prefix, :path, :type, :title, :head, :body, :summary, :body_html
-    head_accessor :author, :date, :category, :tags, :languages, :header
+    attr_accessor :dirname, :name, :type, :src, :head, :body, :summary, :body_html, :tag_list
 
     # Initialize empty post and set specified attributes.
     def initialize(attributes={})
       @head = {}
       @body = ''
       
-      for k, v in attributes
+      attributes.each do |k, v|
         send "#{k}=", v
       end
+
+      @type ||= 'md'
+      
+      parse(src) if src
+
+      raise "post without a title" if title.nil?
+      
+      @name ||= title.downcase.gsub(/[ -]+/, '-').gsub(/[^-a-z0-9_]+/, '')
+      @dirname = date ? "posts/#{year}/#{month}" : 'pages'      
+    end
+
+    def method_missing(id, *args)
+      key = id.to_s
+      if @head.has_key?(key)
+        @head[key]
+      else
+        raise NoMethodError, "undefined method `#{id}' for #{self}", caller(1)
+      end
+    end
+
+    def date=(date)
+      @head['date'] = String === date ? Date.parse(date) : date
     end
 
     # Shortcut for year of date
@@ -46,111 +61,51 @@ module Shinmun
     # Shortcut for month of date
     def month
       date.month
-    end    
+    end
 
     def filename
-      "#{prefix}/#{path}.#{type}"
+      "#{name}.#{type}"
     end
 
-    # Strips off extension and prefix.
-    def filename=(file)
-      if match = file.match(/^(.*?)\/(.*)\.(.*)/)
-        @prefix = match[1]
-        @path = match[2]
-        @type = match[3]
-      else
-        raise "incorrect filename: #{file}"
-      end
+    def filename=(filename)
+      self.name, self.type = filename.split('.')
+    end
+
+    def path
+      dirname.to_s.empty? ? filename : "#{dirname}/#{filename}"
+    end
+
+    def path=(path)
+      list = path.split('/')
+      self.dirname = list[0..-2].join('/')
+      self.filename = list[-1]
     end
 
     # Split up the source into header and body. Load the header as
-    # yaml document. Render body and parse the summary from rendered html.
+    # yaml document.
     def parse(src)
-      # Parse YAML header if present
-      if src =~ /---.*?\n(.*?)\n\n(.*)/m
+      if src =~ /\A---(.*?)---(.*)/m
         @head = YAML.load($1)
         @body = $2
       else
-        @body = src
+        raise ArgumentError, "yaml header not found in src"
       end
 
-      @title = head['title'] or parse_title
-      @body_html = transform(body, type)
+      @body_html = transform(@body)
       @summary = body_html.split("\n\n")[0]
+      @tag_list = tags.to_s.split(",").map { |s| s.strip }      
+      @dirname = date ? "posts/#{year}/#{month}" : 'pages'
 
       self
     end
 
-    # Parse title from different formats
-    def parse_title
-      lines = body.split("\n")
-
-      case type
-      when 'md'
-        @title = lines.shift.sub(/(^#+|#+$)/,'').strip
-        lines.shift if lines.first.match(/^(=|-)+$/)
-
-      when 'html'
-        @title = lines.shift.sub(/(<h1>|\<\/h1>)/,'').strip
-
-      when 'tt'
-        @title = lines.shift.sub(/(^h1.)/,'').strip
-      end
-
-      @body = lines.join("\n")
-    end
-
-    # Convert to yaml for caching.
-    def to_yaml
-      head.merge('author' => author,
-                 'path' => path,
-                 'type' => type,
-                 'title' => title,
-                 'summary' => summary,
-                 'body_html' => body_html).to_yaml
-    end
-
-    # Convert to string representation, used to create new posts.
+    # Convert to string representation
     def dump
-      head = self.head.dup
-      body = self.body.dup
-
-      if type == 'md'        
-        body = title + "\n" + ("=" * title.size) + "\n\n" + body
-      end
-
-      head.each do |k, v|        
-        head.delete(k) if v.nil? || v.empty?
-      end
-      
-      if head.empty?
-        body
-      else
-        head.to_yaml + "\n\n" + body
-      end
+      head.to_yaml + "---" + body
     end
 
-    def load
-      parse(File.read(filename))
-    end
-
-    def save
-      FileUtils.mkdir_p(File.dirname(filename))
-      File.open(filename, "w") { |io| io << dump }
-      self
-    end
-
-    # Variables used for templates.
-    def variables
-      head.merge(:author => author,
-                 :path => path,
-                 :title => title,
-                 :body => body_html)
-    end
-
-    # Transform the body of this post according to given type.
-    # Defaults to Markdown.
-    def transform(src, type)
+    # Transform the body of this post. Defaults to Markdown.
+    def transform(src)
       case type
       when 'html'
         RubyPants.new(src).to_html
@@ -161,6 +116,20 @@ module Shinmun
       end
     end
 
+    def eql?(obj)
+      self == obj
+    end
+
+    def ==(obj)
+      if Post === obj
+        if date
+          year == obj.year and month == obj.month and name == obj.name
+        else
+          name == obj.name
+        end
+      end
+    end
+
   end
 
 end

data/lib/shinmun/routes.rb

@@ -0,0 +1,61 @@
+Shinmun::Blog.map do
+  
+  category_feed '/categories/(.*)\.rss' do |category|
+    render 'category.rxml', find_category(category).merge(:layout => false)
+  end
+ 
+  category '/categories/(.*)' do |category|
+    render 'category.rhtml', find_category(category)
+  end
+
+  tag '/tags/(.*)' do |tag|
+    render 'category.rhtml', :name => "Tag: #{tag}", :posts => posts_with_tags(tag)
+  end
+
+  comments '/(\d+)/(\d+)/(.*)/comments' do |year, month, name|
+    post = find_post(year.to_i, month.to_i, name) or raise "post not found #{request.path_info}"
+    
+    if params['preview']
+      comments = comments_for(post).push(Shinmun::Comment.new(params))
+      render 'post.rhtml', :post => post, :comments => comments
+    else
+      create_comment(post, params)
+      redirect post_path(post)
+    end
+  end
+
+  post '/(\d+)/(\d+)/(.*)' do |year, month, name|
+    if post = find_post(year.to_i, month.to_i, name)
+      render 'post.rhtml', :post => post, :comments => comments_for(post)
+    else
+      render '404.rhtml', :path => request.path_info
+    end
+  end
+
+  archive '/(\d+)/(\d+)' do |year, month|
+    render 'archive.rhtml', :year => year.to_i, :month => month.to_i, :posts => posts_for_month(year.to_i, month.to_i)
+  end
+
+  feed '/index\.rss' do
+    render 'index.rxml', :layout => false
+  end
+
+  index '/$' do
+    render 'index.rhtml'
+  end
+
+  page '/(.*)' do |path|
+    path = path.gsub('..', '')
+    page = find_page(path)
+          
+    if page
+      render 'page.rhtml', :page => page
+      
+    elsif file = store[path]
+      text file
+    else
+      render '404.rhtml', :path => path
+    end
+  end
+  
+end

data/lib/shinmun.rb

@@ -1,23 +1,17 @@
 require 'rubygems'
 require 'fileutils'
-require 'erb'
-require 'yaml'
-require 'time'
-
 require 'bluecloth'
 require 'rubypants'
+require 'coderay'
+require 'kontrol'
+require 'git_store'
 
 begin; require 'redcloth'; rescue LoadError; end
-begin; require 'packr'; rescue LoadError; end
 
-require 'shinmun/cache'
-require 'shinmun/post'
-require 'shinmun/comment'
-require 'shinmun/template'
+require 'shinmun/bluecloth_coderay'
 require 'shinmun/helpers'
+require 'shinmun/handlers'
 require 'shinmun/blog'
-
-require 'shinmun/aggregations/audioscrobbler'
-require 'shinmun/aggregations/delicious'
-require 'shinmun/aggregations/flickr'
-require 'shinmun/aggregations/fortythree'
+require 'shinmun/routes'
+require 'shinmun/post'
+require 'shinmun/comment'

data/templates/404.rhtml

@@ -0,0 +1,4 @@
+<h2>Not Found</h2>
+<p>
+  The page <%= @path %> was not found.
+</p>

data/templates/_comment_form.rhtml

@@ -0,0 +1,21 @@
+<div class="comment-form">
+  <form action="<%= post_path @post %>/comments" method="POST">
+    <p>
+      <label>Name</label><br/>
+      <input type="text" name="name" size="40" value="<%= @params['name'] %>"/>
+    </p>
+    <p>
+      <label>Website</label><br/>
+      <input type="text" name="website" size="40" value="<%= @params['website'] %>"/>
+    </p>
+    <p>
+      <label>Comment</label><br/>
+      <textarea name="text" cols="60" rows="10"><%= @params['text'] %></textarea>
+    </p>
+    <p>
+      <input type="submit" value="Post comment"/>
+      <input type="checkbox" name="preview" value="1"/>
+      Preview
+    </p>
+  </form>
+</div>

data/templates/_comments.rhtml

@@ -0,0 +1,11 @@
+<% for comment in @comments %>
+  <div class="comment">
+    <div class="top">
+      <%= comment.website.to_s.empty? ? comment.name : link_to(comment.name, comment.website) %> said
+      <%= distance_of_time_in_words(comment.time, Time.now, true) %> ago:
+    </div>
+    <div class="body">
+      <%= markdown(comment.text, :filter_html, :filter_styles) %>
+    </div>
+  </div>
+<% end %>

data/templates/archive.rhtml

@@ -0,0 +1,11 @@
+<h1><%= "#{Date::MONTHNAMES[@month]} #{@year}" %></h1>
+
+<div class="articles">
+  <% for post in @blog.posts_for_month(@year, @month) %>
+    <div class="article">
+      <div class="date"><%= human_date post.date %></div>
+      <h2><%= post_link post %></h2>
+      <%= post.summary %>
+    </div>
+  <% end %>
+</div>

data/templates/category.rhtml

@@ -0,0 +1,11 @@
+<h1><%= @name %></h1>
+
+<div class="articles">
+  <% for post in @posts %>
+    <div class="article">
+      <div class="date"><%= human_date post.date %></div>
+      <h2><%= post_link post %></h2>
+      <%= post.summary %>
+    </div>
+  <% end %>
+</div>

data/templates/category.rxml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"> 
+  <channel>
+    <title><%= @name %></title>
+    <link><%= @blog.url %>/categories/<%= urlify @name %></link>
+    <language><%= @blog.language %></language>
+    <copyright><%= @blog.author %></copyright>
+    <pubDate><%= rfc822 Time.now %></pubDate>
+    <% for post in @posts[0, 20] %>
+      <item>
+	<title><%= post.title %></title>
+	<category><%= post.category %></category>
+	<description><%= strip_tags post.summary %></description>
+	<author><%= @author || @blog.author %></author>
+	<link><%= @blog.url %><%= post_path post %></link>
+	<pubDate><%= rfc822 post.date %></pubDate>
+      </item>
+    <% end %>
+  </channel> 
+</rss>

data/templates/index.rhtml

@@ -0,0 +1,11 @@
+<h1>Home</h1>
+
+<div class="articles">
+  <% for post in @blog.recent_posts %>
+    <div class="article">
+      <div class="date"><%= human_date post.date %></div>
+      <h2><%= post_link post %></h2>
+      <%= post.summary %>
+    </div>
+  <% end %>
+</div>

data/templates/index.rxml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"> 
+  <channel>
+    <title><%= @blog.title %></title>
+    <link><%= @blog.url %></link>
+    <description><%= @blog.description %></description>
+    <language><%= @blog.language %></language>
+    <copyright><%= @blog.author %></copyright>
+    <pubDate><%= rfc822 Time.now %></pubDate>
+    <% for post in @blog.recent_posts %>
+      <item>
+	<title><%= post.title %></title>
+	<category><%= post.category %></category>
+	<description><%= strip_tags post.summary %></description>
+	<author><%= @author || @blog.author %></author>
+	<link><%= @blog.url %><%= post_path post %></link>
+	<pubDate><%= rfc822 post.date %></pubDate>
+      </item>
+    <% end %>
+  </channel>
+</rss>

data/templates/layout.rhtml

@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title><%= @blog.title %></title>
+    <meta http-equiv="Content-Language" content="English" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="/index.rss" />
+    <link rel="stylesheet" media="screen" type="text/css" href="/assets/styles.css" />
+    <link rel="stylesheet" media="print" type="text/css" href="/assets/print.css" />
+  </head>
+  <body>
+    <div class="container">
+      <h3><a href="/"><%= @blog.title %></a> - <%= @blog.description %></h3>
+
+      <div class="menu">
+        <%= link_to 'Home', '/' %> -
+        <%= link_to 'About', '/about' %> -
+        <%= link_to 'Subscribe RSS', '/index.rss' %>
+      </div>
+
+      <%= @content %>
+
+      <hr/>
+
+      <p>
+	<h4>Categories</h4>
+	<ul>
+	  <li><%= link_to 'Ruby', '/categories/ruby' %></li>
+	  <li><%= link_to 'Javascript', '/categories/javascript' %></li>
+	</ul>
+      </p>
+
+      <p>
+	<h4>Archive</h4>
+	<ul>
+          <% for year, month in @blog.archives %>
+            <li><%= archive_link year, month %></li>
+          <% end %>
+	</ul>
+      </p>
+
+    </div>
+  </body>
+</html>

data/templates/page.rhtml

@@ -0,0 +1,5 @@
+<h1><%= @page.title %></h1>
+
+<div class="article">
+  <%= @page.body_html %>
+</div>

data/templates/post.rhtml

@@ -0,0 +1,33 @@
+<div class="article">
+
+  <h1><%= @post.title %></h1>
+
+  <div class="date">
+    <%= human_date @post.date %>
+  </div>
+
+  <%= @post.body_html %>
+
+  <p>
+    <% if @post.category %>
+      Posted in category <%= link_to @post.category, "/categories/#{urlify @post.category}" %>.
+    <% end %>
+
+    <% unless @post.tag_list.empty? %>
+      Tagged with <%= @post.tag_list.map {|tag| link_to tag, "/tags/#{tag}" }.join(', ') %>.
+    <% end %>
+  </p>
+
+  <% if @comments %>
+    <h2>Comments</h2>
+
+    <div class="comments">
+      <%= render '_comments.rhtml', :comments => @comments %>
+    </div>
+  <% end %>
+
+  <h2>Leave a comment</h2>
+
+  <%= render '_comment_form.rhtml', :post => @post %>
+
+</div>