georgi-shinmun 0.4.1 → 0.5

data/lib/shinmun/comment.rb

@@ -1,7 +1,7 @@
 module Shinmun
 
   class Comment
-
+    
     attr_accessor :time, :name, :email, :website, :text
 
     def initialize(attributes)

data/lib/shinmun/handlers.rb

@@ -0,0 +1,19 @@
+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/lib/shinmun/helpers.rb

@@ -35,7 +35,7 @@ module Shinmun
 
     def post_path(post)
       "#{base_path}/#{post.year}/#{post.month}/#{post.name}"
-    end
+    end    
 
     def archive_path(year, month)
       "#{base_path}/#{year}/#{month}"

data/lib/shinmun/routes.rb

@@ -9,12 +9,27 @@ Shinmun::Blog.map do
   end
 
   tag '/tags/(.*)' do |tag|
-    render 'category.rhtml', :name => "Tag: #{tag}", :posts => posts.select { |p| p.tag_list.include?(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|
-    post = find_post(year.to_i, month.to_i, name)
-    render 'post.rhtml', :post => post, :comments => comments_for(post.path)
+    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|
@@ -25,47 +40,21 @@ Shinmun::Blog.map do
     render 'index.rxml', :layout => false
   end
 
-  comments '/comments' do
-    if params['preview'] == 'true'
-      render 'comments.rhtml', :comments => [Shinmun::Comment.new(params)], :layout => false
-    else
-      post_comment(params['path'], params)
-      render 'comments.rhtml', :comments => comments_for(params['path']), :layout => false
-    end    
-  end
-
-  javascripts '/assets/javascripts\.js' do
-    scripts = assets['javascripts'].to_a.join
-    if_none_match(etag(scripts)) do
-      text scripts
-    end
-  end
-
-  stylesheets '/assets/stylesheets\.css' do
-    styles = assets['stylesheets'].to_a.join
-    if_none_match(etag(styles)) do
-      text styles
-    end
-  end
-
-  assets '/assets/(.*)' do |path|
-    file = assets[path] or raise "#{path} not found"
-    if_none_match(etag(file)) do
-      text file
-    end
-  end
-
-  get '/$' do
+  index '/$' do
     render 'index.rhtml'
   end
 
-  get '/(.*)' do |path|
+  page '/(.*)' do |path|
+    path = path.gsub('..', '')
     page = find_page(path)
           
     if page
       render 'page.rhtml', :page => page
+      
+    elsif file = store[path]
+      text file
     else
-      raise "page '#{path}' not found"
+      render '404.rhtml', :path => path
     end
   end
   

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/{example/templates → templates}/archive.rhtml

@@ -7,6 +7,5 @@
       <h2><%= post_link post %></h2>
       <%= post.summary %>
     </div>
-    <hr/>
   <% end %>
 </div>

data/{example/templates → templates}/category.rhtml

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

data/{example/templates → templates}/index.rhtml

@@ -7,6 +7,5 @@
       <h2><%= post_link post %></h2>
       <%= post.summary %>
     </div>
-    <hr/>
   <% end %>
 </div>

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/{example/templates → templates}/page.rhtml

@@ -3,5 +3,3 @@
 <div class="article">
   <%= @page.body_html %>
 </div>
-
-<hr/>

data/{example/templates → templates}/post.rhtml

@@ -8,28 +8,15 @@
 
   <%= @post.body_html %>
 
-  <hr/>
-
-  <div style="margin:1em 0em 1em 0em; color:#666">
+  <p>
     <% if @post.category %>
-      Posted in category <%= link_to @post.category, "/categories/#{urlify @post.category}" %> by <%= @blog.author %>.
+      Posted in category <%= link_to @post.category, "/categories/#{urlify @post.category}" %>.
     <% end %>
-    Tagged with <%= @post.tag_list.map {|tag| link_to tag, "/tags/#{tag}" }.join(', ') %>.
-  </div>
-
-  <h6>Similar Posts</h6>
 
-  <ul>
-
-  <% for post in @blog.posts_with_tags(@post.tags) %>
-     <% if post != @post %>
-       <li><%= post_link post %></li>
-     <% end %>
-  <% end %>
-
-  </ul>
-
-  <hr/>
+    <% 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>
@@ -44,5 +31,3 @@
   <%= render '_comment_form.rhtml', :post => @post %>
 
 </div>
-
-<hr/>

data/test/blog_spec.rb

@@ -1,70 +1,53 @@
 require 'shinmun'
 require 'rack/mock'
+require 'rexml/document'
 require 'rexml/xpath'
 require 'pp'
 
 describe Shinmun::Blog do
 
-  TEMPLATES_DIR = File.expand_path(File.dirname(__FILE__) + '/templates')
-  REPO = '/tmp/shinmun-test'
+  DIR = '/tmp/shinmun-test'
 
-  before do
-    FileUtils.rm_rf REPO
-    Dir.mkdir REPO
-    Dir.chdir REPO
-    initialize_blog
-  end
-  
-  def file(file, data)
-    FileUtils.mkpath(File.dirname(file))
-    open(file, 'w') { |io| io << data }
-    `git add #{file}`
-  end
-
-  def initialize_blog
-    `git init`
-    
-    file 'config/blog.yml', {
-      'title' => 'Title',
-      'description' => 'Description',
-      'language' => 'en',
-      'author' =>  'The Author',
-      'url' => 'http://www.my-blog-url.com',
-      'categories' => ['Ruby', 'Javascript']
-    }.to_yaml
+  attr_reader :blog
 
+  before do
     ENV['RACK_ENV'] = 'production'
-    @blog = Shinmun::Blog.new(REPO)
-    @request = Rack::MockRequest.new(@blog)
-
-    Dir.mkdir 'templates'
     
-    Dir[TEMPLATES_DIR + '/*'].each do |path|      
-      unless path.include?('~')
-        file 'templates/' + File.basename(path), File.read(path)
-      end
-    end
+    FileUtils.rm_rf DIR
 
-    `git commit -m 'spec'` 
+    Shinmun::Blog.init(DIR)
+    
+    @blog = Shinmun::Blog.new(DIR)
+    
+    blog.config = {
+      :title => 'Title',
+      :description => 'Description',
+      :language => 'en',
+      :author =>  'The Author',
+      :categories => ['Ruby', 'Javascript']
+    }
     
-    @blog.store.load
+    @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 = [@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')]
+    @pages = [blog.create_page(:title => 'Page 1', :body => 'Body1'),
+              blog.create_page(:title => 'Page 2', :body => 'Body2')]
 
-    @pages = [@blog.create_post(:title => 'Page 1', :body => 'Body1'),
-              @blog.create_post(:title => 'Page 2', :body => 'Body2')]
+    blog.store.load
+  end
 
-    @blog.store.load
+  def request(method, uri, options={})
+    @request = Rack::MockRequest.new(blog)    
+    @response = @request.request(method, uri, options)
   end
 
   def get(*args)
-    @request.get(*args)
+    request(:get, *args)
   end
 
   def post(*args)
-    @request.post(*args)
+    request(:post, *args)
   end  
 
   def xpath(xml, path)
@@ -83,51 +66,35 @@ describe Shinmun::Blog do
       titles[i].text.should == title
       summaries[i].text.to_s.strip.should == summary
     end
-  end 
+  end
+
+  it "should load templates" do
+    blog.load_template("index.rhtml").should be_kind_of(ERB)
+  end
 
   it "should find posts for a category" do    
-    category = @blog.find_category('ruby')
+    category = blog.find_category('ruby')
     category[:name].should == 'Ruby'
     
     category[:posts].should include(@posts[0])
     category[:posts].should include(@posts[1])
 
-    category = @blog.find_category('javascript')
+    category = blog.find_category('javascript')
     category[:name].should == 'Javascript'
     category[:posts].should include(@posts[2])
   end
 
   it "should create a post" do
-    @blog.create_post(:title => 'New post', :date => '2008-10-10')
-    @blog.store.load
-    
-    post = @blog.find_post(2008, 10, 'new-post')
+    post = blog.create_post(:title => 'New post', :date => '2008-10-10')
+    blog.store.load
+
+    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'
   end
 
-  it "should update a post" do
-    post = @blog.create_post(:title => 'New post', :date => '2008-10-10')
-    @blog.update_post(post, "---\ndate: 2008-11-11\ntitle: The title\n---")
-    @blog.store.load
-
-    post = @blog.find_post(2008, 11, 'new-post')
-    post.should_not be_nil
-    post.title.should == 'The title'
-    post.date.should == Date.new(2008, 11, 11)
-    post.name.should == 'new-post'
-  end
-
-  it "should delete a post" do
-    post = @blog.create_post(:title => 'New post', :date => '2008-10-10')
-    @blog.delete_post(post)        
-    @blog.store.load
-
-    @blog.find_post(2008, 10, 'new-post').should be_nil
-  end
-
   it "should render posts" do
     xml = get('/2008/10/new-post').body
 
@@ -143,17 +110,17 @@ describe Shinmun::Blog do
     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://www.my-blog-url.com/2008/10/and-this"
+    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://www.my-blog-url.com/2008/10/new-post"
+    xpath(xml, '/rss/channel/item/link')[1].text.should == "http://example.org/2008/10/new-post"
     
     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_for_month(2008, 10).should_not be_empty
+    blog.posts_for_month(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']])
@@ -170,12 +137,12 @@ describe Shinmun::Blog do
   end
 
   it "should post a comment" do    
-    post "/comments?path=posts/2008/10/new-post.md&name=Hans&text=Hallo"
-    post "/comments?path=posts/2008/10/new-post.md&name=Peter&text=Servus"
-    
-    @blog.store.load
+    post "/2008/10/new-post/comments?name=Hans&text=Hallo"
+    post "/2008/10/new-post/comments?name=Peter&text=Servus"
 
-    comments = @blog.comments_for(@posts[0].path)
+    blog.store.load
+    
+    comments = blog.comments_for(@posts[0])
 
     comments[0].should_not be_nil
     comments[0].name.should == 'Hans'