shinmun 0.5.2 → 0.9

data/.gems

@@ -0,0 +1 @@
+shinmun --version 0.9

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2008 Matthias Georgi <http://www.matthias-georgi.de>
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/shinmun

@@ -9,26 +9,23 @@ when 'init'
   Shinmun::Blog.init ARGV[1]
 
 when 'post'
-  blog = Shinmun::Blog.new('.')
-  post = blog.create_post(:title => ARGV[1], :date => Date.today)
-  path = blog.post_file(post)
-  
-  `git checkout master posts`
-  
-  exec "#{ENV['EDITOR']} #{path}"
+  post = Shinmun::Post.new(:title => ARGV[1], :date => Date.today)
+  post.save
 
-when 'page'
-  blog = Shinmun::Blog.new('.')
-  post = blog.create_page(:title => ARGV[1])
-  path = blog.post_file(post)
+  puts "Created post '#{post.path}'"
 
-  `git checkout master pages`
+when 'page'
+  post = Shinmun::Post.new(:title => ARGV[1])
+  post.save
 
-  exec "#{ENV['EDITOR']} #{path}"
+  puts "Created page '#{post.path}'"
 
 else
   puts "Usage:"
   puts "  shinmun init dir - creates a new blog"
   puts "  shinmun post 'Title of the post' - create a new post"
   puts "  shinmun page 'Title of the page' - create a new page"
+  exit
 end
+
+

data/lib/shinmun/blog.rb

@@ -4,7 +4,8 @@ module Shinmun
   class Blog < Kontrol::Application
     include Helpers
 
-    attr_accessor :config, :store, :posts, :pages
+    attr_accessor :config
+    attr_reader :posts, :pages, :posts_by_date, :posts_by_category, :posts_by_tag
 
     %w[ base_path title description language author categories ].each do |name|
       define_method(name) { @config[name.to_sym] }
@@ -15,163 +16,109 @@ module Shinmun
       super
 
       @config = {}
-      @store = GitStore.new(path)
-      @store.handler['md'] = PostHandler.new
-      @store.handler['rhtml'] = ERBHandler.new
-      @store.handler['rxml'] = ERBHandler.new
+      @templates = {}
+
+      load_posts
+      load_pages
+      sort_posts
     end
 
     def self.init(path)
       path = File.expand_path(path)
       Dir.mkdir(path)
 
-      FileUtils.cp_r "#{ROOT}/assets", path
+      FileUtils.cp_r "#{ROOT}/public", path
       FileUtils.cp_r "#{ROOT}/templates", path
       FileUtils.cp "#{ROOT}/config.ru", path
+      FileUtils.cp "#{ROOT}/.gems", path
 
       Dir.mkdir("#{path}/posts")
       Dir.mkdir("#{path}/pages")
-      Dir.mkdir("#{path}/comments")
-      Dir.mkdir("#{path}/public")
-
-      FileUtils.ln_s("../assets", "#{path}/public/assets")
-
-      Dir.chdir(path) do
-        `git init`
-        `git add .`
-        `git commit -m 'init'`
-      end
-    end
-
-    def load_template(file)
-      store['templates/' + file]
     end
 
     def render(name, vars = {})
       super(name, vars.merge(:blog => self))
     end
 
-    def pages      
-      store.tree('pages').values.select { |v| Post === v }
-    end
+    def reload_changed_files
+      (@posts + @pages.values).each do |post|
+        if post.changed?
+          post.load
+          @changed = true
+        end
+      end
 
-    def posts
-      store.tree('posts').values.select { |v| Post === v }.sort_by { |p| p.date.to_s }.reverse
+      sort_posts if @changed
     end
 
     def call(env)
-      if ENV['RACK_ENV'] == 'production'
-        store.load if store.changed?
-      else
-        store.load(true)
-      end
-      
+      reload_changed_files # if ENV['RACK_ENV'] != 'production'
       super
     end
 
-    def url
-      "http://#{request.host}"
-    end
+    def load_pages
+      @pages = {}
 
-    def symbolize_keys(hash)      
-      hash.inject({}) do |h, (k, v)|
-        h[k.to_sym] = v
-        h
+      Dir["#{ path }/pages/*.md"].each do |file|
+        page = Post.new(:file => file)
+        @pages[page.name] = page
       end
     end
 
-    def transaction(message, &block)
-      store.transaction(message, &block)
-    end
-
-    def post_file(post)
-      'posts' + post_path(post) + '.' + post.type
-    end
-
-    def page_file(post)
-      'pages' + page_path(post) + '.' + post.type
-    end
-
-    def comment_file(post)
-      'comments/' + post_path(post) + '.yml'
-    end
-
-    def create_post(attr)
-      post = Post.new(attr)
-      path = post_file(post)
-
-      transaction "create post `#{post.title}'" do
-        store[path] = post
+    def load_posts
+      @posts = Dir["#{ path }/posts/**/*.md"].map do |file|
+        Post.new(:file => file)
       end
-
-      post
     end
-
-    def create_page(attr)
-      post = Post.new(attr)
-      path = page_file(post)
-
-      transaction "create page `#{post.title}'" do
-        store[path] = post
+    
+    def sort_posts      
+      @posts = @posts.sort_by { |post| post.date.to_s }.reverse
+      
+      @posts_by_category = Hash.new do |hash, category|
+        hash[category] = []
       end
-
-      post
-    end
-
-    def comments_for(post)
-      store[comment_file post] || []
-    end
-
-    def create_comment(post, params)
-      path = comment_file(post)
-      comments = comments_for(post)
-      comment = Comment.new(params)
       
-      transaction "new comment for `#{post.title}'" do
-        store[path] = comments + [comment]
+      @posts_by_tag = Hash.new do |hash, tag|
+        hash[tag] = []
+      end
+
+      @posts_by_date = Hash.new do |hash, year|
+        hash[year] = Hash.new do |hash_months, month|
+          hash_months[month] = Hash.new
+        end
       end
       
-      comment
+      @posts.each do |post|
+        post.tag_list.each { |tag| @posts_by_tag[tag] << post }
+        @posts_by_category[post.category] << post if post.category
+        @posts_by_date[post.year][post.month][post.name] = post
+      end
     end
 
-    def find_page(name)
-      pages.find { |p| p.name == name }
+    def url
+      "http://#{request.host}"
     end
 
-    def find_post(year, month, name)
-      posts.find { |p| p.year == year and p.month == month and p.name == name }
+    def symbolize_keys(hash)      
+      hash.inject({}) do |h, (k, v)|
+        h[k.to_sym] = v
+        h
+      end
     end
 
     def find_category(permalink)
-      name = categories.find { |name| urlify(name) == permalink }
-      
-      { :name => name,
-        :posts => posts.select { |p| p.category == name },
-        :permalink => permalink }
-    end
-
-    def recent_posts
-      posts[0, 20]
-    end
-
-    # Return all posts for a given month.
-    def posts_for_month(year, month)
-      posts.select { |p| p.year == year and p.month == month }
+      categories.find { |name| urlify(name) == permalink }
     end
 
     # Return all posts with any of given tags.
     def posts_with_tags(tags)
       return [] if tags.nil? or tags.empty?
       tags = tags.split(',').map { |t| t.strip } if tags.is_a?(String)
-      
-      posts.select do |post|
-        tags.any? do |tag| 
-          post.tag_list.include?(tag)
-        end
-      end
+
+      tags.map { |tag| posts_by_tag[tag] }.flatten.uniq
     end
 
-    # Return all archives as tuples of [year, month].
+    # Return all archives as tuples of [year, month, posts].
     def archives
       posts.map { |p| [p.year, p.month] }.uniq.sort
     end

data/lib/shinmun/helpers.rb

@@ -2,43 +2,14 @@ module Shinmun
 
   module Helpers
 
-    # 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)
-      to_time = to_time.to_time if to_time.respond_to?(:to_time)
-      distance_in_minutes = (((to_time - from_time).abs)/60).round
-      distance_in_seconds = ((to_time - from_time).abs).round
-
-      case distance_in_minutes
-      when 0..1
-        return (distance_in_minutes == 0) ? 'less than a minute' : '1 minute' unless include_seconds
-        case distance_in_seconds
-        when 0..4   then 'less than 5 seconds'
-        when 5..9   then 'less than 10 seconds'
-        when 10..19 then 'less than 20 seconds'
-        when 20..39 then 'half a minute'
-        when 40..59 then 'less than a minute'
-        else             '1 minute'
-        end
-
-      when 2..44           then "#{distance_in_minutes} minutes"
-      when 45..89          then 'about 1 hour'
-      when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
-      when 1440..2879      then '1 day'
-      when 2880..43199     then "#{(distance_in_minutes / 1440).round} days"
-      when 43200..86399    then 'about 1 month'
-      when 86400..525599   then "#{(distance_in_minutes / 43200).round} months"
-      when 525600..1051199 then 'about 1 year'
-      else                      "over #{(distance_in_minutes / 525600).round} years"
-      end
-    end
+    Kontrol::Template.send(:include, self)
 
     def post_path(post)
-      "#{base_path}/#{post.year}/#{post.month}/#{post.name}"
+      "/#{post.year}/#{post.month}/#{post.name}"
     end    
 
     def archive_path(year, month)
-      "#{base_path}/#{year}/#{month}"
+      "/#{year}/#{month}"
     end
 
     # Render a link to a post
@@ -61,10 +32,16 @@ module Shinmun
       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.
+    # Render a link for the navigation bar.
     def navi_link(text, path)
-      link_to text, path, :class => (request.path_info == path) ? 'active' : nil
+      if path.match(/categories\/(.*)/)        
+        active = $1 == urlify(@category) if @category
+        active = $1 == urlify(@post.category) if @post
+      else
+        active = request.path_info == path
+      end
+      
+      link_to text, path, :class => active ? 'active' : nil
     end
 
     def html_escape(s)

data/lib/shinmun/post.rb

@@ -19,25 +19,24 @@ module Shinmun
       define_method("#{name}=") {|v| head[name] = v }
     end
 
-    attr_accessor :dirname, :name, :type, :src, :head, :body, :summary, :body_html, :tag_list
+    attr_writer :name
+    attr_accessor :src, :type, :head, :body, :file, :mtime
 
     # Initialize empty post and set specified attributes.
     def initialize(attributes={})
       @head = {}
       @body = ''
+      @type = 'md'
       
       attributes.each do |k, v|
         send "#{k}=", v
       end
-
-      @type ||= 'md'
       
-      parse(src) if src
+      load if file
+    end
 
-      raise "post without a title" if title.nil?
-      
-      @name ||= title.downcase.gsub(/[ -]+/, '-').gsub(/[^-a-z0-9_]+/, '')
-      @dirname = date ? "posts/#{year}/#{month}" : 'pages'      
+    def name
+      @name ||= title.to_s.downcase.gsub(/[ -]+/, '-').gsub(/[^-a-z0-9_]+/, '')
     end
 
     def method_missing(id, *args)
@@ -49,10 +48,6 @@ module Shinmun
       end
     end
 
-    def date=(date)
-      @head['date'] = String === date ? Date.parse(date) : date
-    end
-
     # Shortcut for year of date
     def year
       date.year
@@ -63,22 +58,39 @@ module Shinmun
       date.month
     end
 
-    def filename
-      "#{name}.#{type}"
+    def tag_list
+      @tag_list ||= tags.to_s.split(",").map { |s| s.strip }
     end
 
-    def filename=(filename)
-      self.name, self.type = filename.split('.')
+    def body_html
+      @body_html ||= transform(@body)
+    end
+
+    def summary
+      @summary ||= body_html.split("\n\n")[0]
     end
 
     def path
-      dirname.to_s.empty? ? filename : "#{dirname}/#{filename}"
+      folder = date ? "posts/#{year}/#{month}" : 'pages'
+      "#{folder}/#{name}.#{type}"
     end
 
-    def path=(path)
-      list = path.split('/')
-      self.dirname = list[0..-2].join('/')
-      self.filename = list[-1]
+    def load
+      self.type = File.extname(file)[1..-1]
+      self.name = File.basename(file).chomp(".#{type}")
+      self.mtime = File.mtime(file)
+      
+      parse(File.read(file))
+    end
+
+    def changed?
+      File.mtime(file) != mtime
+    end
+
+    def save
+      File.open(path, 'w') do |io|
+        io << dump
+      end
     end
 
     # Split up the source into header and body. Load the header as
@@ -88,15 +100,12 @@ module Shinmun
         @head = YAML.load($1)
         @body = $2
       else
-        raise ArgumentError, "yaml header not found in src"
+        @body = src
       end
-
-      @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
+      
+      @body_html = nil
+      @tag_list = nil
+      @summary = nil
     end
 
     # Convert to string representation
@@ -121,13 +130,7 @@ module Shinmun
     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
+      Post === obj and file == obj.file
     end
 
   end

data/lib/shinmun/routes.rb

@@ -1,39 +1,28 @@
 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)
+  category '/categories/(.*)' do |name|
+    category = find_category(name)
+    
+    render 'category.rhtml', :category => category, :posts => posts_by_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
+    render 'category.rhtml', :name => "Tag: #{tag}", :posts => posts_by_tag[tag]
   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)
+    if post = posts_by_date[year.to_i][month.to_i][name]
+      render 'post.rhtml', :post => 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)
+    render('archive.rhtml',
+           :year => year.to_i,
+           :month => month.to_i,
+           :posts => posts_by_date[year.to_i][month.to_i].values)
   end
 
   feed '/index\.rss' do
@@ -41,18 +30,18 @@ Shinmun::Blog.map do
   end
 
   index '/$' do
-    render 'index.rhtml'
+    render 'index.rhtml', :posts => posts[0, 20]
   end
 
   page '/(.*)' do |path|
     path = path.gsub('..', '')
-    page = find_page(path)
-          
-    if page
-      render 'page.rhtml', :page => page
-      
-    elsif file = store[path]
-      text file
+
+    if page = pages[path]
+      render 'page.rhtml', :page => page      
+    elsif File.exist?("public/#{path}")
+      file = Rack::File.new(nil)
+      file.path = "public/#{path}"
+      response.body = file
     else
       render '404.rhtml', :path => path
     end

data/lib/shinmun.rb

@@ -1,16 +1,16 @@
+$:.unshift '../../kontrol/lib'
+
 require 'rubygems'
 require 'fileutils'
 require 'bluecloth'
 require 'rubypants'
 require 'coderay'
 require 'kontrol'
-require 'git_store'
 
 begin; require 'redcloth'; rescue LoadError; end
 
 require 'shinmun/bluecloth_coderay'
 require 'shinmun/helpers'
-require 'shinmun/handlers'
 require 'shinmun/blog'
 require 'shinmun/routes'
 require 'shinmun/post'

data/templates/archive.rhtml

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

data/templates/category.rhtml

@@ -1,4 +1,4 @@
-<h1><%= @name %></h1>
+<h1><%= @category %></h1>
 
 <div class="articles">
   <% for post in @posts %>

data/templates/index.rhtml

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

data/templates/post.rhtml

@@ -17,17 +17,5 @@
       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>

data/test/blog_spec.rb

@@ -1,3 +1,5 @@
+$:.unshift "#{File.dirname __FILE__}/../lib"
+
 require 'shinmun'
 require 'rack/mock'
 require 'rexml/document'
@@ -27,14 +29,19 @@ describe Shinmun::Blog do
       :categories => ['Ruby', 'Javascript']
     }
     
-    @posts = [blog.create_post(:title => 'New post', :date => '2008-10-10', :category => 'Ruby', :body => 'Body1'),
-              blog.create_post(:title => 'And this', :date => '2008-10-11', :category => 'Ruby', :body => 'Body2'),
-              blog.create_post(:title => 'Again',    :date => '2008-11-10', :category => 'Javascript', :body => 'Body3')]
+    @posts = [Shinmun::Post.new(:title => 'New post', :date => Date.new(2008,10,10), :category => 'Ruby', :body => 'Body1'),
+              Shinmun::Post.new(:title => 'And this', :date => Date.new(2008,10,11), :category => 'Ruby', :body => 'Body2'),
+              Shinmun::Post.new(:title => 'Again',    :date => Date.new(2008,11,10), :category => 'Javascript', :body => 'Body3')]
+
+    @pages = {
+      'page-1' => Shinmun::Post.new(:title => 'Page 1', :body => 'Body1'),
+      'page-2' => Shinmun::Post.new(:title => 'Page 2', :body => 'Body2')
+    }
 
-    @pages = [blog.create_page(:title => 'Page 1', :body => 'Body1'),
-              blog.create_page(:title => 'Page 2', :body => 'Body2')]
+    blog.instance_variable_set('@posts', @posts)
+    blog.instance_variable_set('@pages', @pages)
 
-    blog.store.load
+    blog.sort_posts
   end
 
   def request(method, uri, options={})
@@ -73,54 +80,29 @@ describe Shinmun::Blog do
   end
 
   it "should find posts for a category" do    
-    category = blog.find_category('ruby')
-    category[:name].should == 'Ruby'
+    blog.find_category('ruby').should == 'Ruby'
     
-    category[:posts].should include(@posts[0])
-    category[:posts].should include(@posts[1])
-
-    category = blog.find_category('javascript')
-    category[:name].should == 'Javascript'
-    category[:posts].should include(@posts[2])
-  end
-
-  it "should create a post" do
-    post = blog.create_post(:title => 'New post', :date => '2008-10-10')
-    blog.store.load
+    blog.posts_by_category['Ruby'].should include(@posts[0])
+    blog.posts_by_category['Ruby'].should include(@posts[1])
 
-    post = blog.find_post(2008, 10, 'new-post')
-    post.should_not be_nil
-    post.title.should == 'New post'
-    post.date.should == Date.new(2008, 10, 10)
-    post.name.should == 'new-post'
+    blog.find_category('javascript').should == 'Javascript'
+    blog.posts_by_category['Javascript'].should include(@posts[2])
   end
 
   it "should render posts" do
     xml = get('/2008/10/new-post').body
-
+    
     xpath(xml, "//h1")[0].text.should == 'New post'
     xpath(xml, "//p")[0].text.should == 'Body1'
   end
 
-  it "should render categories" do
-    get('/categories/ruby.rss')['Content-Type'].should == 'application/rss+xml'
-
-    xml = get('/categories/ruby.rss').body
-
-    xpath(xml, '/rss/channel/title')[0].text.should == 'Ruby'
-    xpath(xml, '/rss/channel/item/title')[0].text.should == 'And this'
-    xpath(xml, '/rss/channel/item/pubDate')[0].text.should == "Sat, 11 Oct 2008 00:00:00 +0000"
-    xpath(xml, '/rss/channel/item/link')[0].text.should == "http://example.org/2008/10/and-this"
-    xpath(xml, '/rss/channel/item/title')[1].text.should == 'New post'
-    xpath(xml, '/rss/channel/item/pubDate')[1].text.should == "Fri, 10 Oct 2008 00:00:00 +0000"
-    xpath(xml, '/rss/channel/item/link')[1].text.should == "http://example.org/2008/10/new-post"
-    
+  it "should render categories" do    
     assert_listing(get('/categories/ruby').body, [['And this', 'Body2'], ['New post', 'Body1']])
   end
 
   it "should render index and archives" do
-    blog.posts_for_month(2008, 10).should_not be_empty
-    blog.posts_for_month(2008, 11).should_not be_empty
+    blog.posts_by_date[2008][10].should_not be_empty
+    blog.posts_by_date[2008][11].should_not be_empty
     
     assert_listing(get('/2008/10').body, [['And this', 'Body2'], ['New post', 'Body1']])
     assert_listing(get('/').body, [['Again', 'Body3'], ['And this', 'Body2'], ['New post', 'Body1']])
@@ -136,21 +118,11 @@ describe Shinmun::Blog do
     xpath(xml, "//p")[0].text.should == 'Body2'
   end
 
-  it "should post a comment" do    
-    post "/2008/10/new-post/comments?name=Hans&text=Hallo"
-    post "/2008/10/new-post/comments?name=Peter&text=Servus"
-
-    blog.store.load
-    
-    comments = blog.comments_for(@posts[0])
-
-    comments[0].should_not be_nil
-    comments[0].name.should == 'Hans'
-    comments[0].text.should == 'Hallo'
+  it "should render a post" do
+    xml = get('/2008/10/new-post').body
 
-    comments[1].should_not be_nil
-    comments[1].name.should == 'Peter'
-    comments[1].text.should == 'Servus'
+    xpath(xml, "//h1")[0].text.should == 'New post'
+    xpath(xml, "//div[@class='date']")[0].text.strip.should == 'October 10, 2008'
   end
   
 end

data/test/post_spec.rb

@@ -1,7 +1,15 @@
+$:.unshift '../lib'
+
 require 'shinmun'
 
 describe Shinmun::Post do
 
+  BODY = "Patroon is a template engine written in Javascript in about 100 lines
+of code. It takes existing DOM nodes annotated with CSS classes and
+expand a data object according to simple rules. Additionally you may
+use traditional string interpolation inside attribute values and text
+nodes."
+  
   POST = <<-END
 --- 
 category: Javascript
@@ -9,24 +17,79 @@ date: 2008-09-09
 tags: template, engine, json
 title: Patroon - a Javascript Template Engine
 ---
-Patroon is a template engine written in Javascript in about 100 lines
-of code. It takes existing DOM nodes annotated with CSS classes and
-expand a data object according to simple rules. Additionally you may
-use traditional string interpolation inside attribute values and text
-nodes.
+#{BODY}
 END
 
-  it 'should parse and dump in the same way' do
-    Shinmun::Post.new(:type => 'md', :src => POST).dump.should == (POST)
+  it "should infer the name from title" do
+    post = Shinmun::Post.new(:title => 'Patroon - a Javascript Template Engine')
+    post.name.should == 'patroon-a-javascript-template-engine'
+  end
+
+  it "should return tags as list" do
+    post = Shinmun::Post.new
+    post.tags = 'a,b,c,d'
+    post.tag_list.should == ['a', 'b', 'c', 'd']
   end
 
+  it "should infer path from date and name for posts" do
+    post = Shinmun::Post.new
+    post.name = 'post'
+    post.date = Date.new(2010,1,1)
+    post.path.should == 'posts/2010/1/post.md'
+  end
+
+  it "should infer path from name for pages" do
+    post = Shinmun::Post.new
+    post.name = 'page'
+    post.path.should == 'pages/page.md'
+  end
+
+  it "should set type, name and mtime upon loading a post" do
+    File.stub!(:mtime).and_return(Time.local(2010, 1, 1))
+    File.stub!(:read).and_return(POST)
+    
+    post = Shinmun::Post.new(:file => 'posts/2010/01/a-post.md')
+    post.load
+    post.type.should == 'md'
+    post.name.should == 'a-post'
+    post.mtime.should == Time.local(2010, 1, 1)
+  end
+
+  it "should detect a changed file" do
+    File.should_receive(:mtime).with('file').and_return(Time.local(2009, 1, 1))
+    File.should_receive(:mtime).with('file').and_return(Time.local(2010, 1, 1))
+
+    post = Shinmun::Post.new
+    post.file = 'file'
+    post.mtime = Time.local(2009, 1, 1)
+    post.changed?.should be_false
+    post.changed?.should be_true
+  end    
+
   it "should parse the yaml header" do
-    post = Shinmun::Post.new(:type => 'md', :src => POST)
+    post = Shinmun::Post.new(:type => 'md')
+    post.parse(POST)
     post.title.should == 'Patroon - a Javascript Template Engine'
     post.category.should == 'Javascript'
     post.date.should == Date.new(2008,9,9)
     post.tags.should == 'template, engine, json'
-    post.tag_list.should == ['template', 'engine', 'json']
+    post.body.chop == BODY
+  end
+
+  it "should not parse the yaml header if not present" do
+    post = Shinmun::Post.new
+    post.parse('just the body')
+    post.body.should == 'just the body'
+  end
+
+  it "should transform the body" do
+    post = Shinmun::Post.new(:title => 'test', :body => '**bold**')
+    post.body_html.should == '<p><strong>bold</strong></p>'
+  end
+
+  it "should transform according to type" do
+    post = Shinmun::Post.new(:title => 'test', :type => 'html', :body => '**bold**')
+    post.body_html.should_not == '<p><strong>bold</strong></p>'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shinmun
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: "0.9"
 platform: ruby
 authors: 
 - Matthias Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: coderay
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: kontrol
@@ -60,17 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: git_store
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.3.1
     version: 
 description: git-based blog engine.
 email: matti.georgi@gmail.com
@@ -81,29 +71,27 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- .gems
 - README.md
+- LICENSE
 - Rakefile
-- assets/print.css
-- assets/styles.css
+- public/stylesheets/print.css
+- public/stylesheets/styles.css
 - bin/shinmun
 - config.ru
 - lib/shinmun.rb
 - lib/shinmun/blog.rb
 - lib/shinmun/bluecloth_coderay.rb
 - lib/shinmun/comment.rb
-- lib/shinmun/handlers.rb
 - lib/shinmun/helpers.rb
 - lib/shinmun/post.rb
 - lib/shinmun/routes.rb
 - templates/index.rhtml
 - templates/page.rhtml
 - templates/404.rhtml
-- templates/_comments.rhtml
 - templates/category.rhtml
-- templates/_comment_form.rhtml
 - templates/post.rhtml
 - templates/index.rxml
-- templates/category.rxml
 - templates/archive.rhtml
 - templates/layout.rhtml
 - test/blog_spec.rb

data/lib/shinmun/handlers.rb

@@ -1,19 +0,0 @@
-module Shinmun
-
-  class ERBHandler
-    def read(data)
-      ERB.new(data)
-    end
-  end
-
-  class PostHandler
-    def read(data)
-      Post.new(:src => data)
-    end
-
-    def write(post)
-      post.dump      
-    end    
-  end
-  
-end

data/templates/_comment_form.rhtml

@@ -1,21 +0,0 @@
-<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

@@ -1,11 +0,0 @@
-<% 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/category.rxml

@@ -1,20 +0,0 @@
-<?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>