memorack 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6430c72a4053f23e3741c9ccf52baad7d285de39
-  data.tar.gz: 23d5eaa2c3681cecc1d411dafd75c335fff998e5
+  metadata.gz: 6e66f5b1c38568ebc3011b2210c3b890fa0a8e36
+  data.tar.gz: 006b12c2a64d34170e3a7f3b1543c1dd61120222
 SHA512:
-  metadata.gz: 9e91e9f5381a21fdc873ce74f3a74da9093ab97609709fd9fc372f7a677408015712b058d78ebb29b8d152e70c9b9543045a4b9fd6df270f35010c356a1c0f1d
-  data.tar.gz: b71a85e648d23f013d546f3c8e3a712e429c3b71ecbd197e2b852f73c75d37db6497e9574597ba91b5788c2229ede96560cd487630cab7c667333eb73b43b978
+  metadata.gz: e6e4612436e39a618a59681f0db052f8069a05eb1d332ab754fddfc0cc4ba2371981ab77bf2e42f328d5f55e2025180ce73f0ad9d7370d4bb9bc28d65b3dfe81
+  data.tar.gz: 44cfe752ef03701a381582aa26a1020320a161eb061b06b1d6c2a5864f901dca55c145056b3ad12b395e655e12247eb99995ac378b242e8cdf63065e5c9612e8

data/HISTORY.md

@@ -1,5 +1,12 @@
 ## History
 
+### v0.1.2 / 2013-05-06
+
+* build not remove .git/.hg/.svn/.cvs direcotry
+* fix select menu script in basic theme `index.html`
+* fix comment  in basic theme `config.json`
+* fix css with bootstrap
+
 ### v0.1.1 / 2013-04-16
 
 * fix error page css URL

data/README.md

@@ -116,8 +116,8 @@ Download [highlight.js](http://softwaremaniacs.org/soft/highlight/en/)
 
 Add code to `index.html`
 
-	<link rel="stylesheet" href="/highlight.js/styles/default.css">
-	<script src="/highlight.js/highlight.pack.js"></script>
+	<link rel="stylesheet" href="{{site.url}}/highlight.js/styles/default.css">
+	<script src="{{site.url}}/highlight.js/highlight.pack.js"></script>
 	<script>hljs.initHighlightingOnLoad();</script>
 
 ### org-mode

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/memorack/builder.rb

@@ -17,14 +17,17 @@ module MemoRack
 			uri_escape:	true,
 		}
 
+		DEFAULT_KEEPS = ['.git', '.hg', '.svn', '.csv']
+
 		def generate(options = {}, &callback)
 			options = DEFAULT_BUILD_OPTIONS.merge(options)
+			keeps = options[:keep] || @options[:keeps] || DEFAULT_KEEPS
 
 			url = @site[:url]
 			options[:prefix] = File.join(url, options[:prefix]) unless url.empty?
 
 			output = File.expand_path(options[:output])
-			dir_init(output)
+			dir_init(output, keeps)
 
 			@contents = contents(options)
 			@templates = Set.new @contents.files.collect { |file| file[:path] }
@@ -54,10 +57,13 @@ module MemoRack
 		end
 
 		# ディレクトリを初期化する
-		def dir_init(dir)
+		def dir_init(dir, keeps = [])
 			if Dir.exists?(dir)
 				Dir.glob(File.join(dir, '*'), File::FNM_DOTMATCH) { |path|
-					next if /(^|\/)(\.|\.\.)$/ =~ path
+					fname = File.basename(path)
+
+					next if /^\.{1,2}$/ =~ fname
+					next if keeps.member?(fname)
 
 					FileUtils.remove_entry_secure(path)
 				}

data/lib/memorack/core.rb

@@ -28,7 +28,7 @@ module MemoRack
 
 		# テンプレートエンジンのオプション
 		DEFAULT_TEMPLATE_OPTIONS = {
-			tables:			true
+			tables:				true
 		}
 
 		# テンプレートで使用するローカル変数の初期値
@@ -67,7 +67,7 @@ module MemoRack
 
 			@themes_folders.each { |folder|
 				path = theme && File.join(folder, theme)
-				return path if File.exists?(path) && FileTest::directory?(path)
+				return path if File.exists?(path) && File.directory?(path)
 			}
 
 			nil

data/lib/memorack/template/themes/custom/config.json

@@ -1,6 +1,6 @@
 {
 //	"directory_watcher":	1.0,			// ファイルの変更を監視するか決める（秒）
-	"theme":				"oreilly",		// テーマ（省略すると basic ）
+	"theme":				"oreilly",		// テーマ（省略すると継承されません）
 //	"markdown":				"kramdown",		// 使用する markdownライブラリ（省略すると redcarpet ）
 //	"formats":				["markdown"],	// "markdown", "rdoc", "textile" or "wiki" （要 Tilt に対応した gem ライブラリ）
 //	"requires":				[],				// require libraries

data/lib/memorack/themes/basic/css/2-column.scss

@@ -13,7 +13,12 @@
 	border-radius: 10px;
 
 	ul {
-		padding-left: 20px;
+		padding-left: 0;
+		margin: 14px 0 14px 20px;
+	}
+
+	ul ul {
+		margin: 0 0 0 20px;
 	}
 
 	a:link {

data/lib/memorack/themes/basic/index.html

@@ -17,7 +17,8 @@
 <script type="text/javascript">
 	$(function(){
 		// 表示しているメニューを選択
-		$('#menu a[href$="' + document.location.pathname + '"]').parent().addClass('selected');
+		$('#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');

data/lib/memorack/themes/oreilly/oreilly/base.scss

@@ -22,6 +22,7 @@ body {
 	font-family: Arial,Verdana,'Bitstream Vera Sans',Helvetica,sans-serif;
 	line-height: 1.5;
 	-webkit-font-smoothing: antialiased;
+	margin-top: 8px;
 }
 
 h1, h2, h3, h4, h5, h6 {

data/spec/memorack_spec.rb

@@ -264,8 +264,8 @@ describe MemoRack do
 	describe "build" do
 		before do
 			@hash = {}
-			@hash['basic']		= 'd414b3942f61e6b0a07f6458bfb133da40e7c7b8'
-			@hash['oreilly']	= '56b0c0f6a7394904442d7af6986797b1300301c3'
+			@hash['basic']		= '9b6d4163c422ff9304ebfec6beacb89e23715fe5'
+			@hash['oreilly']	= 'ef118f287e80648235a314980da908f70e982478'
 
 			@file_lists = <<-EOD.cut_indent
 				.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memorack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - gnue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack