retter 0.0.4 → 0.1.0

data/.rspec

@@ -0,0 +1 @@
+--format Fuubar

data/.travis.yml

@@ -1,3 +1,2 @@
 rvm:
   - '1.9.2-p290'
-  - '1.9.3-preview1'

data/Gemfile

@@ -1,4 +1,3 @@
 source :rubygems
 
-gem 'redcarpet', '>= 2.0.0b3'
 gemspec

data/README.md

@@ -1,15 +1,25 @@
-# RETTER (レッター) Lightweight diary workflow.
+# 注意
 
-簡単さにこだわったシンプルな記事作成ツール。以下のような特徴があります。
+0.1.0 以降、`layouts/`ファイル以下に追加と変更があります。
+以下のコマンドで`layouts/`以下のファイルを上書きしてください。
+
+~~~~
+  retter gen $RETTER_HOME
+~~~~
+
+# RETTER (レッター) Flyweight diary workflow.
+
+手軽さを追求した記事作成ツール。以下のような特徴があります。
 
 * CLIでの操作を前提としています
-* どこにいてもすぐに記事を編集できます（Markdown）
+* どこ（cwd）にいてもすぐに記事を編集できます（Markdown）
 * オフラインで簡単にプレビューできます
 * だいたいどんなサーバ上でも動作します（静的HTMLまたはRackアプリとして）
 * RSSフィードを吐きます
 * トラックバック、コメントなどの機能はありません
+* コールバックを設定することでさらに手数を減らすことができます
 
-## Installation
+## インストール - Installation
 
 *ruby-1.9.2* or later is required.
 
@@ -17,26 +27,35 @@
   gem install retter
 ~~~~
 
-## Usage
+## 使い方 - Usage
 
-### Create a new site.
+### 新規サイト生成 - New site
 
-use `new` sub-command.
+`retter new`で新しいサイトのひな形を生成し、依存ライブラリをインストールし、gitリポジトリを初期化します。
 
 ~~~~
   $ retter new my_sweet_diary
 ~~~~
 
-### Settings
+生成するファイルはHAMLテンプレート、設定ファイル、デフォルトのCSS、Rackアプリ用の設定などです。
+
+### 初期設定 - Settings
+
+#### $EDITOR
 
 **retter requires `$EDITOR` variable.**
 
+Retterで記事を編集する際には任意のエディタが起動します。そのためには`$EDITOR`環境変数が設定されている必要があります。
+大抵の場合は設定されていると思いますが、もし設定されていなければ`~/.bash_profile`や`~/.zshenv`などに追記する必要があります。
+
 ~~~~
   $ echo "export EDITOR=vim" >> ~/.bash_profile
   $ . ~/.bash_profile
 ~~~~
 
-ファイルシステム上のどこに居ても `retter` コマンドを使って編集から公開まで行えるよう、 事前に `$RETTER_HOME` 環境変数を設定しておくことができます。
+#### $RETTER_HOME
+
+ファイルシステム上のどこに居ても`retter`コマンドを使って編集から公開まで行えるよう、 事前に`$RETTER_HOME`環境変数を設定します。
 
 You can use `retter` command anywhere, If you set `$RETTER_HOME` variable.
 
@@ -45,17 +64,24 @@ You can use `retter` command anywhere, If you set `$RETTER_HOME` variable.
   $ . ~/.bash_profile
 ~~~~
 
-### Write an article
+作業ディレクトリにRetterfileがある場合は、そのディレクトリが`$RETTER_HOME`に指定されているものとして動作します。
 
-`retter` コマンドは設定されているエディタを起動します。Markdownで記事を書くことができます。
+### 記事を書く - Write an article
 
-`retter` opens `$EDITOR`. Write an article with Markdown. That article will be the draft.
+`retter`コマンドは設定されているエディタを起動します。今のところMarkdown形式で記事を書くことができます。
+
+`retter` opens `$EDITOR`. Write an article with Markdown.
 
 ~~~~
   $ retter
 ~~~~
 
-`preview` で書きかけの最新記事をブラウザで確認することができます（デフォルトブラウザが起動します）。
+記事をひと通り書き終えたり確認したくなったら、エディタの機能で記事を保存して終了してください。
+保存された記事は、その段階ではまだ下書きの状態です。
+
+### プレビュー - Preview
+
+下書きの記事を確認するには`preview`サブコマンドを使います（デフォルトブラウザが起動します）。
 
 `preview` opens the draft article by your default browser.
 
@@ -63,6 +89,13 @@ You can use `retter` command anywhere, If you set `$RETTER_HOME` variable.
   $ retter preview
 ~~~~
 
+気に入らない箇所を見つけたらページを閉じて、また`retter`コマンドで記事を編集します。
+満足のいく文章が出来上がるまで編集とプレビューを繰り返しましょう。
+
+
+### 記事の生成 - Bind
+
+下書きが完成したら、記事をそのサイトのページとして生成します。
 `bind`, `rebind` は下書きの記事をその日の記事として保存し、すべてのHTMLを再生成します。
 
 `bind` and `rebind` binds the draft article. And re-generates actual html web pages. All html pages will be overwritten.
@@ -71,9 +104,27 @@ You can use `retter` command anywhere, If you set `$RETTER_HOME` variable.
   $ retter bind
 ~~~~
 
-### Publish
+### サイト全体の確認 - Browse Offline
+
+生成されるすべてのページは静的HTMLですから、オフラインでも自分のマシンで全体的な見栄えを確認できます。
+`open`サブコマンドはデフォルトブラウザを起動してサイトのトップページを開きます。
+
+`open` sub-command opens your (static) website by your default browser.
+
+~~~~
+  $ retter open
+~~~~
 
-記事を公開するには、すべてのファイルを git リポジトリにコミットし、リモートサーバに push するか単純にファイルをアップロードします。
+デプロイ先のサーバではRackアプリとして起動しているということであれば、rackupで確認しましょう。
+
+~~~~
+  $ retter home # `home` opens a new shell in $RETTER_HOME.
+  (retter) bundle exec rackup
+~~~~
+
+### 記事の公開 - Publish
+
+記事をインターネット上に公開するには、必要なすべてのファイルを git リポジトリにコミットしリモートサーバに push、または単純にファイルをアップロードします。
 
 To publish, use the git command. Or, upload the file to your server.
 
@@ -98,62 +149,76 @@ To publish, use the git command. Or, upload the file to your server.
   (retter) git push [remote] [branch] # heroku, github pages, etc..
 ~~~~
 
-#### Using Callbacks
+後述するコールバックを設定しておくことで、さらに手数を減らすことも可能です。
+
+### 特定の日付の記事を編集する - Edit article (specific date).
+
+昨日、明日、過去や未来の日付を指定して記事を編集・プレビューするには、 `--date` オプションを用います。
+
+`--date` option is available in `edit` `preview` sub-command.
+
+~~~~
+  retter edit --date 20110101
+  retter preview --date 20110101
+~~~~
+
+### コールバック - Callbacks
 
-コールバックを定義しておくことで、公開の作業を無意識に実行することができます。
+コールバックはいくつかのサブコマンド（edit bind rebind commit）の実行直後に自動的に実行されます。
+コールバックを定義しておくことで、手数の多い割に代わり映えのしない作業を自動化することができます。
 
 Callback is enabled in `edit`, `bind`, `rebind` and `commit` sub-command.
 
+#### Syntax
+
 ~~~~ruby
   after [command], [invoke command or proc]
 ~~~~
 
+#### HTMLの生成時、デプロイまでの作業を自動化する - Auto deploying
+
 以下のような内容を Retterfile に記述しておくことで、rebind または bind が実行されると即座に公開までの処理も実行されます。
 
 In Retterfile:
 
 ~~~~ruby
-  after :rebind, :commit
+  after :rebind, :commit # git commit
 
-  after :commit do
+  after :commit do       # deploy
     system "cd #{config.retter_home}"
     system 'git push origin master'
   end
 ~~~~
 
+もし毎回デプロイするのが煩わしい場合は、`--silent`オプションを付けることでコールバックを回避できます。
+その場合は`retter rebind`ではなく`retter rebind --silent`を実行することになります。
+
 `--silent` option skip the callback.
 
-### Edit article (specific date).
+#### エディタを終了したとき即座にプレビューする - Auto preview
 
-過去や未来の日付を指定して記事を編集・プレビューするには、 `--date` オプションを用います。
+記事を編集しエディタを終了したあとブラウザでプレビューしたい場合は、`edit`へのコールバックを設定できます。
 
-`--date` option is available in `edit` `preview` sub-command.
-
-~~~~
-  retter edit --date=20110101
-  retter preview --date=20110101
+~~~~ruby
+  after :edit do
+    preview if yes?("Preview now? [yes/no]")
+  end
 ~~~~
 
-### Browse offline
+もしもコールバックを毎回実行したくない場合、`--silent`を指定する以外に、上記のように確認プロンプトを表示させるという方法もあります。
 
-生成されるすべてのページは静的HTMLです。`open` でサーバにデプロイしたものとほぼ同じようにオフラインでも閲覧することができます。rackでもOK。
+#### コールバック呼出し
 
-`open` sub-command opens your (static) website by your default browser.
+コマンド実行後にコールバックだけを再度実行したい場面では、`callback`サブコマンドを使用できます。
 
 ~~~~
-  $ retter open    # visit file://path/to/my_sweet_diary/index.html
+  $ retter callback --after edit
 ~~~~
 
-Or, Use rack if needed.
-
-~~~~
-  $ cd /path/to/my_sweet_diary
-  $ bundle exec rackup
-~~~~
-
-### Pre-installed themes
+### 組込みテーマ - Pre-installed themes
 
 スタイルシートを変更することでテーマを変更できます。HTMLのヘッダを変更するには `layouts/retter.html.haml` を編集します。
+スタイルシートの指定を変更し、`retter rebind`コマンドを実行するとすべてのページが更新されます。
 
 #### Default
 
@@ -171,15 +236,34 @@ Or, Use rack if needed.
 
 ![Orange](http://hibariya.github.com/images/theme_samples/retter_orange.jpg)
 
+### HTMLの修正 - HTML Layout
+
+HTMLのレイアウト自体を変更するには`layouts/`ディレクトリ以下のHAMLファイルを修正します。
+これらのファイルを変更したとしても、`retter rebind`コマンドを実行するまでは反映されません。
+
+~~~~
+layouts
+  |-- article.html.haml
+  |-- entries.html.haml
+  |-- entry.html.haml
+  |-- index.html.haml
+  |-- profile.html.haml
+  `-- retter.html.haml
+~~~~
+
+`retter.html.haml`はHTML宣言を含めた全体のHTMLが含まれています。
+`entry.html.haml`を変更することで日別のページのレイアウトを変更することができます。
+`article.html.haml`を変更することで個々の記事のレイアウトを変更することができます。
+その他のファイルは実際のURLと名前が対応しています。
+
 ## LICENSE
 
 The MIT License
 
-Copyright (c) 2011 hibariya
+Copyright (c) 2011 hibariya, uzura29
 
 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 OR COPYRIGHT HOLDERS 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/retter

@@ -5,9 +5,16 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'retter'
 
-if ARGV[0] == 'new'
-  require 'generator/newretter'
-  Newretter.start ARGV[1..-1]
+case ARGV[0]
+when 'new'
+  Retter::Generator::Creator.start ARGV[1..-1]
+when 'gen'
+  Retter::Generator::Updator.start ARGV[1..-1]
 else
-  Retter::Command.start
+  begin
+    Retter::Command.start
+  rescue Errno::ENOENT
+    $stderr.puts "Some files might be broken. run `retter gen $RETTER_HOME`"
+    raise
+  end
 end

data/lib/retter/command.rb

@@ -1,6 +1,14 @@
 # coding: utf-8
 
 class Retter::Command < Thor
+  map '-v' => :version,
+      '-e' => :edit,
+      '-p' => :preview,
+      '-o' => :open,
+      '-r' => :rebind,
+      '-b' => :bind,
+      '-h' => :home
+
   desc 'edit', 'Open $EDITOR. Write an article with Markdown.'
   method_options date: :string, silent: :boolean
   def edit
@@ -64,6 +72,12 @@ class Retter::Command < Thor
     say 'bye', :green
   end
 
+  desc 'callback', 'Call a callback process only'
+  method_options after: :string
+  def callback
+    invoke_after options[:after].intern
+  end
+
   desc 'new', 'Create a new site'
   def new; end
 
@@ -72,6 +86,11 @@ class Retter::Command < Thor
     say Retter::Command.usage, :green
   end
 
+  desc 'version', 'Show version.'
+  def version
+    say "Retter version #{Retter::VERSION}"
+  end
+
   private
 
   def detected_retter_file

data/lib/retter/config.rb

@@ -14,6 +14,7 @@ class Retter::Config
     :layout_file,
     :profile_layout_file,
     :entry_layout_file,
+    :article_layout_file,
     :entries_layout_file,
     :index_layout_file,
     :entries_dir,
@@ -55,6 +56,7 @@ class Retter::Config
     layout_file         layouts_dir.join('retter.html.haml')
     profile_layout_file layouts_dir.join('profile.html.haml')
     entry_layout_file   layouts_dir.join('entry.html.haml')
+    article_layout_file layouts_dir.join('article.html.haml')
     entries_layout_file layouts_dir.join('entries.html.haml')
     index_layout_file   layouts_dir.join('index.html.haml')
     entries_dir         retter_home.join('entries/')
@@ -66,7 +68,7 @@ class Retter::Config
 
   def load_retterfile_if_exists
     retterfile = retter_home.join('Retterfile')
-    instance_eval retterfile.read if retterfile.exist?
+    instance_eval retterfile.read, retterfile.to_s if retterfile.exist?
   end
 
   def detect_retter_home
@@ -82,8 +84,12 @@ class Retter::Config
     entries_dir.join date.strftime('%Y%m%d.html')
   end
 
+  def entry_dir(date)
+    entries_dir.join date.strftime('%Y%m%d')
+  end
+
   def self.delegatables
-    ATTRIBUTES + [:retter_file, :entry_file]
+    ATTRIBUTES + [:retter_file, :entry_file, :entry_dir]
   end
 
   def after(name, sym = nil, &block)

data/lib/retter/entry.rb

@@ -1,13 +1,22 @@
 # coding: utf-8
 
 class Retter::Entry
-  attr_accessor :date, :body, :titles
+  class Article
+    attr_accessor :entry, :id, :title, :body
+
+    def to_s
+      body
+    end
+  end
+
+  attr_accessor :date, :lede, :body, :articles
 
   def initialize(attrs={})
     @date, @body = attrs.values_at(:date, :body)
 
     attach_titles
-    load_titles
+    extract_articles
+    load_lede
   end
 
   def to_s
@@ -29,9 +38,28 @@ class Retter::Entry
     @body = html.search('//body/*').to_s
   end
 
-  def load_titles
-    @titles = body_elements.search('//h1').each_with_object({}) {|h1, titles|
-      titles[h1.attr('id')] = h1.text
+  def extract_articles
+    @articles = body_elements.search('body > *').each_with_object([]) {|c, r|
+      if c.name == 'h1'
+        article = Article.new
+        article.entry = self
+        article.id = c.attr('id')
+        article.title = c.text
+        article.body  = ''
+        r << article
+      else
+        article  = r.last
+        next if article.nil?
+
+        article.body += c.to_s
+      end
+    } || []
+  end
+
+  def load_lede
+    @lede = body_elements.search('body > *').each_with_object('') {|c, r|
+      break r if c.name == 'h1'
+      r<< c.to_s
     }
   end
 end

data/lib/{generator/newretter.rb → retter/generator/base.rb}

@@ -6,7 +6,7 @@ require 'bundler'
 require 'bundler/cli'
 require 'retter'
 
-class Newretter < Thor::Group
+class Retter::Generator::Base < Thor::Group
   TEMPLATES = %w(
     Retterfile
     Gemfile
@@ -14,6 +14,7 @@ class Newretter < Thor::Group
     index.html
     layouts/entries.html.haml
     layouts/entry.html.haml
+    layouts/article.html.haml
     layouts/profile.html.haml
     layouts/index.html.haml
     layouts/retter.html.haml
@@ -60,35 +61,4 @@ class Newretter < Thor::Group
 
     FileUtils.cd pwd
   end
-
-  def git_init
-    Grit::Repo.init "#{Dir.pwd}/#{name}"
-  end
-
-  def notice_how_to_use
-    editor = ENV['EDITOR']
-
-    say "-- Thanks for flying Retter :-> --\n", :green
-    say <<-EOM, :green
-Setting $EDITOR:
-  retter *requires* $EDITOR variable.
-  example:
-    echo "export EDITOR=vim" >> ~/.zshenv # or ~/.bash_profile
-    . ~/.zshenv
-    EOM
-
-    say "  Current your $EDITOR is #{editor ? editor : 'undefined'}.\n", :red
-
-    say <<-EOM, :green
-Setting $RETTER_HOME:
-  You can use retter command anywhere, If you set $RETTER_HOME variable.
-  example:
-    echo "export RETTER_HOME=#{Dir.pwd}/#{name}" >> ~/.zshenv
-    ...
-
-See also:
-  retter usage
-  retter help
-    EOM
-  end
 end

data/lib/retter/generator/creator.rb

@@ -0,0 +1,34 @@
+# coding: utf-8
+
+class Retter::Generator::Creator < Retter::Generator::Base
+  def git_init
+    Grit::Repo.init "#{Dir.pwd}/#{name}"
+  end
+
+  def notice_how_to_use
+    editor = ENV['EDITOR']
+
+    say "-- Thanks for flying Retter :-> --\n", :green
+    say <<-EOM, :green
+Setting $EDITOR:
+  retter *requires* $EDITOR variable.
+  example:
+    echo "export EDITOR=vim" >> ~/.zshenv # or ~/.bash_profile
+    . ~/.zshenv
+    EOM
+
+    say "  Current your $EDITOR is #{editor ? editor : 'undefined'}.\n", :red
+
+    say <<-EOM, :green
+Setting $RETTER_HOME:
+  You can use retter command anywhere, If you set $RETTER_HOME variable.
+  example:
+    echo "export RETTER_HOME=#{Dir.pwd}/#{name}" >> ~/.zshenv
+    ...
+
+See also:
+  retter usage
+  retter help
+    EOM
+  end
+end

data/lib/{generator → retter/generator}/skel/Retterfile

@@ -16,6 +16,12 @@ author      '<%= ENV["USER"] %>'
 #
 ## Using proc example:
 #    after :commit do
-#      system "cd #{config.retter_home}"
-#      system 'git push origin master'
+#      if yes?("Deploy now? [yes/no]")
+#        system "cd #{config.retter_home}"
+#        system 'git push origin master'
+#      end
+#    end
+#
+#    after :edit do
+#      preview if yes?("Preview now? [yes/no]")
 #    end

data/lib/retter/generator/skel/layouts/article.html.haml

@@ -0,0 +1,6 @@
+%article
+  %h1.date
+    %a{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
+  %h1{id: article.id}
+    %a{href: article_path(entry.date, article.id)}= article.title
+  = article

data/lib/{generator → retter/generator}/skel/layouts/entries.html.haml

@@ -4,6 +4,6 @@
       %li
         %a.entry{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
         %ul.titles
-          - entry.titles.each do |id, title|
+          - entry.articles.each do |article|
             %li
-              %a.title{href: entry_path(entry.date, id)}= title
+              %a.title{href: article_path(entry.date, article.id)}= article.title

data/lib/retter/generator/skel/layouts/entry.html.haml

@@ -0,0 +1,9 @@
+%article
+  %h1.date
+    %a{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
+  - unless entry.lede.empty?
+    = entry.lede
+  - entry.articles.each do |article|
+    %h1{id: article.id}
+      %a{href: article_path(entry.date, article.id)}= article.title
+    = article

data/lib/retter/generator/skel/layouts/index.html.haml

@@ -0,0 +1,11 @@
+#entries
+  - entries[0..5].each do |entry|
+    %article
+      %h1.date
+        %a{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
+      - unless entry.lede.empty?
+        = entry.lede
+      - entry.articles.each do |article|
+        %h1{id: article.id}
+          %a{href: article_path(entry.date, article.id)}= article.title
+        = article

data/lib/{generator → retter/generator}/skel/layouts/retter.html.haml

@@ -1,7 +1,7 @@
 !!!
 %html
   %head
-    %title= config.title
+    %title= title
     %meta{:'http-equiv' => 'Content-Type', content: 'text/html', charset: 'utf-8'}
     %link{rel: 'icon', type: 'image/png', href: '/favicon.png'}
     %link{href: '/stylesheets/base.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}

data/lib/retter/generator/updator.rb

@@ -0,0 +1,7 @@
+# coding: utf-8
+
+class Retter::Generator::Updator < Retter::Generator::Base
+  def complete_message
+    say 'Website has been updated!', :green
+  end
+end

data/lib/retter/generator.rb

@@ -0,0 +1,8 @@
+# coding: utf-8
+
+module Retter::Generator
+  autoload :Creator, 'retter/generator/creator'
+  autoload :Updator, 'retter/generator/updator'
+end
+
+require 'retter/generator/base'

data/lib/retter/stationery/binder.rb

@@ -32,22 +32,44 @@ module Retter::Stationery
     end
 
     def bind_entries
-      @entries.each {|entry| print_entry entry }
+      @entries.each do |entry|
+        print_entry entry
+        print_articles entry
+      end
+
       print_toc
     end
 
     def print_entry(entry)
+      title = "#{entry.date.strftime('%Y/%m/%d')} - #{config.title}"
       part = entry_renderer.render(view_scope, entry: entry)
-      html = layout_renderer.render(view_scope, content: part)
+      html = layout_renderer.render(view_scope, content: part, title: title)
 
       entry_file(entry.date).open('w') do |f|
         f.puts View::Helper.fix_path(html, '../')
       end
     end
 
+    def print_articles(entry)
+      return if entry.articles.empty?
+
+      entry_dir = config.entry_dir(entry.date)
+      entry_dir.mkdir unless entry_dir.directory?
+
+      entry.articles.each do |article|
+        title = "#{article.title} - #{config.title}"
+        part = article_renderer.render(view_scope, entry: entry, article: article)
+        html = layout_renderer.render(view_scope, content: part, title: title)
+
+        entry_dir.join("#{article.id}.html").open('w') do |f|
+          f.puts View::Helper.fix_path(html, '../../')
+        end
+      end
+    end
+
     def print_index
       part = Haml::Engine.new(index_layout_file.read, ugly: true).render(view_scope)
-      html = layout_renderer.render(view_scope, content: part)
+      html = layout_renderer.render(view_scope, content: part, title: config.title)
 
       index_file.open('w') do |f|
         f.puts  View::Helper.fix_path(html, './')
@@ -56,7 +78,7 @@ module Retter::Stationery
 
     def print_profile
       part = Haml::Engine.new(profile_layout_file.read, ugly: true).render(view_scope)
-      html = layout_renderer.render(view_scope, content: part)
+      html = layout_renderer.render(view_scope, content: part, title: config.title)
 
       profile_file.open('w') do |f|
         f.puts  View::Helper.fix_path(html, './')
@@ -65,7 +87,7 @@ module Retter::Stationery
 
     def print_toc
       part = Haml::Engine.new(entries_layout_file.read, ugly: true).render(view_scope)
-      html = layout_renderer.render(view_scope, content: part)
+      html = layout_renderer.render(view_scope, content: part, title: config.title)
 
       entries_file.open('w') do |f|
         f.puts  View::Helper.fix_path(html, './')
@@ -120,5 +142,9 @@ module Retter::Stationery
     def entry_renderer
       @entry_renderer ||= Haml::Engine.new(entry_layout_file.read, ugly: true)
     end
+
+    def article_renderer
+      @article_renderer ||= Haml::Engine.new(article_layout_file.read, ugly: true)
+    end
   end
 end

data/lib/retter/stationery/previewer.rb

@@ -46,7 +46,7 @@ module Retter::Stationery
     def print_html
       scope = View::Scope.new(config)
       part = entry_renderer.render(scope, entry: @entry)
-      html = renderer.render(scope, content: part, entries: [@entry])
+      html = renderer.render(scope, content: part, title: config.title, entries: [@entry])
 
       file_path.open('w') do |file|
         file.puts View::Helper.fix_path(html, './')

data/lib/retter/stationery/view.rb

@@ -14,6 +14,10 @@ module Retter::Stationery::View
       date.strftime('/entries/%Y%m%d.html') + (id ? "##{id}" : '')
     end
 
+    def article_path(date, id)
+      date.strftime("/entries/%Y%m%d/#{id}.html")
+    end
+
     private
 
     def fix_src_path(elements, prefix = './')

data/lib/retter/version.rb

@@ -1,3 +1,3 @@
 module Retter
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/lib/retter.rb

@@ -5,6 +5,8 @@ $LOAD_PATH.unshift here unless $LOAD_PATH.include?(here)
 
 module Retter
   class EnvError < RuntimeError; end
+
+  autoload :Generator, 'retter/generator'
 end
 
 require 'date'

data/retter.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["hibariya", "uzura29"]
   s.email       = ["celluloid.key@gmail.com"]
   s.homepage    = "https://github.com/hibariya/retter"
-  s.summary     = %q{Lightweight diary workflow}
-  s.description = %q{Lightweight diary workflow. ruby-1.9.2 or later is required.}
+  s.summary     = %q{Flyweight diary workflow}
+  s.description = %q{Flyweight diary workflow. ruby-1.9.2 or later is required.}
 
   #s.rubyforge_project = "retter"
 
@@ -32,5 +32,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ir_b', ['>= 1.4.0']
   s.add_development_dependency 'tapp', ['>= 1.1.0']
   s.add_development_dependency 'rspec', ['>= 2.6.0']
+  s.add_development_dependency 'fuubar', ['>= 0.0.6']
   s.add_development_dependency 'simplecov', ['>= 0.5.3']
 end

data/spec/command/callback_spec.rb

@@ -2,28 +2,17 @@
 
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe 'Retter::Command#invoke_after', clean: :all do
+describe 'Retter::Command#callback', clean: :all do
   let(:command) { Retter::Command.new }
 
-  context 'invoke with proc' do
-    before do
-      command.stub!(:config) { retter_config }
+  before do
+    command.stub!(:config) { retter_config }
 
-      retter_config.after(:edit) { commit }
-      command.should_receive(:commit).and_return(true)
-    end
+    retter_config.after(:edit) { commit }
+    command.should_receive(:commit).and_return(true)
 
-    it { command.edit.should }
+    command.stub!(:options) { {after: :edit} }
   end
 
-  context 'invoke with symbol' do
-    before do
-      command.stub!(:config) { retter_config }
-
-      retter_config.after(:edit, :commit)
-      command.should_receive(:invoke).with(:commit).and_return(true)
-    end
-
-    it { command.edit.should }
-  end
+  it { command.callback.should }
 end

data/spec/command/invoke_after_spec.rb

@@ -0,0 +1,29 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'Retter::Command#invoke_after', clean: :all do
+  let(:command) { Retter::Command.new }
+
+  context 'invoke with proc' do
+    before do
+      command.stub!(:config) { retter_config }
+
+      retter_config.after(:edit) { commit }
+      command.should_receive(:commit).and_return(true)
+    end
+
+    it { command.edit.should }
+  end
+
+  context 'invoke with symbol' do
+    before do
+      command.stub!(:config) { retter_config }
+
+      retter_config.after(:edit, :commit)
+      command.should_receive(:invoke).with(:commit).and_return(true)
+    end
+
+    it { command.edit.should }
+  end
+end

data/spec/command/preview_spec.rb

@@ -23,7 +23,7 @@ describe 'Retter::Command#preview', clean: :all do
       command.preview
     end
 
-    subject { texts_of(preview, '.entry p') }
+    subject { texts_of(preview, 'article p') }
 
     it { should == [article] }
   end
@@ -42,7 +42,7 @@ describe 'Retter::Command#preview', clean: :all do
       command.preview
     end
 
-    subject { texts_of(preview, '.entry p') }
+    subject { texts_of(preview, 'article p') }
 
     it { should_not be_include('おやすみなさい') }
     it { should be_include(article) }

data/spec/command/rebind_spec.rb

@@ -40,9 +40,9 @@ describe 'Retter::Command#rebind', clean: :all do
     describe 'index.html' do
       let(:index_html) { retter_config.index_file.read }
 
-      it { texts_of(index_html, '.entry p').should be_include('おはようございます') }
-      it { texts_of(index_html, '.entry h1.date').should == %w(2011/01/01) }
-      it { texts_of(index_html, '.entry h1').should == %w(2011/01/01 朝11時 夜1時) }
+      it { texts_of(index_html, 'article p').should include('おはようございます') }
+      it { texts_of(index_html, 'article h1.date').should == %w(2011/01/01) }
+      it { texts_of(index_html, 'article h1').should == %w(2011/01/01 朝11時 夜1時) }
     end
 
     describe 'entries.html' do
@@ -55,9 +55,51 @@ describe 'Retter::Command#rebind', clean: :all do
     describe 'entry.html' do
       let(:entry_html) { retter_config.entry_file(Date.parse(date_str)).read }
 
-      it { texts_of(entry_html, '.entry p').should be_include('おはようございます') }
-      it { texts_of(entry_html, '.entry h1.date').should == %w(2011/01/01) }
-      it { texts_of(entry_html, '.entry h1').should == %w(2011/01/01 朝11時 夜1時) }
+      it { texts_of(entry_html, 'article p').should == %w(おはようございます おやすみなさい) }
+      it { texts_of(entry_html, 'article h1.date').should == %w(2011/01/01) }
+      it { texts_of(entry_html, 'article h1').should == %w(2011/01/01 朝11時 夜1時) }
+    end
+
+    describe 'entry part(first)' do
+      let(:part_html) { retter_config.entry_dir(Date.parse(date_str)).join('a0.html').read }
+
+      describe 'body' do
+        subject { texts_of(part_html, 'article p') }
+        it { should include('おはようございます') }
+        it { should_not include('おやすみなさい') }
+      end
+
+      describe 'date' do
+        subject { texts_of(part_html, 'article h1.date') }
+        it { should == %w(2011/01/01) }
+      end
+
+      describe 'headings' do
+        subject { texts_of(part_html, 'article h1') }
+        it { should include('朝11時') }
+        it { should_not include('夜1時') }
+      end
+    end
+
+    describe 'entry part(last)' do
+      let(:part_html) { retter_config.entry_dir(Date.parse(date_str)).join('a1.html').read }
+
+      describe 'body' do
+        subject { texts_of(part_html, 'article p') }
+        it { should include('おやすみなさい') }
+        it { should_not include('おはようございます') }
+      end
+
+      describe 'date' do
+        subject { texts_of(part_html, 'article h1.date') }
+        it { should == %w(2011/01/01) }
+      end
+
+      describe 'headings' do
+        subject { texts_of(part_html, 'article h1') }
+        it { should include('夜1時') }
+        it { should_not include('朝11時') }
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 
   retter_home = RETTER_ROOT.join('tmp', 'test')
-  skel        = RETTER_ROOT.join('lib', 'generator', 'skel')
+  skel        = RETTER_ROOT.join('lib', 'retter', 'generator', 'skel')
 
   config.before(:each, clean: :all) do
     FileUtils.cp_r skel, retter_home.dirname.join('test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70099940455160 !ruby/object:Gem::Requirement
+  requirement: &70099608665480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70099940455160
+  version_requirements: *70099608665480
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70099940452260 !ruby/object:Gem::Requirement
+  requirement: &70099608664900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099940452260
+  version_requirements: *70099608664900
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70099940451680 !ruby/object:Gem::Requirement
+  requirement: &70099608664340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.0b3
   type: :runtime
   prerelease: false
-  version_requirements: *70099940451680
+  version_requirements: *70099608664340
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70099940451100 !ruby/object:Gem::Requirement
+  requirement: &70099608663780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70099940451100
+  version_requirements: *70099608663780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70099940450560 !ruby/object:Gem::Requirement
+  requirement: &70099608663200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099940450560
+  version_requirements: *70099608663200
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70099940450040 !ruby/object:Gem::Requirement
+  requirement: &70099608662620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70099940450040
+  version_requirements: *70099608662620
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70099940449440 !ruby/object:Gem::Requirement
+  requirement: &70099608662020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70099940449440
+  version_requirements: *70099608662020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70099940448860 !ruby/object:Gem::Requirement
+  requirement: &70099608661500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099940448860
+  version_requirements: *70099608661500
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70099940448280 !ruby/object:Gem::Requirement
+  requirement: &70099608660900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70099940448280
+  version_requirements: *70099608660900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70099940447700 !ruby/object:Gem::Requirement
+  requirement: &70099608660380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70099940447700
+  version_requirements: *70099608660380
 - !ruby/object:Gem::Dependency
   name: ir_b
-  requirement: &70099940447220 !ruby/object:Gem::Requirement
+  requirement: &70099608659820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70099940447220
+  version_requirements: *70099608659820
 - !ruby/object:Gem::Dependency
   name: tapp
-  requirement: &70099940446620 !ruby/object:Gem::Requirement
+  requirement: &70099608659240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70099940446620
+  version_requirements: *70099608659240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70099940446040 !ruby/object:Gem::Requirement
+  requirement: &70099608658740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,21 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70099940446040
+  version_requirements: *70099608658740
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &70099608658160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :development
+  prerelease: false
+  version_requirements: *70099608658160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70099940445440 !ruby/object:Gem::Requirement
+  requirement: &70099608657600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,8 +176,8 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70099940445440
-description: Lightweight diary workflow. ruby-1.9.2 or later is required.
+  version_requirements: *70099608657600
+description: Flyweight diary workflow. ruby-1.9.2 or later is required.
 email:
 - celluloid.key@gmail.com
 executables:
@@ -175,36 +186,41 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - bin/retter
-- lib/generator/newretter.rb
-- lib/generator/skel/.gitignore
-- lib/generator/skel/Gemfile
-- lib/generator/skel/Retterfile
-- lib/generator/skel/config.ru
-- lib/generator/skel/entries/.gitkeep
-- lib/generator/skel/images/.gitkeep
-- lib/generator/skel/images/orange/bg_body.jpg
-- lib/generator/skel/images/orange/bg_entry.jpg
-- lib/generator/skel/images/orange/bg_header.png
-- lib/generator/skel/index.html
-- lib/generator/skel/javascripts/.gitkeep
-- lib/generator/skel/layouts/entries.html.haml
-- lib/generator/skel/layouts/entry.html.haml
-- lib/generator/skel/layouts/index.html.haml
-- lib/generator/skel/layouts/profile.html.haml
-- lib/generator/skel/layouts/retter.html.haml
-- lib/generator/skel/retters/.gitkeep
-- lib/generator/skel/stylesheets/base.css
-- lib/generator/skel/stylesheets/orange.css
-- lib/generator/skel/stylesheets/retter.css
 - lib/retter.rb
 - lib/retter/command.rb
 - lib/retter/config.rb
 - lib/retter/entry.rb
+- lib/retter/generator.rb
+- lib/retter/generator/base.rb
+- lib/retter/generator/creator.rb
+- lib/retter/generator/skel/.gitignore
+- lib/retter/generator/skel/Gemfile
+- lib/retter/generator/skel/Retterfile
+- lib/retter/generator/skel/config.ru
+- lib/retter/generator/skel/entries/.gitkeep
+- lib/retter/generator/skel/images/.gitkeep
+- lib/retter/generator/skel/images/orange/bg_body.jpg
+- lib/retter/generator/skel/images/orange/bg_entry.jpg
+- lib/retter/generator/skel/images/orange/bg_header.png
+- lib/retter/generator/skel/index.html
+- lib/retter/generator/skel/javascripts/.gitkeep
+- lib/retter/generator/skel/layouts/article.html.haml
+- lib/retter/generator/skel/layouts/entries.html.haml
+- lib/retter/generator/skel/layouts/entry.html.haml
+- lib/retter/generator/skel/layouts/index.html.haml
+- lib/retter/generator/skel/layouts/profile.html.haml
+- lib/retter/generator/skel/layouts/retter.html.haml
+- lib/retter/generator/skel/retters/.gitkeep
+- lib/retter/generator/skel/stylesheets/base.css
+- lib/retter/generator/skel/stylesheets/orange.css
+- lib/retter/generator/skel/stylesheets/retter.css
+- lib/retter/generator/updator.rb
 - lib/retter/stationery.rb
 - lib/retter/stationery/binder.rb
 - lib/retter/stationery/previewer.rb
@@ -215,6 +231,7 @@ files:
 - spec/command/callback_spec.rb
 - spec/command/commit_spec.rb
 - spec/command/edit_spec.rb
+- spec/command/invoke_after_spec.rb
 - spec/command/open_spec.rb
 - spec/command/preview_spec.rb
 - spec/command/rebind_spec.rb
@@ -246,11 +263,12 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Lightweight diary workflow
+summary: Flyweight diary workflow
 test_files:
 - spec/command/callback_spec.rb
 - spec/command/commit_spec.rb
 - spec/command/edit_spec.rb
+- spec/command/invoke_after_spec.rb
 - spec/command/open_spec.rb
 - spec/command/preview_spec.rb
 - spec/command/rebind_spec.rb

data/lib/generator/skel/layouts/entry.html.haml

@@ -1,5 +0,0 @@
-%article
-  .entry
-    %h1.date
-      %a{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
-    = entry

data/lib/generator/skel/layouts/index.html.haml

@@ -1,7 +0,0 @@
-#entries
-  - entries[0..5].each do |entry|
-    %article
-      .entry
-        %h1.date
-          %a{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
-        = entry