tdiary 4.0.2 → 4.0.2.20140201

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b1d5ff9c5be93ee04e88c9d5e1a1894e7e42dd
-  data.tar.gz: dc3abc8a1d49859c4db89e70c1f84c34d8176227
+  metadata.gz: 3c52de43dc119883d82cc39f570b3b2f5999b96d
+  data.tar.gz: 517e13ad91be78f16ae61c3d4fd678d9d29e327c
 SHA512:
-  metadata.gz: a4fd13995035a6a6ac9a4a62cee6fdd567d9c0d5a4c3fbe88368d7ba082bc339dc918149164a2dc9fc0824ed1e8a63f9cc378a69b322f32ebab6832288811ab5
-  data.tar.gz: 5b7c08feb7f14e2cd6b002cd7a5105dcb6dde0d8b3278a11f8f22736ad6f54e39eb657b99b0467135c0b0faa1fbf7ecaebec4852aa3a48206019b3065b3c329e
+  metadata.gz: 857ecaf2c9a4466f323710df41d0341dbb19bb02332c96ede67ec6f5966d20e25de11215ac3d7dbea86df89e6f6ffce2c3dc1fc2f0fd6569f36efd483833e897
+  data.tar.gz: f60cfac1eec83552533d86cf30b4ce6468470eb54d2009570afd70903c51807b259fc386cf77e78a89b78dbab5ae45ad0d503fc1509145afd0ca01a913939b4d

data/.travis.yml

@@ -6,6 +6,8 @@ rvm:
   - 1.9.3
   - 2.0.0
 
+cache: bundler
+
 # ignored --deployment option
 bundler_args: ""
 

data/Gemfile

@@ -21,23 +21,24 @@ group :server do
 end
 
 group :development do
-  gem 'pit', :require => false
-  gem 'racksh', :require => false
+  gem 'pit', require: false
+  gem 'racksh', require: false
   gem 'rake'
+  gem 'redcarpet'
 
   group :test do
     gem 'pry'
     gem 'tapp'
-    gem 'test-unit', :require => 'test/unit'
+    gem 'test-unit', require: 'test/unit'
     gem 'rspec'
-    gem 'capybara', :require => 'capybara/rspec'
+    gem 'capybara', require: 'capybara/rspec'
     gem 'selenium-webdriver'
     gem 'launchy'
     gem 'sequel'
     gem 'sqlite3'
-    gem 'jasmine'
-    gem 'simplecov', :require => false
-    gem 'coveralls', :require => false
+    gem 'jasmine', '~> 1.3'
+    gem 'simplecov', require: false
+    gem 'coveralls', require: false
   end
 end
 

data/Gemfile.lock

@@ -2,19 +2,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
-    capybara (2.2.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.3.9)
+    childprocess (0.4.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -23,10 +23,10 @@ GEM
       thor
     daemons (1.1.9)
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.2)
     eventmachine (1.0.3)
     execjs (2.0.2)
-    fastimage (1.5.4)
+    fastimage (1.6.0)
       addressable (~> 2.3, >= 2.3.5)
     ffi (1.9.3)
     hike (1.2.3)
@@ -41,13 +41,13 @@ GEM
       addressable (~> 2.3)
     libv8 (3.16.14.3)
     method_source (0.8.2)
-    mime-types (2.0)
+    mime-types (2.1)
     mini_portile (0.5.2)
-    multi_json (1.8.2)
-    nokogiri (1.6.0)
+    multi_json (1.8.4)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     pit (0.0.7)
-    pry (0.9.12.4)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -57,7 +57,8 @@ GEM
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
-    rake (10.1.0)
+    rake (10.1.1)
+    redcarpet (3.0.0)
     ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -69,13 +70,13 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    rubyzip (1.0.0)
-    selenium-webdriver (2.37.0)
+    rubyzip (1.1.0)
+    selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip (~> 1.0.0)
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
-    sequel (4.4.0)
+    sequel (4.6.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -116,13 +117,14 @@ DEPENDENCIES
   coveralls
   fastimage
   hikidoc
-  jasmine
+  jasmine (~> 1.3)
   launchy
   pit
   pry
   rack
   racksh
   rake
+  redcarpet
   rspec
   selenium-webdriver
   sequel

data/config.ru

@@ -1,6 +1,4 @@
 $:.unshift( File::dirname( __FILE__ ).untaint )
-require 'tdiary'
-require 'tdiary/environment'
 require 'tdiary/application'
 
 use ::Rack::Reloader unless ENV['RACK_ENV'] == 'production'

data/doc/INSTALL-paas.md

@@ -27,10 +27,16 @@ tDiary の最新版を取得します。
 git clone git://github.com/tdiary/tdiary-core.git
 ```
 
-heroku コマンドを用いて Heroku でアプリケーションを作成します。なお、Heroku のアカウント作成方法は本ドキュメントでは省略します。tDiary のルートディレクトリ(Gemfile が存在する箇所) で以下のコマンドを実行します。
+続いて、依存するライブラリをインストールするために bundle install コマンドを実行します。
 
 ```
 % cd tdiary-core
+% bundle install
+```
+
+heroku コマンドを用いて Heroku でアプリケーションを作成します。なお、Heroku のアカウント作成方法は本ドキュメントでは省略します。tDiary のルートディレクトリ(Gemfile が存在する箇所) で以下のコマンドを実行します。
+
+```
 % heroku apps:create [アプリケーション名]
 ```
 
@@ -51,7 +57,7 @@ heroku コマンドを用いて Heroku でアプリケーションを作成し
 日記更新時に必要となるユーザー名とパスワードを保存する .htpasswd ファイルを作成します。この情報は重要なので、外部には公開しないでください。
 
 ```
-% rake auth:password:create
+% bundle exec rake auth:password:create
 ```
 
 ここまでの変更内容を deploy ブランチにコミットし、Heroku にアプリケーションを転送します。
@@ -73,10 +79,16 @@ tDiary の最新版を取得します。
 git clone git://github.com/tdiary/tdiary-core.git
 ```
 
-sqale.jp にアクセスして新しいアプリケーションを作成します。作成後にアプリケーションの URL を git のリモートリポジトリに追加します。tDiary のルートディレクトリ(Gemfile が存在する箇所) で以下のコマンドを実行します。
+続いて、依存するライブラリをインストールするために bundle install コマンドを実行します。
 
 ```
 % cd tdiary-core
+% bundle install
+```
+
+sqale.jp にアクセスして新しいアプリケーションを作成します。作成後にアプリケーションの URL を git のリモートリポジトリに追加します。tDiary のルートディレクトリ(Gemfile が存在する箇所) で以下のコマンドを実行します。
+
+```
 % git remote add sqale ssh://sqale@gateway.sqale.jp:2222/[username]/[application].git
 ```
 
@@ -97,7 +109,7 @@ username と application の値は別途読み替えてください。続いて
 日記更新時に必要となるユーザー名とパスワードを保存する .htpasswd ファイルを作成します。この情報は重要なので、外部には公開しないでください。
 
 ```
-% rake auth:password:create
+% bundle exec rake auth:password:create
 ```
 
 dot.env ファイルを .env にリネームして、データベースの接続情報を記入します。データベースの接続情報は sqale のアプリケーションダッシュボードから参照してください。接続情報は以下の形式で記入します。
@@ -109,7 +121,7 @@ DATABASE_URL=mysql2://username:password@hostname/database
 sqale では javascript や css ファイルを作業ディレクトリの public/assets 配下に置く必要があります。以下のコマンドを実行して対象のファイルをコピーしてください。
 
 ```
-rake assets:copy
+% bundle exec rake assets:copy
 ```
 
 ここまでの変更内容を deploy ブランチにコミットし、Heroku にアプリケーションを転送します。

data/misc/plugin/amazon/amazonimg.rb

@@ -66,7 +66,7 @@ def amazon_call_ecs( asin, country = nil )
 	url << "&Version=#{@amazon_require_version}"
 
 	timeout( 10 ) do
-		open( url, :proxy => @proxy ) {|f| f.read}
+		open( url, proxy: @proxy ) {|f| f.read}
 	end
 end
 

data/misc/plugin/category.rb

@@ -78,8 +78,8 @@ def category_navi
 	result = ''
 	case mode
 	when :year, :half, :quarter, :month
-		all_diary = Category::Info.new(@cgi, @years, @conf, :year => -1, :month => -1)
-		all = Category::Info.new(@cgi, @years, @conf, :category => ['ALL'], :year => -1, :month => -1)
+		all_diary = Category::Info.new(@cgi, @years, @conf, year: -1, month: -1)
+		all = Category::Info.new(@cgi, @years, @conf, category: ['ALL'], year: -1, month: -1)
 		result << category_navi_anchor(info.prev, @conf['category.prev_' + mode.to_s], mobile)
 		result << category_navi_anchor(info.next, @conf['category.next_' + mode.to_s], mobile)
 		unless mobile then
@@ -87,17 +87,17 @@ def category_navi
 			result << category_navi_anchor(all, @conf['category.all'])
 		end
 	when :all
-		year = Category::Info.new(@cgi, @years, @conf, :year => Time.now.year.to_s)
-		half = Category::Info.new(@cgi, @years, @conf, :year => Time.now.year.to_s, :month => "#{((Time.now.month - 1) / 6 + 1)}H")
-		quarter = Category::Info.new(@cgi, @years, @conf, :year => Time.now.year.to_s, :month => "#{((Time.now.month - 1) / 3 + 1)}Q")
-		month = Category::Info.new(@cgi, @years, @conf, :year => Time.now.year.to_s, :month => '%02d' % Time.now.month)
+		year = Category::Info.new(@cgi, @years, @conf, year: Time.now.year.to_s)
+		half = Category::Info.new(@cgi, @years, @conf, year: Time.now.year.to_s, month: "#{((Time.now.month - 1) / 6 + 1)}H")
+		quarter = Category::Info.new(@cgi, @years, @conf, year: Time.now.year.to_s, month: "#{((Time.now.month - 1) / 3 + 1)}Q")
+		month = Category::Info.new(@cgi, @years, @conf, year: Time.now.year.to_s, month: '%02d' % Time.now.month)
 		result << category_navi_anchor(year, @conf['category.this_year'], mobile)
 		result << category_navi_anchor(half, @conf['category.this_half'], mobile)
 		result << category_navi_anchor(quarter, @conf['category.this_quarter'], mobile)
 		result << category_navi_anchor(month, @conf['category.this_month'], mobile)
 	end
 	if !info.category.include?('ALL') and !mobile then
-		all_category = Category::Info.new(@cgi, @years, @conf, :category => ['ALL'])
+		all_category = Category::Info.new(@cgi, @years, @conf, category: ['ALL'])
 		result << category_navi_anchor(all_category, @conf['category.all_category'])
 	end
 	result

data/misc/plugin/image.rb

@@ -120,10 +120,13 @@ end
 #
 # initialize
 #
-@image_dir = @options && @options['image.dir'] || './images/'
+@image_dir = (@options && @options['image.dir']) || File.join(TDiary.server_root, @cgi.is_a?(RackCGI) ? 'public/images' : 'images')
 @image_dir.chop! if /\/$/ =~ @image_dir
+FileUtils.mkdir_p @image_dir unless File.exist?(@image_dir)
+
 @image_url = @options && @options['image.url'] || "#{base_url}images/"
 @image_url.chop! if /\/$/ =~ @image_url
+
 @image_maxwidth = @options && @options['image.maxwidth'] || nil
 
 add_body_enter_proc do |date|	

data/misc/plugin/search-default.rb

@@ -0,0 +1,269 @@
+# -*- coding: utf-8 -*-
+#
+# search-default.rb - site search plugin sample using DefaultIO.
+#
+# Copyright (C) 2003-2005 Minero Aoki
+# Copyright (C) 2012, TADA Tadashi <t@tdtds.jp>
+# You can redistribute it and/or modify it under GPL2.
+#
+#
+
+def search_title
+	'全文検索'
+end
+
+class WrongQuery < StandardError; end
+
+module DefaultIOSearch
+
+	module_function
+	def setup_patterns(query)
+		patterns = split_string(query).map {|pat|
+			check_pattern pat
+			Regexp.new( Regexp.quote(pat), Regexp::IGNORECASE )
+		}
+		raise WrongQuery, 'no pattern' if patterns.empty?
+		raise WrongQuery, 'too many sub patterns' if patterns.length > 8
+		patterns
+	end
+
+	def check_pattern(pat)
+		raise WrongQuery, 'no pattern' unless pat
+		raise WrongQuery, 'empty pattern' if pat.empty?
+		raise WrongQuery, "pattern too short: #{pat}" if pat.length < 2
+		raise WrongQuery, 'pattern too long' if pat.length > 128
+	end
+
+	def split_string(str)
+		str.split(/[\s　]+/ou).reject {|w| w.empty? }
+	end
+
+	INF = 1 / 0.0
+
+	def match_components(patterns, data_path)
+		foreach_diary_from_latest(data_path) do |diary|
+			next unless diary.visible?
+			num = 1
+			diary.each_section do |sec|
+				if patterns.all? {|re| re =~ sec.to_src }
+					yield diary, fragment('p', num), sec
+				end
+				num += 1
+			end
+			diary.each_visible_comment(INF) do |cmt, num|
+				if patterns.all? {|re| re =~ cmt.body }
+					yield diary, fragment('c', num), cmt
+				end
+			end
+		end
+	end
+
+	def fragment(type, num)
+		sprintf('%s%02d', type, num)
+	end
+
+	#
+	# tDiary Implementation Dependent
+	#
+	def foreach_diary_from_latest(data_path, &block)
+		foreach_data_file(data_path.sub(%r</+\z>, '')) do |path|
+			read_diaries(path).sort_by {|diary| diary.date }.reverse_each(&block)
+		end
+	end
+
+	def foreach_data_file(data_path, &block)
+		Dir.glob("#{data_path}/[0-9]*/*.td2").sort.reverse_each do |path|
+			yield path.untaint
+		end
+	end
+
+	def read_diaries(path)
+		d = nil
+		diaries = {}
+		load_tdiary_textdb(path) do |header, body|
+			begin
+				d = diary_class(header['Format']).new(header['Date'], '', body)
+			rescue ArgumentError
+				next
+			end
+			d.show(header['Visible'] != 'false')
+			diaries[d.ymd] = d
+		end
+		(Years[d.y] ||= []).push(d.m) if d
+		load_comments diaries, path
+		diaries.values
+	end
+
+	DIARY_CLASS_CACHE = {}
+
+	def diary_class(style)
+		c = DIARY_CLASS_CACHE[style]
+		return c if c
+		if TDiary.const_defined?('Style')
+			require "tdiary/style/#{style.downcase}.rb"
+			c = eval("TDiary::Style::#{style.capitalize}Diary")
+		else
+			require "tdiary/style/#{style.downcase}_style.rb"
+			c = eval("TDiary::#{style.capitalize}Diary")
+		end
+		c.__send__(:include, DiaryClassDelta)
+		DIARY_CLASS_CACHE[style] = c
+		c
+	end
+
+	module DiaryClassDelta
+		def ymd
+			date().strftime('%Y%m%d')
+		end
+
+		def y_m_d
+			date().strftime('%Y-%m-%d')
+		end
+
+		def y
+			'%04d' % date().year
+		end
+
+		def m
+			'%02d' % date().month
+		end
+	end
+
+	def load_comments(diaries, path)
+		cmtfile = path.sub(/2\z/, 'c')
+		return unless File.file?(cmtfile)
+		load_tdiary_textdb(cmtfile) do |header, body|
+			c = TDiary::Comment.new(header['Name'], header['Mail'], body,
+															Time.at(header['Last-Modified'].to_i))
+			c.show = (header['Visible'] != 'false')
+			d = diaries[header['Date']]
+			d.add_comment c if d
+		end
+	end
+
+	def load_tdiary_textdb(path)
+		File.open(path) {|f|
+			ver = f.gets.strip
+			raise "unkwnown format: #{ver}" unless ver == 'TDIARY2.00.00' or ver == 'TDIARY2.01.00'
+			f.each('') do |header|
+				h = {}
+				header.untaint.strip.each_line do |line|
+					begin
+						n, v = *line.split(':', 2)
+					rescue ArgumentError
+						next
+					end
+					h[n.strip] = v.strip
+				end
+				body = f.gets("\n.\n").chomp(".\n").untaint
+				yield h, body
+			end
+		}
+	end
+
+	def short_html(component)
+		# Section classes do not have common superclass, we can't use class here.
+		case component.class.name
+		when /Section/
+			section = component
+			if section.subtitle
+				sprintf('%s<br>%s',
+					tdiary2text(section.subtitle_to_html),
+					tdiary2text(section.body_to_html))
+			else
+				tdiary2text(section.body_to_html)
+			end
+		when /Comment/
+			cmt = component
+			shorten(escape((cmt.name + ': ' + cmt.body)))
+		else
+			raise "must not happen: #{component.class}"
+		end
+	end
+
+	def tdiary2text(html)
+		re = Regexp.new('<[^>]*>', Regexp::EXTENDED)
+		shorten(apply_tdiary_plugins(html).gsub(re, ''))
+	end
+
+	Years = {}
+
+	TDiary::Plugin.__send__(:public, :apply_plugin)
+	def apply_tdiary_plugins(html)
+		#@plugin.apply_plugin(html, false)
+		html
+	end
+
+	@plugin = nil
+
+	#
+	# Utils
+	#
+	HTML_ESCAPE_TABLE = {
+		'&' => '&amp;',
+		'<' => '&lt;',
+		'>' => '&gt;',
+		'"' => '&quot;'
+	}
+
+	def escape(str)
+		tbl = HTML_ESCAPE_TABLE
+		str.gsub(/[&"<>]/) {|ch| tbl[ch] }
+	end
+
+	def shorten(str, len = 200)
+		matched = str.gsub( /\n/, ' ' ).scan( /^.{0,#{len - 3}}/u )[0]
+		if $'.nil? || $'.empty?
+			matched
+		else
+			matched + '...'
+		end
+	end
+end
+
+def search_input_form( q )
+	r = <<-HTML
+		<form method="GET" action="#{@conf.index}"><div>
+			検索キーワード:
+			<input name="q" value="#{h q}">
+			<input type="submit" value="OK">
+		</div></form>
+	HTML
+end
+
+def search_result
+	unless @conf.io_class == (TDiary.const_defined?('DefaultIO') ? TDiary::DefaultIO : TDiary::IO::Default)
+		return %Q|<p class="message">could not use this plugin under #{@conf.io_class}.</p>| 
+	end
+
+	query = CGI::unescape( @cgi.params['q'][0] )
+	start = CGI::unescape( @cgi.params['start'][0] || '0' ).to_i
+
+	begin
+		patterns = DefaultIOSearch::setup_patterns(query)
+		r = search_input_form( query )
+
+		r << '<dl class="search-result autopagerize_page_element">'
+		count = 0
+		too_many = false
+		DefaultIOSearch::match_components(patterns, @conf.data_path) do |diary, fragment, component|
+			count += 1
+			if count > 50 # TO MANY HITS
+				too_many = true
+				break
+			end
+			href = @conf.index + anchor( "#{diary.ymd}#{fragment}" )
+			r << %Q|<dt><a href="#{href}">#{h diary.y_m_d}</a></dt>|
+			r << %Q|<dd>#{DefaultIOSearch::short_html(component)}</dd>|
+		end
+		r << '</dl>'
+
+		r << '<div class="search-navi">'
+		r << "<p>#{too_many ? 'too many' : count} hits.</p>"
+		r << '</div>'
+
+		r
+	rescue WrongQuery
+		search_input_form( query ) + %Q|<p class="message">#{$!.message}</p>|
+	end
+end

data/misc/theme_convert/theme_convert.rb

@@ -167,12 +167,12 @@ racc_goto_default = [
 racc_token_table = {
  false => 0,
  Object.new => 1,
- :IDENT => 2,
+ IDENT: 2,
  ":" => 3,
  "{" => 4,
  "}" => 5,
- :QUOTE => 6,
- :EOL => 7 }
+ QUOTE: 6,
+ EOL: 7 }
 
 racc_use_result_var = true
 

data/plugin/50sp.rb

@@ -8,8 +8,9 @@ SP_PREFIX = 'sp'
 end
 @sp_path << "#{TDiary::PATH}/misc/plugin" if @sp_path.include?('misc/plugin')
 
-# FIXME: dirty hack, it should create TDiary::Server::Config.plugin_path
-TDiary::Contrib::Plugin.setup( @sp_path ) if defined?(TDiary::Contrib)
+@sp_path.concat TDiary::Extensions::constants.map {|extension|
+	TDiary::Extensions::const_get( extension ).sp_path
+}.flatten.compact.uniq
 
 # get plugin option
 def sp_option( key )

data/spec/acceptance/append_comment_spec.rb

@@ -6,8 +6,8 @@ feature 'ツッコミの更新' do
 		append_default_diary
 		visit '/'
 		click_link 'ツッコミを入れる'
-		fill_in "name", :with => "alpha"
-		fill_in "body", :with => <<-BODY
+		fill_in "name", with: "alpha"
+		fill_in "body", with: <<-BODY
 こんにちは!こんにちは!
 BODY
 
@@ -22,7 +22,7 @@ BODY
 			page.should have_content "こんにちは!こんにちは!"
 		}
 		today = Date.today.strftime('%Y年%m月%d日')
-		page.find('h2', :text => today).click_link today
+		page.find('h2', text: today).click_link today
 		within('div.day div.comment div.commentbody') {
 			within('div.commentator'){
 				t = Time.now
@@ -38,8 +38,8 @@ BODY
 		append_default_comment
 		visit "/"
 		click_link 'ツッコミを入れる'
-		fill_in "name", :with => "bravo"
-		fill_in "body", :with => <<-BODY
+		fill_in "name", with: "bravo"
+		fill_in "body", with: <<-BODY
 こんばんは!こんばんは!
 BODY
 
@@ -55,7 +55,7 @@ BODY
 		}
 
 		today = Date.today.strftime('%Y年%m月%d日')
-		page.find('h2', :text => today).click_link today
+		page.find('h2', text: today).click_link today
 		within('div.day div.comment div.commentbody') {
 			t = Time.now
 			page.should have_content "%04d年%02d月%02d日" % [t.year, t.month, t.day]
@@ -70,8 +70,8 @@ BODY
 		append_default_diary
 		visit '/'
 		click_link 'ツッコミを入れる'
-		fill_in "name", :with => "alpha"
-		fill_in "body", :with => <<-BODY
+		fill_in "name", with: "alpha"
+		fill_in "body", with: <<-BODY
 こんにちは!こんにちは!
 BODY