assets/print.css assets/styles.css config.ru templates/404.rhtml templates/_comment_form.rhtml templates/_comments.rhtml templates/archive.rhtml templates/category.rhtml templates/category.rxml templates/index.rhtml templates/index.rxml templates/layout.rhtml templates/page.rhtml templates/post.rhtml test/templates/templates/_comments.rhtml test/templates/templates/archive.rhtml test/templates/templates/category.rhtml test/templates/templates/category.rxml test/templates/templates/index.rhtml test/templates/templates/index.rxml test/templates/templates/layout.rhtml test/templates/templates/page.rhtml test/templates/templates/post.rhtml @@ -7,16 +7,22 @@ when 'init' Shinmun::Blog.init ARGV[1] when 'post' - post = Shinmun::Post.new(:title => ARGV[1], :date => Date.today) - FileUtils.mkpath(File.dirname(post.path)) - open(post.path, 'w') { |io| io.write post.dump } - puts "created #{post.path}" + blog = Shinmun::Blog.new('.') + post = blog.create_post(:title => ARGV[1], :date => Date.today) + path = blog.post_file(post) + + `git checkout #{path}` + + exec "#{ENV['EDITOR']} #{path}" when 'page' - post = Shinmun::Post.new(:title => ARGV[1]) - FileUtils.mkpath(File.dirname(post.path)) - open(post.path, 'w') { |io| io.write post.dump } - puts "created #{post.path}" + blog = Shinmun::Blog.new('.') + post = blog.create_page(:title => ARGV[1]) + path = blog.post_file(post) + + `git checkout #{path}` + + exec "#{ENV['EDITOR']} #{path}" else puts "Usage:" bin/shinmun @@ -1,104 +1,71 @@ module Shinmun + ROOT = File.expand_path(File.dirname(__FILE__) + '/../..') class Blog < Kontrol::Application - - EXAMPLE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../example') - include Helpers - attr_reader :aggregations, :categories, :comments, :repo, :store + attr_accessor :config, :store, :posts, :pages - %w[ assets comments config posts pages templates ].each do |name| - define_method(name) { store.root.tree(name) } - end - - %w[ title description language author url base_path categories ].each do |name| - define_method(name) { config['blog.yml'][name] } + %w[ base_path title description language author categories ].each do |name| + define_method(name) { @config[name.to_sym] } end # Initialize the blog def initialize(path) super - @aggregations = {} - if ENV['RACK_ENV'] == 'production' @store = GitStore.new(path) else @store = GitStore::FileStore.new(path) end - + + @store.handler['md'] = PostHandler.new @store.load - - @repo = Grit::Repo.new(path) if defined?(Grit) - - Thread.start do - loop do - load_aggregations - sleep 300 - end - end - end - def self.init(name) - Dir.mkdir name - Dir.chdir name - FileUtils.cp_r EXAMPLE_DIR + '/.', '.' - `git init` - `git add .` - `git commit -m 'init'` + @config = {} end - def load_template(file) - templates[file] or raise "template #{file} not found" - end + def self.init(path) + path = File.expand_path(path) + Dir.mkdir(path) - def render(name, vars = {}) - super(name, vars.merge(:blog => self)) - end + FileUtils.cp_r "#{ROOT}/assets", path + FileUtils.cp_r "#{ROOT}/templates", path + FileUtils.cp "#{ROOT}/config.ru", path - def call(env) - store.refresh! - super - end + Dir.mkdir("#{path}/posts") + Dir.mkdir("#{path}/pages") + Dir.mkdir("#{path}/comments") + Dir.mkdir("#{path}/public") - def load_aggregations - config['aggregations.yml'].to_a.each do |c| - aggregations[c['name']] = Object.const_get(c['class']).new(c['url']) - end - end + FileUtils.ln_s("../assets", "#{path}/public/assets") - def posts_by_date - posts.sort_by { |post| post.date.to_s }.reverse + Dir.chdir(path) do + `git init` + `git add .` + `git commit -m 'init'` + end end - def recent_posts - posts_by_date[0, 20] + def render(name, vars = {}) + super(name, vars.merge(:blog => self)) end - # Return all posts for a given month. - def posts_for_month(year, month) - posts_by_date.select { |p| p.year == year and p.month == month } + def load + store.load + @pages = store['pages'].values + @posts = store['posts'].values.sort_by { |post| post.date.to_s }.reverse 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 - end - - # Return all archives as tuples of [year, month]. - def archives - posts.map { |p| [p.year, p.month] }.uniq.sort + def call(env) + load if store.changed? + + super end - - def tree(post) - post.date ? posts.tree(post.year).tree(post.month) : pages + + def url + "http://#{request.host}" end def symbolize_keys(hash) @@ -112,36 +79,54 @@ module Shinmun store.transaction(message, &block) end - # Create a new post with given attributes. - def create_post(atts) - post = Post.new(atts) - transaction "create '#{post.title}'" do - store[post.path] = post - 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 update_post(post, data) - transaction "update '#{post.title}'" do - store.delete(post.path) - post.parse data - store[post.path] = post + def create_post(attr) + post = Post.new(attr) + path = post_file(post) + + transaction "create post '#{post.title}'" do + store[path] = post end + + post end - def delete_post(post) - transaction "delete '#{post.title}'" do - store.delete(post.path) + def create_page(attr) + post = Post.new(attr) + path = page_file(post) + + transaction "create page '#{post.title}'" do + store[path] = post end + + post end - def comments_for(path) - comments[path + '.yml'] || [] + def comments_for(post) + store[comment_file post] || [] end - def post_comment(path, params) - transaction "new comment for '#{path}'" do - comments[path + '.yml'] = comments[path + '.yml'].to_a + [ Comment.new(params) ] + 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] end + + comment end def find_page(name) @@ -149,22 +134,42 @@ module Shinmun end def find_post(year, month, name) - tree = posts[year, month] and tree.find { |p| p.name == name } + posts.find { |p| p.year == year and p.month == month and p.name == name } end def find_category(permalink) - name = categories.find { |name| urlify(name) == permalink } or raise "category not found" - posts = self.posts.select { |p| p.category == name }.sort_by { |p| p.date }.reverse - { :name => name, :posts => posts, :permalink => 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 - def write(file, template, vars={}) - file = "public/#{base_path}/#{file}" - FileUtils.mkdir_p(File.dirname(file)) - open(file, 'wb') do |io| - io << render(template, vars) + # Return all posts for a given month. + 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? + 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 end + + # Return all archives as tuples of [year, month]. + def archives + posts.map { |p| [p.year, p.month] }.uniq.sort + end end lib/shinmun/blog.rb @@ -1,7 +1,7 @@ module Shinmun class Comment - + attr_accessor :time, :name, :email, :website, :text def initialize(attributes) lib/shinmun/comment.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}" lib/shinmun/helpers.rb @@ -1,16 +1,13 @@ module Shinmun class PostHandler - def read(path, data) - Post.new(:path => path, :src => data) + def read(data) + Post.new(:src => data) end - def write(path, post) - post.dump + def write(post) + post.dump end end end - -GitStore::Handler['md'] = Shinmun::PostHandler.new -GitStore::Handler['html'] = Shinmun::PostHandler.new lib/shinmun/post_handler.rb @@ -9,12 +9,24 @@ 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) + render 'post.rhtml', :post => post, :comments => comments_for(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) + 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) end archive '/(\d+)/(\d+)' do |year, month| @@ -25,47 +37,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.exist?(path) + text File.read("#{self.path}/public/#{path}") else - raise "page '#{path}' not found" + render '404.rhtml', :path => path end end lib/shinmun/routes.rb @@ -1,70 +1,51 @@ 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` + FileUtils.rm_rf DIR + + Shinmun::Blog.init(DIR) - 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 - 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 - - `git commit -m 'spec'` + @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')] - @pages = [@blog.create_post(:title => 'Page 1', :body => 'Body1'), - @blog.create_post(:title => 'Page 2', :body => 'Body2')] + @pages = [@blog.create_page(:title => 'Page 1', :body => 'Body1'), + @blog.create_page(:title => 'Page 2', :body => 'Body2')] - @blog.store.load + @blog.load + end + + 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) @@ -98,9 +79,9 @@ describe Shinmun::Blog do end it "should create a post" do - @blog.create_post(:title => 'New post', :date => '2008-10-10') - @blog.store.load - + post = @blog.create_post(:title => 'New post', :date => '2008-10-10') + @blog.load + post = @blog.find_post(2008, 10, 'new-post') post.should_not be_nil post.title.should == 'New post' @@ -108,26 +89,6 @@ describe Shinmun::Blog do 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,10 +104,10 @@ 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 @@ -170,12 +131,10 @@ 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" + 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].path) + comments = @blog.comments_for(@posts[0]) comments[0].should_not be_nil comments[0].name.should == 'Hans' test/blog_spec.rb example/Rakefile example/assets/images/favicon.ico example/assets/images/loading.gif example/assets/javascripts/1-jquery.min.js example/assets/javascripts/2-jquery-form.min.js example/assets/javascripts/3-comments.js example/assets/javascripts/4-coderay.js example/assets/print.css example/assets/stylesheets/1-reset.css example/assets/stylesheets/2-typo.css example/assets/stylesheets/3-table.css example/assets/stylesheets/4-article.css example/assets/stylesheets/5-comments.css example/assets/stylesheets/6-diff.css example/assets/stylesheets/7-blog.css example/config.ru example/config/blog.yml example/pages/about.md example/templates/_comment_form.rhtml example/templates/_comments.rhtml example/templates/_pagination.rhtml example/templates/archive.rhtml example/templates/category.rhtml example/templates/category.rxml example/templates/comments.rhtml example/templates/index.rhtml example/templates/index.rxml example/templates/layout.rhtml example/templates/page.rhtml example/templates/post.rhtml 6c472da81642c0d24040d2d9b3be949aaf6f15ca Matthias Georgi matti.georgi@gmail.com http://github.com/georgi/shinmun/commit/f9304707fe84188f607cfbc45c76b5d19d75c174 f9304707fe84188f607cfbc45c76b5d19d75c174 2009-04-27T03:40:25-07:00 2009-04-27T03:40:25-07:00 reorganized directory structure e0db0cfa4d96a91cf0c246de88d1780449c5ec78 Matthias Georgi matti.georgi@gmail.com