memorack 0.1.2 → 0.2.0

data/lib/memorack/plugins/formats/markdown.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+require 'memorack/pageinfo'
+
+
+module MemoRack
+
+	class PageInfoMarkdown < PageInfo
+		# ファイル拡張子
+		def self.extnames
+			['md', 'mkd', 'markdown']
+		end
+
+		def accept_title(line, prev = nil)
+			case line
+			when /^(\#{1,6}?)\s+(.+)$/
+				level = $1.length
+				headline = $2.gsub(/\#+\s*$/, '').strip
+				return headline
+			when /^\s*([=\-])+\s*$/
+				return nil unless prev
+
+				prev = prev.strip
+				unless prev.empty?
+					level = ($1 == '=') ? 1 : 2
+					return prev
+				end
+			end
+		end
+	end
+
+end

data/lib/memorack/plugins/formats/org.rb

@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+
+require 'memorack/pageinfo'
+require 'time'
+
+require 'rubygems'
+require 'org-ruby'
+
+
+module MemoRack
+
+	class PageInfoOrg < PageInfo
+		# ファイル拡張子
+		def self.extnames
+			['org']
+		end
+
+		def self.org_keys(*keys, &block)
+			define_keys *keys
+
+			keys.each { |name|
+				block = lambda { |line, prev = nil| org_info(name, line) }
+				define_method("accept_#{name}", &block)
+			}
+		end
+
+		# ファイル解析の終了か？
+		def parse_end?(line, n)
+			line !~ /^\#/
+		end
+
+		def org_info(name, line)
+			name = name.to_s.upcase
+
+			if line =~ /^\#\+#{name}:\s*(.+)$/
+				$1.strip
+			end
+		end
+
+		def accept_date(line, prev = nil)
+			value = org_info(:date, line)
+			value = Time.parse(value) if value
+			value
+		end
+
+		# 作成日
+		define_key(:ctime) { |key|
+			values[key] ||= parse(:date) || File::Stat.new(@path).ctime
+		}
+
+		org_keys :title, :author, :email, :language, :description
+	end
+
+end

data/lib/memorack/template/.gitignore

@@ -1,3 +1,4 @@
+/_site
 tmp
 .sass-cache
 .ruby-version

data/lib/memorack/template/themes/custom/macro.yml

@@ -0,0 +1,2 @@
+page:
+  title: '{{#content?}}{{page.name}} | {{/content?}}{{title}}'

data/spec/memorack_spec.rb

@@ -3,6 +3,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'memorack'
 require 'memorack/cli'
+require 'cgi'
 
 
 describe MemoRack do
@@ -45,6 +46,38 @@ describe MemoRack do
 		}
 	end
 
+	# パッチをあてる
+	def patch(name)
+		path = File.expand_path("../patches/#{name}", __FILE__)
+		if File.directory?(path)
+			Dir[File.join(path, '*.patch')].each { |path|
+				`patch -p1 < "#{path}"`
+			}
+		else
+			path += '.patch'
+			`patch -p1 < "#{path}"`
+		end
+	end
+
+	# git でパッチをあてる
+	def git_am(name)
+		unless File.exists?('.git')
+			`git init`
+			`git add .`
+			`git commit -m "first commit"`
+		end
+
+		path = File.expand_path("../patches/#{name}", __FILE__)
+		if File.directory?(path)
+			Dir[File.join(path, '*.patch')].each { |path|
+				`git am -3 "#{path}"`
+			}
+		else
+			path += '.patch'
+			`git am -3 "#{path}"`
+		end
+	end
+
 	before do
 		require 'tmpdir'
 		@tmpdir = Dir.mktmpdir
@@ -60,7 +93,7 @@ describe MemoRack do
 				proc { memorack '-h' }.must_output nil, <<-EOD.cut_indent
 					Usage: memorack create [options] PATH
 					       memorack theme  [options] [THEME]
-					       memorack server [options] PATH
+					       memorack server [options] [PATH]
 					       memorack build  [options] [PATH]
 
 					    -h, --help                       Show this message
@@ -86,10 +119,10 @@ describe MemoRack do
 
 			it "server" do
 				proc { memorack 'server', '-h' }.must_output nil, <<-EOD.cut_indent
-					Usage: memorack server [options] PATH
+					Usage: memorack server [options] [PATH]
 
 					    -p, --port PORT                  use PORT (default: 9292)
-					    -t, --theme THEME                use THEME (default: oreilly)
+					    -t, --theme THEME                use THEME (default: custom)
 					    -h, --help                       Show this message
 				EOD
 			end
@@ -103,6 +136,7 @@ describe MemoRack do
 					        --url URL                    Site URL (default: )
 					        --local                      Site URL is output directory
 					        --prettify                   prettify URL
+					        --index                      output index.html of sub directory
 					    -h, --help                       Show this message
 				EOD
 			end
@@ -117,7 +151,7 @@ describe MemoRack do
 				proc { memorack '-h' }.must_output nil, <<-EOD.cut_indent
 					Usage: memorack create [options] PATH
 					       memorack theme  [options] [THEME]
-					       memorack server [options] PATH
+					       memorack server [options] [PATH]
 					       memorack build  [options] [PATH]
 
 					    -h, --help                       このメッセージを表示
@@ -144,10 +178,10 @@ describe MemoRack do
 
 			it "server" do
 				proc { memorack 'server', '-h' }.must_output nil, <<-EOD.cut_indent
-					Usage: memorack server [options] PATH
+					Usage: memorack server [options] [PATH]
 
 					    -p, --port PORT                  ポートを使う (省略値: 9292)
-					    -t, --theme THEME                テーマを使う (省略値: oreilly)
+					    -t, --theme THEME                テーマを使う (省略値: custom)
 					    -h, --help                       このメッセージを表示
 				EOD
 			end
@@ -161,6 +195,7 @@ describe MemoRack do
 					        --url URL                    サイトURL (省略値: )
 					        --local                      サイトURLをアウトプットディレクトリにする
 					        --prettify                   綺麗なURLになるように生成する
+					        --index                      サブディレクトリの index.html を出力する
 					    -h, --help                       このメッセージを表示
 				EOD
 			end
@@ -181,10 +216,17 @@ describe MemoRack do
 					./content
 					./content/README.md
 					./Gemfile
+					./plugins
+					./plugins/.gitkeep
 					./themes
 					./themes/custom
 					./themes/custom/config.json
 					./themes/custom/index.md
+					./themes/custom/locales
+					./themes/custom/locales/.gitkeep
+					./themes/custom/macro.yml
+					./themes/custom/pages
+					./themes/custom/pages/.gitkeep
 				EOD
 			}
 		end
@@ -226,6 +268,11 @@ describe MemoRack do
 					custom --> [oreilly] --> [basic]
 					  config.json
 					  index.md
+					  locales/
+					  locales/.gitkeep
+					  macro.yml
+					  pages/
+					  pages/.gitkeep
 				EOD
 			}
 		end
@@ -266,6 +313,7 @@ describe MemoRack do
 			@hash = {}
 			@hash['basic']		= '9b6d4163c422ff9304ebfec6beacb89e23715fe5'
 			@hash['oreilly']	= 'ef118f287e80648235a314980da908f70e982478'
+			@theme = 'oreilly'
 
 			@file_lists = <<-EOD.cut_indent
 				.
@@ -279,7 +327,7 @@ describe MemoRack do
 		end
 
 		it "build" do
-			theme  = 'oreilly'
+			theme  = @theme
 			output = '_site'
 
 			chmemo { |name|
@@ -293,7 +341,7 @@ describe MemoRack do
 		end
 
 		it "build PATH" do
-			theme  = 'basic'
+			theme  = @theme
 			output = '_site'
 
 			chmemo { |name|
@@ -313,7 +361,7 @@ describe MemoRack do
 		end
 
 		it "build --output DIRECTORY" do
-			theme  = 'oreilly'
+			theme  = @theme
 			output = 'output'
 
 			chmemo { |name|
@@ -341,7 +389,7 @@ describe MemoRack do
 		end
 
 		it "build --url URL" do
-			theme  = 'oreilly'
+			theme  = @theme
 			output = '_site'
 			url    = 'http://memo.pow'
 
@@ -351,13 +399,13 @@ describe MemoRack do
 				Dir.chdir(output) { |output|
 					`find . -print`.must_equal @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
-					File.read('index.html').must_match %r[<a href="#{url}/README.html">README</a>]
+					File.read('index.html').must_match %r[<a href="#{url}/README.html">MemoRack について</a>]
 				}
 			}
 		end
 
 		it "build --local" do
-			theme  = 'oreilly'
+			theme  = @theme
 			output = '_site'
 
 			chmemo { |name|
@@ -368,13 +416,13 @@ describe MemoRack do
 				Dir.chdir(output) { |output|
 					`find . -print`.must_equal @file_lists
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
-					File.read('index.html').must_match %r[<a href="#{url}/README.html">README</a>]
+					File.read('index.html').must_match %r[<a href="#{url}/README.html">MemoRack について</a>]
 				}
 			}
 		end
 
 		it "build --prettify" do
-			theme  = 'oreilly'
+			theme  = @theme
 			output = '_site'
 			url    = ''
 
@@ -394,7 +442,56 @@ describe MemoRack do
 					EOD
 
 					`git hash-object css/styles.css`.must_equal @hash[theme]+"\n"
-					File.read('index.html').must_match %r[<a href="#{url}/README">README</a>]
+					File.read('index.html').must_match %r[<a href="#{url}/README">MemoRack について</a>]
+				}
+			}
+		end
+
+		it "plugin" do
+			theme  = @theme
+			output = '_site'
+
+			chmemo { |name|
+				patch 'plugin'
+				proc { memorack 'build' }.must_output "Build 'content/' -> '#{output}'\n"
+
+				Dir.chdir(output) { |output|
+					theme_chain = 'Theme (custom --> oreilly --> basic)'
+					File.read('index.html').must_match /#{Regexp.escape CGI.escapeHTML theme_chain}/
+				}
+			}
+		end
+
+		it "macro" do
+			theme  = @theme
+			output = '_site'
+
+			chmemo { |name|
+				patch 'macro'
+				proc { memorack 'build' }.must_output "Build 'content/' -> '#{output}'\n"
+
+				Dir.chdir(output) { |output|
+					File.read('index.html').must_match %r[<title>覚書き</title>]
+					File.read('README.html').must_match %r[<title>MemoRack について ≫ 覚書き</title>]
+				}
+			}
+		end
+
+		it "git" do
+			theme  = @theme
+			output = '_site'
+
+			chmemo { |name|
+				git_am 'git'
+				proc { memorack 'build' }.must_output "Build 'content/' -> '#{output}'\n"
+
+				Dir.chdir(output) { |output|
+					ctime = '<div>作成時間：2013-05-11 18:47:31 +0900</div>'
+					mtime = '<div>更新時間：2013-05-11 18:49:46 +0900</div>'
+
+					history = File.read('HISTORY.html')
+					history.must_match /#{Regexp.escape ctime}/
+					history.must_match /#{Regexp.escape mtime}/
 				}
 			}
 		end
@@ -420,18 +517,21 @@ describe MemoRack do
 			get '/'
 			last_response.must_be :ok?
 			last_response.body.must_match /Powered by <a href="#{MemoRack::HOMEPAGE}"[^>]*>/
+			last_response.body.must_match %r[<title>覚書き</title>]
 		end
 
 		it "server /README" do
 			get '/README'
 			last_response.must_be :ok?
 			last_response.body.must_match /このディレクトリに markdown 等のメモファイルを作成してください/
+			last_response.body.must_match %r[<title>MemoRack について \| 覚書き</title>]
 		end
 
 		it "server /404" do
 			get '/404'
 			last_response.status.must_equal 404
 			last_response.body.must_match %r[<div id="content"><h3>Not Found</h3>\s+</div>]
+			last_response.body.must_match %r[<title>Error 404 \| 覚書き</title>]
 		end
 
 		after do

data/spec/patches/git/0001-add-HISTORY.patch

@@ -0,0 +1,15 @@
+From f816996d9e38bff0a10839e4fa66b00d0a2a7569 Mon Sep 17 00:00:00 2001
+From: gnue <gnue@so-kukan.com>
+Date: Sat, 11 May 2013 18:47:31 +0900
+Subject: [PATCH 1/3] add HISTORY
+
+---
+ 0 files changed
+ create mode 100644 content/HISTORY.md
+
+diff --git a/content/HISTORY.md b/content/HISTORY.md
+new file mode 100644
+index 0000000..e69de29
+-- 
+1.7.12.4 (Apple Git-37)
+

data/spec/patches/git/0002-change-HISTORY.patch

@@ -0,0 +1,19 @@
+From eacb034650f18239f9cd99f8833ebe730595b69b Mon Sep 17 00:00:00 2001
+From: gnue <gnue@so-kukan.com>
+Date: Sat, 11 May 2013 18:49:46 +0900
+Subject: [PATCH 2/3] change HISTORY
+
+---
+ content/HISTORY.md | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/content/HISTORY.md b/content/HISTORY.md
+index e69de29..a01569d 100644
+--- a/content/HISTORY.md
++++ b/content/HISTORY.md
+@@ -0,0 +1,2 @@
++## HISTORY
++
+-- 
+1.7.12.4 (Apple Git-37)
+

data/spec/patches/git/0003-index.html.patch

@@ -0,0 +1,75 @@
+From 3dbf53d1c486ff86cbbd229c9c42f9d8260c2349 Mon Sep 17 00:00:00 2001
+From: gnue <gnue@so-kukan.com>
+Date: Sat, 11 May 2013 18:58:35 +0900
+Subject: [PATCH 3/3] =?UTF-8?q?index.html=20=E3=82=92=E8=BF=BD=E5=8A=A0?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ themes/custom/index.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 53 insertions(+)
+ create mode 100644 themes/custom/index.html
+
+diff --git a/themes/custom/index.html b/themes/custom/index.html
+new file mode 100644
+index 0000000..2fa51a5
+--- /dev/null
++++ b/themes/custom/index.html
+@@ -0,0 +1,53 @@
++<!DOCTYPE html>
++<html>
++<head>
++<meta charset="utf-8" />
++
++<style>
++  article, aside, dialog, figure, footer, header,
++  hgroup, menu, nav, section { display: block; }
++</style>
++
++<meta name="keywords" content="" />
++<meta name="description" content="" />
++<title>{{page.title}}</title>
++
++<link type="text/css" href="{{site.url}}/css/styles.css" rel="stylesheet" media="all" />
++<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
++<script type="text/javascript">
++	$(function(){
++		// 表示しているメニューを選択
++		$('#menu a[href="' + document.location.pathname + '"]').parent().addClass('selected');
++		$('#menu a[href="' + document.location + '"]').parent().addClass('selected');
++
++		// 外部サイトのリンクに target='_blank' を追加
++		$('a[href^=http]').not('[href*="://' + location.hostname + '"]').attr('target', '_blank');
++	});
++</script>
++
++</head>
++<body>
++  <div id="page">
++    <header>
++      <h1><a href="{{site.url}}/">{{title}}</a></h1>
++    </header>
++
++    <div id="content-container">
++      <div id="menu" class="importdoc">{{{__menu__}}}</div>
++      <div id="content">
++        {{#content?}}
++        <div>作成時間：{{page.ctime}}</div>
++        <div>更新時間：{{page.mtime}}</div>
++        {{/content?}}
++
++        {{{__content__}}}
++      </div>
++      <div class="clear"></div>
++    </div>
++
++    <footer>
++      <p>Powered by <a href="{{app.url}}" target="_blank"> {{app.name}} {{app.version}}</a></p>
++    </footer>
++  </div>
++</body>
++</html>
+-- 
+1.7.12.4 (Apple Git-37)
+