georgi-shinmun 0.4.1 → 0.5

data/README.md

@@ -1,5 +1,5 @@
 Shinmun - a git-based blog engine
-==========================================
+=================================
 
 Shinmun is a small git-based blog engine. Write posts in your favorite
 editor, git-push it and serve your blog straight from a repository.
@@ -11,7 +11,6 @@ editor, git-push it and serve your blog straight from a repository.
 * Deploy via [git-push][11]
 * Index, category and archive listings
 * RSS feeds
-* Flickr and Delicious aggregations
 * Syntax highlighting provided by [CodeRay][4]
 * AJAX comment system with Markdown preview
 
@@ -21,9 +20,9 @@ editor, git-push it and serve your blog straight from a repository.
 Install the gems:
 
     $ gem sources -a http://gems.github.com
-    $ gem install rack BlueCloth rubypants coderay mojombo-grit georgi-git_store georgi-kontrol georgi-shinmun
+    $ gem install rack BlueCloth rubypants coderay georgi-git_store georgi-kontrol georgi-shinmun
 
-Create a sample blog (this step requires the git executable):
+Create a sample blog:
 
     $ shinmun init myblog
 
@@ -48,9 +47,7 @@ folder:
     shinmun post 'The title of the post'
 
 Shinmun will then create a post file in the right place, for example
-in `posts/2008/9/the-title-of-the-post.md`. After creating you will
-probably open the file, set the category and tags and start writing
-your new article.
+in `posts/2008/9/the-title-of-the-post.md` and open it with $EDITOR.
 
 
 ### Post Format
@@ -141,23 +138,15 @@ An example tree:
 
 ### Blog configuation
 
-Inside `config/blog.yml` you set the properties of your blog:
+Inside `config.ru` you can set the properties of your blog:
 
-* title: the title of your blog, used inside templates
-* description: used for RSS
-* language: used for RSS
-* author: used for RSS
-* url: used for RSS
-* categories: a list of categories
-
-
-### Assets
-
-Shinmun serves asset files from your assets directory. Files in the
-directories `assets/stylesheets` and `assets/javascripts` will be
-served as one file each under the URLs `assets/stylesheets.css` and
-`assets/javascripts.css`. You have to name them accordingly like
-`1-reset.css` and `2-typo.css` to define the order.
+    blog.config = {
+      :language => 'en',
+      :title => "Blog Title",
+      :author => "The Author",
+      :categories => ["Ruby", "Javascript"],
+      :description => "Blog description"
+    }
 
 
 ### Templates
@@ -176,17 +165,20 @@ Layout and templates are rendered by *ERB*.  The layout is defined in
       </body>
      </html>
 
-The attributes of a post are accessible as instance variables in a
-template:
+The attributes of a post are accessible via the @post variable:
 
-    <div class="article">    
+    <div class="article">
+     
+      <h1><%= @post.title %></h1>
+     
       <div class="date">
-        <%= date @date %>
+        <%= human_date @post.date %>
       </div>
-      <h2><%= @title %></h2>  
-      <%= @body %>
-      <h3>Comments</h3>
-      <!-- comment form -->
+     
+      <%= @post.body_html %>
+
+      ...      
+
     </div>
 
 

data/assets/print.css

@@ -0,0 +1,76 @@
+body {
+    line-height:1.5;
+    font-family:"Helvetica Neue", "Lucida Grande", Arial, Verdana, sans-serif;
+    color:#000;
+    background:none;
+    font-size:10pt;
+}
+
+.container {
+    background:none;
+}
+
+h1,h2,h3,h4,h5,h6 {
+    font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;
+}
+
+code {
+    font:.9em "Courier New", Monaco, Courier, monospace;
+}
+
+img {
+    float:left;
+    margin:1.5em 1.5em 1.5em 0;
+}
+
+a img {
+    border:none;
+}
+
+p img.top {
+    margin-top:0;
+}
+
+hr {
+    background:#ccc;
+    color:#ccc;
+    width:100%;
+    height:2px;
+    border:none;
+    margin:2em 0;
+    padding:0;
+}
+
+blockquote {
+    font-style:italic;
+    font-size:.9em;
+    margin:1.5em;
+    padding:1em;
+}
+
+.small {
+    font-size:.9em;
+}
+
+.large {
+    font-size:1.1em;
+}
+
+.quiet {
+    color:#999;
+}
+
+.hide {
+    display:none;
+}
+
+a:link,a:visited {
+    background:transparent;
+    font-weight:700;
+    text-decoration:underline;
+}
+
+a:link:after,a:visited:after {
+    content:" (" attr(href) ") ";
+    font-size:90%;
+}

data/assets/styles.css

@@ -0,0 +1,91 @@
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p,
+blockquote, pre, a, abbr, acronym, address, del, dfn, img,
+q, fieldset, form, label, legend, table,
+caption, tbody, tfoot, thead, tr, th, td {
+    margin: 0; 
+    padding: 0; 
+    border: 0; 
+    font-weight: inherit;
+    font-style: inherit;
+    font-size: 100%; 
+    font-family: inherit;
+    vertical-align: baseline;
+}
+
+body {
+    line-height: 1.5;
+    background: #fff;
+    margin:0.5em 0;
+    font-size: 80%;
+    color: #222;
+    font-family: Arial, sans-serif;
+}
+
+p {
+    margin-bottom: 1em;
+}
+
+a {
+    color: #444;
+}
+
+a:visited {
+    color: #444;
+}
+
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+    text-decoration: none;
+}
+
+h1 { font-size: 2em; line-height: 1; margin-top: 1em; margin-bottom: 1em; }
+h2 { font-size: 1.5em; margin-top: 0.75em; margin-bottom: 0.75em; }
+h3 { font-size: 1.3em; line-height: 1; margin-top: 1.7em; margin-bottom: 1em; }
+h4 { font-size: 1.2em; line-height: 1.25; margin-top: 1.25em; margin-bottom: 1.25em; }
+h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
+h6 { font-size: 1em; font-weight: bold; }
+
+hr { 
+    height: 1px;
+    color: #ccc;
+}
+
+.container {
+    width: 600px;
+    margin: 0 auto;
+}
+
+.article {
+}
+
+.article h2 {
+    margin-top:0px;
+}
+
+.article .date {
+    color: #666;
+}
+
+.article .tags a {
+    color: #69c;
+    text-decoration: none;
+}
+
+.comments {
+    margin-bottom: 2em;
+}
+
+.comments .comment, .preview .comment {
+    margin-top: 2em;
+    border: 1px solid #ccc;
+}
+
+.comments .comment .top, .preview .comment .top  {
+    background: #F0F0F0;
+    color: #333;
+    padding: 3px 5px;
+}
+
+.comments .comment .body, .preview .comment .body {
+    background: #F8F8F8;
+    padding: 3px 5px;
+}

data/bin/shinmun

@@ -2,21 +2,29 @@
 
 require 'shinmun'
 
+ENV['RACK_ENV'] = 'production'
+
 case ARGV[0]
 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 master posts`
+  
+  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 master pages`
+
+  exec "#{ENV['EDITOR']} #{path}"
 
 else
   puts "Usage:"

data/config.ru

@@ -0,0 +1,16 @@
+require 'shinmun'
+
+use Rack::Session::Cookie
+use Rack::Reloader
+
+blog = Shinmun::Blog.new(File.dirname(__FILE__))
+
+blog.config = {
+  :language => 'en',
+  :title => "Blog Title",
+  :author => "The Author",
+  :categories => ["Ruby", "Javascript"],
+  :description => "Blog description"
+}
+
+run blog

data/lib/shinmun.rb

@@ -10,11 +10,8 @@ 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'
 require 'shinmun/comment'
-require 'shinmun/post_handler'
-
-require 'shinmun/aggregations/delicious'
-require 'shinmun/aggregations/flickr'

data/lib/shinmun/blog.rb

@@ -1,104 +1,76 @@
 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
-
-    %w[ assets comments config posts pages templates ].each do |name|
-      define_method(name) { store.root.tree(name) }
-    end
+    attr_accessor :config, :store, :posts, :pages
 
-    %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.load
-      
-      @repo = Grit::Repo.new(path) if defined?(Grit)
-      
-      Thread.start do
-        loop do
-          load_aggregations
-          sleep 300
-        end
-      end
+      @config = {}
+      @store = GitStore.new(path)
+      @store.handler['md'] = PostHandler.new
+      @store.handler['rhtml'] = ERBHandler.new
+      @store.handler['rxml'] = ERBHandler.new
     end
 
-    def self.init(name)
-      Dir.mkdir name      
-      Dir.chdir name
-      FileUtils.cp_r EXAMPLE_DIR + '/.', '.'
-      `git init`
-      `git add .`
-      `git commit -m 'init'`
-    end
+    def self.init(path)
+      path = File.expand_path(path)
+      Dir.mkdir(path)
 
-    def load_template(file)
-      templates[file] or raise "template #{file} not found"
-    end    
+      FileUtils.cp_r "#{ROOT}/assets", path
+      FileUtils.cp_r "#{ROOT}/templates", path
+      FileUtils.cp "#{ROOT}/config.ru", path
 
-    def render(name, vars = {})
-      super(name, vars.merge(:blog => self))
-    end
+      Dir.mkdir("#{path}/posts")
+      Dir.mkdir("#{path}/pages")
+      Dir.mkdir("#{path}/comments")
+      Dir.mkdir("#{path}/public")
 
-    def call(env)
-      store.refresh!      
-      super
-    end
+      FileUtils.ln_s("../assets", "#{path}/public/assets")
 
-    def load_aggregations
-      config['aggregations.yml'].to_a.each do |c|
-        aggregations[c['name']] = Object.const_get(c['class']).new(c['url'])
+      Dir.chdir(path) do
+        `git init`
+        `git add .`
+        `git commit -m 'init'`
       end
     end
 
-    def posts_by_date
-      posts.sort_by { |post| post.date.to_s }.reverse
+    def load_template(file)
+      store['templates/' + file]
     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 pages      
+      store.tree('pages').values
     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
+    def posts
+      store.tree('posts').values.sort_by { |post| post.date.to_s }.reverse
     end
 
-    # Return all archives as tuples of [year, month].
-    def archives
-      posts.map { |p| [p.year, p.month] }.uniq.sort
+    def call(env)
+      if ENV['RACK_ENV'] == 'production'
+        store.load if store.changed?
+      else
+        store.load(true)
+      end
+      
+      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 +84,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,23 +139,43 @@ 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
-    
-  end  
+
+    # Return all archives as tuples of [year, month].
+    def archives
+      posts.map { |p| [p.year, p.month] }.uniq.sort
+    end
+
+  end
   
 end