@@ -15,6 +15,3 @@ require 'shinmun/blog' require 'shinmun/routes' require 'shinmun/post' require 'shinmun/comment' - -require 'shinmun/aggregations/delicious' -require 'shinmun/aggregations/flickr' lib/shinmun.rb @@ -55,17 +55,20 @@ module Shinmun store.tree('pages').values end - der posts + def posts store.tree('posts').values.sort_by { |post| post.date.to_s }.reverse end def call(env) - store.load if store.changed? - store.load(true) if ENV['RACK_ENV'] != 'production') - + if ENV['RACK_ENV'] == 'production' + store.load if store.changed? + else + store.load(true) + end + super end - + def url "http://#{request.host}" end @@ -146,7 +149,7 @@ module Shinmun :posts => posts.select { |p| p.category == name }, :permalink => permalink } end - + def recent_posts posts[0, 20] end @@ -155,7 +158,7 @@ module Shinmun def posts_for_month(year, month) posts.select { |p| p.year == year and p.month == month } end - + # Return all posts with any of given tags. def posts_with_tags(tags) return [] if tags.nil? or tags.empty? @@ -172,7 +175,7 @@ module Shinmun def archives posts.map { |p| [p.year, p.month] }.uniq.sort end - - end + + end end lib/shinmun/blog.rb @@ -20,13 +20,16 @@ Shinmun::Blog.map do render 'post.rhtml', :post => post, :comments => comments else create_comment(post, params) - render 'post.rhtml', :post => post, :comments => comments_for(post) + redirect post_path(post) end end post '/(\d+)/(\d+)/(.*)' do |year, month, name| - post = find_post(year.to_i, month.to_i, name) or raise "post not found #{request.path_info}" - render 'post.rhtml', :post => post, :comments => comments_for(post) + 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| lib/shinmun/routes.rb @@ -14,6 +14,8 @@ </p> <p> <input type="submit" value="Post comment"/> + <input type="checkbox" name="preview" value="1"/> + Preview </p> </form> </div> templates/_comment_form.rhtml @@ -34,7 +34,7 @@ describe Shinmun::Blog do @pages = [blog.create_page(:title => 'Page 1', :body => 'Body1'), blog.create_page(:title => 'Page 2', :body => 'Body2')] - blog.load + blog.store.load end def request(method, uri, options={}) @@ -86,7 +86,7 @@ describe Shinmun::Blog do it "should create a post" do post = blog.create_post(:title => 'New post', :date => '2008-10-10') - blog.load + blog.store.load post = blog.find_post(2008, 10, 'new-post') post.should_not be_nil @@ -139,6 +139,8 @@ describe Shinmun::Blog do 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]) test/blog_spec.rb 3deb5fffbc705aca3fe9896c97224fd371fb1f5b Matthias Georgi matti.georgi@gmail.com http://github.com/georgi/shinmun/commit/73a0bf57cf73fecd51caf3c8e3dc4332e46ccd42 73a0bf57cf73fecd51caf3c8e3dc4332e46ccd42 2009-05-05T09:00:47-07:00 2009-05-05T09:00:47-07:00 fixed some bugs cd217b32dc0f0e814af01154fb2938e3e489e26c Matthias Georgi matti.georgi@gmail.com